任务 17464 17463 17462 17461

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

@@ -44,11 +44,17 @@ public interface PlanOperationRecordMapper {
     String getLastBatchNo();
 
     /**
-     * 获取batchNo
+     * 获取userId
      * @return
      */
     List<String> getArraysUserIds(String roleCode);
 
+    /**
+     * 获取用户名称
+     * @return
+     */
+    List<String> getArraysUserName(String roleCode);
+
     Map<String, Object> getLatestFireEquipId();
 
     PlanRule getPlanRuleByBatchNo(String batchNo);

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

@@ -918,6 +918,14 @@ public class ContingencyPlanServiceImpl implements IContingencyPlanService {
                 start = 0;
             }
             List<ContingencyPlanInstanceVO> list = contingencyInstanceInfoMapper.getTaskActionPage((int) start, size, batchNo, type, runState, updateDate, roleList);
+            list.stream().forEach(e->{
+                if(ObjectUtils.isEmpty(e.getCreateUser())) {
+                    List<String> userName = planVisual3dService.getUserName(e.getRoleCode());
+                    String[] objects = new String[userName.size()];
+                    String[] strings = userName.toArray(objects);
+                    e.setStartUserName(String.join(",", strings));
+                }
+            });
             page.setRecords(list);
             page.setTotal(total);
         }

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

@@ -769,6 +769,11 @@ public class PlanVisual3dServiceImpl implements IPlanVisual3dService {
         return planOperationRecordMapper.getArraysUserIds(roleCode);
     }
 
+    public List<String> getUserName(String roleCode) {
+
+        return planOperationRecordMapper.getArraysUserName(roleCode);
+    }
+
     @Override
     public String getLastBatchNo() {
         return planOperationRecordMapper.getLastBatchNo();

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

@@ -117,6 +117,13 @@ public interface IPlanVisual3dService {
      */
     void sendMessage(String roleCode, MessageVO messageVO);
 
+    /**
+     * 获取用户名称
+     *
+     * @param roleCode
+     */
+    List<String> getUserName(String roleCode);
+
 
     /**
      * 修改动作执行状态

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

@@ -145,4 +145,9 @@
         select id from f_dict fd where dict_value = #{roleCode}
       )
     </select>
+  <select id="getArraysUserName" resultType="java.lang.String">
+    SELECT  person_name from c_emergency_relation cer where obligationId in (
+      select id from f_dict fd where dict_value = #{roleCode}
+    )
+  </select>
 </mapper>
\ No newline at end of file