融合调度规则 任务 4318 4326 4327

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

@@ -93,4 +93,7 @@ public interface OrgUsrMapper extends BaseMapper<OrgUsr> {
     List<Map<String, Long>> countDeptByCompanyId(@Param("companyIdList") List<String> companyIdList);
 
     List<Map<String,Object>> queryCompanyId(String bizOrgName);
+
+    List<Map<String,Object>> queryCompanyIdNew(String bizOrgName);
+
 }

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

@@ -181,7 +181,7 @@
         cb_firefighters  firefighters
         WHERE
         fire_team_id in ( select sequence_nbr from cb_fire_team cft  where company in (
-        select sequence_nbr from cb_org_usr cou where biz_org_name = '消防救援部') )
+        select sequence_nbr from cb_org_usr cou where biz_org_name = '消防救援保障部') )
         <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-api/amos-boot-module-common-api/src/main/resources/mapper/OrgUsrMapper.xml

@@ -699,4 +699,18 @@ LEFT JOIN (
         ) d where d.parentId in  (select sequence_nbr from cb_org_usr cou where biz_org_name = #{bizOrgName})
         and (d.fireManagementPostCode = '消防安全管理人' or d.fireManagementPostCode = '消防安全责任人')
     </select>
+
+    <select id="queryCompanyIdNew" resultType="map">
+       	select * from (
+        select cou.biz_org_name bizOrgName,cou.sequence_nbr sequenceNbr ,cou .parent_id parentId,
+        a.administrativePositionCode, b.telephone from cb_org_usr cou
+        left join (select i.instance_id id1 ,if(i.field_code = 'administrativePositionCode',
+        i.field_value_label, null) as 'administrativePositionCode' from cb_dynamic_form_instance i where i.field_code  = 'administrativePositionCode'
+        and i.field_value_label  is not null) a on cou .sequence_nbr = a.id1
+        left join (select i.instance_id id2,if(i.field_code = 'telephone',
+        i.field_value, null) as 'telephone' from cb_dynamic_form_instance i where i.field_code  = 'telephone'
+        and i.field_value  is not null) b on cou .sequence_nbr = b.id2
+        ) d where d.parentId in  (select sequence_nbr from cb_org_usr cou where biz_org_name = #{bizOrgName})
+
+    </select>
 </mapper>

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

@@ -1866,6 +1866,12 @@ public class OrgUsrServiceImpl extends BaseService<OrgUsrDto, OrgUsr, OrgUsrMapp
 		return orgUsrMapper.queryCompanyId(bizOrgName);
 	}
 
+	public  List<Map<String,Object>> queryCompanyIdNew(String bizOrgName) {
+
+		return orgUsrMapper.queryCompanyIdNew(bizOrgName);
+	}
+
+
 	public List<AgencyUserModel> getAmosUserByOrgUser(String orgUserIds) throws Exception {
 		if (ValidationUtil.isEmpty(orgUserIds)) {
 			throw new Exception("账号不存在");

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

@@ -273,7 +273,7 @@ public class AlertSubmittedServiceImpl extends BaseService<AlertSubmittedDto, Al
                         }
                         if(e.containsKey("airportUnit")) {
                             //  根据人员职务：干部&领导  机场单位 模块 消防急救保障部中，“人员职务”不为空的人员
-                            List<Map<String, Object>> mapList = iOrgUsrService.queryCompanyId("消防救援部");
+                            List<Map<String, Object>> mapList = iOrgUsrService.queryCompanyIdNew("消防救援保障部");
                             orgUsers.addAll(mapList);
                         }