From a78bc14fa88bde6470829b3d3bd141f64e7fefcb Mon Sep 17 00:00:00 2001 From: yefei Date: Tue, 11 Apr 2023 17:39:15 +0800 Subject: [PATCH] =?UTF-8?q?ariesy=20=E4=BF=AE=E6=94=B9=E5=8F=96=E6=B6=88?= =?UTF-8?q?=E8=BF=9B=E9=A1=B9=E7=A8=8E=E8=BD=AC=E5=87=BA,=E6=8E=A8?= =?UTF-8?q?=E9=80=81ztid?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../receipt/BaseReceiptOutServiceImpl.java | 129 ++++++++---------- .../controller/SDNYMainProcessController.java | 11 +- .../service/customs/CustomsServiceImpl.java | 4 +- 3 files changed, 62 insertions(+), 82 deletions(-) diff --git a/dxhy-base/src/main/java/com/dxhy/base/service/receipt/BaseReceiptOutServiceImpl.java b/dxhy-base/src/main/java/com/dxhy/base/service/receipt/BaseReceiptOutServiceImpl.java index 31fb94ea..d20e2ef6 100644 --- a/dxhy-base/src/main/java/com/dxhy/base/service/receipt/BaseReceiptOutServiceImpl.java +++ b/dxhy-base/src/main/java/com/dxhy/base/service/receipt/BaseReceiptOutServiceImpl.java @@ -43,10 +43,10 @@ import com.github.pagehelper.PageInfo; * @date 2019-04-24 进项税转出相关操作 */ @SuppressWarnings({"AlibabaUndefineMagicConstant", "AlibabaCollectionInitShouldAssignCapacity", - "AlibabaLowerCamelCaseVariableNaming"}) + "AlibabaLowerCamelCaseVariableNaming"}) @Service("baseIReceiptOutService") public class BaseReceiptOutServiceImpl extends MpBaseServiceImpl - implements BaseIReceiptOutService { + implements BaseIReceiptOutService { @Resource private BaseIInvoiceOutService baseIInvoiceOutService; @@ -67,8 +67,7 @@ public class BaseReceiptOutServiceImpl extends MpBaseServiceImpl pageInfo = baseIInvoiceOutService.listPageByInvoice(filter); @@ -134,7 +133,7 @@ public class BaseReceiptOutServiceImpl extends MpBaseServiceImpl invoiceStatusMap) { + Map invoiceStatusMap) { BaseReceiptOutRespVO vo = new BaseReceiptOutRespVO(); // uuid作为主键 vo.setId(record.getUuid()); @@ -179,7 +176,7 @@ public class BaseReceiptOutServiceImpl extends MpBaseServiceImpl setPartInvoiceByType(List invoices, - BaseInvoiceEditCondVO condVO, UserInfo userInfo) { + BaseInvoiceEditCondVO condVO, UserInfo userInfo) { List condList = new ArrayList<>(); for (BaseTDxRecordInvoice record : invoices) { QueryWrapper queryWrapper = new QueryWrapper<>(); @@ -251,7 +245,7 @@ public class BaseReceiptOutServiceImpl extends MpBaseServiceImpl * 查询底账表数据,查询转出流水 如果已经有转出流水,则update 如果没有转出流水,则insert 更正底账表转出相关字段 * - * @param condVO - * 请求参数 - * @param userInfo - * 请求参数 + * @param condVO 请求参数 + * @param userInfo 请求参数 * @return 返回结果 */ @Override @@ -379,7 +367,7 @@ public class BaseReceiptOutServiceImpl extends MpBaseServiceImpl outs = listByUuids(ids); Map outMap = - outs.stream().collect(Collectors.toMap(BaseTDxRecordInvoiceOut::getUuid, tri -> tri)); + outs.stream().collect(Collectors.toMap(BaseTDxRecordInvoiceOut::getUuid, tri -> tri)); // third:设置底账表中的 进项税转出 部分相关字段 List condList = setPartInvoiceByType(invoices, condVO, userInfo); @@ -406,10 +394,8 @@ public class BaseReceiptOutServiceImpl extends MpBaseServiceImpl condList, List outList) { @@ -422,8 +408,7 @@ public class BaseReceiptOutServiceImpl extends MpBaseServiceImpl list) { if (list != null && list.size() > 0) { @@ -434,8 +419,7 @@ public class BaseReceiptOutServiceImpl extends MpBaseServiceImpl listByUuids(String[] uuids) { @@ -447,8 +431,7 @@ public class BaseReceiptOutServiceImpl extends MpBaseServiceImpl list = baseIReceiptInvoiceService.selectByUuids(ids); @@ -507,8 +488,7 @@ public class BaseReceiptOutServiceImpl extends MpBaseServiceImpl pageInfo = baseIInvoiceOutService.listPageByInvoice(filter); @@ -609,7 +588,7 @@ public class BaseReceiptOutServiceImpl extends MpBaseServiceImpl invoiceStatusMap) { + Map invoiceStatusMap) { BaseReceiptOutCancelRespVO vo = new BaseReceiptOutCancelRespVO(); // uuid作为主键 vo.setId(record.getUuid()); @@ -652,7 +629,7 @@ public class BaseReceiptOutServiceImpl extends MpBaseServiceImpl