From 16774174ff8991da4c539cebb84067f30b54fe24 Mon Sep 17 00:00:00 2001
From: mashuai <ma_shuai0327@163.com>
Date: Tue, 8 Jul 2025 18:30:57 +0800
Subject: [PATCH] =?UTF-8?q?=E9=A2=86=E6=96=99=E5=87=BA=E5=BA=93=E7=AD=BE?=
 =?UTF-8?q?=E5=AD=97?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../com/bonus/common/biz/domain/lease/LeaseApplyInfo.java | 8 ++++++++
 .../lease/service/impl/LeaseApplyInfoServiceImpl.java     | 7 +------
 .../mapper/material/lease/LeaseApplyInfoMapper.xml        | 2 +-
 3 files changed, 10 insertions(+), 7 deletions(-)

diff --git a/bonus-common-biz/src/main/java/com/bonus/common/biz/domain/lease/LeaseApplyInfo.java b/bonus-common-biz/src/main/java/com/bonus/common/biz/domain/lease/LeaseApplyInfo.java
index 2629dfe2..1ba2b4d3 100644
--- a/bonus-common-biz/src/main/java/com/bonus/common/biz/domain/lease/LeaseApplyInfo.java
+++ b/bonus-common-biz/src/main/java/com/bonus/common/biz/domain/lease/LeaseApplyInfo.java
@@ -307,4 +307,12 @@ public class LeaseApplyInfo extends BaseEntity{
 
     @ApiModelProperty(value = "有无电子签名 0 否，1 是")
     private Integer hasSign;
+
+    @ApiModelProperty(value = "签字人")
+    private String signPerson;
+
+    @ApiModelProperty(value = "领料出库id集合")
+    private String ids;
+
+    private Long leaseSignId;
 }
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 64d8591b..4d1241e0 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
@@ -206,12 +206,7 @@ public class LeaseApplyInfoServiceImpl implements ILeaseApplyInfoService {
             }
         }
         if (!CollectionUtils.isEmpty(list)) {
-            if (leaseApplyInfo.getHasSign() != null && leaseApplyInfo.getHasSign() == 1) {
-                // 将list集合中leaseSignUrl不为null的数据过滤出来
-                list = list.stream()
-                        .filter(info -> StringUtils.isNotBlank(info.getLeaseSignUrl()))
-                        .collect(Collectors.toList());
-            } else if (leaseApplyInfo.getHasSign() != null && leaseApplyInfo.getHasSign() == 0) {
+            if (leaseApplyInfo.getHasSign() != null && leaseApplyInfo.getHasSign() == 0) {
                 list =  leaseApplyInfoMapper.selectNoSignList(leaseApplyInfo);
             }
         }
diff --git a/bonus-modules/bonus-material/src/main/resources/mapper/material/lease/LeaseApplyInfoMapper.xml b/bonus-modules/bonus-material/src/main/resources/mapper/material/lease/LeaseApplyInfoMapper.xml
index fc254a16..2a8749d9 100644
--- a/bonus-modules/bonus-material/src/main/resources/mapper/material/lease/LeaseApplyInfoMapper.xml
+++ b/bonus-modules/bonus-material/src/main/resources/mapper/material/lease/LeaseApplyInfoMapper.xml
@@ -380,7 +380,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
                 LEFT JOIN ma_type mt1 ON mt.parent_id = mt1.type_id
                 AND mt1.del_flag = '0'
         WHERE
-            1 = 1
+        lod.lease_sign_id is null
         <if test="startTime != null and startTime != '' and endTime != null and endTime != ''">
             <![CDATA[ AND DATE_FORMAT( lai.create_time, '%Y-%m-%d' ) BETWEEN #{startTime} AND #{endTime} ]]>
         </if>