Merge remote-tracking branch 'origin/demo_' into demo_

platform-service/src/main/java/com/platform/service/fill/impl/FillGatherTaskServiceImpl.java

@@ -64,6 +64,11 @@ public class FillGatherTaskServiceImpl extends BaseServiceImpl<FillGatherTaskMap
     private void deleteDetails(List<String> detailIds,String taskId){
         StringBuilder ids = new StringBuilder();
         for(int i=0;i<detailIds.size();i++){
+            String id = detailIds.get(i);
+            // 判断是否已填报，未填报的设备不允许删除
+            if(fillGatherTaskDetailMapper.selectByPrimaryKey(id).getStatus() == 0){
+                throw new DeniedException("未填报的设备不允许删除，请在填报后进行删除");
+            }
             FillGatherTaskDetail detail = new FillGatherTaskDetail();
             detail.setId(detailIds.get(i));
             ids.append(detail.getId()).append("&");
@@ -187,6 +192,11 @@ public class FillGatherTaskServiceImpl extends BaseServiceImpl<FillGatherTaskMap
                 }
                 task.setTotalNum(task1.getTotalNum() + dto.getSbIds().size());
                 task.setWaitNum(task1.getTotalNum() + dto.getSbIds().size());
+                // 如果之前任务状态为巡检完成或者待审核，修改任务状态
+                if(task1.getStatus() == FillGatherTaskStatusEnum.COMPLETED.getValue() ||
+                        task1.getStatus() == FillGatherTaskStatusEnum.SUCCESS.getValue()){
+                    task.setStatus(FillGatherTaskStatusEnum.PROCESSING.getValue());
+                }
                 //新增明细,调用saveDetail方法
                 String content = getContentByGatherId(task1.getGatherId());
                 saveDetails(content, dto.getSbIds(), dto.getSortNums(), task.getId());