修改bug和添加字段

dxhy-base/src/main/java/com/dxhy/base/controller/BaseInvoiceController.java

@@ -443,8 +443,12 @@ public class BaseInvoiceController extends AbstractController {
         String qsr = (String)map.get("qsr");
         String company = (String)map.get("company");
         String menuId = (String)map.get("menuId");
+        String bzdh = (String) map.get("bzdh");
+        String inAccountStatus = (String) map.get("inaccountStatus");
 
         Map<String, Object> pramsMap = new HashMap<>(18);
+        pramsMap.put("bzdh", bzdh);
+        pramsMap.put("inAccountStatus", inAccountStatus);
         pramsMap.put("company", company);
         pramsMap.put("menuId", menuId);
         pramsMap.put("business", getUserInfo().getBusiness());
@@ -468,7 +472,7 @@ public class BaseInvoiceController extends AbstractController {
             log.info("accountPeriod:{}",accountPeriod);
         }
 //        pramsMap.put("accountPeriod", map.get("accountPeriod"));
-        String inAccountStatus = (String)map.get("inAccountStatus");
+//        String inAccountStatus = (String)map.get("inAccountStatus");
 
         if (sfkrz != null) {
             if (!"99".equals(sfkrz)) {
@@ -566,9 +570,9 @@ public class BaseInvoiceController extends AbstractController {
         if (!StringUtils.isBlank(qsr)) {
             pramsMap.put("qsr", qsr);
         }
-        if (StringUtils.isNotBlank(inAccountStatus)) {
-            pramsMap.put("inAccountStatus", inAccountStatus);
-        }
+//        if (StringUtils.isNotBlank(inAccountStatus)) {
+//            pramsMap.put("inAccountStatus", inAccountStatus);
+//        }
         try {
             return ResponseEntity
                 .ok(R.ok().put("data", baseInvoiceManualCheckService.selectByManualCheck(pramsMap, curr, size)));

dxhy-base/src/main/java/com/dxhy/base/entity/BaseTDxRecordInvoice.java

@@ -509,4 +509,6 @@ public class BaseTDxRecordInvoice implements Serializable {
     private String postingTime;
     //影像号
     private String imageId;
+    //报账单号
+    private String bzdh;
 }

dxhy-base/src/main/java/com/dxhy/base/model/BaseSggxCxRespVO.java

@@ -149,4 +149,9 @@ public class BaseSggxCxRespVO {
      */
     private String accountPeriod;
 
+    /**
+     * 报账单号
+     */
+    private String bzdh;
+
 }

dxhy-base/src/main/java/com/dxhy/base/service/invoicecheck/BaseInvoiceManualCheckServiceImpl.java

@@ -185,6 +185,8 @@ public class BaseInvoiceManualCheckServiceImpl extends MpBaseServiceImpl<BaseTDx
                         AmountFormatUtil.fmtMicrometer(MathUtil.round(pageList.get(i).getTaxAmount().toString())));
                     vo.setInvoiceStatus(dictdetaServcice.queryDictName(DictConstant.INVOICE_STATUS,pageList.get(i).getInvoiceStatus()));
                     vo.setInvoiceType(pageList.get(i).getInvoiceType());
+                    vo.setInAccountStatus(pageList.get(i).getInvoiceStatus());
+                    vo.setBzdh(pageList.get(i).getBzdh());
                     // 签收方式为已经签收时展示签收信息
                     if ("1".equals(pageList.get(i).getQsStatus())) {
                         if (pageList.get(i).getQsDate() != null) {

dxhy-base/src/main/resources/mapper/BaseSggxcxMapper.xml

@@ -22,11 +22,13 @@
         <result column="qs_name" property="qsName"/>
         <result column="invoice_status" property="invoiceStatus"/>
         <result column="authStatus" property="authStatus"/>
-        <result column="in_account_status" property="inAccountStatus"/>
+        <result column="inaccount_status" property="inAccountStatus"/>
         <result column="payment_date" property="paymentDate"/>
         <result column="payment_status" property="paymentStatus"/>
         <result column="voucher_number" property="voucherNumber"/>
         <result column="ele_invoice_no" property="eleInvoiceNo"/>
+        <result column="bzdh" property="bzdh"/>
+        <result column="inaccount_status" property="inAccountStatus"/>
     </resultMap>
     <resultMap id="hjResultMap"
                type="com.dxhy.base.entity.BaseTDxRecordInvoice">
@@ -91,6 +93,12 @@
         <if test="qszt != null and qszt != '' and qszt != 'null' ">
             and t.qs_status = #{qszt}
         </if>
+        <if test="bzdh != null and bzdh != '' and bzdh != 'null'">
+            and t.bzdh = #{bzdh}
+        </if>
+        <if test="inAccountStatus != null and inAccountStatus != '' and inAccountStatus != 'null'">
+            and t.inaccount_status = #{inAccountStatus}
+        </if>
         <if test="qsksrq != null and qsksrq != '' and qsksrq != 'null' and qsjsrq != null and qsjsrq != '' and qsjsrq != 'null'">
             and date_format(t.qs_date,'%Y-%m-%d') between #{qsksrq} and #{qsjsrq}
         </if>
@@ -151,9 +159,6 @@
             </foreach>
             ) or (t.dept_id is null or t.dept_id='' or t.dept_id='99'))
         </if>
-        <if test='inAccountStatus!=null and inAccountStatus!="" and inAccountStatus !="99"'>
-            and t.in_account_status = #{inAccountStatus}
-        </if>
         <if test="eleInvoiceNo!=null and eleInvoiceNo!='' and eleInvoiceNo!='null'">
             and t.ele_invoice_no = #{eleInvoiceNo}
         </if>
@@ -354,8 +359,7 @@
         and t.auth_status in('0','5','6')
         and t.export_mark = '0'
         and t.company = #{company}
-        <if
-                test="sfkrz != '99' and sfkrz != null and sfkrz != '' and sfkrz != 'null' and sfkrz == '1'.toString()">
+        <if test="sfkrz != '99' and sfkrz != null and sfkrz != '' and sfkrz != 'null' and sfkrz == '1'.toString()">
             and t.invoice_status in ('0','7')
             and t.invoice_amount>0
             and t.tax_amount>=0
@@ -363,8 +367,7 @@
             and d.tj_status in('0','3')
         </if>
 
-        <if
-                test="sfkrz != '99' and sfkrz != null and sfkrz != '' and sfkrz != 'null' and sfkrz == '0'.toString()">
+        <if test="sfkrz != '99' and sfkrz != null and sfkrz != '' and sfkrz != 'null' and sfkrz == '0'.toString()">
             and (t.invoice_status in ('1','2','3','4','8','80') or t.invoice_amount &lt;0 or t.tax_amount &lt;0 or
             date_format(t.invoice_date,'%Y%m%d') &lt;= c.select_start_date or
             date_format(t.invoice_date,'%Y%m%d') &gt;=
@@ -424,6 +427,12 @@
         <if test="invoiceSource!=null and invoiceSource!='99' and invoiceSource!='null' and invoiceSource!=''">
             and t.invoice_source =#{invoiceSource}
         </if>
+        <if test="bzdh != null and bzdh != '' and bzdh != 'null'">
+            and t.bzdh = #{bzdh}
+        </if>
+        <if test="inAccountStatus != null and inAccountStatus != '' and inAccountStatus != 'null'">
+            and t.inaccount_status = #{inAccountStatus}
+        </if>
         <if test="businessCode==''">
             and (t.dept_id is null or t.dept_id='' or t.dept_id='99')
         </if>
@@ -435,6 +444,7 @@
             ) or (t.dept_id is null or t.dept_id='' or t.dept_id='99'))
         </if>
 
+
         <!-- 按签收人查询 -->
         <if
                 test="position != null and position != '' and position != 'null' and position == '1'.toString()">
@@ -443,9 +453,9 @@
         <if test="settlementNo != null and settlementNo != ''">
             and t.settlement_no like concat(#{settlementNo},'%')
         </if>
-        <if test='inAccountStatus!=null and inAccountStatus!="" and inAccountStatus !="99"'>
-            and t.in_account_status = #{inAccountStatus}
-        </if>
+<!--        <if test='inAccountStatus!=null and inAccountStatus!="" and inAccountStatus !="99"'>-->
+<!--            and t.inaccount_status = #{inAccountStatus}-->
+<!--        </if>-->
         <if test="eleInvoiceNo!=null and eleInvoiceNo!='' and eleInvoiceNo!='null'">
             and t.ele_invoice_no = #{eleInvoiceNo}
         </if>

dxhy-sign/src/main/java/com/dxhy/sign/service/fpqs/impl/FpqsServiceImpl.java

@@ -275,7 +275,10 @@ public class FpqsServiceImpl extends MpBaseServiceImpl<SignRecordInvoiceDao, TDx
 
         // 1、基础信息校验
         String note = signRulesUtils.validateInvoiceInfo(pramsMap.get("invoiceCode"), pramsMap.get("invoiceNo"));
-
+        log.info("note======> {}0",note);
+        if(pramsMap.get("eleInvoiceNo") != null){
+            note = null;
+        }
         // uuid = 发票代码+发票号码
         String uuid = pramsMap.get("invoiceCode") + pramsMap.get("invoiceNo");
         // 2、查询扫描表是否有数据，有（重复扫描）且签收结果为成功则return，下一个
@@ -342,7 +345,7 @@ public class FpqsServiceImpl extends MpBaseServiceImpl<SignRecordInvoiceDao, TDx
             // 接口不通
             result[0] = false;
             result[1] = queryInvoiceResult.getString("returnMessage");
-            log.error("发票号码：" + pramsMap.get("invoiceNo") + "签收失败，失败原因:" + result[1]);
+            log.error("发票号码：" + pramsMap.get("invoiceNo") +"发票代码"+pramsMap.get("invoiceCode")+ "签收失败，失败原因:" + result[1]);
             // insertOrUpdate 扫描表
             createFailScanInvoice(pramsMap, result[1].toString(), scanInvoice, userInfo, invoiceType, qsType);
             return result;
@@ -719,6 +722,9 @@ public class FpqsServiceImpl extends MpBaseServiceImpl<SignRecordInvoiceDao, TDx
         if(StringUtils.isNotBlank(pramsMap.get("eleInvoiceNo"))){
             //全电号码
             scanInvoicce.setEleInvoiceNo(pramsMap.get("eleInvoiceNo"));
+            if (pramsMap.get("eleInvoiceNo") == null){
+                scanInvoicce.setEleInvoiceNo(pramsMap.get("invoiceNo"));
+            }
         }
         //uuid
         scanInvoicce.setUuid(StringUtils.isBlank(pramsMap.get("invoiceCode"))?"":pramsMap.get("invoiceCode") + pramsMap.get("invoiceNo"));

dxhy-sign/src/main/java/com/dxhy/sign/service/fpqs/impl/SignFpqsServiceImpl.java

@@ -774,6 +774,7 @@ public class SignFpqsServiceImpl extends MpBaseServiceImpl<SignRecordInvoiceDao,
         tDxInvoice.setDeptName(pramsMap.get("businessName"));
         tDxInvoice.setScanId(pramsMap.get("scanId"));
         tDxInvoice.setCompany(pramsMap.get("company"));
+        tDxInvoice.setEleInvoiceNo(pramsMap.get("eleInvoiceNo"));
         try {
             tDxInvoice.setInvoiceDate(new SimpleDateFormat("yyyy-MM-dd").parse(pramsMap.get("invoiceDate")));
         } catch (Exception e) {
@@ -1494,10 +1495,18 @@ public class SignFpqsServiceImpl extends MpBaseServiceImpl<SignRecordInvoiceDao,
         for (int i = 0; i < detailArray.size(); i++) {
             JSONObject excelFp = detailArray.getJSONObject(i);
             // 入参统一在入口处理
-
             String invoiceType = excelFp.getString("invoiceType");
             String invoiceCode = excelFp.getString("invoiceCode");
             String invoiceNo = excelFp.getString("invoiceNo");
+            String eleInvoiceNo = excelFp.getString("eleInvoiceNo");
+            if (invoiceNo != null && invoiceNo.length() == 20){
+                eleInvoiceNo = invoiceNo;
+                invoiceCode = invoiceNo.substring(0,12);
+                invoiceNo = invoiceNo.substring(12,20);
+
+            }
+
+            pramsMap.put("eleInvoiceNo",eleInvoiceNo);
             pramsMap.put("invoiceCode", invoiceCode);
             pramsMap.put("invoiceNo", invoiceNo);
             pramsMap.put("invoiceType", invoiceType);

dxhy-sign/src/main/java/com/dxhy/sign/util/SignRulesUtils.java

@@ -68,6 +68,7 @@ public class SignRulesUtils {
         InvoiceUtil invoiceUtil = new InvoiceUtil(invoiceCode);
         if (!invoiceUtil.fpdmValid() || invoiceUtil.getFplxdm() == null) {
             notes = "发票代码不正确";
+
         } else {
             invoiceUtil.setFphm(invoiceNo);
             if (!invoiceUtil.fphmValid()) {