Merge branch 'dev' of git.yfzx.zjtys.com.cn:matrix/device-back into feature-check

dev-sendback/src/main/java/com/tykj/dev/device/sendback/service/impl/RepelBusinessServiceImpl.java

@@ -369,6 +369,7 @@ public class RepelBusinessServiceImpl implements RepelBusinessService {
                     }
                 }
         );
+
         mapUnitList.forEach((k,v) ->{
             AtomicReference<Integer> count= new AtomicReference<>(0);
             v.forEach(units1 -> {
@@ -1556,11 +1557,11 @@ public class RepelBusinessServiceImpl implements RepelBusinessService {
      * 判读是否留在代办
      */
     private void isCommission(TaskBto taskBto, Integer repelId) {
-        boolean flag = repelTaskStatisticalService.findAllRepelTaskStatistical(taskBto.getParentTaskId(), repelId).stream().allMatch(e -> e.getTaskStatus() != 3);
-        if (flag) {
-            TaskBto parentTask = taskService.get(taskBto.getParentTaskId());
-            taskService.moveToSpecial(parentTask, GlobalMap.getStatusEnumMap().get(parentTask.getBillStatus()), -1);
-        }
+//        boolean flag = repelTaskStatisticalService.findAllRepelTaskStatistical(taskBto.getParentTaskId(), repelId).stream().allMatch(e -> e.getTaskStatus() != 3);
+//        if (flag) {
+//            TaskBto parentTask = taskService.get(taskBto.getParentTaskId());
+//            taskService.moveToSpecial(parentTask, GlobalMap.getStatusEnumMap().get(parentTask.getBillStatus()), -1);
+//        }
     }
 
     /**

dev-statistical/src/main/java/com/tykj/dev/statistical/controller/StatisticalController.java

@@ -42,6 +42,7 @@ import java.util.function.Function;
 import java.util.stream.Collectors;
 
 import static java.util.stream.Collectors.groupingBy;
+import static java.util.stream.Collectors.toMap;
 
 @RestController
 @Api(tags = "统计业务模块", description = "统计相关接口")
@@ -312,7 +313,13 @@ public class StatisticalController {
         List<ScrappedDestroyedRetiredVo> destroyedRetiredVoList = new ArrayList<>();
         if (lifeStatus.containsAll(deviceLibrarySelectVo.getLifeStatus())){
             //进行组合
-            Map<String, List<DeviceLibrary>> map = libraryList.stream().collect(groupingBy(deviceLibrary -> deviceLibrary.getModel() + "Ǵ" + deviceLibrary.getName() + "Ǵ" + deviceLibrary.getMatchingRangeName()+"Ǵ"+deviceLibrary.getIsPart()));
+//            Map<String, List<DeviceLibrary>> map = libraryList.stream()
+//                    .collect(groupingBy(deviceLibrary -> deviceLibrary.getModel() + "Ǵ" + deviceLibrary.getName() + "Ǵ" +
+//                            deviceLibrary.getMatchingRangeName()+"Ǵ"+deviceLibrary.getIsPart()));
+            LinkedHashMap<String, List<DeviceLibrary>> map =
+                    libraryList.stream().collect(groupingBy(deviceLibrary -> deviceLibrary.getModel() + "Ǵ"
+                            + deviceLibrary.getName() + "Ǵ" + deviceLibrary.getMatchingRangeName() + "Ǵ" + deviceLibrary.getIsPart(),
+                    LinkedHashMap::new, Collectors.toList()));
             if (map.size()>0){
                 for (String s : map.keySet()) {
                     String[] strings = s.split("Ǵ");

dev-user/src/main/java/com/tykj/dev/device/user/cache/AreaExhibitionCache.java

@@ -5,6 +5,7 @@ import com.tykj.dev.device.user.subject.entity.Units;
 import lombok.Data;
 
 import java.util.ArrayList;
+import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 import java.util.function.Function;
@@ -68,4 +69,11 @@ public class AreaExhibitionCache {
         this.areaExhibitions=areaExhibitionList;
         return this;
     }
+
+    public Map<Integer,String> checkSpecial(){
+       Map<Integer,String> map=new HashMap<>();
+       map.put(1,idMap.get(3).getAreaName());
+       map.put(2,idMap.get(4).getAreaName());
+       return map;
+    }
 }