From 512b95fddd2563ff0ad4d569be4b9719b9a292b8 Mon Sep 17 00:00:00 2001
From: "liang.chao" <1360241448@qq.com>
Date: Fri, 13 Dec 2024 14:34:22 +0800
Subject: [PATCH] =?UTF-8?q?=E5=90=88=E5=90=8C=E7=AE=A1=E7=90=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../java/com/bonus/material/contract/domain/BmContract.java | 3 +++
 .../bonus/material/order/controller/OrderController.java    | 1 -
 .../resources/mapper/material/contract/BmContractMapper.xml | 6 +++++-
 3 files changed, 8 insertions(+), 2 deletions(-)

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<BmFileInfo> 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"
     </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>