ariesy 完善票池页面细节功能点 v1

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

@@ -87,4 +87,10 @@ public class ExtOtherInvoice implements Serializable {
     /** 业务单号 */
     private String businessDocumentNumber;
     private String createDate;
+
+    private String snVoucherNumber;
+    private String postingTime;
+    private String imageId;
+    private String accountPeriod;
+    private String compCode;
 }

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

@@ -105,4 +105,10 @@ public class TicketInvoiceModel implements Serializable {
     /** 业务单号 */
     private String businessDocumentNumber;
     private String createDate;
+
+    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/PoolPaperServiceImpl.java

@@ -126,7 +126,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[13];
+                    String[] dataArray = new String[17];
                     dataArray[0] = String.valueOf((curr - 1) * size + i + 1);
                     // 发票类型
                     dataArray[1] = new InvoiceTypeUtils().invoiceTypeName(pageList.get(i).getInvoiceType());
@@ -154,6 +154,10 @@ public class PoolPaperServiceImpl extends MpBaseServiceImpl<PoolPaperDao, Invoic
                     dataArray[9] = pageList.get(i).getQsr();
                     dataArray[10] = pageList.get(i).getBusinessDocumentNumber();
                     dataArray[11] = pageList.get(i).getCreateDate();
+                    dataArray[12] = pageList.get(i).getSnVoucherNumber();
+                    dataArray[13] = pageList.get(i).getPostingTime();
+                    dataArray[14] = pageList.get(i).getImageId();
+                    dataArray[15] = pageList.get(i).getAccountPeriod();
                     returnList.add(dataArray);
                 }
             }

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

@@ -137,7 +137,7 @@ public class TicketServiceImpl extends MpBaseServiceImpl<TicketDao, TicketInvoic
 
             for (int i = 0; i < resultList.size(); i++) {
                 // 页面展示需要信息
-                String[] dataArray = new String[20];
+                String[] dataArray = new String[24];
                 dataArray[0] = String.valueOf((curr - 1) * size + i + 1);
                 dataArray[1] = exchangeInvoiceType(resultList.get(i).getInvoiceType());
                 dataArray[2] = resultList.get(i).getInvoiceCode();
@@ -182,6 +182,11 @@ public class TicketServiceImpl extends MpBaseServiceImpl<TicketDao, TicketInvoic
                 if (StringUtils.isNotBlank(pageList.get(i).getCreateDate())) {
                     dataArray[18] = pageList.get(i).getCreateDate().substring(0, 10);
                 }
+                dataArray[19] = resultList.get(i).getSnVoucherNumber();
+                dataArray[20] = resultList.get(i).getPostingTime();
+                dataArray[21] = resultList.get(i).getImageId();
+                dataArray[22] = resultList.get(i).getAccountPeriod();
+
                 returnList.add(dataArray);
             }
         }

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

@@ -63,12 +63,12 @@ public class CustomExportThread extends BaseThread {
 
     String[] titleColumns = {"序号", "缴款书号码", "管理状态", "填发日期", "缴款单位名称", "缴款单位税号", "税款金额", "抵扣税款金额", "稽核结果", "是否申请核对",
         "核对结果", "认证状态", "认证类型", "认证日期", "认证方式", "认证人", "采集状态", "底账库采集时间", "采集来源", "签收方式", "签收状态", "签收日期", "签收人", "入账月份",
-        "入账状态", "凭证号", "业务单元", "入池时间"};
+        "入账状态", "凭证号", "业务单元", "入池时间","凭证号", "过账时间", "影像号", "账期"};
 
     String[] titleprop = {"xh", "customsCode", "fillInDate", "gfTaxNo", "gfName", "taxAmount", "yxTaxAmount",
         "auditStatus", "applyCheck", "checkStatus", "rzhYesorno", "bdkStatus", "rzhDate", "rzhType", "confirmUser",
         "cjzt", "createDate", "dataSources", "qsType", "qsStatus", "qsDate", "qsUser", "inAccountStatus",
-        "voucherNumber", "documentNumber", "createDate"};
+        "voucherNumber", "documentNumber", "createDate","voucherNo", "postingTime","imageId","accountPeriod"};
 
     private final IExcelExportlogService exportLogService;
 

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

