[]

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

@@ -214,7 +214,7 @@ public class RepelBusinessServiceImpl implements RepelBusinessService {
                              log.info("count 时间：{}",System.currentTimeMillis()-time);
                              if (count!=0) {
                                  TaskBto taskBto1 = cityRepelTask(unisId, deviceRepelDetailService.saveDeviceRepelDetail(deviceRepelDetail).getId(), deviceRepel.getTitle(), taskBto.getId(),userId);
-                                 list.add(new RepelTaskStatistical(deviceRepel1.getId(), taskBto.getId(), taskBto1.getId(), 0, area1.getName(), count, ""));
+                                 list.add(new RepelTaskStatistical(deviceRepel1.getId(), taskBto.getId(), taskBto1.getId(), 0, area1.getName(), repelStatusJudgeCount(deviceRepel.getRepelStatus(),count), ""));
                              }
                          }
                      }else {
@@ -228,7 +228,7 @@ public class RepelBusinessServiceImpl implements RepelBusinessService {
         Integer count=deviceLibraryService.countAllRepel(deviceRepel.getFieldingIds(),directlUnderUnitNames,seqNumbers,lifeStatus);
         if (directlUnderUnit.get()&&count!=0){
                 TaskBto taskBto2 = directlyUnderTask(units.getUnitId(), deviceRepelDetailService.saveDeviceRepelDetail(deviceRepelDetail).getId(), taskBto.getId(),deviceRepel.getTitle(),userId);
-                list.add(new RepelTaskStatistical(deviceRepel1.getId(), taskBto.getId(), taskBto2.getId(), 0, "省直属",count, ""));
+                list.add(new RepelTaskStatistical(deviceRepel1.getId(), taskBto.getId(), taskBto2.getId(), 0, "省直属",repelStatusJudgeCount(deviceRepel.getRepelStatus(),count), ""));
         }
         deviceRepelDetail.setId(null);
         List<String> strings=new ArrayList<>();
@@ -237,7 +237,7 @@ public class RepelBusinessServiceImpl implements RepelBusinessService {
          count=deviceLibraryService.countAllRepel(deviceRepel.getFieldingIds(),strings, seqNumbers,lifeStatus);
         if (correspondingLevel.get()&&count!=0){
             TaskBto  taskBto1 =  oneselfTask(units.getUnitId(),deviceRepelDetailService.saveDeviceRepelDetail(deviceRepelDetail).getId(), taskBto.getId(),deviceRepel.getTitle(),userId);
-            list.add(new RepelTaskStatistical(deviceRepel1.getId(),taskBto.getId(),taskBto1.getId(),0,"省本级",count,""));
+            list.add(new RepelTaskStatistical(deviceRepel1.getId(),taskBto.getId(),taskBto1.getId(),0,"省本级",repelStatusJudgeCount(deviceRepel.getRepelStatus(),count),""));
         }
         if (list==null||list.size()==0){
             taskService.moveToSpecial(taskBto, StatusEnum.SEND_BACK_1212,userId);
@@ -245,6 +245,14 @@ public class RepelBusinessServiceImpl implements RepelBusinessService {
         repelTaskStatisticalService.saveAllRepelTaskStatistical(list);
     }
 
+    private Integer repelStatusJudgeCount(Integer repelStatus,Integer count){
+        if (repelStatus==1){
+            return count;
+        }else {
+            return 0;
+        }
+    }
+
     @Override
     public void resolveRepel(DeviceRepel deviceRepel, Integer taskId, Integer userId) {
 
@@ -301,7 +309,7 @@ public class RepelBusinessServiceImpl implements RepelBusinessService {
                         Integer count=deviceLibraryService.countAllRepel(deviceRepel.getFieldingIds(),unitsService.findBySubordinateUnitName(units1.getUnitId()), DeviceSeqUtil.selectDeviceSeqs(deviceRepel.getSeqNumbers()),lifeStatus);
                         if (count!=0) {
                             TaskBto taskBto1 = countyRepelTask(unisId, deviceRepelDetailService.saveDeviceRepelDetail(deviceRepelDetail).getId(), deviceRepel.getTitle(), taskBto.getId(),userId);
-                            list.add(new RepelTaskStatistical(deviceRepel1.getId(), taskBto.getId(), taskBto1.getId(), 0, area1.getName(),count, ""));
+                            list.add(new RepelTaskStatistical(deviceRepel1.getId(), taskBto.getId(), taskBto1.getId(), 0, area1.getName(),repelStatusJudgeCount(deviceRepel.getRepelStatus(),count), ""));
                         }
                     }else {
                         //添加本级清退任务
@@ -314,7 +322,7 @@ public class RepelBusinessServiceImpl implements RepelBusinessService {
                         Integer count=deviceLibraryService.countAllRepel(deviceRepel.getFieldingIds(),unitNames, DeviceSeqUtil.selectDeviceSeqs(deviceRepel.getSeqNumbers()),lifeStatus);
                         if(count!=0) {
                             TaskBto taskBto1 = cityDeclaredTask(units.getUnitId(), deviceRepelDetailService.saveDeviceRepelDetail(deviceRepelDetail).getId(), taskBto.getId(), units.getName(),userId);
-                            list.add(new RepelTaskStatistical(deviceRepel1.getId(), taskBto.getId(), taskBto1.getId(), 0, "省本级", count, ""));
+                            list.add(new RepelTaskStatistical(deviceRepel1.getId(), taskBto.getId(), taskBto1.getId(), 0, "省本级", repelStatusJudgeCount(deviceRepel.getRepelStatus(),count), ""));
                         }
                         }
                 }
@@ -377,7 +385,7 @@ public class RepelBusinessServiceImpl implements RepelBusinessService {
                             Integer count=deviceLibraryService.countAllRepel(deviceRepel.getFieldingIds(),unitsService.findBySubordinateUnitName(units1.getUnitId()), DeviceSeqUtil.selectDeviceSeqs(deviceRepel.getSeqNumbers()),lifeStatus);
                             if (count!=0) {
                                 TaskBto taskBto1 = countyRepelTask(unisId, deviceRepelDetailService.saveDeviceRepelDetail(deviceRepelDetail).getId(), deviceRepel.getTitle(), taskBto.getId(),userId);
-                                list.add(new RepelTaskStatistical(deviceRepel.getId(), taskBto.getId(), taskBto1.getId(), 0, area1.getName(), count, ""));
+                                list.add(new RepelTaskStatistical(deviceRepel.getId(), taskBto.getId(), taskBto1.getId(), 0, area1.getName(), repelStatusJudgeCount(deviceRepel.getRepelStatus(),count), ""));
                             }
 
                         }else {