隐患排查功能流程修改

@@ -52,7 +52,15 @@ public class AjhRectificationInfo extends FlowEntity {
 	@Excel(name = "整改建议", width = 15)
     @ApiModelProperty(value = "整改建议")
 	private String recOrdAdvi;
-
+	/**风险库关联ID*/
+	@Excel(name = "风险库关联ID", width = 15)
+	@ApiModelProperty(value = "风险库关联ID")
+	private String dangerId;
+	/**验收人*/
+	@Excel(name = "验收人", width = 15)
+	@ApiModelProperty(value = "验收人")
+	@Dict(dicCode = "id",dictTable="sys_user",dicText="realname")
+	private String recYsUser;
 
 	/**整改责任人*/
 	@Excel(name = "整改责任人", width = 15)

 package com.skua.modules.safe.controller;
 
 import java.io.File;
-import java.util.Arrays;
-import java.util.List;
-import java.util.Map;
+import java.util.*;
 import java.io.IOException;
 import java.io.UnsupportedEncodingException;
 import java.net.URLDecoder;
@@ -21,6 +19,7 @@ import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.skua.modules.safe.service.IDangerLevelManageShareService;
+import com.skua.modules.system.datestandard.entity.SysStructDict;
 import com.skua.modules.system.entity.SysDepart;
 import com.skua.modules.system.service.ISysConfigService;
 import com.skua.modules.system.service.ISysDepartService;
@@ -88,6 +87,30 @@ public class DangerLevelManageController {
 		return result;
 	}
 
+	 @AutoLog(value = "风险分级管控清单-风险库下拉框")
+	 @ApiOperation(value="风险分级管控清单-风险库下拉框", notes="风险分级管控清单-风险库下拉框")
+	 @GetMapping(value = "/get")
+	 public Result<List<Map>> queryPageList(DangerLevelManage dangerLevelManage) {
+		 Result<List<Map>> result = new Result<List<Map>>();
+		 List<DangerLevelManage> list = new ArrayList<>();
+				 QueryWrapper<DangerLevelManage> queryWrapper = new QueryWrapper<>();
+		 if(ConvertUtils.isNotEmpty(dangerLevelManage.getDepartId())
+				 &&ConvertUtils.isNotEmpty(dangerLevelManage.getDangerPlace())){
+			 queryWrapper.eq("depart_id",dangerLevelManage.getDepartId());
+			 queryWrapper.eq("danger_place",dangerLevelManage.getDangerPlace());
+			 list = dangerLevelManageService.list(queryWrapper);
+		 }
+		 List<Map> listMap = new LinkedList<>();
+		 for (DangerLevelManage dangerLevel : list) {
+			 Map map = new LinkedHashMap();
+			 map.put("itemCode", dangerLevel.getId());
+			 map.put("itemName", dangerLevel.getDangerName());
+			 listMap.add(map);
+		 }
+		 result.setResult(listMap);
+		 return result;
+	 }
+
 
 	 @AutoLog(value = "风险分级管控清单-（共享）分页列表查询")
 	 @ApiOperation(value="风险分级管控清单-（共享）分页列表查询", notes="风险分级管控清单-（共享）分页列表查询")