t

dev-sendback/src/main/java/com/tykj/dev/device/sendback/entity/domain/SendBackBill.java

@@ -103,7 +103,7 @@ public class SendBackBill {
     private Integer formId;
 
     @ApiModelProperty(value = "是否完成")
-    private Integer isComplete;
+    private Integer isComplete=0;
 
     @ApiModelProperty(value = "区块链RID",name = "recordId")
     private String recordId;

dev-sendback/src/main/java/com/tykj/dev/device/sendback/service/impl/SendBackServiceImpl.java

@@ -414,11 +414,10 @@ public class SendBackServiceImpl implements SendBackService {
 
         if (parentTaskBill.getInvoleDevice().equals("")){
             taskService.moveToEnd(parentTask);
-            Units units1 =unitsDao.findById(Integer.valueOf(parentTask.getCustomInfo())).get();
-            s1(parentTask,units1,idList);
-           }
-
 
+           }
+        Units units1 =unitsDao.findById(Integer.valueOf(parentTask.getCustomInfo())).get();
+        s1(parentTask,units1,idList);
 
 //        sendBackBillEntityDao.save(parentTaskBill);
         saveSendBackBill(parentTaskBill);
@@ -659,7 +658,7 @@ public class SendBackServiceImpl implements SendBackService {
         //查询当前task上级task
 
         //查询当前task上级task所有子task
-        List<Task> taskList=taskDao.findAllByParentTaskId(fatherTaskBto.getId());
+        List<Task> taskList=taskDao.findAllByParentTaskIdAndBusinessType(fatherTaskBto.getId(),BusinessEnum.SEND_BACK.id);
         //判断对应的bill是否完成
         List<Integer> integers=taskList.stream().map(Task::getBillId).collect(Collectors.toList());
 
@@ -709,10 +708,12 @@ public class SendBackServiceImpl implements SendBackService {
 
         Area area= areaDao.findById(units.getAreaId()).get();
         updateStatistical(idList,area.getName(),sendBackVo);
+        fatherBill.setSendBackStatistical(JacksonUtil.toJSon(sendBackVo));
+        saveSendBackBill(fatherBill);
         //查询当前task上级task
 
         //查询当前task上级task所有子task
-        List<Task> taskList=taskDao.findAllByParentTaskId(fatherTaskBto.getId());
+        List<Task> taskList=taskDao.findAllByParentTaskIdAndBusinessType(fatherTaskBto.getId(),BusinessEnum.SEND_BACK.id);
         //判断对应的bill是否完成
         List<Integer> integers=taskList.stream().map(Task::getBillId).collect(Collectors.toList());
 

dev-task/src/main/java/com/tykj/dev/device/task/repository/TaskDao.java

@@ -47,7 +47,7 @@ public interface TaskDao extends JpaRepository<Task, Integer>, JpaSpecificationE
      */
     Task findAllByParentTaskIdIsNullAndBillIdAndBusinessType(Integer billId, Integer businessType);
 
-    List<Task> findAllByParentTaskId(Integer parentTaskId);
+    List<Task> findAllByParentTaskIdAndBusinessType(Integer parentTaskId,Integer type);
 
     @Query("select o.billId from Task o where o.id=?1")
     Integer findBillIdByTaskId(int taskId);
@@ -60,6 +60,7 @@ public interface TaskDao extends JpaRepository<Task, Integer>, JpaSpecificationE
 
     List<Task> findTaskEntitiesByParentTaskIdAndAndBusinessType(Integer parentTaskId,Integer businessType);
 
+    List<Task> findAllByParentTaskId(Integer parentTaskId);
     Task findByBusinessTypeAndOwnUnitAndBillStatus(Integer type, Integer ownUnit, Integer billStatus);
 
     Task findByParentTaskIdAndAndTitle(Integer parentId, String title);