From fedadfcd3cbe6f3e9afe854a19acd59a4aac8c4a Mon Sep 17 00:00:00 2001 From: "liang.chao" <1360241448@qq.com> Date: Tue, 17 Dec 2024 20:32:08 +0800 Subject: [PATCH] =?UTF-8?q?=E7=A7=9F=E8=B5=81=E5=8D=8F=E8=AE=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../material/book/domain/CompanyPersonPhoneKey.java | 1 + .../book/service/impl/BookCarServiceImpl.java | 1 + .../material/contract/mapper/BmContractMapper.java | 2 ++ .../material/contract/service/BmContractService.java | 2 ++ .../contract/service/impl/BmContractServiceImpl.java | 6 ++++++ .../material/order/controller/OrderController.java | 11 +++++------ .../mapper/material/contract/BmContractMapper.xml | 4 ++++ 7 files changed, 21 insertions(+), 6 deletions(-) diff --git a/bonus-modules/bonus-material-mall/src/main/java/com/bonus/material/book/domain/CompanyPersonPhoneKey.java b/bonus-modules/bonus-material-mall/src/main/java/com/bonus/material/book/domain/CompanyPersonPhoneKey.java index f719e3d..8d49f32 100644 --- a/bonus-modules/bonus-material-mall/src/main/java/com/bonus/material/book/domain/CompanyPersonPhoneKey.java +++ b/bonus-modules/bonus-material-mall/src/main/java/com/bonus/material/book/domain/CompanyPersonPhoneKey.java @@ -15,6 +15,7 @@ import lombok.NoArgsConstructor; @NoArgsConstructor public class CompanyPersonPhoneKey { private String companyName; + private String companyId; private String person; private String personPhone; } diff --git a/bonus-modules/bonus-material-mall/src/main/java/com/bonus/material/book/service/impl/BookCarServiceImpl.java b/bonus-modules/bonus-material-mall/src/main/java/com/bonus/material/book/service/impl/BookCarServiceImpl.java index c89f518..975d263 100644 --- a/bonus-modules/bonus-material-mall/src/main/java/com/bonus/material/book/service/impl/BookCarServiceImpl.java +++ b/bonus-modules/bonus-material-mall/src/main/java/com/bonus/material/book/service/impl/BookCarServiceImpl.java @@ -77,6 +77,7 @@ public class BookCarServiceImpl implements BookCarService { Map> groupedByKey = bookCarDetails.stream() .collect(Collectors.groupingBy(bookCarDetail -> new CompanyPersonPhoneKey( bookCarDetail.getCompanyName(), + bookCarDetail.getCompanyId(), bookCarDetail.getPerson(), bookCarDetail.getPersonPhone() ))); diff --git a/bonus-modules/bonus-material-mall/src/main/java/com/bonus/material/contract/mapper/BmContractMapper.java b/bonus-modules/bonus-material-mall/src/main/java/com/bonus/material/contract/mapper/BmContractMapper.java index 876c406..2e7fcbc 100644 --- a/bonus-modules/bonus-material-mall/src/main/java/com/bonus/material/contract/mapper/BmContractMapper.java +++ b/bonus-modules/bonus-material-mall/src/main/java/com/bonus/material/contract/mapper/BmContractMapper.java @@ -29,4 +29,6 @@ public interface BmContractMapper { List lisTemplate(BmContract bmContract); BmContract disclaimer(); + + BmContract getContract(BmContract bmContract); } diff --git a/bonus-modules/bonus-material-mall/src/main/java/com/bonus/material/contract/service/BmContractService.java b/bonus-modules/bonus-material-mall/src/main/java/com/bonus/material/contract/service/BmContractService.java index d8bfe48..e79f12d 100644 --- a/bonus-modules/bonus-material-mall/src/main/java/com/bonus/material/contract/service/BmContractService.java +++ b/bonus-modules/bonus-material-mall/src/main/java/com/bonus/material/contract/service/BmContractService.java @@ -24,4 +24,6 @@ public interface BmContractService { List lisTemplate(BmContract bmContract); BmContract disclaimer(); + + BmContract getContract(BmContract bmContract); } diff --git a/bonus-modules/bonus-material-mall/src/main/java/com/bonus/material/contract/service/impl/BmContractServiceImpl.java b/bonus-modules/bonus-material-mall/src/main/java/com/bonus/material/contract/service/impl/BmContractServiceImpl.java index 5235337..b2c83e6 100644 --- a/bonus-modules/bonus-material-mall/src/main/java/com/bonus/material/contract/service/impl/BmContractServiceImpl.java +++ b/bonus-modules/bonus-material-mall/src/main/java/com/bonus/material/contract/service/impl/BmContractServiceImpl.java @@ -125,6 +125,12 @@ public class BmContractServiceImpl implements BmContractService { return bmContractMapper.disclaimer(); } + @Override + public BmContract getContract(BmContract bmContract) { + bmContract.setStatus(1); + return bmContractMapper.getContract(bmContract); + } + private String getString() { //根据前台传过来的数据，生成需求编号 SimpleDateFormat dateFormat = new SimpleDateFormat("yyyyMMdd"); diff --git a/bonus-modules/bonus-material-mall/src/main/java/com/bonus/material/order/controller/OrderController.java b/bonus-modules/bonus-material-mall/src/main/java/com/bonus/material/order/controller/OrderController.java index 777deca..ba361b3 100644 --- a/bonus-modules/bonus-material-mall/src/main/java/com/bonus/material/order/controller/OrderController.java +++ b/bonus-modules/bonus-material-mall/src/main/java/com/bonus/material/order/controller/OrderController.java @@ -375,14 +375,13 @@ public class OrderController extends BaseController { replacements.put("orderTable", orderDetail); BmContract bmContract = new BmContract(); - bmContract.setStatus(1); - List list = bmContractService.list(bmContract); - String content = list.get(0).getContent(); - if (StringUtils.isBlank(content)) { - content = bmContractService.lisTemplate(bmContract).get(0).getContent(); + + BmContract bmContracts = bmContractService.getContract(bmContract); + if (StringUtils.isBlank(bmContracts.getContent())) { + bmContracts.setContent(bmContractService.lisTemplate(bmContract).get(0).getContent()); } StrSubstitutor sub = new StrSubstitutor(replacements); - String result = sub.replace(content); + String result = sub.replace(bmContracts.getContent()); return AjaxResult.success(result); } else { return AjaxResult.error("参数错误"); diff --git a/bonus-modules/bonus-material-mall/src/main/resources/mapper/material/contract/BmContractMapper.xml b/bonus-modules/bonus-material-mall/src/main/resources/mapper/material/contract/BmContractMapper.xml index 423fe57..445bd51 100644 --- a/bonus-modules/bonus-material-mall/src/main/resources/mapper/material/contract/BmContractMapper.xml +++ b/bonus-modules/bonus-material-mall/src/main/resources/mapper/material/contract/BmContractMapper.xml @@ -57,4 +57,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" + \ No newline at end of file