提交代码

dev-config/src/main/java/com/tykj/dev/config/LogType.java

@@ -262,7 +262,7 @@ public enum LogType {
     WORK_H1(79, WORK_HANDOVER.id, ORIGIN_STATUS.id, WORKHANDOVER1011.id, "工作交接任务生成完成,等待上传交接单"),
     WORK_H2(80, WORK_HANDOVER.id, WORKHANDOVER1011.id, END.id, "工作交接完成"),
     ALLOT_8(82, ALLOT.id, ORIGIN_STATUS.id, ALLOTING.id, "对(%receiveUnit)发起配发"),
-    ALLOT_9(83, ALLOT.id, ALLOTING.id, END.id, "接收配发装备并上传配发签收单"),
+    ALLOT_9(83, ALLOT.id, ALLOTING.id, END.id, "上传了相关单据，任务完结"),
     ALLOT_10(84, ALLOT.id, WAIT_ALLOT.id, ALLOTING.id, "对(%receiveUnit)发起配发"),
     ALLOT_11(85, ALLOT.id, ALLOTING.id, ARCHIVE.id, "拒绝接收配发装备"),
     ALLOT_BACK_5(86, ALLOT_BACK.id, WAIT_UPLOAD_BACK_FILE_2.id, END.id, "上传退回回执单"),
@@ -327,7 +327,7 @@ public enum LogType {
 //    ALLOT_BACK_16(141,ALLOT_BACK.id, BACK_DRAFT.id, ALLOT_BACKING.id, "从草稿发起退回"),
     ALLOT_BACK_17(142,ALLOT_BACK.id, ORIGIN_STATUS.id, BACK_DRAFT.id, "从草稿发起退回"),
     ALLOT_23(143,ALLOT.id, ALLOTING.id, SIGN_WAIT_CONFIRM.id, "申请入库签章"),
-    ALLOT_24(144,ALLOT.id, ORIGIN_STATUS.id, WAIT_UPLOAD_ALLOT_FILE.id, "待上传回执单"),
+    ALLOT_24(144,ALLOT.id, ORIGIN_STATUS.id, WAIT_UPLOAD_ALLOT_FILE.id, "待上传回执单"),//0-322
 //    REPAIR_BACK_22(145,REPAIR_BACK.id, ORIGIN_STATUS.id, REPAIR_BACK_DRAFT.id, "维修退回等待出库"),
     REPAIR_BACK_23(146,REPAIR_BACK.id, REPAIR_BACK_DRAFT.id, REPAIR_BACK_SIGN_WAIT_CONFIRM.id, "申请签章待审核"),
 //    REPAIR_SEND_22(147,REPAIR.id, ORIGIN_STATUS.id, REPAIR_SEND_DRAFT.id, "送修等待出库"),

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

@@ -257,14 +257,14 @@ public class TaskController {
         //添加当前业务日志
         List<TaskLogUserVo> taskLogUserVos = taskLogService.getByTaskId(taskId);
         //查询所有子业务
-        List<TaskBto> taskBtos = taskDao.findAll().stream()
-                .filter(task -> task.getNodeIdDetail() != null && task.getNodeIdDetail().contains("." + taskId + "."))
-                .map(Task::parse2Bto)
-                .collect(Collectors.toList());
-        //添加子业务日志
-        if (taskBtos.size() > 0) {
-            taskBtos.forEach(taskBto -> taskLogUserVos.addAll(taskLogService.getByTaskId(taskBto.getId())));
-        }
+//        List<TaskBto> taskBtos = taskDao.findAll().stream()
+//                .filter(task -> task.getNodeIdDetail() != null && task.getNodeIdDetail().contains("." + taskId + "."))
+//                .map(Task::parse2Bto)
+//                .collect(Collectors.toList());
+//        //添加子业务日志
+//        if (taskBtos.size() > 0) {
+//            taskBtos.forEach(taskBto -> taskLogUserVos.addAll(taskLogService.getByTaskId(taskBto.getId())));
+//        }
         //按日志时间排序
         List<TaskLogUserVo> taskLogUserVoList = taskLogUserVos.stream()
                 .sorted(Comparator.comparing(TaskLogUserVo::getCreateTime,Comparator.nullsLast(Date::compareTo)).reversed())
@@ -426,7 +426,7 @@ public class TaskController {
 //                    if (billStatus == 333){
 //                        map.clear();
 //                    }else {
-                        map.put(taskLogUserVo.getOldStatus()+"",taskLogUserVo.getUser());
+                            map.put(taskLogUserVo.getOldStatus()+"",taskLogUserVo.getUser());
 //                    }
                 }