| | |
|---|
| | | //库区转换 |
|---|
| | | Map<String, PatrolSuperData> map = new HashMap<>(); |
|---|
| | | for (Dept dept : deptList) { |
|---|
| | | map.put(dept.getId(), new PatrolSuperData(dept.getCompanyId(), dept.getId())); |
|---|
| | | map.put(dept.getId(), new PatrolSuperData(dept.getId().substring(0,(dept.getId().length()-3)), dept.getId())); |
|---|
| | | } |
|---|
| | | |
|---|
| | | List<Patrol> weekList = patrolService.getWeekList(); |
|---|
| | |
|---|
| | | } |
|---|
| | | } |
|---|
| | | |
|---|
| | | return new ArrayList<>(map.values()); |
|---|
| | | ArrayList<PatrolSuperData> list = new ArrayList<>(map.values()); |
|---|
| | | Collections.sort(list, new Comparator<PatrolSuperData>() { |
|---|
| | | @Override |
|---|
| | | public int compare(PatrolSuperData o1, PatrolSuperData o2) { |
|---|
| | | return o1.getDeptId().compareTo(o2.getDeptId()); |
|---|
| | | } |
|---|
| | | }); |
|---|
| | | return list; |
|---|
| | | } |
|---|
| | | |
|---|
| | | /*-------------------电子巡更记录主表信息--------------------*/ |
|---|
