From 8c5b409fbd780455bdb0d777e1762d5e273b0437 Mon Sep 17 00:00:00 2001
From: sxu <602087911@qq.com>
Date: Wed, 13 Nov 2024 13:36:06 +0800
Subject: [PATCH 1/2] =?UTF-8?q?=E9=A2=86=E6=96=99=E6=8E=A5=E5=8F=A3?=
 =?UTF-8?q?=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../material/lease/service/impl/LeaseApplyInfoServiceImpl.java   | 1 +
 1 file changed, 1 insertion(+)

diff --git a/bonus-modules/bonus-material/src/main/java/com/bonus/material/lease/service/impl/LeaseApplyInfoServiceImpl.java b/bonus-modules/bonus-material/src/main/java/com/bonus/material/lease/service/impl/LeaseApplyInfoServiceImpl.java
index e0bd3477..fb892c2a 100644
--- a/bonus-modules/bonus-material/src/main/java/com/bonus/material/lease/service/impl/LeaseApplyInfoServiceImpl.java
+++ b/bonus-modules/bonus-material/src/main/java/com/bonus/material/lease/service/impl/LeaseApplyInfoServiceImpl.java
@@ -114,6 +114,7 @@ public class LeaseApplyInfoServiceImpl implements ILeaseApplyInfoService {
             tmTaskAgreement.setCreateBy(SecurityUtils.getUsername());
             tmTaskAgreementMapper.insertTmTaskAgreement(tmTaskAgreement);
             tmTaskRequestVo.getLeaseApplyInfo().setTaskId(tmTask.getTaskId());
+            tmTaskRequestVo.getLeaseApplyInfo().setCode(taskCode);
             int count = leaseApplyInfoMapper.insertLeaseApplyInfo(tmTaskRequestVo.getLeaseApplyInfo());
             if (count > 0) {
                 return insertPurchaseCheckDetails(tmTaskRequestVo.getLeaseApplyDetailsList(), tmTask.getTaskId());

From 8372096fb9bc6aafc500e764866f42a1095123a8 Mon Sep 17 00:00:00 2001
From: sxu <602087911@qq.com>
Date: Wed, 13 Nov 2024 13:43:38 +0800
Subject: [PATCH 2/2] =?UTF-8?q?=E9=A2=86=E6=96=99=E6=8E=A5=E5=8F=A3?=
 =?UTF-8?q?=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../com/bonus/material/basic/domain/BmAgreementInfo.java   | 6 ++++++
 .../mapper/material/basic/BmAgreementInfoMapper.xml        | 7 +++++++
 2 files changed, 13 insertions(+)

diff --git a/bonus-modules/bonus-material/src/main/java/com/bonus/material/basic/domain/BmAgreementInfo.java b/bonus-modules/bonus-material/src/main/java/com/bonus/material/basic/domain/BmAgreementInfo.java
index ff75c0af..4cfe2321 100644
--- a/bonus-modules/bonus-material/src/main/java/com/bonus/material/basic/domain/BmAgreementInfo.java
+++ b/bonus-modules/bonus-material/src/main/java/com/bonus/material/basic/domain/BmAgreementInfo.java
@@ -122,6 +122,12 @@ public class BmAgreementInfo extends BaseEntity
     @ApiModelProperty(value = "关键词")
     private String keyWord;
 
+    @ApiModelProperty(value = "开始时间")
+    private String startTime;
+
+    @ApiModelProperty(value = "结束时间")
+    private String endTime;
+
     @ApiModelProperty(value = "附件列表")
     private List<BmFileInfo> bmFileInfos;
 }
diff --git a/bonus-modules/bonus-material/src/main/resources/mapper/material/basic/BmAgreementInfoMapper.xml b/bonus-modules/bonus-material/src/main/resources/mapper/material/basic/BmAgreementInfoMapper.xml
index ac7afa70..0c8b8087 100644
--- a/bonus-modules/bonus-material/src/main/resources/mapper/material/basic/BmAgreementInfoMapper.xml
+++ b/bonus-modules/bonus-material/src/main/resources/mapper/material/basic/BmAgreementInfoMapper.xml
@@ -37,9 +37,16 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         where bai.status = '1'
         <if test="keyWord != null  and keyWord != ''">
             and (bai.contract_code like concat('%', #{keyWord}, '%') or
+            bai.agreement_code like concat('%', #{keyWord}, '%') or
             auth_person like concat('%', #{keyWord}, '%') or
             phone like concat('%', #{keyWord}, '%'))
         </if>
+        <if test="startTime != null and startTime != '' and endTime != null and endTime != ''">
+            <![CDATA[ AND DATE_FORMAT( bai.plan_start_time, '%Y-%m-%d' ) BETWEEN #{startTime} AND #{endTime} ]]>
+        </if>
+        <if test="status != null and status != ''">
+            AND bai.`status` = #{status}
+        </if>
         <if test="agreementCode != null  and agreementCode != ''">
             and bai.agreement_code like concat('%', #{agreementCode}, '%')
         </if>