@@ -54,7 +54,7 @@ public class PoolOtherThread extends BaseThread {
      * 导出excel的列名
      */
     private final String[] titleColumns =
-        {"序号", "发票类型", "发票代码", "发票号码", "开票日期", "金额", "签收状态", "签收日期", "签收方式", "签收人", "业务单号", "入池时间"};
+        {"序号", "发票类型", "发票代码", "发票号码", "开票日期", "金额", "签收状态", "签收日期", "签收方式", "签收人", "业务单号", "入池时间","凭证号", "过账时间", "影像号", "账期"};
 
     private final IExcelExportlogService exportLogService;
 

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

@@ -60,7 +60,7 @@ public class QypcsmkpExportThread extends BaseThread {
      * 导出excel的列名
      */
     private final String[] titleColumns = {"序号", "发票类型", "发票代码", "发票号码", "开票日期", "销方名称", "乘坐人", "证件号", "班次/车次", "金额",
-        "税率(%)", "税额", "签收状态", "签收日期", "签收方式", "签收人", "抵扣状态", "业务单号", "入池时间"};
+        "税率(%)", "税额", "签收状态", "签收日期", "签收方式", "签收人", "抵扣状态", "业务单号", "入池时间","凭证号", "过账时间", "影像号", "账期"};
 
     private final IExcelExportlogService exportLogService;
 

dxhy-erp/src/main/java/com/dxhy/erp/controller/SDNYMainProcessController.java

@@ -388,7 +388,7 @@ public class SDNYMainProcessController extends AbstractController {
             sapInvoiceDetailList.add(sapInvoiceDetail);
         }
 
-        info.setIT_ITEM(sapInvoiceDetailList.toString());
+        info.setIT_ITEM(sapInvoiceDetailList);
 
         info.setZFPDM(snInvoice.getInvoiceCode());
         info.setZCD(snInvoice.getOriginPlace());
@@ -448,7 +448,7 @@ public class SDNYMainProcessController extends AbstractController {
         info.setZZWLX(snInvoice.getSeat());
         info.setZTID(snInvoice.getInvoiceCode()+snInvoice.getInvoiceNumber());
 
-        sapInvoiceInfos.add(info.toString());
+        sapInvoiceInfos.add(JSONObject.toJSONString(info));
         object.setZDATA(sapInvoiceInfos);
         return object;
 

dxhy-erp/src/main/java/com/dxhy/erp/entity/sdny/SAPInvoiceInfo.java

@@ -452,7 +452,7 @@ public class SAPInvoiceInfo {
      * 行项目结构
      */
     @JSONField(name = "IT_ITEM")
-    private String IT_ITEM;
+    private List<SAPInvoiceDetail> IT_ITEM;
 
 
     /**

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

@@ -1,11 +1,13 @@
 package com.dxhy.extend.controller;
 
+import com.alibaba.fastjson.JSONObject;
 import com.dxhy.common.aspect.SysLog;
 import com.dxhy.common.constant.CommonConstants;
 import com.dxhy.common.controller.AbstractController;
 import com.dxhy.common.util.UserInfoUtil;
 import com.dxhy.common.utils.DateUtils;
 import com.dxhy.common.utils.R;
+import com.dxhy.common.vo.UserInfo;
 import com.dxhy.extend.service.customs.CustomsService;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.http.ResponseEntity;
@@ -45,6 +47,10 @@ public class ExtCustomsController extends AbstractController {
     @ResponseBody
     @SysLog("海关缴款书综合查询")
     public Object listFpzhcx(@RequestBody Map<String, Object> pramsMap) {
+        UserInfo userInfo = getUserInfo();
+        log.info("登录信息为:{}", JSONObject.toJSONString(userInfo));
+        log.info("传入参数为:{}",pramsMap);
+
         pramsMap.put("business", getUserInfo().getBusiness());
         pramsMap.put("dbName", getUserInfo().getDbName());
         List<String> gfshList = new ArrayList<>();
@@ -63,6 +69,12 @@ public class ExtCustomsController extends AbstractController {
                     DateUtils.getNight(DateUtils.strToDate(pramsMap.get("fillInEndDate").toString())));
         }
 
+        if (pramsMap.get("accountPeriod") != null && !"".equals(pramsMap.get("accountPeriod"))) {
+            String accountPeriod = pramsMap.get("accountPeriod").toString().substring(0,7);
+            pramsMap.put("accountPeriod", accountPeriod);
+            log.info("accountPeriod:{}",accountPeriod);
+        }
+
         if ("1".equals(pramsMap.get("qsStatus"))) {
             if (pramsMap.get("qsDateStartDate") != null && !"".equals(pramsMap.get("qsDateStartDate"))) {
                 pramsMap.put("qsDateStartDate",

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

@@ -6,6 +6,8 @@ import java.util.Map;
 
 import javax.annotation.Resource;
 
+import com.alibaba.fastjson.JSONObject;
+import com.dxhy.common.vo.UserInfo;
 import org.springframework.http.ResponseEntity;
 import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestMapping;
@@ -46,6 +48,9 @@ public class ExtTicketController extends AbstractController {
     @RequestMapping("/queryTicket")
     @SysLog("实名客票信息查询")
     public ResponseEntity<R> queryTicket(@RequestBody Map<String, Object> paramsMap) {
+        UserInfo userInfo = getUserInfo();
+        log.info("登录信息为:{}", JSONObject.toJSONString(userInfo));
+        log.info("传入参数为:{}",paramsMap);
         paramsMap.put("dbName", getUserInfo().getDbName());
 
         List<String> gfshList = new ArrayList<>();
@@ -73,6 +78,13 @@ public class ExtTicketController extends AbstractController {
         if (paramsMap.get("kpjsrq") != null && !"".equals(paramsMap.get("kpjsrq"))) {
             paramsMap.put("kpjsrq", DateUtils.getNight(DateUtils.strToDate(paramsMap.get("kpjsrq").toString())));
         }
+
+        if (paramsMap.get("accountPeriod") != null && !"".equals(paramsMap.get("accountPeriod"))) {
+            String accountPeriod = paramsMap.get("accountPeriod").toString().substring(0,7);
+            paramsMap.put("accountPeriod", accountPeriod);
+            log.info("accountPeriod:{}",accountPeriod);
+        }
+
         if (paramsMap.get("cjksyf") != null && !"".equals(paramsMap.get("cjksyf"))) {
             paramsMap.put("cjksyf", DateUtils.getMorning(DateUtils.strToDate(paramsMap.get("cjksyf").toString())));
         }