班组下拉选修改

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

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

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>

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