修改力量调派发送人员

amos-boot-module/amos-boot-module-api/amos-boot-module-common-api/src/main/java/com/yeejoin/amos/boot/module/common/api/mapper/DynamicFormInstanceMapper.java

@@ -128,7 +128,8 @@ public interface DynamicFormInstanceMapper extends BaseMapper<DynamicFormInstanc
 
     List<Map<String, Object>>  getDutyPersonByTeamIdAndCarIdone(
             String dutyDate,
-            String departmentName);
+            String departmentName,
+            String type);
 
 
 

amos-boot-module/amos-boot-module-api/amos-boot-module-common-api/src/main/java/com/yeejoin/amos/boot/module/common/api/mapper/FirefightersMapper.java

@@ -36,7 +36,7 @@ public interface FirefightersMapper extends BaseMapper<Firefighters> {
                                              String state, String areasExpertise, String jobTitle, String bizOrgCode);
 
     List<FirefightersDto> queryById(@Param("gw") String[] gw, @Param("name") String name);
-    List<FirefightersDto> queryByIdone(@Param("gw") String[] gw, @Param("name") String name);
+    List<FirefightersDto> queryByIdone(@Param("gw") String[] gw, @Param("name") String name, @Param("type") String type);
 
 
     List<Map<String, String>> selectNormalFirePerson(String jobId);

amos-boot-module/amos-boot-module-api/amos-boot-module-common-api/src/main/resources/mapper/DynamicFormInstanceMapper.xml

@@ -421,7 +421,16 @@ FROM
 					cbd.instance_id
 			) ss
 		WHERE
-			ss.userId in ( select    cb_firefighters.org_usr_id	FROM  cb_firefighters where cb_firefighters.fire_team_id=#{departmentName}
+			ss.userId in ( select    cb_firefighters.org_usr_id	FROM  cb_firefighters
+	                      LEFT JOIN cb_fire_team f   on cb_firefighters.fire_team_id =f.sequence_nbr
+
+			where cb_firefighters.fire_team_id=#{departmentName}
+
+                <if test="type != null">
+                    and f.name !='消防支队'
+                </if>
+
+
 			 and cb_firefighters.org_usr_id is not null )
 	) hh
 LEFT JOIN cb_org_usr cou ON hh.userId = cou.sequence_nbr

amos-boot-module/amos-boot-module-api/amos-boot-module-common-api/src/main/resources/mapper/FirefightersMapper.xml

@@ -241,8 +241,14 @@
         amos_user_id amosUserId
         FROM
         (select * from cb_firefighters fr  where is_delete = 0)  firefighters
+        LEFT JOIN cb_fire_team f   on fire_team_id =f.sequence_nbr
+
         WHERE
-        fire_team_id =#{name}
+           fire_team_id =#{name}
+        <if test="type != null">
+          and f.name !='消防支队'
+        </if>
+
         <if test="gw != null">
             And job_title_code In
             <foreach item="item" collection="gw" index="index" open="(" separator="," close=")">

amos-boot-module/amos-boot-module-biz/amos-boot-module-common-biz/src/main/java/com/yeejoin/amos/boot/module/common/biz/service/impl/FirefightersServiceImpl.java

@@ -192,10 +192,10 @@ public class FirefightersServiceImpl extends BaseService<FirefightersDto, Firefi
 	}
 
 
-	public List<FirefightersDto> queryByIdone(String[] gw,String name){
+	public List<FirefightersDto> queryByIdone(String[] gw,String name,	String type){
 
 
-		return firefightersMapper.queryByIdone(gw,name);
+		return firefightersMapper.queryByIdone(gw,name,type);
 	}
     /**
      * 获取指定岗位名称下的队伍人员电话号码信息

amos-boot-module/amos-boot-module-biz/amos-boot-module-jcs-biz/src/main/java/com/yeejoin/amos/boot/module/jcs/biz/service/impl/AlertSubmittedServiceImpl.java

@@ -1677,7 +1677,7 @@ public class AlertSubmittedServiceImpl extends BaseService<AlertSubmittedDto, Al
                         if (jsonObject1.containsKey("fireBrigade")) {
 
                             //List<Map<String, Object>> mapList = dynamicFormInstanceMapper.getFireRescueDepartmentStaff(one.getBizOrgName(),positionType);
-                            List<FirefightersDto> fireBrigade = firefightersService.queryByIdone(groupCode, fireTeam.getSequenceNbr().toString());
+                            List<FirefightersDto> fireBrigade = firefightersService.queryByIdone(groupCode, fireTeam.getSequenceNbr().toString(),"1");
                             fireBrigade.stream().forEach(f-> {
                                 HashMap<String, Object> map = new HashMap<>();
                                 map.put("mobilePhone", f.getMobilePhone());
@@ -1690,7 +1690,7 @@ public class AlertSubmittedServiceImpl extends BaseService<AlertSubmittedDto, Al
                         }
                         //所在大队值班当日值班员；
                         if(jsonObject1.containsKey("onDuty")) {
-                            List<Map<String, Object>> mapList = dynamicFormInstanceMapper.getDutyPersonByTeamIdAndCarIdone(DateUtils.getDateNowShortStr(), fireTeam.getSequenceNbr().toString());
+                            List<Map<String, Object>> mapList = dynamicFormInstanceMapper.getDutyPersonByTeamIdAndCarIdone(DateUtils.getDateNowShortStr(), fireTeam.getSequenceNbr().toString(),"1");
                             sendUserIds.addAll(mapList);
                         }
                         //支队
@@ -1707,7 +1707,7 @@ public class AlertSubmittedServiceImpl extends BaseService<AlertSubmittedDto, Al
 
 
 
-                            List<FirefightersDto> fireBrigade = firefightersService.queryByIdone(groupCode, fireTeaml.getSequenceNbr().toString());
+                            List<FirefightersDto> fireBrigade = firefightersService.queryByIdone(groupCode, fireTeaml.getSequenceNbr().toString(),null);
                             fireBrigade.stream().forEach(f-> {
                                 HashMap<String, Object> map = new HashMap<>();
                                 map.put("mobilePhone", f.getMobilePhone());
@@ -1722,7 +1722,7 @@ public class AlertSubmittedServiceImpl extends BaseService<AlertSubmittedDto, Al
                         }
                         // 支队值班员：   值班表中 【值班排班】中本支队的当日值班员；
                         if(jsonObject1.containsKey("onDuty")) {
-                            List<Map<String, Object>> mapList = dynamicFormInstanceMapper.getDutyPersonByTeamIdAndCarIdone(DateUtils.getDateNowShortStr(),fireTeaml.getSequenceNbr().toString());
+                            List<Map<String, Object>> mapList = dynamicFormInstanceMapper.getDutyPersonByTeamIdAndCarIdone(DateUtils.getDateNowShortStr(),fireTeaml.getSequenceNbr().toString(),null);
                             sendUserIds.addAll(mapList);
                         }