From dc59a19176cb4c62bdc5aebb6628b963aebe748c Mon Sep 17 00:00:00 2001 From: "liang.chao" <1360241448@qq.com> Date: Tue, 17 Dec 2024 21:16:53 +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/order/controller/OrderController.java | 12 ++++++------ .../bonus/material/order/domain/OrderInfoDto.java | 2 ++ .../mapper/material/order/OrderInfoMapper.xml | 1 + 3 files changed, 9 insertions(+), 6 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 9096d8c..4e582d7 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 @@ -338,14 +338,14 @@ 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 = bmContractService.getContract(bmContract); + bmContract.setCompanyId(orderInfoDto.getCompanyId()); + if (bmContract == null || StringUtils.isBlank(bmContract.getContent())) { + bmContract = new BmContract(); + bmContract.setContent(bmContractService.lisTemplate(bmContract).get(0).getContent()); } StrSubstitutor sub = new StrSubstitutor(replacements); - String result = sub.replace(content); + String result = sub.replace(bmContract.getContent()); return AjaxResult.success(result); } diff --git a/bonus-modules/bonus-material-mall/src/main/java/com/bonus/material/order/domain/OrderInfoDto.java b/bonus-modules/bonus-material-mall/src/main/java/com/bonus/material/order/domain/OrderInfoDto.java index 56109ec..73de7ce 100644 --- a/bonus-modules/bonus-material-mall/src/main/java/com/bonus/material/order/domain/OrderInfoDto.java +++ b/bonus-modules/bonus-material-mall/src/main/java/com/bonus/material/order/domain/OrderInfoDto.java @@ -129,4 +129,6 @@ public class OrderInfoDto { @ApiModelProperty(value = "是否部分退租") private boolean isPartBacked; + private Integer companyId; + } diff --git a/bonus-modules/bonus-material-mall/src/main/resources/mapper/material/order/OrderInfoMapper.xml b/bonus-modules/bonus-material-mall/src/main/resources/mapper/material/order/OrderInfoMapper.xml index 2cce02a..f28593f 100644 --- a/bonus-modules/bonus-material-mall/src/main/resources/mapper/material/order/OrderInfoMapper.xml +++ b/bonus-modules/bonus-material-mall/src/main/resources/mapper/material/order/OrderInfoMapper.xml @@ -281,6 +281,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" moi.CODE AS CODE, moi.order_time, up.dept_name AS czcompanyName, + up.dept_id as companyId, mdi.person_phone AS personPhone, su.phonenumber AS phoneNumber, moi.address,