修改接口

YeeAmosFireAutoSysCommon/src/main/java/com/yeejoin/amos/fas/dao/entity/EmergencyRelation.java

@@ -27,8 +27,8 @@ public class EmergencyRelation extends BasicEntity {
     private Long personId;
 
     //分工内容id
-    @Column(name = "content_id")
-    private Long contentId;
+    @Column(name = "amos_id")
+    private Long amosOrgId;
 
     //人员名称
     @Column(name = "person_name")

YeeAmosFireAutoSysService/src/main/java/com/yeejoin/amos/fas/business/controller/ContingencyPlanController.java

 package com.yeejoin.amos.fas.business.controller;
 
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.yeejoin.amos.fas.business.service.impl.EmergencyTaskServiceImpl;
 import com.yeejoin.amos.fas.business.service.intfc.IContingencyPlanService;
 import com.yeejoin.amos.fas.business.vo.*;
 import com.yeejoin.amos.fas.config.Permission;
@@ -28,6 +29,9 @@ public class ContingencyPlanController extends BaseController {
     @Autowired
     private IContingencyPlanService contingencyPlanService;
 
+    @Autowired
+    private EmergencyTaskServiceImpl emergencyTaskService;
+
     /**
      * 创建数字预案
      */
@@ -262,10 +266,13 @@ public class ContingencyPlanController extends BaseController {
     public ResponseModel getUserOperateCountAndTaskName() {
         AgencyUserModel user = getUserInfo();
         List<RoleModel> roleModelList = new ArrayList<>();
+        Map<String, Object> map = new HashMap<>();
         for (Long key : user.getOrgRoles().keySet()) {
             roleModelList.addAll(user.getOrgRoles().get(key));
         }
-        return CommonResponseUtil2.success(contingencyPlanService.getUserOperateCountAndTaskName(roleModelList));
+        String obligationIds = emergencyTaskService.getRolesByUserId(user.getUserId());
+        map.put("roleCodes",obligationIds);
+        return CommonResponseUtil2.success(contingencyPlanService.getUserOperateCountAndTaskName(roleModelList,map));
     }
 
     @ApiOperation(value = "获取当前登录人待处置任务及预案信息")

YeeAmosFireAutoSysService/src/main/java/com/yeejoin/amos/fas/business/dao/mapper/EmergencyTaskMapper.java

@@ -15,4 +15,7 @@ public interface EmergencyTaskMapper extends BaseMapper {
     void deleteTreeNode(Long obligationId , Long personId);
 
     void save(EmergencyRelation emergencyRelation);
+
+    List<String> roleCodes(String amosOrgId);
+
 }

YeeAmosFireAutoSysService/src/main/java/com/yeejoin/amos/fas/business/service/impl/ContingencyPlanServiceImpl.java

@@ -926,8 +926,8 @@ public class ContingencyPlanServiceImpl implements IContingencyPlanService {
     }
 
     @Override
-    public Map<String, Object> getUserOperateCountAndTaskName(List<RoleModel> roleModelList) {
-        Map<String, Object> map = new HashMap<>();
+    public Map<String, Object> getUserOperateCountAndTaskName(List<RoleModel> roleModelList,Map<String, Object> map) {
+
         List<PlanOperationRecord> recordList = planOperationRecordDao.findByStatus(0);
         if (!CollectionUtils.isEmpty(recordList)) {
             PlanOperationRecord record = recordList.get(0);

YeeAmosFireAutoSysService/src/main/java/com/yeejoin/amos/fas/business/service/impl/EmergencyTaskServiceImpl.java

@@ -11,6 +11,8 @@ import org.springframework.data.domain.Page;
 import org.springframework.data.domain.PageImpl;
 import org.springframework.stereotype.Service;
 
+import java.util.ArrayList;
+import java.util.Arrays;
 import java.util.List;
 
 @Service
@@ -42,4 +44,11 @@ public class EmergencyTaskServiceImpl implements IEmergencyTaskService {
     public void save(EmergencyRelation emergencyRelation) {
         emergencyTaskMapper.save(emergencyRelation);
     }
+
+    @Override
+    public String getRolesByUserId(String userId) {
+        List<String> list = emergencyTaskMapper.roleCodes(userId);
+        String roleCodes = String.join(",", list);
+        return roleCodes;
+    }
 }

YeeAmosFireAutoSysService/src/main/java/com/yeejoin/amos/fas/business/service/intfc/IContingencyPlanService.java

@@ -138,7 +138,7 @@ public interface IContingencyPlanService {
 
     Map<String, Object> getUserOperateCountAndPlanName(List<RoleModel> roleModelList);
 
-    Map<String, Object> getUserOperateCountAndTaskName(List<RoleModel> roleModelList);
+    Map<String, Object> getUserOperateCountAndTaskName(List<RoleModel> roleModelList,Map<String, Object> map);
 
     String getPlanBatchNo();
 

YeeAmosFireAutoSysService/src/main/java/com/yeejoin/amos/fas/business/service/intfc/IEmergencyTaskService.java

@@ -19,4 +19,6 @@ public interface IEmergencyTaskService  {
 
    void save(EmergencyRelation emergencyRelation);
 
+   String getRolesByUserId(String userId);
+
 }

YeeAmosFireAutoSysStart/src/main/resources/db/mapper/dbTemplate_emergency_task.xml

@@ -44,9 +44,20 @@
         '1' as type
         FROM
         c_emergency_relation cer
-
     </select>
 
+    <select id="roleCodes" resultType="string">
+        SELECT
+            f.dict_value
+        FROM
+            c_emergency_relation cer LEFT JOIN  f_dict f ON cer.obligationId = f.id
+        <where>
+            <if test="amosOrgId != null and  amosOrgId != '' ">
+                cer.amos_id = #{amosOrgId}
+            </if>
+        </where>
+
+    </select>
     <delete id="deleteTreeNode">
 
        delete  from   c_emergency_relation where obligationId = #{obligationId} and person_id = #{personId}
@@ -54,7 +65,7 @@
     </delete>
 
     <insert id="save" parameterType="com.yeejoin.amos.fas.dao.entity.EmergencyRelation">
-        INSERT INTO `c_emergency_relation`(id, `obligationId`, `person_id`, `content_id`, `person_name`)
-        VALUES (#{id}, #{obligationId}, #{personId}, #{contentId},  #{personName});
+        INSERT INTO `c_emergency_relation`(id, `obligationId`, `person_id`, `amos_id`, `person_name`)
+        VALUES (#{id}, #{obligationId}, #{personId}, #{amosOrgId},  #{personName});
     </insert>
 </mapper>
\ No newline at end of file