Commit e23359b8 authored by chenhao's avatar chenhao

修改隐患级别下拉枚举值重复的问题

parent 5472302d
...@@ -102,6 +102,7 @@ import java.util.Arrays; ...@@ -102,6 +102,7 @@ import java.util.Arrays;
import java.util.Collections; import java.util.Collections;
import java.util.Date; import java.util.Date;
import java.util.HashMap; import java.util.HashMap;
import java.util.HashSet;
import java.util.LinkedList; import java.util.LinkedList;
import java.util.List; import java.util.List;
import java.util.Map; import java.util.Map;
...@@ -1738,8 +1739,8 @@ public class LatentDangerServiceImpl extends BaseService<LatentDangerBo, LatentD ...@@ -1738,8 +1739,8 @@ public class LatentDangerServiceImpl extends BaseService<LatentDangerBo, LatentD
@Override @Override
public List<Map<String, String>> getAllDangerState() { public Set<Map<String, String>> getAllDangerState() {
List<Map<String, String>> levelList = Lists.newArrayList(); Set<Map<String, String>> levelList = new HashSet<Map<String, String>>();
List<LatentDangerState.SupervisionDangerStateEnum> supervisionDangerStateList = Lists.newArrayList(LatentDangerState.SupervisionDangerStateEnum.values()); List<LatentDangerState.SupervisionDangerStateEnum> supervisionDangerStateList = Lists.newArrayList(LatentDangerState.SupervisionDangerStateEnum.values());
List<LatentDangerState.PatrolDangerStateEnum> patrolDangerStateEnumList = Lists.newArrayList(LatentDangerState.PatrolDangerStateEnum.values()); List<LatentDangerState.PatrolDangerStateEnum> patrolDangerStateEnumList = Lists.newArrayList(LatentDangerState.PatrolDangerStateEnum.values());
......
...@@ -22,6 +22,7 @@ import org.typroject.tyboot.core.restful.utils.ResponseModel; ...@@ -22,6 +22,7 @@ import org.typroject.tyboot.core.restful.utils.ResponseModel;
import java.util.Date; import java.util.Date;
import java.util.List; import java.util.List;
import java.util.Map; import java.util.Map;
import java.util.Set;
/** /**
* @author keyong * @author keyong
...@@ -166,7 +167,7 @@ public interface ILatentDangerService { ...@@ -166,7 +167,7 @@ public interface ILatentDangerService {
* 获取所有隐患治理进度 * 获取所有隐患治理进度
* @return * @return
*/ */
List<Map<String, String>> getAllDangerState(); Set<Map<String, String>> getAllDangerState();
/** /**
* 获取所有未完成的隐患数量 * 获取所有未完成的隐患数量
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment