bug修改

amos-boot-module/amos-boot-module-api/amos-boot-module-latentdanger-api/src/main/java/com/yeejoin/amos/latentdanger/common/enums/AuditEnum.java

+package com.yeejoin.amos.latentdanger.common.enums;
+
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+public enum AuditEnum {
+	AUDIT("待审核","audit"),
+	REVIEW("待复核","review");
+
+	/**
+	 * 名称，描述
+	 */
+	private String name;
+
+	/**
+	 * 编码
+	 */
+	private String code;
+
+	AuditEnum(String name, String code){
+		this.name = name;
+		this.code = code;
+	}
+	
+	public static AuditEnum getEnum(String code) {
+		AuditEnum auditEnum = null;
+		for(AuditEnum type: AuditEnum.values()) {
+			if (type.getCode().equals(code)) {
+				auditEnum = type;
+				break;
+			}
+		}
+		
+		return auditEnum;
+	}
+	
+	public static List<Map<String,String>> getEnumList() {
+		List<Map<String,String>> nameList = new ArrayList<>();
+		for (AuditEnum c: AuditEnum.values()) {
+			Map<String, String> map = new HashMap<String, String>();
+			map.put("name", c.getName());
+			map.put("code", c.getCode());
+			nameList.add(map);
+		}
+		return nameList;
+	}
+
+	public String getName() {
+		return name;
+	}
+
+	public void setName(String name) {
+		this.name = name;
+	}
+
+	public String getCode() {
+		return code;
+	}
+
+	public void setCode(String code) {
+		this.code = code;
+	}
+}

amos-boot-module/amos-boot-module-biz/amos-boot-module-latentdanger-biz/src/main/java/com/yeejoin/amos/latentdanger/business/service/impl/LatentDangerServiceImpl.java

@@ -53,6 +53,7 @@ import com.yeejoin.amos.latentdanger.business.vo.DangerTimeAxisVo;
 import com.yeejoin.amos.latentdanger.business.vo.LatentDangerDetailRiskVo;
 import com.yeejoin.amos.latentdanger.business.vo.LatentDangerDetailVo;
 import com.yeejoin.amos.latentdanger.business.vo.LatentDangerListVo;
+import com.yeejoin.amos.latentdanger.common.enums.AuditEnum;
 import com.yeejoin.amos.latentdanger.common.enums.DangerHandleStateEnum;
 import com.yeejoin.amos.latentdanger.common.enums.DictTypeEnum;
 import com.yeejoin.amos.latentdanger.common.enums.ExecuteStateEnum;
@@ -1886,13 +1887,15 @@ public class LatentDangerServiceImpl extends BaseService<LatentDangerBo, LatentD
             dangerIdList = Lists.newArrayList(idsStr.split(","));
         }
         if (OwerEnum.MY.getCode().equals(pageParam.get("my"))) {
-            // 不指定隐患id-我的任务
+            // 查询工作流待登录人执行的任务
             JSONObject allTaskResult = workflowFeignService.getCurrentUserAllTaskList(workflowProcessDefinitionKey);
             allTaskList = (List) allTaskResult.get("data");
+            // 待执行任务对应instanceId列表
             List<String> instanceIdList = Lists.newArrayList();
             List<LatentDanger> dangers;
             if (!ValidationUtil.isEmpty(allTaskList)) {
                 allTaskList.forEach(m -> instanceIdList.add(((Map) m).get("processInstanceId").toString()));
+                // 查询对应instanceId的隐患数据
                 dangers =
                         this.baseMapper.selectList(new LambdaQueryWrapper<LatentDanger>().in(LatentDanger::getInstanceId, instanceIdList));
                 List<String> finalDangerIdList = dangerIdList;
@@ -1907,6 +1910,10 @@ public class LatentDangerServiceImpl extends BaseService<LatentDangerBo, LatentD
                     pageParam.put("dangerState", LatentDangerState.PatrolDangerStateEnum.待评审.getCode());
                 }
             }
+            // app待审核隐患须加上“提交隐患”状态的数据
+            if (AuditEnum.AUDIT.getCode().equals(pageParam.get("type"))) {
+                pageParam.put("submitDangerState", LatentDangerState.SupervisionDangerStateEnum.提交隐患.getCode());
+            }
         }
         // 获取隐患地点的子节点
         Object structureId = pageParam.get("structureId");
@@ -2231,7 +2238,7 @@ public class LatentDangerServiceImpl extends BaseService<LatentDangerBo, LatentD
     @Override
     public IPage<LatentDanger> reviewListDanger(PageParam pageParam) throws Exception {
         String type = pageParam.get("type").toString();
-        if ("audit".equals(type)) {
+        if (AuditEnum.AUDIT.getCode().equals(type)) {
             List<LatentDangerState.SupervisionDangerStateEnum> stateEnums =
                     LatentDangerState.SupervisionDangerStateEnum.getEnumListByProcessState(LatentDangerProcessStateEnum.待审核.getCode());
             List<String> dangerState = stateEnums.stream().map(stateEnum -> stateEnum != null ?
@@ -2239,7 +2246,7 @@ public class LatentDangerServiceImpl extends BaseService<LatentDangerBo, LatentD
             dangerState.add(LatentDangerState.SupervisionDangerStateEnum.提交隐患.getCode());
             // 审核状态
             pageParam.put("dangerState", Joiner.on(",").join(dangerState));
-        } else if ("review".equals(type)) {
+        } else if (AuditEnum.REVIEW.getCode().equals(type)) {
             List<LatentDangerState.SupervisionDangerStateEnum> stateEnums =
                     LatentDangerState.SupervisionDangerStateEnum.getEnumListByProcessState(LatentDangerProcessStateEnum.待复核.getCode());
             List<String> dangerState = stateEnums.stream().map(stateEnum -> stateEnum != null ? stateEnum.getCode() : null).collect(Collectors.toList());

amos-boot-system-latentdanger/src/main/resources/db/mapper/LatentDangerMapper.xml

@@ -967,10 +967,13 @@
                     and a.biz_type = #{value}
                 </if>
                 <if test="key == 'dangerIds' and value != null">
-                    and a.id IN
+                    and (a.id IN
                     <foreach collection="value" item="id" open="(" separator="," close=")">
                         #{id}
                     </foreach>
+                    <if test="paramMap['my'] == 0">
+                        or a.danger_state = #{paramMap[submitDangerState]}
+                    </if>)
                 </if>
                 <if test="key == 'dangerState' and value != null and !value.isEmpty()">
                     and a.danger_state IN

amos-boot-system-supervision/src/main/resources/db/mapper/dbTemplate_plan_task.xml

@@ -361,6 +361,7 @@
         p.id pointId,
         p.point_no pointNO,
         p.offline,
+        p.original_id originalId,
         ptd.status,
         ptd.is_finish finish,
         p.is_fixed isFixed,