ariesy 进项票池功能 v1

dxhy-core/src/main/java/com/dxhy/core/entity/ExtAddTaxInvoice.java

@@ -266,4 +266,10 @@ public class ExtAddTaxInvoice implements Serializable {
     private String systemName;
     private String collectDate;
     private String collectFrom;
+
+    private String snVoucherNumber;
+    private String postingTime;
+    private String imageId;
+    private String accountPeriod;
+    private String compCode;
 }

dxhy-core/src/main/java/com/dxhy/core/job/entity/TDxRecordInvoiceDetail.java

@@ -63,6 +63,10 @@ public class TDxRecordInvoiceDetail implements Serializable {
      * 税率
      */
     private String taxRate;
+    /**
+     * 税码
+     */
+    private String taxCode;
     /**
      * 税额
      */

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

@@ -153,4 +153,10 @@ public class JkszhcxRespVO implements Serializable {
      * 认证方式
      */
     private String rzhType;
+
+    private String snVoucherNumber;
+    private String postingTime;
+    private String imageId;
+    private String accountPeriod;
+    private String compCode;
 }

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

@@ -50,7 +50,7 @@ public class CustomsServiceImpl extends MpBaseServiceImpl<CustomsDao, JkszhcxRes
             List<String[]> returnList = new ArrayList<>();
             String[] titleColumns = {"序号", "缴款书号码", "管理状态", "填发日期", "缴款单位名称", "缴款单位税号", "税款金额", "抵扣税款金额", "稽核结果",
                 "是否申请核对", "核对结果", "认证状态", "认证类型", "认证日期", "认证方式", "认证人", "采集状态", "底账库采集时间", "采集来源", "签收方式", "签收状态",
-                "签收日期", "签收人", "入账月份", "入账状态", "凭证号", "业务单元", "入池时间"};
+                "签收日期", "签收人", "入账月份", "入账状态", "凭证号", "业务单元", "入池时间","凭证号","入账时间","账期","影像id"};
             // 用于页面返回list对象
             if (pageList.size() > 0) {
                 for (int i = 0; i < pageList.size(); i++) {
@@ -119,6 +119,10 @@ public class CustomsServiceImpl extends MpBaseServiceImpl<CustomsDao, JkszhcxRes
                     dataArray[26] = vo.getBusinessName();
                     // 入池时间
                     dataArray[27] = vo.getCreateDate() == null ? "" : vo.getCreateDate().trim().substring(0, 11);
+                    dataArray[28] = vo.getSnVoucherNumber();
+                    dataArray[29] = vo.getPostingTime();
+                    dataArray[30] = vo.getAccountPeriod();
+                    dataArray[31] = vo.getImageId();
                     returnList.add(dataArray);
                 }
             }

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

@@ -183,7 +183,7 @@ public class PoolPaperServiceImpl extends MpBaseServiceImpl<PoolPaperDao, Invoic
             // 用于页面返回list对象
             if (pageList != null && pageList.size() > 0) {
                 for (int i = 0; i < pageList.size(); i++) {
-                    String[] dataArray = new String[32];
+                    String[] dataArray = new String[36];
                     dataArray[0] = String.valueOf((curr - 1) * size + i + 1);
                     // 发票类型
                     dataArray[1] = new InvoiceTypeUtils().invoiceTypeName(pageList.get(i).getInvoiceType());
@@ -298,6 +298,10 @@ public class PoolPaperServiceImpl extends MpBaseServiceImpl<PoolPaperDao, Invoic
 
                     dataArray[30] = pageList.get(i).getDocumentNumber();
                     dataArray[31] = pageList.get(i).getCreateDate();
+                    dataArray[32] = pageList.get(i).getSnVoucherNumber();
+                    dataArray[33] = pageList.get(i).getPostingTime();
+                    dataArray[34] = pageList.get(i).getAccountPeriod();
+                    dataArray[35] = pageList.get(i).getImageId();
                     returnList.add(dataArray);
                 }
             }

dxhy-core/src/main/java/com/dxhy/core/thread/PoolAddTaxThread.java

