From f961f3f20074f855a345a18e15e6b931a5499d89 Mon Sep 17 00:00:00 2001 From: "liang.chao" <1360241448@qq.com> Date: Tue, 17 Dec 2024 16:54:15 +0800 Subject: [PATCH 1/7] =?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 --- .../order/controller/OrderController.java | 78 ++++++++++++++++--- 1 file changed, 67 insertions(+), 11 deletions(-) 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 08bdc0b..b51dd80 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 @@ -10,6 +10,7 @@ import com.bonus.common.security.utils.SecurityUtils; import com.bonus.material.book.domain.BookCarInfoDto; import com.bonus.material.contract.domain.BmContract; import com.bonus.material.contract.service.BmContractService; +import com.bonus.material.device.domain.vo.DevInfoVo; import com.bonus.material.order.domain.OrderDetailCostReliefDto; import com.bonus.material.order.domain.OrderDetailDto; import com.bonus.material.order.domain.OrderInfoDto; @@ -174,10 +175,11 @@ public class OrderController extends BaseController { } } - /*@ApiOperation(value = "租赁协议(查看)") + @ApiOperation(value = "租赁协议(查看)") @GetMapping("/leaseAgreement") public AjaxResult getleaseAgreement(String orderId, Map replacements) throws IOException, ParseException { OrderInfoDto orderInfoDto = orderService.getAgreementByOrderId(orderId); + List orderDetailsByOrderId = orderMapper.selectOrderDetailsByOderId(orderId); BmContract bmContract = new BmContract(); bmContract.setStatus(1); List list = bmContractService.list(bmContract); @@ -199,6 +201,16 @@ public class OrderController extends BaseController { replacements.put("${companyName}", orderInfoDto.getCompanyName()); //订单金额 replacements.put("${cost}", orderInfoDto.getCost().toString()); + //订单详情 + String orderDetail = ""; + for (OrderDetailDto orderDetailDto : orderDetailsByOrderId) { + Date rentBeginTime = inputFormat.parse(orderDetailDto.getRentBeginTime().toString()); + String beginTime = outputFormat.format(rentBeginTime); + Date rentEndTime = inputFormat.parse(orderDetailDto.getRentEndTime().toString()); + String endTime = outputFormat.format(rentEndTime); + orderDetail += "机具名称：" + orderDetailDto.getDeviceName() + "租期：" + beginTime + "至" + endTime + "天数：" + orderDetailDto.getDays() + "天 租金：" + orderDetailDto.getDayLeasePrice() + "元/天数量：" + orderDetailDto.getNum(); + } + replacements.put("${orderTable}", orderDetail); for (IBodyElement element : document.getBodyElements()) { if (element instanceof XWPFParagraph) { @@ -221,12 +233,12 @@ public class OrderController extends BaseController { MultipartFile file = new MockMultipartFile("contract", "contract.docx", MediaType.APPLICATION_OCTET_STREAM_VALUE, wordBytes); return sysFileService.upload(file); - }*/ + } - @ApiOperation(value = "租赁协议(查看)") + /* @ApiOperation(value = "租赁协议(查看)") @GetMapping("/leaseAgreement") - public AjaxResult getleaseAgreement(String orderId, Map replacements) throws ParseException { + public AjaxResult getleaseAgreement(String orderId, Map replacements) throws ParseException { OrderInfoDto orderInfoDto = orderService.getAgreementByOrderId(orderId); List orderDetailsByOrderId = orderMapper.selectOrderDetailsByOderId(orderId); String dateStr = orderInfoDto.getOrderTime().toString(); @@ -235,27 +247,71 @@ public class OrderController extends BaseController { Date date = inputFormat.parse(dateStr); String formattedDate = outputFormat.format(date); + //订单日期 - replacements.put("${orderTime}", formattedDate); + replacements.put("orderTime", formattedDate); //装备所属公司 - replacements.put("${czcompanyName}", orderInfoDto.getCzcompanyName()); + replacements.put("czCompanyName", orderInfoDto.getCzcompanyName()); //承租方所属公司 - replacements.put("${companyName}", orderInfoDto.getCompanyName()); + replacements.put("companyName", orderInfoDto.getCompanyName()); //订单金额 - replacements.put("${cost}", orderInfoDto.getCost().toString()); + replacements.put("cost", orderInfoDto.getCost().toString()); //订单详情 String orderDetail = ""; for (OrderDetailDto orderDetailDto : orderDetailsByOrderId) { - orderDetail += "

机具名称：" + orderDetailDto.getDeviceName() + "  租期：" + orderDetailDto.getRentBeginTime() + "至" + orderDetailDto.getRentEndTime() + "  天数：" + orderDetailDto.getDays() + "天  租金：" + orderDetailDto.getDayLeasePrice() + "元/天  数量：" + orderDetailDto.getNum() + "

"; + Date rentBeginTime = inputFormat.parse(orderDetailDto.getRentBeginTime().toString()); + String beginTime = outputFormat.format(rentBeginTime); + Date rentEndTime = inputFormat.parse(orderDetailDto.getRentEndTime().toString()); + String endTime = outputFormat.format(rentEndTime); + orderDetail += "

机具名称：" + orderDetailDto.getDeviceName() + "
租期：" + beginTime + "至" + endTime + "
天数：" + orderDetailDto.getDays() + "天
租金：" + orderDetailDto.getDayLeasePrice() + "元/天
数量：" + orderDetailDto.getNum() + "

"; } - replacements.put("${orderTable}", orderDetail); + 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(); + } StrSubstitutor sub = new StrSubstitutor(replacements); String result = sub.replace(content); return AjaxResult.success(result); - } + }*/ + + /* @ApiOperation(value = "购物车协议(查看)") + @GetMapping("/bookCarAgreement") + public AjaxResult getbookCarAgreement(OrderInfoDto orderInfoDto, Map replacements) throws ParseException { + if (orderInfoDto != null) { + SimpleDateFormat inputFormat = new SimpleDateFormat("EEE MMM dd HH:mm:ss zzz yyyy", Locale.ENGLISH); + SimpleDateFormat outputFormat = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss"); + //装备所属公司 + replacements.put("czcompanyName", orderInfoDto.getCzcompanyName()); + //承租方所属公司 + replacements.put("companyName", orderInfoDto.getCompanyName()); + //订单金额 + replacements.put("cost", orderInfoDto.getCost().toString()); + //订单详情 + String orderDetail = ""; + List detailsList = orderInfoDto.getDetailsList(); + for (OrderDetailDto orderDetailDto : detailsList) { + Date rentBeginTime = inputFormat.parse(orderDetailDto.getRentBeginTime().toString()); + String beginTime = outputFormat.format(rentBeginTime); + Date rentEndTime = inputFormat.parse(orderDetailDto.getRentEndTime().toString()); + String endTime = outputFormat.format(rentEndTime); + orderDetail += "

机具名称：" + orderDetailDto.getDeviceName() + "
租期：" + beginTime + "至" + endTime + "
天数：" + orderDetailDto.getDays() + "天
租金：" + orderDetailDto.getDayLeasePrice() + "元/天
数量：" + orderDetailDto.getNum() + "

"; + } + 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(); + } + StrSubstitutor sub = new StrSubstitutor(replacements); + String result = sub.replace(content); + return AjaxResult.success(result); + }*/ } From be8ba99be63d63fa2e79aaed981188d9e509ff6b Mon Sep 17 00:00:00 2001 From: "liang.chao" <1360241448@qq.com> Date: Tue, 17 Dec 2024 17:00:39 +0800 Subject: [PATCH 2/7] =?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 --- .../service/impl/BmContractServiceImpl.java | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) 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 09ad721..1be4041 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 @@ -32,12 +32,12 @@ public class BmContractServiceImpl implements BmContractService { public List list(BmContract bmContract) { bmContract.setOwnerCom(SecurityUtils.getLoginUser().getSysUser().getCompanyId()); List list = bmContractMapper.list(bmContract); - /* for (BmContract contract : list) { + for (BmContract contract : list) { BmFileInfo bmFileInfo = new BmFileInfo(); bmFileInfo.setModelId(Long.valueOf(contract.getId())).setTaskType(MaterialConstants.APPENDICES_OF_CONTRACT).setFileType(0L); List bmFileInfos = bmFileInfoMapper.selectBmFileInfoList(bmFileInfo); contract.setBmFileInfoList(bmFileInfos); - }*/ + } return list; } @@ -48,7 +48,7 @@ public class BmContractServiceImpl implements BmContractService { bmContract.setOwnerCom(SecurityUtils.getLoginUser().getSysUser().getCompanyId()); bmContract.setStatus(0); Integer add = bmContractMapper.add(bmContract); - /* if (add > 0) { + if (add > 0) { if (bmContract.getBmFileInfoList().size() > 0) { for (BmFileInfo bmFileInfo : bmContract.getBmFileInfoList()) { bmFileInfo.setModelId(Long.valueOf(bmContract.getId())); @@ -59,7 +59,7 @@ public class BmContractServiceImpl implements BmContractService { bmFileInfoMapper.insertBmFileInfo(bmFileInfo); } } - }*/ + } return add; } @@ -68,7 +68,7 @@ public class BmContractServiceImpl implements BmContractService { bmContract.setOwnerId(SecurityUtils.getLoginUser().getUserid()); bmContract.setOwnerCom(SecurityUtils.getLoginUser().getSysUser().getCompanyId()); Integer edit = bmContractMapper.edit(bmContract); - /* if (edit > 0) { + if (edit > 0) { if (bmContract.getBmFileInfoList().size() > 0) { BmFileInfo fileInfo = new BmFileInfo(); fileInfo.setModelId(Long.valueOf(bmContract.getId())).setTaskType(MaterialConstants.APPENDICES_OF_CONTRACT).setFileType(0L); @@ -82,18 +82,18 @@ public class BmContractServiceImpl implements BmContractService { bmFileInfoMapper.insertBmFileInfo(bmFileInfo); } } - }*/ + } return edit; } @Override public Integer del(BmContract bmContract) { Integer del = bmContractMapper.del(bmContract); - /* if (del > 0) { + if (del > 0) { BmFileInfo fileInfo = new BmFileInfo(); fileInfo.setModelId(Long.valueOf(bmContract.getId())).setTaskType(MaterialConstants.APPENDICES_OF_CONTRACT).setFileType(0L); bmFileInfoMapper.deleteBmFileInfo(fileInfo); - }*/ + } return del; } From e5d3d0985a6d11ae4790ea5b6158a6feb67194fd Mon Sep 17 00:00:00 2001 From: "liang.chao" <1360241448@qq.com> Date: Tue, 17 Dec 2024 17:10:31 +0800 Subject: [PATCH 3/7] =?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 --- .../com/bonus/material/order/controller/OrderController.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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 b51dd80..860f775 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 @@ -208,7 +208,7 @@ public class OrderController extends BaseController { String beginTime = outputFormat.format(rentBeginTime); Date rentEndTime = inputFormat.parse(orderDetailDto.getRentEndTime().toString()); String endTime = outputFormat.format(rentEndTime); - orderDetail += "机具名称：" + orderDetailDto.getDeviceName() + "租期：" + beginTime + "至" + endTime + "天数：" + orderDetailDto.getDays() + "天 租金：" + orderDetailDto.getDayLeasePrice() + "元/天数量：" + orderDetailDto.getNum(); + orderDetail += "机具名称：" + orderDetailDto.getDeviceName() + "\\n租期：" + beginTime + "至" + endTime + "\\n天数：" + orderDetailDto.getDays() + "天 \\n租金：" + orderDetailDto.getDayLeasePrice() + "元/天\\n数量：" + orderDetailDto.getNum()+"\\n"; } replacements.put("${orderTable}", orderDetail); From f8e250d580825512596d1a84f28c0ebd53adf8fd Mon Sep 17 00:00:00 2001 From: "liang.chao" <1360241448@qq.com> Date: Tue, 17 Dec 2024 17:24:35 +0800 Subject: [PATCH 4/7] =?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 --- .../order/controller/OrderController.java | 17 ++++++++++++++--- 1 file changed, 14 insertions(+), 3 deletions(-) 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 860f775..82253a5 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 @@ -1,6 +1,7 @@ package com.bonus.material.order.controller; import cn.hutool.core.collection.CollectionUtil; +import cn.hutool.core.text.StrBuilder; import com.bonus.common.biz.enums.MaStatusEnum; import com.bonus.common.biz.enums.OrderStatusEnum; import com.bonus.common.core.web.controller.BaseController; @@ -202,15 +203,25 @@ public class OrderController extends BaseController { //订单金额 replacements.put("${cost}", orderInfoDto.getCost().toString()); //订单详情 - String orderDetail = ""; + StrBuilder orderDetail = new StrBuilder(); for (OrderDetailDto orderDetailDto : orderDetailsByOrderId) { Date rentBeginTime = inputFormat.parse(orderDetailDto.getRentBeginTime().toString()); String beginTime = outputFormat.format(rentBeginTime); Date rentEndTime = inputFormat.parse(orderDetailDto.getRentEndTime().toString()); String endTime = outputFormat.format(rentEndTime); - orderDetail += "机具名称：" + orderDetailDto.getDeviceName() + "\\n租期：" + beginTime + "至" + endTime + "\\n天数：" + orderDetailDto.getDays() + "天 \\n租金：" + orderDetailDto.getDayLeasePrice() + "元/天\\n数量：" + orderDetailDto.getNum()+"\\n"; + // 添加每一行的内容 + orderDetail.append("机具名称：").append(orderDetailDto.getDeviceName()).append("\n") + .append(" 租期：").append(beginTime).append(" 至 ").append(endTime).append("\n") + .append(" 天数：").append(orderDetailDto.getDays()).append("天 ").append("\n") + .append("租金：").append(orderDetailDto.getDayLeasePrice()).append("元/天 ").append("\n") + .append("数量：").append(orderDetailDto.getNum()).append("个").append("\n"); + + // 在每条订单的末尾添加换行 +// orderDetail.append("\n"); } - replacements.put("${orderTable}", orderDetail); + + // 将拼接的字符串放入替换的map中 + replacements.put("${orderTable}", orderDetail.toString()); for (IBodyElement element : document.getBodyElements()) { if (element instanceof XWPFParagraph) { From 3f2cbc78d1d3253cfa0b7a067a02673cc9531b3d Mon Sep 17 00:00:00 2001 From: "liang.chao" <1360241448@qq.com> Date: Tue, 17 Dec 2024 17:24:51 +0800 Subject: [PATCH 5/7] =?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 --- .../com/bonus/material/order/controller/OrderController.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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 82253a5..54cc555 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 @@ -217,7 +217,7 @@ public class OrderController extends BaseController { .append("数量：").append(orderDetailDto.getNum()).append("个").append("\n"); // 在每条订单的末尾添加换行 -// orderDetail.append("\n"); + orderDetail.append("\n"); } // 将拼接的字符串放入替换的map中 From 2bc48c4c461fe174727d9144ee314088678c37f2 Mon Sep 17 00:00:00 2001 From: "liang.chao" <1360241448@qq.com> Date: Tue, 17 Dec 2024 17:28:17 +0800 Subject: [PATCH 6/7] =?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 --- .../bonus/material/order/controller/OrderController.java | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) 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 54cc555..d4f5e96 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 @@ -210,10 +210,11 @@ public class OrderController extends BaseController { Date rentEndTime = inputFormat.parse(orderDetailDto.getRentEndTime().toString()); String endTime = outputFormat.format(rentEndTime); // 添加每一行的内容 + orderDetail.append("\n"); orderDetail.append("机具名称：").append(orderDetailDto.getDeviceName()).append("\n") - .append(" 租期：").append(beginTime).append(" 至 ").append(endTime).append("\n") - .append(" 天数：").append(orderDetailDto.getDays()).append("天 ").append("\n") - .append("租金：").append(orderDetailDto.getDayLeasePrice()).append("元/天 ").append("\n") + .append("租期：").append(beginTime).append(" 至 ").append(endTime).append("\n") + .append("天数：").append(orderDetailDto.getDays()).append("天").append("\n") + .append("租金：").append(orderDetailDto.getDayLeasePrice()).append("元/天").append("\n") .append("数量：").append(orderDetailDto.getNum()).append("个").append("\n"); // 在每条订单的末尾添加换行 From cbeb16ca2830de486521a1aa155b1e9ef72f2e81 Mon Sep 17 00:00:00 2001 From: "liang.chao" <1360241448@qq.com> Date: Tue, 17 Dec 2024 17:29:01 +0800 Subject: [PATCH 7/7] =?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 --- .../com/bonus/material/order/controller/OrderController.java | 3 --- 1 file changed, 3 deletions(-) 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 d4f5e96..77c9eae 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 @@ -216,9 +216,6 @@ public class OrderController extends BaseController { .append("天数：").append(orderDetailDto.getDays()).append("天").append("\n") .append("租金：").append(orderDetailDto.getDayLeasePrice()).append("元/天").append("\n") .append("数量：").append(orderDetailDto.getNum()).append("个").append("\n"); - - // 在每条订单的末尾添加换行 - orderDetail.append("\n"); } // 将拼接的字符串放入替换的map中