[清退] 业务代码提交

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

@@ -415,8 +415,8 @@ public class RepelBusinessServiceImpl implements RepelBusinessService {
         StringBuffer ids=new StringBuffer();
         DeviceRepelDetail deviceRepelDetail= deviceRepelDetailService.findDeviceRepelDetailNoDev(taskBto.getBillId());
         RepelTaskStatistical repelTaskStatistical= repelTaskStatisticalService.findRepelTaskStatistical(taskBto.getId(),deviceRepelDetail.getRepelId());
-//        List<ModelCount> modelCountList= JacksonUtil.readValue(repelTaskStatistical.getModelCount(), new TypeReference<List<ModelCount>>() {});
-        List<ModelCount> modelCountList= new ArrayList<>();
+        List<ModelCount> modelCountList= JacksonUtil.readValue(repelTaskStatistical.getModelCount(), new TypeReference<List<ModelCount>>() {});
+//        List<ModelCount> modelCountList= new ArrayList<>();
         modelCountList.forEach(
                 modelCount -> {
                     map.put(modelCount.getModel(),0);

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

@@ -60,8 +60,10 @@ public class RepelQueryServiceImpl implements RepelQueryService {
     public DeviceRepelDetail findDeviceRepelDetail(Integer taskId) {
          TaskBto taskBto= taskService.get(taskId);
         DeviceRepelDetail deviceRepelDetail=  repelDetailService.findDeviceRepelDetail(taskBto.getBillId());
-        deviceRepelDetail.setScripts(JacksonUtil.readValue(deviceRepelDetail.getScriptJson(), new TypeReference<List<ScriptSaveVo>>() {
-        }));
+        if (deviceRepelDetail.getScriptJson()!=null) {
+            deviceRepelDetail.setScripts(JacksonUtil.readValue(deviceRepelDetail.getScriptJson(), new TypeReference<List<ScriptSaveVo>>() {
+            }));
+        }
         return deviceRepelDetail;
     }