修改mapper文件

dxhy-customs/src/main/java/com/dxhy/customs/model/TdxCustomsRecordModelDTO.java

@@ -65,6 +65,9 @@ public class TdxCustomsRecordModelDTO extends CommonDTO {
     private String bdkMessage;
     private List<Business> business;
 
+    private String bzdh;
+    private String inAccountStatus;
+
     public void setParam(Page page, UserInfo userInfo) throws Exception {
         business = userInfo.getBusiness();
         if ("99".equals(gfsh) || "".equals(gfsh)) {

dxhy-customs/src/main/resources/mapper/CustomsRecordMapper.xml

@@ -254,7 +254,9 @@
         p.export_mark as exportMark,
         p.auth_status as authStatus,
         p.check_status as checkStatus,
-        p.dept_name as businessName
+        p.dept_name as businessName,
+        p.inaccount_status as inAccountStatus,
+        p.bzdh
         FROM
         t_dx_customs_record p
         where
@@ -275,6 +277,13 @@
             and p.gf_tax_no = #{queryParams.gfsh}
         </if>
 
+        <if test="bzdh != null and bzdh != '' and bzdh != 'null'">
+            and p.bzdh = #{bzdh}
+        </if>
+        <if test="inAccountStatus != null and inAccountStatus != '' and inAccountStatus != 'null'">
+            and p.inaccount_status = #{inAccountStatus}
+        </if>
+
         <if test="queryParams.customsCode!=null and queryParams.customsCode!=''">
             and p.customs_code = #{queryParams.customsCode}
         </if>
@@ -360,6 +369,13 @@
             and p.gf_tax_no = #{queryParams.gfsh}
         </if>
 
+        <if test="bzdh != null and bzdh != '' and bzdh != 'null'">
+            and p.bzdh = #{bzdh}
+        </if>
+        <if test="inAccountStatus != null and inAccountStatus != '' and inAccountStatus != 'null'">
+            and p.inaccount_status = #{inAccountStatus}
+        </if>
+
         <if test="queryParams.customsCode!=null and queryParams.customsCode!=''">
             and p.customs_code = #{queryParams.customsCode}
         </if>

dxhy-export-domestic/src/main/java/com/dxhy/domestic/model/dto/TdxExportCustomsModelDTO.java

@@ -49,6 +49,8 @@ public class TdxExportCustomsModelDTO extends CommonDTO {
     private String rzhType;
     private String cxrzType;
     private String entryDiscrepancy;
+    private String bzdh;
+    private String inAccountStatus;
 
     public void setParam(Page page, UserInfo userInfo) throws Exception {
 

dxhy-export-domestic/src/main/resources/mapper/DomesticExportCustomsMapper.xml

@@ -318,6 +318,14 @@
             </foreach>
         </if>
 
+        <if test="bzdh != null and bzdh != '' and bzdh != 'null'">
+            and p.bzdh = #{bzdh}
+        </if>
+
+        <if test="inAccountStatus != null and inAccountStatus != '' and inAccountStatus != 'null'">
+            and p.inaccount_status = #{inAccountStatus}
+        </if>
+
         <if test="queryParams.gfsh!=null and queryParams.gfsh!=''">
             and p.gf_tax_no = #{queryParams.gfsh}
         </if>
@@ -399,7 +407,9 @@
         p.confirm_user as confirmUser,
         p.rzh_belong_date as rzhBelongDate,
         p.cxrz_status as cxrzStatus,
-        p.cxbdk_status as cxbdkStatus
+        p.cxbdk_status as cxbdkStatus,
+        p.bzdh as bzdh,
+        p.inaccount_status as inAccountStatus
         FROM
         t_dx_export_customs p
         where
@@ -412,6 +422,14 @@
             </foreach>
         </if>
 
+        <if test="bzdh != null and bzdh != '' and bzdh != 'null'">
+            and p.bzdh = #{bzdh}
+        </if>
+
+        <if test="inAccountStatus != null and inAccountStatus != '' and inAccountStatus != 'null'">
+            and p.inaccount_status = #{inAccountStatus}
+        </if>
+
         <if test="queryParams.gfsh!=null and queryParams.gfsh!=''">
             and p.gf_tax_no = #{queryParams.gfsh}
         </if>

dxhy-extend/src/main/java/com/dxhy/extend/controller/ExtFpzhcxController.java

@@ -214,6 +214,8 @@ public class ExtFpzhcxController extends AbstractController {
         Map<String, Object> data = new HashMap<>(16);
         data.put("dbName", getUserInfo().getDbName());
         data.put("business", getUserInfo().getBusiness());
+        data.put("bzdh",pramsMap.get("bzdh"));
+        data.put("inaccountStatus",pramsMap.get("inaccountStatus"));
         List<String> gfshList = new ArrayList<>();
         if (!"99".equals(pramsMap.get("gfsh")) && pramsMap.get("gfsh") != null && !"".equals(pramsMap.get("gfsh"))) {
             gfshList.add(pramsMap.get("gfsh").toString());

dxhy-extend/src/main/java/com/dxhy/extend/model/ExtBbfpzhcxRespVO.java

@@ -152,7 +152,7 @@ public class ExtBbfpzhcxRespVO implements Serializable {
      */
     private String exportMark;
     private String scanId;
-    private String inAccountStatus;
+    private String inaccountStatus;
 
     /**
      * 结算单号
@@ -185,6 +185,7 @@ public class ExtBbfpzhcxRespVO implements Serializable {
     private String imageId;
     private String accountPeriod;
     private String compCode;
+    private String bzdh;
 
     public ExtBbfpzhcxRespVO() {}
 

dxhy-extend/src/main/java/com/dxhy/extend/model/ExtBbycfpcxRespVO.java

@@ -108,6 +108,8 @@ public class ExtBbycfpcxRespVO implements Serializable {
     private String skssq;
 
     private String businessName;
+    private String inaccountStatus;
+    private String bzdh;
 
     public ExtBbycfpcxRespVO() {}
 

dxhy-extend/src/main/java/com/dxhy/extend/service/bb/impl/ExtFpzhcxServiceImpl.java

@@ -122,9 +122,9 @@ public class ExtFpzhcxServiceImpl extends MpBaseServiceImpl<ExtBbfpzhDao, ExtBbf
                     resultList.get(i).setQsfs(dictdetaServcice.queryDictName(DictConstant.QS_TYPE, qsfs));
                     String bdkStatus = resultList.get(i).getBdkStatus();
                     resultList.get(i).setBdkStatus(dictdetaServcice.queryDictName(DictConstant.BDK_STATUS, bdkStatus));
-                    String inAccountStatus = resultList.get(i).getInAccountStatus();
+                    String inAccountStatus = resultList.get(i).getInaccountStatus();
                     resultList.get(i)
-                        .setInAccountStatus(dictdetaServcice.queryDictName(DictConstant.DK_STATUS, inAccountStatus));
+                        .setInaccountStatus(dictdetaServcice.queryDictName(DictConstant.DK_STATUS, inAccountStatus));
                 }
             }
 

dxhy-extend/src/main/resources/mapper/ExtBbfpzhMapper.xml

@@ -6,6 +6,8 @@
     <resultMap id="BaseResultMap"
                type="com.dxhy.extend.model.ExtBbfpzhcxRespVO">
         <result column="invoice_code" property="invoiceCode"/>
+        <result column="bzdh" property="bzdh"/>
+        <result column="in_account_status" property="inaccountStatus"/>
         <result column="invoice_no" property="invoiceNo"/>
         <result column="kprq" property="invoiceDate"/>
         <result column="invoice_type" property="invoiceType"/>
@@ -63,7 +65,7 @@
         dqskssq,t.auth_status,t.qs_type,t.qs_status,t.confirm_user,t.qs_name,t.rzh_yesorno,
         t.invoice_type , t.dept_name deptName,t.glzt
         glzt,t.uuid,t.bdk_status,t.scan_id,t.in_account_status,t.settle_source,
-        t.settlement_no,
+        t.settlement_no,t.in_account_status,t.bzdh,
         t.settlement_status,t.voucher_number,t.total_amount,t.sn_voucher_number,t.posting_time,t.image_id,t.account_period
         from t_dx_record_invoice t
         WHERE t.company = #{company} and t.invoice_date between #{kpksrq} and #{kpjsrq}
@@ -71,6 +73,12 @@
         <foreach collection="gfsh" index="index" item="item" open="(" separator="," close=")">
             #{item}
         </foreach>
+        <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.in_account_status = #{inaccountStatus}
+        </if>
         <if
                 test="invoiceStatus != null and invoiceStatus != '' and invoiceStatus != 'null' and invoiceStatus != '99'">
             and t.invoice_status = #{invoiceStatus}
@@ -324,6 +332,12 @@
                 test="invoiceStatus != null and invoiceStatus != '' and invoiceStatus != 'null' and invoiceStatus != '99'">
             and t.invoice_status = #{invoiceStatus}
         </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.in_account_status = #{inaccountStatus}
+        </if>
         <if test="qszt != null and qszt != '' and qszt != 'null' and qszt != '99'">
             and t.qs_status = #{qszt}
         </if>

dxhy-extend/src/main/resources/mapper/ExtBbycfpcxMapper.xml

@@ -5,6 +5,8 @@
 
     <resultMap id="BaseResultMap"
                type="com.dxhy.extend.model.ExtBbycfpcxRespVO">
+        <result column="inaccount_status" property="inaccountStatus"/>
+        <result column="bzdh" property="bzdh"/>
         <result column="fpdm" property="fpdm"/>
         <result column="fphm" property="fphm"/>
         <result column="invoiceType" property="invoiceType"/>
@@ -41,7 +43,7 @@
         t.invoice_code fpdm, t.invoice_no fphm ,DATE_FORMAT(t.invoice_date,'%Y-%m-%d')
         kprq,t.gf_tax_no gfsh,t.gf_name gfmc,t.invoice_type invoiceType,
         t.xf_tax_no xfsh,t.xf_name xfmc,t.tax_amount se,t.invoice_amount
-        je,DATE_FORMAT(t.qs_date,'%Y-%m-%d') qsrq,
+        je,DATE_FORMAT(t.qs_date,'%Y-%m-%d') qsrq,t.inaccount_status,t.bzdh,
         t.qs_status qszt,t.qs_name qsr, t.invoice_status
         yczt,DATE_FORMAT(t.status_update_date,'%Y-%m-%d') ycsj,rzh_date
         rzsj,
@@ -55,6 +57,12 @@
         <foreach collection="gfsh" index="index" item="item" open="(" separator="," close=")">
             #{item}
         </foreach>
+        <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="yczt != null and yczt != '' and yczt != 'null' ">
             and t.invoice_status = #{yczt}
@@ -156,6 +164,12 @@
         <foreach collection="gfsh" index="index" item="item" open="(" separator="," close=")">
             #{item}
         </foreach>
+        <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="yczt != null and yczt != '' and yczt != 'null' ">
             and t.invoice_status = #{yczt}