[任务] 提交bug

dev-task/src/main/java/com/tykj/dev/device/task/controller/TaskController.java

@@ -30,6 +30,7 @@ import org.springframework.http.ResponseEntity;
 import org.springframework.validation.annotation.Validated;
 import org.springframework.web.bind.annotation.*;
 
+import javax.persistence.Id;
 import java.util.*;
 import java.util.stream.Collectors;
 
@@ -353,7 +354,7 @@ public class TaskController {
 //        }
         switch(businessType){
             case 3 :
-               return ResponseEntity.ok(allot(taskLogUserVos,billStatus));
+               return ResponseEntity.ok(allot2(taskLogUserVos,billStatus));
 
             case 22 :
                 //语句
@@ -499,6 +500,54 @@ public class TaskController {
 
     }
 
+
+    private Map<String, String> allot2(List<TaskLogUserVo> taskLogUserVos,Integer billStatus){
+        Map<String, String> map = new HashMap<>();
+        for (TaskLogUserVo taskLogUserVo : taskLogUserVos) {
+            if (taskLogUserVo.getOldStatus()!=null){
+                if (taskLogUserVo.getOldStatus() == 340){
+                    if (map.containsKey("340")){
+                        if (map.containsKey("302")) {
+                            map.put("340j", taskLogUserVo.getUser());
+                        }else {
+                            map.put("340",taskLogUserVo.getUser());
+                        }
+                    } else {
+                        if (map.containsKey("302")) {
+                            map.put("340j", taskLogUserVo.getUser());
+                        }else {
+                            map.put(taskLogUserVo.getOldStatus() + "", taskLogUserVo.getUser());
+                        }
+                    }
+                    }else {
+                    map.put(taskLogUserVo.getOldStatus()+"",taskLogUserVo.getUser());
+                }
+                }else {
+                     map.put(taskLogUserVo.getOldStatus()+"",taskLogUserVo.getUser());
+                }
+            }
+        if (billStatus==333){
+            map.remove("340");
+        }
+        if (billStatus==340 && !map.containsKey("302")){
+            map.remove("340");
+        }
+        if (!map.containsKey("341") && billStatus!=341){
+            map.remove("340");
+        }
+        if (billStatus==341 && map.containsKey("302")){
+            map.remove("340");
+        }
+        if (billStatus==302||billStatus==340){
+            map.remove("340j");
+        }
+        if (!map.containsKey("341") && billStatus!=341&&map.containsKey("302")){
+            map.remove("340j");
+        }
+        return map;
+
+    }
+
     private Map<String, String> backAllot(List<TaskLogUserVo> taskLogUserVos,Integer billStatus){
         Map<String, String> map = new HashMap<>();
         for (TaskLogUserVo taskLogUserVo : taskLogUserVos) {