From c2e6cf5dcb014d8daf42c4c7f844ca17e6b744aa Mon Sep 17 00:00:00 2001 From: yefei Date: Tue, 28 Mar 2023 20:55:35 +0800 Subject: [PATCH] =?UTF-8?q?ariesy=20=E5=AE=8C=E5=96=84=E7=A5=A8=E6=B1=A0?= =?UTF-8?q?=E9=A1=B5=E9=9D=A2=E7=BB=86=E8=8A=82=E5=8A=9F=E8=83=BD=E7=82=B9?= =?UTF-8?q?=20v1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/dxhy/core/entity/ExtOtherInvoice.java | 6 ++++++ .../com/dxhy/core/entity/TicketInvoiceModel.java | 6 ++++++ .../service/export/impl/PoolPaperServiceImpl.java | 6 +++++- .../core/service/export/impl/TicketServiceImpl.java | 7 ++++++- .../com/dxhy/core/thread/CustomExportThread.java | 4 ++-- .../java/com/dxhy/core/thread/PoolOtherThread.java | 2 +- .../com/dxhy/core/thread/QypcsmkpExportThread.java | 2 +- .../erp/controller/SDNYMainProcessController.java | 4 ++-- .../com/dxhy/erp/entity/sdny/SAPInvoiceInfo.java | 2 +- .../dxhy/extend/controller/ExtCustomsController.java | 12 ++++++++++++ .../dxhy/extend/controller/ExtTicketController.java | 12 ++++++++++++ 11 files changed, 54 insertions(+), 9 deletions(-) diff --git a/dxhy-core/src/main/java/com/dxhy/core/entity/ExtOtherInvoice.java b/dxhy-core/src/main/java/com/dxhy/core/entity/ExtOtherInvoice.java index 88328a24..7f9ef0f9 100644 --- a/dxhy-core/src/main/java/com/dxhy/core/entity/ExtOtherInvoice.java +++ b/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; } diff --git a/dxhy-core/src/main/java/com/dxhy/core/entity/TicketInvoiceModel.java b/dxhy-core/src/main/java/com/dxhy/core/entity/TicketInvoiceModel.java index b32b8541..9d11c847 100644 --- a/dxhy-core/src/main/java/com/dxhy/core/entity/TicketInvoiceModel.java +++ b/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; } diff --git a/dxhy-core/src/main/java/com/dxhy/core/service/export/impl/PoolPaperServiceImpl.java b/dxhy-core/src/main/java/com/dxhy/core/service/export/impl/PoolPaperServiceImpl.java index e5621ccf..687543b5 100644 --- a/dxhy-core/src/main/java/com/dxhy/core/service/export/impl/PoolPaperServiceImpl.java +++ b/dxhy-core/src/main/java/com/dxhy/core/service/export/impl/PoolPaperServiceImpl.java @@ -126,7 +126,7 @@ public class PoolPaperServiceImpl extends MpBaseServiceImpl 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 IT_ITEM; /** diff --git a/dxhy-extend/src/main/java/com/dxhy/extend/controller/ExtCustomsController.java b/dxhy-extend/src/main/java/com/dxhy/extend/controller/ExtCustomsController.java index 009c6ffd..5defb148 100644 --- a/dxhy-extend/src/main/java/com/dxhy/extend/controller/ExtCustomsController.java +++ b/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 pramsMap) { + UserInfo userInfo = getUserInfo(); + log.info("登录信息为:{}", JSONObject.toJSONString(userInfo)); + log.info("传入参数为:{}",pramsMap); + pramsMap.put("business", getUserInfo().getBusiness()); pramsMap.put("dbName", getUserInfo().getDbName()); List 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", diff --git a/dxhy-extend/src/main/java/com/dxhy/extend/controller/ExtTicketController.java b/dxhy-extend/src/main/java/com/dxhy/extend/controller/ExtTicketController.java index 11fac4c3..e042a5b6 100644 --- a/dxhy-extend/src/main/java/com/dxhy/extend/controller/ExtTicketController.java +++ b/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 queryTicket(@RequestBody Map paramsMap) { + UserInfo userInfo = getUserInfo(); + log.info("登录信息为:{}", JSONObject.toJSONString(userInfo)); + log.info("传入参数为:{}",paramsMap); paramsMap.put("dbName", getUserInfo().getDbName()); List 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()))); }