bonus
/
Bonus-Cloud-Material-Mall
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

租赁协议

This commit is contained in:
liang.chao 2024-12-17 21:16:53 +08:00
parent 93b58cc96e
commit dc59a19176
3 changed files with 9 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
bonus-modules/bonus-material-mall/src/main/java/com/bonus/material/order/controller/OrderController.java
View File

@ -338,14 +338,14 @@ public class OrderController extends BaseController {
replacements.put("orderTable", orderDetail); replacements.put("orderTable", orderDetail);
BmContract bmContract = new BmContract(); BmContract bmContract = new BmContract();
bmContract.setStatus(1); bmContract = bmContractService.getContract(bmContract);
List<BmContract> list = bmContractService.list(bmContract); bmContract.setCompanyId(orderInfoDto.getCompanyId());
String content = list.get(0).getContent(); if (bmContract == null || StringUtils.isBlank(bmContract.getContent())) {
if (StringUtils.isBlank(content)) { bmContract = new BmContract();
content = bmContractService.lisTemplate(bmContract).get(0).getContent(); bmContract.setContent(bmContractService.lisTemplate(bmContract).get(0).getContent());
} }
StrSubstitutor sub = new StrSubstitutor(replacements); StrSubstitutor sub = new StrSubstitutor(replacements);
String result = sub.replace(content); String result = sub.replace(bmContract.getContent());
return AjaxResult.success(result); return AjaxResult.success(result);
} }

2
bonus-modules/bonus-material-mall/src/main/java/com/bonus/material/order/domain/OrderInfoDto.java
View File

@ -129,4 +129,6 @@ public class OrderInfoDto {
@ApiModelProperty(value = "是否部分退租") @ApiModelProperty(value = "是否部分退租")
private boolean isPartBacked; private boolean isPartBacked;
private Integer companyId;
} }

1
bonus-modules/bonus-material-mall/src/main/resources/mapper/material/order/OrderInfoMapper.xml
View File

@ -281,6 +281,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
moi.CODE AS CODE, moi.CODE AS CODE,
moi.order_time, moi.order_time,
up.dept_name AS czcompanyName, up.dept_name AS czcompanyName,
up.dept_id as companyId,
mdi.person_phone AS personPhone, mdi.person_phone AS personPhone,
su.phonenumber AS phoneNumber, su.phonenumber AS phoneNumber,
moi.address, moi.address,