合同管理

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<BmFileInfo> bmFileInfoList;
 }

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()) {

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"
     </insert>
     <update id="edit">
         update bm_contract set
-        contract_name = #{contractName},
+        <if test="contractName != null and contractName != ''">contract_name = #{contractName},</if>
+        <if test="status != null">status = #{status},</if>
         owner_id = #{ownerId},
         owner_com = #{ownerCom},
         update_time = now()
@@ -29,6 +30,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="contractName != null and contractName != ''">
                 and contract_name like concat('%', #{contractName}, '%')
             </if>
+            <if test="startTime != null and startTime != '' and endTime != null and endTime != ''">
+                AND update_time BETWEEN CONCAT(#{startTime}, ' 00:00:00') AND CONCAT(#{endTime}, ' 23:59:59')
+            </if>
             <if test="status != null">
                 and status = #{status}
             </if>