fix(冲突): 解决dev合到devcheck

dev-allot/src/main/java/com/tykj/dev/device/allot/controller/AllotBillController.java

@@ -214,7 +214,6 @@ public class AllotBillController {
         if (allotBillSaveVo.getAllotType() == 1) {
             //直接发起
             if (allotBillSaveVo.getTaskId() == null) {
-//                TaskBto taskBto = new TaskBto(StatusEnum.ALLOTING.id, allotBillSaveVo.getSendUnit() + "配发型号" + StringSplitUtil.stringListToString(allotBillSaveVo.getScriptSaveVos().stream().map(ScriptSaveVo::getModel).distinct().collect(Collectors.toList())) + "的装备共" + allotBillSaveVo.getAllotCount() + "件至" + allotBillSaveVo.getReceiveUnit(), null, ".", billId, 3, userPublicService.findUnitIdByName(allotBillSaveVo.getReceiveUnit()), 1, null, userIds);
 //                TaskBto taskBto = new TaskBto(StatusEnum.ALLOTING.id, "["+allotBillSaveVo.getReceiveUnit().substring(0,3)+"]型号" + StringSplitUtil.stringListToString(allotBillSaveVo.getScriptSaveVos().stream().map(ScriptSaveVo::getModel).distinct().collect(Collectors.toList())) + "的装备共" + allotBillSaveVo.getAllotCount() + "件" , null, ".", billId, 3, userPublicService.findUnitIdByName(allotBillSaveVo.getReceiveUnit()), 1, null, userIds);
 //                TaskBto taskBto = new TaskBto(StatusEnum.ALLOTING.id, "["+DeviceModelSort.unitNameToDisName(allotBillSaveVo.getReceiveUnit())+"]型号" + StringSplitUtil.stringListToString(allotBillSaveVo.getScriptSaveVos().stream().map(ScriptSaveVo::getModel).distinct().collect(Collectors.toList())) + "的装备共" + allotBillSaveVo.getAllotCount() + "件" , null,
 //                        ".", billId, 3, userPublicService.findUnitIdByName(allotBillSaveVo.getReceiveUnit()),
@@ -387,6 +386,7 @@ public class AllotBillController {
         allotBill.setReplyFileList(FilesUtil.stringFileToList(allotBill.getReplyFiles()));
         //
         allotBill.setTaskId(saveEntity.getId());
+        allotBill.setSendTaskId(taskService.findByParentId(saveEntity.getId()).getId());
         //输出配发单给前端
         return ResponseEntity.ok(new ResultObj(allotBill, "发起成功"));
     }

dev-allot/src/main/java/com/tykj/dev/device/allot/subject/domin/AllotBill.java

@@ -312,8 +312,13 @@ public class AllotBill {
     @Transient
     private List<FileRet> receiveFileList = new ArrayList<>();
 
-    @ApiModelProperty(value = "任务id")
+    @ApiModelProperty(value = "收件方任务id")
     @Transient
     private Integer taskId;
 
+
+    @ApiModelProperty(value = "发件方任务id")
+    @Transient
+    private Integer sendTaskId;
+
 }

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

@@ -271,4 +271,9 @@ public interface TaskService {
      * @param taskId  任务id
      */
     void deleteById(Integer taskId);
+
+    /**
+     * 根据父id查询任务
+     */
+    Task findByParentId(Integer parentTaskId);
 }

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

@@ -1236,9 +1236,14 @@ public class TaskServiceImpl implements TaskService {
         taskDao.deleteById(taskId);
     }
 
+
+    public Task findByParentId(Integer parentTaskId) {
+        return taskDao.findByParentTaskId(parentTaskId);
+    }
+
     @Override
-    public void moveAllSonNodeToEnd(Integer taskId) {
-        List<Task> tasks = taskDao.findAllByParentTaskId(taskId);
+    public void moveAllSonNodeToEnd(Integer taaskId) {
+        List<Task> tasks = taskDao.findAllByParentTaskId(taaskId);
         if (tasks.size()>0){
             tasks.forEach(task -> {
                 moveToEnd(task.parse2Bto());