[清退]

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

@@ -226,6 +226,7 @@ public class RepelBusinessServiceImpl implements RepelBusinessService {
       repelTaskStatisticalService.saveAllRepelTaskStatistical(list);
       TaskBto currentTask= taskService.get(taskId);
       taskService.moveToSpecial(currentTask,StatusEnum.SEND_BACK_1206);
+      isCommission(taskBto,deviceRepel1.getId());
 
     }
 
@@ -244,6 +245,7 @@ public class RepelBusinessServiceImpl implements RepelBusinessService {
         deviceRepelDetail.setRepelId(deviceRepel1.getId());
         deviceRepelDetail.setRepelStatus(1);
         TaskBto taskBto= cityInitiateTask(unitsFather.getUnitId(),deviceRepelDetailService.saveDeviceRepelDetail(deviceRepelDetail).getId(),deviceRepel.getTitle());
+
 //        repelTaskStatisticalService.saveRepelTaskStatistical(new RepelTaskStatistical(deviceRepel1.getId(),null,taskBto.getId(),null,area.getName()));
 //        Set<ModelCount> modelCounts=new HashSet<>();
 //        deviceRepel.getModels().forEach(i->{
@@ -298,9 +300,12 @@ public class RepelBusinessServiceImpl implements RepelBusinessService {
             repelTaskStatisticalService.saveAllRepelTaskStatistical(list);
             taskBto.setOwnUnit(deviceRepel.getUnitId());
             taskService.moveToSpecial(taskBto,StatusEnum.SEND_BACK_1204,-1);
+            isCommission(taskBto,deviceRepel.getId());
+
         }else {
             taskService.moveToEnd(taskBto);
         }
+
     }