[日志]提交枚举

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

@@ -265,6 +265,7 @@ public enum LogType {
     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_11(85, ALLOT.id, ALLOTING.id, ARCHIVE.id, "(%sendUnit)撤回了配发业务"),
     ALLOT_BACK_5(86, ALLOT_BACK.id, WAIT_UPLOAD_BACK_FILE_2.id, END.id, "上传退回回执单"),
     REPAIR_SEND_10(87, REPAIR.id, ORIGIN_STATUS.id, WAIT_UPLOAD_FILE.id, "向(%receiveUnit)发起装备维修"),
     REPAIR_BACK_7(88, REPAIR_BACK.id, ORIGIN_STATUS.id, END.id, "维修退回装备接收并发起入库"),
@@ -335,11 +336,13 @@ public enum LogType {
     ALLOT_25(149,ALLOT.id,ALLOT_DRAFT.id,ALLOT_DRAFT.id,"申请电子签章被拒绝"),
     ALLOT_26(150,ALLOT.id,SIGN_WAIT_CONFIRM.id,ARCHIVE.id,"该业务已经被撤回"),
     ALLOT_27(151,REPAIR_BACK.id,ORIGIN_STATUS.id,WAIT_UPLOAD_BACK_SEND_FILE.id,"等待上传回执单"),
+    ALLOT_28(157,ALLOT.id,ALLOTING.id,REVOKEALLOTTASK.id,"该业务已经被撤回"),
     REPAIR_BACK_24(152,REPAIR_BACK.id,REPAIR_BACK_SIGN_WAIT_CONFIRM.id,REPAIR_BACK_WAIT_SIGN.id,"同意签章审核"),
     REPAIR_BACK_25(153,REPAIR_BACK.id,WAIT_BACK_RECEIVE.id,REPAIR_BACK_SIGN_WAIT_CONFIRM.id,"等待签章审核"),
     REPAIR_BACK_26(154,REPAIR_BACK.id,REPAIR_BACK_SIGN_WAIT_CONFIRM.id,REPAIR_BACK_WAIT_SIGN.id,"等待签章审核"),
     REPAIR_BACK_27(155,REPAIR_BACK.id,REPAIR_BACK_WAIT_SIGN.id,WAIT_BACK_RECEIVE.id,"等待签章审核"),
     REPAIR_BACK_28(156,REPAIR_BACK.id,REPAIR_BACK_WAIT_SIGN.id,WAIT_UPLOAD_BACK_FILE.id,"等待上传相关单据"),
+
     ;
 
     public Integer id;

dev-misc/src/main/java/com/tykj/dev/misc/base/StatusEnum.java

@@ -149,6 +149,11 @@ public enum StatusEnum {
      */
     ARCHIVE(8888, "业务封存"),
 
+    /**
+     * 配发任务撤回
+     */
+    REVOKEALLOTTASK(20000, "配发任务撤回"),
+
     /**
      * 列装待审核
      */

dev-task/src/main/java/com/tykj/dev/device/task/service/TaskService.java

@@ -95,6 +95,11 @@ public interface TaskService {
      */
     TaskBto moveToArchive(TaskBto taskBto);
 
+    /**
+     * 业务撤回
+     */
+    TaskBto moveToRevoke(TaskBto taskBto);
+
     /**
      * 新增Task
      */
@@ -125,6 +130,12 @@ public interface TaskService {
      */
     TaskBto get(Integer billId, Integer businessType);
 
+
+    /**
+     * 根据billId和businessType获得Task
+     */
+    TaskBto getParentTaskIsNull(Integer billId, Integer businessType);
+
     /**
      * @param taskSelectVo 获取跟踪和待办业务列表
      */

dev-task/src/main/java/com/tykj/dev/device/task/service/impl/TaskServiceImpl.java

@@ -295,6 +295,15 @@ public class TaskServiceImpl implements TaskService {
         return taskBto;
     }
 
+    @Override
+    @Log
+    public TaskBto moveToRevoke(TaskBto taskBto) {
+        taskBto.setBillStatus(StatusEnum.REVOKEALLOTTASK.id);
+        update(taskBto);
+        myWebSocket.sendMessage1();
+        return taskBto;
+    }
+
     /**
      * 新增Task
      */
@@ -387,6 +396,17 @@ public class TaskServiceImpl implements TaskService {
 //                .parse2Bto();
     }
 
+    @Override
+    public TaskBto getParentTaskIsNull(Integer billId, Integer businessType) {
+        List<Task> tasks = taskDao.findAllByBillIdAndBusinessType(billId, businessType);
+        tasks = tasks.stream().filter(task -> task.getParentTaskId() == null).collect(Collectors.toList());
+        if (tasks.size()==0){
+            throw new ApiException(String.format("要查询的数据不存在,查询的billId为 %d,businessType为 %d", billId, businessType));
+        }else {
+            return tasks.get(0).parse2Bto();
+        }
+    }
+
     /**
      * @param taskSelectVo 获取跟踪和待办业务列表
      */