@@ -67,7 +67,7 @@ public class PoolAddTaxThread extends BaseThread {
      */
     private final String[] titleColumns = {"序号", "发票类型", "发票代码", "发票号码", "发票状态", "开票日期", "销方名称", "销方税号", "金额", "税额",
         "有效税额", "价税合计", "认证状态", "认证类型", "认证日期", "认证方式", "认证人", "采集状态", "底账库采集时间", "采集来源", "签收方式", "签收状态", "签收日期", "签收人",
-        "入账月份", "入账状态", "凭证号", "是否末次摊销", "摊销金额", "剩余金额", "业务单号", "入池时间"};
+        "入账月份", "入账状态", "凭证号", "是否末次摊销", "摊销金额", "剩余金额", "业务单号", "入池时间","凭证号","入账时间","账期","影像id"};
 
     /**
      * 导出excel的列名

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

@@ -37,7 +37,8 @@
         t.id,t.customs_code,DATE_FORMAT(t.fill_in_date,'%Y-%m-%d')
         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,
+        rzh_date, t.rzh_yesorno,t.sn_voucher_number snVoucherName,t.postingTime,t.image_id imageId,
+        t.account_period accountPeriod,t.auth_status,t.bdk_status,t.confirm_user,t.rzh_belong_date,t.glzt,
         t.customs_scan_id,t.dept_name businessName,t.in_account_status,t.voucher_number,t.document_number,t.in_account_date,rzh_type,rzlx,t.create_date,
         data_sources
         from t_dx_customs_record t
@@ -124,6 +125,19 @@
         <if test=" skssq != null and  skssq != '' and  skssq != 'null' ">
             and DATE_FORMAT(t.qs_date, '%Y-%m') like CONCAT(#{skssq},'%')
         </if>
+        <if test="snVoucherNumber != null and snVoucherNumber != '' and snVoucherNumber != 'null' and snVoucherNumber != '99'">
+            and t.sn_voucher_number = #{snVoucherNumber}
+        </if>
+        <if test="postingTime != null and postingTime != '' and postingTime != 'null' and postingTime != '99'">
+            and t.postingTime = #{postingTime}
+        </if>
+        <if test="imageId != null and imageId != '' and imageId != 'null' and imageId != '99'">
+            and t.image_id = #{imageId}
+        </if>
+        <if test="accountPeriod != null and accountPeriod != '' and accountPeriod != 'null' and accountPeriod != '99'">
+            and t.account_period = #{accountPeriod}
+        </if>
+
         order by t.fill_in_date desc
     </select>
 

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

@@ -173,6 +173,10 @@
         t.source_system sourceSystem,
         t.is_sale_list listStatus,
         t.remark remark,
+        t.sn_voucher_number snVoucherName,
+        t.postingTime,
+        t.image_id imageId,
+        t.account_period accountPeriod,
         t.document_number documentNumber,
         DATE_FORMAT(t.collect_date,'%Y-%m-%d') collectDate,
         t.collect_from collectFrom
@@ -235,6 +239,18 @@
         <if test="invoiceSource!=null and invoiceSource!='' and invoiceSource!='99'">
             and t.invoice_source = #{invoiceSource}
         </if>
+        <if test="snVoucherNumber != null and snVoucherNumber != '' and snVoucherNumber != 'null' and snVoucherNumber != '99'">
+            and t.sn_voucher_number = #{snVoucherNumber}
+        </if>
+        <if test="postingTime != null and postingTime != '' and postingTime != 'null' and postingTime != '99'">
+            and t.postingTime = #{postingTime}
+        </if>
+        <if test="imageId != null and imageId != '' and imageId != 'null' and imageId != '99'">
+            and t.image_id = #{imageId}
+        </if>
+        <if test="accountPeriod != null and accountPeriod != '' and accountPeriod != 'null' and accountPeriod != '99'">
+            and t.account_period = #{accountPeriod}
+        </if>
     </select>
     <!--销项票池查询-->
     <select id="listSaleInvoice" parameterType="java.util.Map"

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

@@ -132,4 +132,10 @@ public class ExtAddTaxInvoice implements Serializable {
     private String systemName;
     private String collectDate;
     private String collectFrom;
+
+    private String snVoucherNumber;
+    private String postingTime;
+    private String imageId;
+    private String accountPeriod;
+    private String compCode;
 }

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

@@ -62,4 +62,8 @@ public class ExtOtherInvoice implements Serializable {
     private String businessDocumentNumber;
     private String createDate;
     private String taxAmount;
+    private String snVoucherNumber;
+    private String postingTime;
+    private String imageId;
+    private String accountPeriod;
 }

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

@@ -99,4 +99,10 @@ public class ExtTicketInvoiceModel implements Serializable {
     private String businessDocumentNumber;
     private String createDate;
 
+    private String snVoucherNumber;
+    private String postingTime;
+    private String imageId;
+    private String accountPeriod;
+    private String compCode;
+
 }

dxhy-extend/src/main/java/com/dxhy/extend/service/companypool/TicketServiceImpl.java

@@ -40,11 +40,11 @@ public class TicketServiceImpl extends MpBaseServiceImpl<ExtTicketDao, ExtTicket
         DynamicContextHolder.push(paramsMap.get("dbName") + DbConstant.BUSINESS_READ);
         try {
             String[] titlelist = {"序号", "发票类型", "发票代码", "发票号码", "开票日期", "销方名称", "乘坐人", "证件号", "班次/车次", "金额", "税率(%)", "税额",
-                "签收状态", "签收日期", "签收方式", "签收人", "抵扣状态", "业务单号", "入池时间"};
+                "签收状态", "签收日期", "签收方式", "签收人", "抵扣状态", "业务单号", "入池时间","凭证号", "过账时间", "影像号", "账期"};
 
             String[] titleprop = {"xh", "invoiceTypeString", "invoiceCode", "invoiceNo", "invoiceDate", "xfName",
                 "passenger", "passengerSfzh", "trainNumber", "invoiceAmount", "taxRate", "taxAmount", "qsStatus",
-                "qsDate", "qsType", "qsName", "isDeduction", "businessDocumentNumber", "createDate"};
+                "qsDate", "qsType", "qsName", "isDeduction", "businessDocumentNumber", "createDate","voucherNo", "postingTime","imageId","accountPeriod"};
             // 需要设置返回列表标题时调用
             json = super.setTitleList(titlelist, titleprop);
             PageHelper.startPage(curr, size);

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

@@ -44,11 +44,11 @@ public class CustomsServiceImpl extends MpBaseServiceImpl<CustomsDao, CustomsRec
         // 表头
         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", "voucherNumber", "businessName", "createDate"};
+            "inAccountDate", "inAccountStatus", "voucherNumber", "businessName", "createDate","voucherNo", "postingTime","imageId","accountPeriod"};
         // 需要设置返回列表标题时调用
         JSONObject json = super.setTitleList(titlelist, titleprop);
         try {

dxhy-extend/src/main/java/com/dxhy/extend/service/pool/ExtInvoicePoolServiceImpl.java

@@ -42,12 +42,12 @@ public class ExtInvoicePoolServiceImpl extends MpBaseServiceImpl<ExtInvoicePoolD
         try {
             String[] titlelist = {"序号", "发票类型", "发票代码", "发票号码", "发票状态", "开票日期", "销方名称", "销方税号", "金额", "税额", "有效税额",
                 "价税合计", "认证状态", "认证类型", "认证日期", "认证方式", "认证人", "采集状态", "底账库采集时间", "采集来源", "签收方式", "签收状态", "签收日期", "签收人",
-                "入账月份", "入账状态", "凭证号", "是否末次摊销", "摊销金额", "剩余金额", "业务单号", "入池时间"};
+                "入账月份", "入账状态","凭证号", "过账时间", "影像号", "账期","是否末次摊销", "摊销金额", "剩余金额", "业务单号", "入池时间"};
 
             String[] titleprop = {"xh", "invoiceType", "invoiceCode", "invoiceNo", "invoiceStatus", "invoiceDate",
                 "xfmc", "xfsh", "invoiceAmount", "taxAmount", "yxse", "totalAmount", "rzzt", "rzlx", "rzrq", "rzfs",
                 "rzr", "collectStatus", "collectDate", "collectFrom", "qsfs", "qszt", "qsrq", "qsr", "inAccountMonth",
-                "inAccountStatus", "voucherNo", "amortizeStatus", "amortizeAmount", "remainAmortizeAmount",
+                "inAccountStatus", "voucherNo","postingTime","imageId","accountPeriod", "amortizeStatus", "amortizeAmount", "remainAmortizeAmount",
                 "documentNumber", "createDate"};
             // 需要设置返回列表标题时调用
             json = super.setTitleList(titlelist, titleprop);
@@ -205,9 +205,9 @@ public class ExtInvoicePoolServiceImpl extends MpBaseServiceImpl<ExtInvoicePoolD
         DynamicContextHolder.push(pramsMap.get("dbName") + DbConstant.BUSINESS_READ);
         try {
             String[] titlelist =
-                {"序号", "发票类型", "发票代码", "发票号码", "开票日期", "金额", "签收状态", "签收日期", "签收方式", "签收人", "业务单号", "入池时间"};
+                {"序号", "发票类型", "发票代码", "发票号码", "开票日期", "金额", "签收状态", "签收日期", "签收方式", "签收人", "业务单号", "入池时间","凭证号", "过账时间", "影像号", "账期"};
             String[] titleprop = {"xh", "invoiceTypeString", "invoiceCode", "invoiceNo", "invoiceDate", "invoiceAmount",
-                "qszt", "qsrq", "qsfs", "qsr", "businessDocumentNumber", "createDate"};
+                "qszt", "qsrq", "qsfs", "qsr", "businessDocumentNumber", "createDate","voucherNo", "postingTime","imageId","accountPeriod"};
             // 需要设置返回列表标题时调用
             json = super.setTitleList(titlelist, titleprop);
             PageHelper.startPage(curr, size);

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

@@ -130,6 +130,18 @@
         <if test=" skssq != null and  skssq != '' and  skssq != 'null' ">
             and DATE_FORMAT(t.qs_date, '%Y-%m') like CONCAT(#{skssq},'%')
         </if>
+        <if test="snVoucherNumber != null and snVoucherNumber != '' and snVoucherNumber != 'null' and snVoucherNumber != '99'">
+            and t.sn_voucher_number = #{snVoucherNumber}
+        </if>
+        <if test="postingTime != null and postingTime != '' and postingTime != 'null' and postingTime != '99'">
+            and t.postingTime = #{postingTime}
+        </if>
+        <if test="imageId != null and imageId != '' and imageId != 'null' and imageId != '99'">
+            and t.image_id = #{imageId}
+        </if>
+        <if test="accountPeriod != null and accountPeriod != '' and accountPeriod != 'null' and accountPeriod != '99'">
+            and t.account_period = #{accountPeriod}
+        </if>
         order by t.fill_in_date desc
     </select>
 
@@ -222,6 +234,18 @@
         <if test=" skssq != null and  skssq != '' and  skssq != 'null' ">
             and DATE_FORMAT(t.qs_date, '%Y-%m') like CONCAT(#{skssq},'%')
         </if>
+        <if test="snVoucherNumber != null and snVoucherNumber != '' and snVoucherNumber != 'null' and snVoucherNumber != '99'">
+            and t.sn_voucher_number = #{snVoucherNumber}
+        </if>
+        <if test="postingTime != null and postingTime != '' and postingTime != 'null' and postingTime != '99'">
+            and t.postingTime = #{postingTime}
+        </if>
+        <if test="imageId != null and imageId != '' and imageId != 'null' and imageId != '99'">
+            and t.image_id = #{imageId}
+        </if>
+        <if test="accountPeriod != null and accountPeriod != '' and accountPeriod != 'null' and accountPeriod != '99'">
+            and t.account_period = #{accountPeriod}
+        </if>
     </select>
 
 

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

@@ -109,6 +109,15 @@
         <if test="qsfs != null and qsfs != '' and qsfs != 'null' and qsfs != '99'">
             and t.qs_type = #{qsfs}
         </if>
+        <if test="postingTime != null and postingTime != '' and postingTime != 'null' and postingTime != '99'">
+            and t.postingTime = #{postingTime}
+        </if>
+        <if test="imageId != null and imageId != '' and imageId != 'null' and imageId != '99'">
+            and t.image_id = #{imageId}
+        </if>
+        <if test="accountPeriod != null and accountPeriod != '' and accountPeriod != 'null' and accountPeriod != '99'">
+            and t.account_period = #{accountPeriod}
+        </if>
         <if
                 test="inAccountStatus != null and inAccountStatus != '' and inAccountStatus != 'null' and inAccountStatus != '99'">
             and t.payment_status = #{inAccountStatus}
@@ -218,6 +227,15 @@
                 test="inAccountStatus != null and inAccountStatus != '' and inAccountStatus != 'null' and inAccountStatus != '99'">
             and t.payment_status = #{inAccountStatus}
         </if>
+        <if test="postingTime != null and postingTime != '' and postingTime != 'null' and postingTime != '99'">
+            and t.postingTime = #{postingTime}
+        </if>
+        <if test="imageId != null and imageId != '' and imageId != 'null' and imageId != '99'">
+            and t.image_id = #{imageId}
+        </if>
+        <if test="accountPeriod != null and accountPeriod != '' and accountPeriod != 'null' and accountPeriod != '99'">
+            and t.account_period = #{accountPeriod}
+        </if>
         <if
                 test="inAccountMonth != null and inAccountMonth != null and inAccountMonth != '' and inAccountMonth != ''">
             and DATE_FORMAT(t.payment_date,'%Y-%m') = #{inAccountMonth}
@@ -319,6 +337,18 @@
         <if test="qsfs != null and qsfs != '' and qsfs != 'null' and qsfs != '99'">
             AND qs_type = #{qsfs}
         </if>
+        <if test="snVoucherNumber != null and snVoucherNumber != '' and snVoucherNumber != 'null' and snVoucherNumber != '99'">
+            and t.sn_voucher_number = #{snVoucherNumber}
+        </if>
+        <if test="postingTime != null and postingTime != '' and postingTime != 'null' and postingTime != '99'">
+            and t.postingTime = #{postingTime}
+        </if>
+        <if test="imageId != null and imageId != '' and imageId != 'null' and imageId != '99'">
+            and t.image_id = #{imageId}
+        </if>
+        <if test="accountPeriod != null and accountPeriod != '' and accountPeriod != 'null' and accountPeriod != '99'">
+            and t.account_period = #{accountPeriod}
+        </if>
         GROUP BY uuid having min(create_date)
         ORDER BY create_date DESC
     </select>
@@ -383,6 +413,18 @@
         <if test="invoiceSource!=null and invoiceSource!='' and invoiceSource!='99'">
             and t.invoice_source = #{invoiceSource}
         </if>
+        <if test="snVoucherNumber != null and snVoucherNumber != '' and snVoucherNumber != 'null' and snVoucherNumber != '99'">
+            and t.sn_voucher_number = #{snVoucherNumber}
+        </if>
+        <if test="postingTime != null and postingTime != '' and postingTime != 'null' and postingTime != '99'">
+            and t.postingTime = #{postingTime}
+        </if>
+        <if test="imageId != null and imageId != '' and imageId != 'null' and imageId != '99'">
+            and t.image_id = #{imageId}
+        </if>
+        <if test="accountPeriod != null and accountPeriod != '' and accountPeriod != 'null' and accountPeriod != '99'">
+            and t.account_period = #{accountPeriod}
+        </if>
     </select>
     <!--销项票池查询-->
     <select id="listSaleInvoice" parameterType="java.util.Map"

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

@@ -54,6 +54,18 @@
         <if test="company !=null and company !=''">
             and t.company = #{company}
         </if>
+        <if test="snVoucherNumber != null and snVoucherNumber != '' and snVoucherNumber != 'null' and snVoucherNumber != '99'">
+            and t.sn_voucher_number = #{snVoucherNumber}
+        </if>
+        <if test="postingTime != null and postingTime != '' and postingTime != 'null' and postingTime != '99'">
+            and t.postingTime = #{postingTime}
+        </if>
+        <if test="imageId != null and imageId != '' and imageId != 'null' and imageId != '99'">
+            and t.image_id = #{imageId}
+        </if>
+        <if test="accountPeriod != null and accountPeriod != '' and accountPeriod != 'null' and accountPeriod != '99'">
+            and t.account_period = #{accountPeriod}
+        </if>
     </select>
 
 
@@ -102,5 +114,17 @@
         <if test="company !=null and company !=''">
             and t.company = #{company}
         </if>
+        <if test="snVoucherNumber != null and snVoucherNumber != '' and snVoucherNumber != 'null' and snVoucherNumber != '99'">
+            and t.sn_voucher_number = #{snVoucherNumber}
+        </if>
+        <if test="postingTime != null and postingTime != '' and postingTime != 'null' and postingTime != '99'">
+            and t.postingTime = #{postingTime}
+        </if>
+        <if test="imageId != null and imageId != '' and imageId != 'null' and imageId != '99'">
+            and t.image_id = #{imageId}
+        </if>
+        <if test="accountPeriod != null and accountPeriod != '' and accountPeriod != 'null' and accountPeriod != '99'">
+            and t.account_period = #{accountPeriod}
+        </if>
     </select>
 </mapper>