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:05:08 +08:00
parent 2c99cf8486
commit 93b58cc96e
2 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -378,13 +378,13 @@ public class OrderController extends BaseController {
replacements.put("orderTable", orderDetail);
BmContract bmContract = new BmContract();
BmContract bmContracts = bmContractService.getContract(bmContract);
if (StringUtils.isBlank(bmContracts.getContent())) {
bmContracts.setContent(bmContractService.lisTemplate(bmContract).get(0).getContent());
bmContract = bmContractService.getContract(bmContract);
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(bmContracts.getContent());
String result = sub.replace(bmContract.getContent());
return AjaxResult.success(result);
} else {
return AjaxResult.error("参数错误");

2
bonus-modules/bonus-material-mall/src/main/resources/mapper/material/contract/BmContractMapper.xml
View File

@ -58,7 +58,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
select content from bm_book_contract limit 1
</select>
<select id="getContract" resultType="com.bonus.material.contract.domain.BmContract">
select content from bm_contract
select * from bm_contract
where owner_com = #{companyId} and status = #{status}
</select>
</mapper>