diff --git a/bonus-modules/bonus-material-mall/src/main/java/com/bonus/material/contract/domain/BmContract.java b/bonus-modules/bonus-material-mall/src/main/java/com/bonus/material/contract/domain/BmContract.java index d1bbd92..a498d84 100644 --- a/bonus-modules/bonus-material-mall/src/main/java/com/bonus/material/contract/domain/BmContract.java +++ b/bonus-modules/bonus-material-mall/src/main/java/com/bonus/material/contract/domain/BmContract.java @@ -40,6 +40,9 @@ public class BmContract { @ApiModelProperty(value = "用户所属公司") private Long ownerCom; + private String startTime; + private String endTime; + @ApiModelProperty(value = "文件附件") private List bmFileInfoList; } 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 5caa1bb..018a388 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 @@ -170,7 +170,6 @@ public class OrderController extends BaseController { replacements.put("${companyName}", orderInfoDto.getCompanyName()); //订单金额 replacements.put("${cost}", orderInfoDto.getCost().toString()); - // 可根据需求添加更多占位符及替换值 // 遍历文档中的段落,进行占位符替换 for (IBodyElement element : document.getBodyElements()) { 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 e81efc4..13887f5 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 @@ -9,7 +9,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" update bm_contract set - contract_name = #{contractName}, + contract_name = #{contractName}, + status = #{status}, owner_id = #{ownerId}, owner_com = #{ownerCom}, update_time = now() @@ -29,6 +30,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" and contract_name like concat('%', #{contractName}, '%') + + AND update_time BETWEEN CONCAT(#{startTime}, ' 00:00:00') AND CONCAT(#{endTime}, ' 23:59:59') + and status = #{status}