修改导出的入账状态

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

@@ -43,7 +43,7 @@ public class CustomsRecordVO {
     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/CustomsCollectServiceImpl.java

@@ -468,6 +468,11 @@ public class CustomsCollectServiceImpl extends MpBaseServiceImpl<CustomsCollectD
                 vo.setRzhYesorno(dictdetaServcice.queryDictName(DictConstant.DEDU_STATUS, vo.getRzhYesorno()));
                 vo.setAuthStatus(dictdetaServcice.queryDictName(DictConstant.AUTH_STATUS_ALL, vo.getAuthStatus()));
                 vo.setRzlx(dictdetaServcice.queryDictName(DictConstant.INVOICE_RZLX, vo.getRzlx()));
+                if ("1".equals(vo.getInAccountStatus())){
+                    vo.setInAccountStatus("已入账");
+                }else {
+                    vo.setInAccountStatus("未入账");
+                }
                 i++;
             }
         }

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

@@ -105,6 +105,7 @@
         bzdh,
         bzr,
         inaccount_status inAccountStatus,
+        image_id imageId,
         comp_code compCode
         FROM
         t_dx_invoice_reimburse

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

@@ -1201,7 +1201,7 @@
         account_period as account_period,
         bzdh,
         bzr,
-        inaccount_status as inaccountStatus,
+        inaccount_status as inAccountStatus,
         comp_code as compCode
         from t_dx_customs_record
         where

dxhy-extend/src/main/java/com/dxhy/extend/entity/JkszhcxRespVO.java

@@ -197,4 +197,5 @@ public class JkszhcxRespVO {
     private String businessName;
     private String compCode;
     private String bzdh;
+    private String bzr;
 }

dxhy-extend/src/main/java/com/dxhy/extend/service/customs/CustomsServiceImpl.java

@@ -43,14 +43,15 @@ public class CustomsServiceImpl extends MpBaseServiceImpl<CustomsDao, CustomsRec
     public String selectByPramsMap(Map<String, Object> pramsMap, int curr, int size) {
         DynamicContextHolder.push(pramsMap.get("dbName") + DbConstant.BUSINESS_READ);
         // 表头
-        String[] titlelist = {"序号", "缴款书号码", "管理状态", "填发日期", "缴款单位名称", "缴款单位税号", "税款金额", "抵扣税款金额", "稽核结果", "是否申请核对",
-            "核对结果", "认证状态", "认证类型", "认证日期", "认证方式", "认证人", "采集状态", "底账库采集时间", "采集来源", "签收方式", "签收状态", "签收日期", "签收人",
-            "入账月份", "入账状态", "凭证号", "业务单元", "入池时间", "过账时间","报账单号", "影像号", "账期","所属组织"};
+        String[] titlelist = {"序号", "缴款书号码", "管理状态", "填发日期", "缴款单位名称", "缴款单位税号", "税款金额", "抵扣税款金额",
+                "稽核结果", "是否申请核对", "核对结果", "认证状态", "认证类型", "认证日期", "认证方式", "认证人", "采集状态", "底账库采集时间",
+                "采集来源", "签收方式", "签收状态", "签收日期", "签收人", "入账月份", "入账状态", "凭证号", "业务单元", "入池时间",
+                "过账时间","报账单号","报账人", "影像号", "账期","所属组织"};
         String[] titleprop = {"xh", "customsCode", "glzt", "fillInDate", "gfName", "gfTaxNo", "taxAmount",
             "yxTaxAmount", "auditStatus", "applyCheck", "checkStatus", "rzhYesorno", "bdkStatus", "rzhDate", "rzhType",
             "confirmUser", "cjzt", "createDate", "dataSources", "qsType", "qsStatus", "qsDate", "qsUser",
-            "inAccountDate", "inAccountStatus", "snVoucherNumber", "businessName", "createDate", "postingTime","bzdh","imageId",
-                "accountPeriod","compCode"};
+            "inAccountDate", "inAccountStatus", "snVoucherNumber", "businessName", "createDate", "postingTime",
+                "bzdh","bzr","imageId","accountPeriod","compCode"};
         // 需要设置返回列表标题时调用
         JSONObject json = super.setTitleList(titlelist, titleprop);
         try {

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

@@ -34,6 +34,7 @@
         <result column="image_id" property="imageId"/>
         <result column="account_period" property="accountPeriod"/>
         <result column="bzdh" property="bzdh"/>
+        <result column="bzr" property="bzr"/>
     </resultMap>
 
     <resultMap id="HjResultMap" type="java.util.Map">
@@ -48,8 +49,9 @@
         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.inaccount_status,t.sn_voucher_number,t.document_number,t.in_account_date,rzh_type,rzlx,t.create_date,
-        data_sources,t.image_id,t.posting_time,t.account_period,t.comp_code,t.bzdh
+        t.customs_scan_id,t.dept_name businessName,t.inaccount_status,t.sn_voucher_number,t.document_number,
+        t.in_account_date,rzh_type,rzlx,t.create_date,
+        data_sources,t.image_id,t.posting_time,t.account_period,t.comp_code,t.bzdh,t.bzr
         from t_dx_customs_record t
         where export_mark = '0'
         and t.gf_tax_no = #{gfsh}