From 433c117870406b2d167542e2ff88501b4892a963 Mon Sep 17 00:00:00 2001
From: cwchen <1048842385@qq.com>
Date: Tue, 3 Sep 2024 15:30:09 +0800
Subject: [PATCH] =?UTF-8?q?=E7=8F=AD=E7=BB=84=E4=B8=8B=E6=8B=89=E9=80=89?=
 =?UTF-8?q?=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../main/java/com/bonus/common/entity/app/AppParamsDto.java    | 3 +++
 .../com/bonus/common/entity/bracelet/BraceletParamsDto.java    | 2 +-
 .../src/main/resources/mapper/AppEquipmentReqMapper.xml        | 3 +++
 .../src/main/resources/mapper/system/SelectMapper.xml          | 2 +-
 4 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/bonus-common/bonus-common-entity/src/main/java/com/bonus/common/entity/app/AppParamsDto.java b/bonus-common/bonus-common-entity/src/main/java/com/bonus/common/entity/app/AppParamsDto.java
index c37b900..7a06934 100644
--- a/bonus-common/bonus-common-entity/src/main/java/com/bonus/common/entity/app/AppParamsDto.java
+++ b/bonus-common/bonus-common-entity/src/main/java/com/bonus/common/entity/app/AppParamsDto.java
@@ -139,4 +139,7 @@ public class AppParamsDto {
     private String file;
 
     private String params;
+
+    /**是否在用 0 在用 1归还*/
+    private String isLy;
 }
diff --git a/bonus-common/bonus-common-entity/src/main/java/com/bonus/common/entity/bracelet/BraceletParamsDto.java b/bonus-common/bonus-common-entity/src/main/java/com/bonus/common/entity/bracelet/BraceletParamsDto.java
index d52a6c0..e4dd188 100644
--- a/bonus-common/bonus-common-entity/src/main/java/com/bonus/common/entity/bracelet/BraceletParamsDto.java
+++ b/bonus-common/bonus-common-entity/src/main/java/com/bonus/common/entity/bracelet/BraceletParamsDto.java
@@ -121,7 +121,7 @@ public class BraceletParamsDto {
     /**关键字*/
     private String keyWord;
 
-    /**是否领用*/
+    /**是否在用 0 在用 1归还*/
     private String isLy;
 
     @Data
diff --git a/bonus-modules/bonus-app/src/main/resources/mapper/AppEquipmentReqMapper.xml b/bonus-modules/bonus-app/src/main/resources/mapper/AppEquipmentReqMapper.xml
index fb90465..606c837 100644
--- a/bonus-modules/bonus-app/src/main/resources/mapper/AppEquipmentReqMapper.xml
+++ b/bonus-modules/bonus-app/src/main/resources/mapper/AppEquipmentReqMapper.xml
@@ -124,6 +124,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="roleCode=='depart'">
                 AND a.departId = #{departId}
             </if>
+            <if test="isLy!=null and isLy!=''">
+                AND IF(a.ghTime IS NULL,'0','1') = #{isLy}
+            </if>
         </where>
         ORDER BY IFNULL(a.ghTime,now()) DESC,a.lyTime DESC
     </select>
diff --git a/bonus-modules/bonus-system/src/main/resources/mapper/system/SelectMapper.xml b/bonus-modules/bonus-system/src/main/resources/mapper/system/SelectMapper.xml
index 9e2f606..6cc2f9b 100644
--- a/bonus-modules/bonus-system/src/main/resources/mapper/system/SelectMapper.xml
+++ b/bonus-modules/bonus-system/src/main/resources/mapper/system/SelectMapper.xml
@@ -8,7 +8,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     <select id="getTeamList" resultType="com.bonus.system.domain.vo.SysSelectVo">
         SELECT team_id AS id,
                CONCAT(team_name,'(',team_name,')') AS name
-        FROM t_work_team WHERE del_flag = 0
+        FROM t_work_team WHERE del_flag = 0 AND team_status = 0
     </select>
     <!--工程下拉选-->
     <select id="getProList" resultType="com.bonus.system.domain.vo.SysSelectVo">