fix(配发模块,任务模块): 增加配发下一步

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

@@ -23,6 +23,7 @@ import com.tykj.dev.device.task.repository.TaskDao;
 import com.tykj.dev.device.task.service.TaskLogService;
 import com.tykj.dev.device.task.service.TaskService;
 import com.tykj.dev.device.task.subject.bto.TaskBto;
+import com.tykj.dev.device.task.subject.domin.Task;
 import com.tykj.dev.device.user.read.service.MessageService;
 import com.tykj.dev.device.user.read.subject.bto.MessageBto;
 import com.tykj.dev.device.user.subject.dao.UserDao;
@@ -394,8 +395,10 @@ public class AllotBillController {
         allotBill.setSendFileList(FilesUtil.stringFileToList(allotBill.getSendFiles()));
         allotBill.setReplyFileList(FilesUtil.stringFileToList(allotBill.getReplyFiles()));
         //
+        Task byParentId = taskService.findByParentId(saveEntity.getId());
         allotBill.setTaskId(saveEntity.getId());
-        allotBill.setSendTaskId(taskService.findByParentId(saveEntity.getId()).getId());
+        allotBill.setSendTaskId(byParentId.getId());
+        allotBill.setBillStatus(byParentId.getBillStatus());
         //输出配发单给前端
         return ResponseEntity.ok(new ResultObj(allotBill, "发起成功"));
     }

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

@@ -321,4 +321,8 @@ public class AllotBill {
     @Transient
     private Integer sendTaskId;
 
+    @ApiModelProperty(value = "下一步的业务状态")
+    @Transient
+    private Integer billStatus;
+
 }