Merge remote-tracking branch 'origin/0803-add_column' into release

dxhy-core/src/main/java/com/dxhy/core/model/QssbRespVO.java

@@ -106,7 +106,7 @@ public class QssbRespVO implements Serializable {
     private String imageId;
     private String accountPeriod;
     private String compCode;
-    private String inaccountStatus;
+    private String inAccountStatus;
     private String bzdh;
     private String bzr;
 }

dxhy-core/src/main/java/com/dxhy/core/service/export/impl/QssbServiceImpl.java

@@ -60,10 +60,10 @@ public class QssbServiceImpl extends MpBaseServiceImpl<QssbDao, QssbRespVO> impl
                 resultList.get(i).setSe(MathUtil.round(resultList.get(i).getSe()));
 
                 //字典值转换
-                if ("1".equals(resultList.get(i).getInaccountStatus())){
-                    resultList.get(i).setInaccountStatus("已入账");
+                if ("1".equals(resultList.get(i).getInAccountStatus())){
+                    resultList.get(i).setInAccountStatus("已入账");
                 }else {
-                    resultList.get(i).setInaccountStatus("未入账");
+                    resultList.get(i).setInAccountStatus("未入账");
                 }
                 resultList.get(i).setQsfs(dictdetaServcice.queryDictName(DictConstant.QS_TYPE,resultList.get(i).getQsfs()));
                 resultList.get(i).setInvoiceType(dictdetaServcice.queryDictName(DictConstant.INVOICE_TYPE_VAT,resultList.get(i).getInvoiceType()));

dxhy-core/src/main/java/com/dxhy/core/service/export/impl/QyswxxServiceImpl.java

@@ -84,7 +84,9 @@ public class QyswxxServiceImpl extends MpBaseServiceImpl<QyswxxDao, QyswxxRespVO
                         }
                     }
                 }
-                hzxx.setSbzq(getSbzq(hzxx.getSbzq()));
+                if (StringUtils.isNotBlank(hzxx.getSbzq())){
+                    hzxx.setSbzq(getSbzq(hzxx.getSbzq()));
+                }
                 if ("0".equals(hzxx.getSdzt())) {
                     hzxx.setSdzt("否");
                 }

dxhy-core/src/main/resources/mapper/QssbMapper.xml

@@ -20,7 +20,7 @@
         <result column="je" property="je"/>
         <result column="se" property="se"/>
         <result column="deptName" property="businessName"/>
-        <result column="inaccount_status" property="inaccountStatus"/>
+        <result column="inaccount_status" property="inAccountStatus"/>
         <result column="sn_voucher_number" property="snVoucherNumber"/>
         <result column="posting_time" property="postingTime"/>
         <result column="image_id" property="imageId"/>

dxhy-extend/src/main/java/com/dxhy/extend/service/caution/ExtCautionExpirationServiceImpl.java

@@ -213,7 +213,7 @@ public class ExtCautionExpirationServiceImpl extends MpBaseServiceImpl<ExtTdxRec
 
         // 购方税号
         queryWrapper.eq("gf_tax_no",reqVO.getGfsh());
-        queryWrapper.eq("comp_code",reqVO.getCompanyCode()).or().eq("comp_code","").or().isNull("comp_code");
+        queryWrapper.eq("comp_code",reqVO.getCompanyCode());
         // 发票号码
         if (StringUtils.isNotBlank(reqVO.getInvoiceNo())) {
             queryWrapper.lambda().eq(ExtTdxRecordInvoice::getInvoiceNo, reqVO.getInvoiceNo());