修改mapper文件

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

@@ -127,14 +127,14 @@ public class BaseInvoiceController extends AbstractController {
         String businessCode = (String)map.get("businessCode");
         String qsr = (String)map.get("qsr");
         String rzhr = (String)map.get("rzhr");
-        String inAccountStatus = (String)map.get("inAccountStatus");
+        String inAccountStatus = (String)map.get("inaccountStatus");
         int curr = (int)map.get("curr");
         int size = (int)map.get("size");
         String bzdh = (String) map.get("bzdh");
         Map<String, Object> pramsMap = new HashMap<>(25);
 
         pramsMap.put("bzdh", bzdh);
-        pramsMap.put("inAccountStatus", inAccountStatus);
+        pramsMap.put("inaccountStatus", inAccountStatus);
         pramsMap.put("qszt", map.get("qszt"));
         pramsMap.put("wrzfpStart", map.get("wrzfpStart"));
         pramsMap.put("wrzfpEnd", map.get("wrzfpEnd"));
@@ -284,7 +284,7 @@ public class BaseInvoiceController extends AbstractController {
             return ResponseEntity.ok(R.error("开票结束日期不能为空！"));
         }
         if (StringUtils.isNotBlank(inAccountStatus)) {
-            pramsMap.put("inAccountStatus", inAccountStatus);
+            pramsMap.put("inaccountStatus", inAccountStatus);
         }
 
         if(pramsMap.get("imageNumber") != null){
@@ -451,7 +451,7 @@ public class BaseInvoiceController extends AbstractController {
 
         Map<String, Object> pramsMap = new HashMap<>(18);
         pramsMap.put("bzdh", bzdh);
-        pramsMap.put("inAccountStatus", inAccountStatus);
+        pramsMap.put("inaccountStatus", inAccountStatus);
         pramsMap.put("company", company);
         pramsMap.put("menuId", menuId);
         pramsMap.put("business", getUserInfo().getBusiness());

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

@@ -463,7 +463,7 @@ public class BaseTDxRecordInvoice implements Serializable {
     /**
      * 打款状态
      */
-    private String inAccountStatus;
+    private String inaccountStatus;
 
     private String invoiceSource;
     /**

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

@@ -171,7 +171,7 @@ public class BaseFpRzRespVO implements Serializable {
     private String rzlx;
 
     private String rzhBackMsg;
-    private String inAccountStatus;
+    private String inaccountStatus;
     /**
      * 付款状态
      */

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

@@ -106,7 +106,7 @@ public class BaseSggxCxRespVO {
     /**
      * 打款状态
      */
-    private String inAccountStatus;
+    private String inaccountStatus;
 
     /**
      * 付款状态

dxhy-base/src/main/java/com/dxhy/base/service/fpxxrz/BaseRzFpxxServiceImpl.java

@@ -137,7 +137,7 @@ public class BaseRzFpxxServiceImpl extends MpBaseServiceImpl<BaseFpxxZhDao, Base
                         }
 
                         pageList.get(i).setId(pageList.get(i).getId());
-                        pageList.get(i).setInAccountStatus(pageList.get(i).getInAccountStatus());
+                        pageList.get(i).setInaccountStatus(pageList.get(i).getInaccountStatus());
                         pageList.get(i).setBzdh(pageList.get(i).getBzdh());
                         pageList.get(i).setXh(String.valueOf(i + start));
                         pageList.get(i).setTaxAmount(
@@ -182,8 +182,8 @@ public class BaseRzFpxxServiceImpl extends MpBaseServiceImpl<BaseFpxxZhDao, Base
                         // }
                         // }
                         // }
-                        pageList.get(i).setInAccountStatus(dictdetaServcice.queryDictName(DictConstant.DK_STATUS,
-                            pageList.get(i).getInAccountStatus()));
+                        pageList.get(i).setInaccountStatus(dictdetaServcice.queryDictName(DictConstant.DK_STATUS,
+                            pageList.get(i).getInaccountStatus()));
                         pageList.get(i).setRzsj(pageList.get(i).getRzsj());
                         pageList.get(i).setSkssq(pageList.get(i).getSkssq());
                     }

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

@@ -185,7 +185,7 @@ 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.setInaccountStatus(pageList.get(i).getInvoiceStatus());
                     vo.setBzdh(pageList.get(i).getBzdh());
                     // 签收方式为已经签收时展示签收信息
                     if ("1".equals(pageList.get(i).getQsStatus())) {
@@ -211,9 +211,9 @@ public class BaseInvoiceManualCheckServiceImpl extends MpBaseServiceImpl<BaseTDx
                     vo.setXfmc(pageList.get(i).getXfName());
                     vo.setBusinessName(businessName);
                     vo.setEleInvoiceNo(pageList.get(i).getEleInvoiceNo());
-                    String dkzt= dictdetaServcice.queryDictName(DictConstant.DK_STATUS,pageList.get(i).getInAccountStatus());
-                    pageList.get(i).setInAccountStatus(dkzt);
-                    vo.setInAccountStatus(dkzt);
+                    String dkzt= dictdetaServcice.queryDictName(DictConstant.DK_STATUS,pageList.get(i).getInaccountStatus());
+                    pageList.get(i).setInaccountStatus(dkzt);
+                    vo.setInaccountStatus(dkzt);
                     vo.setSelect(true);
                     if (!"1".equals(pageList.get(i).getAuthStatus())) {
                         vo.setSelect(false);

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

@@ -42,7 +42,7 @@
         <result column="bdk_current_period" property="bdkCurrentPeriod"/>
         <result column="bdk_date" property="bdkDate"/>
         <result column="bzdh" property="bzdh"/>
-        <result column="inaccount_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"/>
@@ -63,7 +63,7 @@
         t.dept_id deptId,t.dept_name deptName,
         t.xf_tax_no,t.xf_name,t.tax_amount,t.dk_tax_amount,t.invoice_status,t.invoice_amount,date_format(t.rzh_date,'%Y-%m-%d') rzh_date,
         date_format(t.qs_date,'%Y-%m-%d') qs_date,t.rzh_type,t.id id,
-        t.gx_user_name,t.rzh_belong_date
+        t.gx_user_name,t.rzh_belong_date,t.inaccount_status,t.bzdh,
         dqskssq,t.auth_status,t.qs_type,t.qs_status,t.confirm_user,t.qs_name,t.rzh_yesorno,t.cxrz_status,t.out_status,
         t.bdk_status,t.bdk_current_period,date_format(t.bdk_date,'%Y-%m-%d')
         bdk_date,t.rzh_back_msg,t.in_account_status,t.payment_status,date_format(t.payment_date,'%Y-%m-%d')payment_date,
@@ -89,7 +89,7 @@
             and t.bzdh = #{bzdh}
         </if>
         <if test="inAccountStatus != null and inAccountStatus != '' and inAccountStatus != 'null'">
-            and t.inaccount_status = #{inAccountStatus}
+            and t.inaccount_status = #{inaccountStatus}
         </if>
         <if test="qszt != null and qszt != '' and qszt != 'null' and qszt != '99'">
             and t.qs_status = #{qszt}
@@ -342,8 +342,8 @@
         <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 test="inaccountStatus != null and inaccountStatus != '' and inaccountStatus != 'null'">
+            and t.inaccount_status = #{inaccountStatus}
         </if>
         <if test="qszt != null and qszt != '' and qszt != 'null' ">
             and t.qs_status = #{qszt}

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

@@ -22,13 +22,12 @@
         <result column="qs_name" property="qsName"/>
         <result column="invoice_status" property="invoiceStatus"/>
         <result column="authStatus" property="authStatus"/>
-        <result column="inaccount_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">
@@ -61,7 +60,7 @@
         ,t.qs_type,t.qs_status,t.dk_tax_amount,t.qs_name,t.sn_voucher_number,t.posting_time,t.image_id,t.account_period,
         case date_format(t.invoice_date,'%Y%m%d') between c.select_start_date and c.select_end_date when
         true then 1
-        else 2 end authStatus,
+        else 2 end authStatus,t.bzdh,
         t.in_account_status,t.payment_status,DATE_FORMAT(t.payment_date,'%Y-%m-%d')payment_date,t.settlement_no,t.ele_invoice_no
         from t_dx_record_invoice t left join t_dx_tax_current c on t.gf_tax_no = c.taxno
         left join t_dx_dk_count d on c.taxno = d.taxno and c.current_tax_period = d.skssq
@@ -96,8 +95,8 @@
         <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 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}
@@ -430,8 +429,8 @@
         <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 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')

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

@@ -180,5 +180,7 @@ public class JkszhcxRespVO implements Serializable {
     /**
      * 入账状态
      */
-    private String inAccountStatus;
+    private String inaccountStatus;
+
+    private String bzdh;
 }

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

@@ -66,7 +66,7 @@ public class TdxCustomsRecordModelDTO extends CommonDTO {
     private List<Business> business;
 
     private String bzdh;
-    private String inAccountStatus;
+    private String inaccountStatus;
 
     public void setParam(Page page, UserInfo userInfo) throws Exception {
         business = userInfo.getBusiness();

dxhy-customs/src/main/java/com/dxhy/customs/service/impl/CustomsCustomsJkszhcxServiceImpl.java

@@ -322,11 +322,11 @@ public class CustomsCustomsJkszhcxServiceImpl extends MpBaseServiceImpl<CustomsJ
             vo.setInAccountDate(null);
         }
         if ("0".equals(record.getInAccountStatus())) {
-            vo.setInAccountStatus("未入账");
+            vo.setInaccountStatus("未入账");
         } else if ("1".equals(record.getInAccountStatus())) {
-            vo.setInAccountStatus("已入账");
+            vo.setInaccountStatus("已入账");
         } else {
-            vo.setInAccountStatus("未入账");
+            vo.setInaccountStatus("未入账");
         }
         return vo;
     }

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

@@ -5,6 +5,8 @@
 
     <resultMap id="BaseResultMap"
                type="com.dxhy.customs.model.JkszhcxRespVO">
+        <result column="inaccountStatus" property="inaccountStatus"/>
+        <result column="bzdh" property="bzdh"/>
         <result column="customs_code" property="customsCode"/>
         <result column="fill_in_date" property="fillInDate"/>
         <result column="gf_tax_no" property="gfTaxNo"/>
@@ -40,12 +42,18 @@
         fill_in_date,t.gf_tax_no,t.gf_name,t.tax_amount,t.yx_tax_amount,t.audit_status,t.apply_check,t.check_status,t.qs_status,
         DATE_FORMAT(t.qs_date,'%Y-%m-%d') qs_date,t.qs_type,t.qs_user,DATE_FORMAT(t.rzh_date,'%Y-%m-%d')
         rzh_date, t.rzh_yesorno,t.auth_status,t.bdk_status,t.confirm_user,t.rzh_belong_date,t.glzt,
-        t.customs_scan_id,t.dept_name businessName
+        t.customs_scan_id,t.dept_name businessName,t.inaccount_status inaccountStatus ,t.bzdh bzdh
         from t_dx_customs_record t
         where export_mark = '0' and t.gf_tax_no in
         <foreach close=")" collection="gfsh" index="index" item="item" open="(" separator=",">
             #{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="customsCode != null and customsCode != '' and customsCode != 'null'">
             and t.customs_code = #{customsCode}
         </if>
@@ -206,6 +214,12 @@
         <if test="customsCode != null and customsCode != '' and customsCode != 'null'">
             and t.customs_code = #{customsCode}
         </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="fillInStartDate != null and fillInEndDate != null and fillInStartDate != '' and fillInEndDate != ''">
             and t.fill_in_date between #{fillInStartDate} and #{fillInEndDate}

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

@@ -255,7 +255,7 @@
         p.auth_status as authStatus,
         p.check_status as checkStatus,
         p.dept_name as businessName,
-        p.inaccount_status as inAccountStatus,
+        p.inaccount_status as inaccountStatus,
         p.bzdh
         FROM
         t_dx_customs_record p
@@ -280,8 +280,8 @@
         <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 test="inaccountStatus != null and inaccountStatus != '' and inaccountStatus != 'null'">
+            and p.inaccount_status = #{inaccountStatus}
         </if>
 
         <if test="queryParams.customsCode!=null and queryParams.customsCode!=''">
@@ -372,8 +372,8 @@
         <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 test="inaccountStatus != null and inaccountStatus != '' and inaccountStatus != 'null'">
+            and p.inaccount_status = #{inaccountStatus}
         </if>
 
         <if test="queryParams.customsCode!=null and queryParams.customsCode!=''">
@@ -814,7 +814,9 @@
         p.rzh_back_msg as rzhBackMsg,
         p.cxrz_status as cxrzStatus,
         p.bdk_status as bdkStatus,
-        p.dept_name as businessName
+        p.dept_name as businessName,
+        p.inaccount_status as inaccountStatus,
+        p.bzdh bzdh
         FROM
         t_dx_customs_record p
         where
@@ -829,6 +831,14 @@
             </foreach>
         </if>
 
+        <if test="queryParams.bzdh != null and queryParams.bzdh != '' and queryParams.bzdh != 'null'">
+            and p.bzdh = #{bzdh}
+        </if>
+
+        <if test="queryParams.inaccountStatus != null and queryParams.inaccountStatus != '' and queryParams.inaccountStatus != 'null'">
+            and p.inaccount_status = #{inaccountStatus}
+        </if>
+
         <if test="queryParams.gfsh!=null and queryParams.gfsh!=''">
             and p.gf_tax_no = #{queryParams.gfsh}
         </if>
@@ -1048,6 +1058,14 @@
             </foreach>
         </if>
 
+        <if test="queryParams.bzdh != null and queryParams.bzdh != '' and queryParams.bzdh != 'null'">
+            and p.bzdh = #{bzdh}
+        </if>
+
+        <if test="queryParams.inaccountStatus != null and queryParams.inaccountStatus != '' and queryParams.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/resources/mapper/ExtBbfpzhMapper.xml

@@ -7,7 +7,7 @@
                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="inaccount_status" property="inaccountStatus"/>
         <result column="invoice_no" property="invoiceNo"/>
         <result column="kprq" property="invoiceDate"/>
         <result column="invoice_type" property="invoiceType"/>
@@ -65,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.in_account_status,t.bzdh,
+        t.settlement_no,t.inaccount_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}
@@ -76,8 +76,8 @@
         <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 test="inaccountStatus != null and inaccountStatus != '' and inaccountStatus != 'null'">
+            and t.inaccount_status = #{inaccountStatus}
         </if>
         <if
                 test="invoiceStatus != null and invoiceStatus != '' and invoiceStatus != 'null' and invoiceStatus != '99'">
@@ -335,7 +335,7 @@
         <if test="bzdh != null and bzdh != '' and bzdh != 'null'">
             and t.bzdh = #{bzdh}
         </if>
-        <if test="inAccountStatus != null and inAccountStatus != '' and inAccountStatus != 'null'">
+        <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'">