巡查逻辑修改

guoshilong

2023-07-12 b176ddd3a9acdd1eef2e7eb9c0cef5fa620334b4

 skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/patrol/service/impl/PatrolTaskServiceImpl.java

@@ -40,6 +40,7 @@

@Service
@AllArgsConstructor
@Transactional(rollbackFor = Exception.class)
public class PatrolTaskServiceImpl extends BaseServiceImpl<PatrolTaskMapper, PatrolTask> implements IPatrolTaskService {
   private final IFlowClient flowClient;
   private final IPatrolRecordService patrolRecordService;
@@ -153,8 +154,11 @@
         variables.put("taskUser",StringUtil.format("{}{}", TASK_USR_PREFIX, taskUser));
         // 完成任务
         flowClient.completeTask(taskId,processInstanceId,comment,variables);
         //保存巡查记录
         patrolRecordService.saveBatch(patrolTask.getPatrolRecordList());
         saveReport(patrolTask);
         //保存上报
         //停用
//         saveReport(patrolTask);
         return baseMapper.updateById(patrolTask) >0;
      }else {
         return  false;
@@ -199,7 +203,7 @@
   }

   @Override
   public PatrolTask customizeGetById(String businessId) {
   public PatrolTaskVO customizeGetById(String businessId) {
      return baseMapper.customizeGetById(businessId);
   }

@@ -209,19 +213,49 @@
   }

   @Override
   public IPage<PatrolTaskReport> getTaskReport(IPage<PatrolTaskReport> page,PatrolTaskReport patrolTaskReport) {
   public IPage<PatrolTaskReport> getTaskReportPage(IPage<PatrolTaskReport> page,PatrolTaskReport patrolTaskReport) {
      List<PatrolTaskReport> list = new ArrayList();
      if (Func.equals(patrolTaskReport.getRegionFlag(),"0")){
         //省  返回市
         list =  baseMapper.getTaskReportProvince(page,patrolTaskReport);
      }else if (Func.equals(patrolTaskReport.getRegionFlag(),"1")){
         //市 返回区
         list = baseMapper.getTaskReportRegion(page,patrolTaskReport);
      }else if (Func.equals(patrolTaskReport.getRegionFlag(),"2")){
         //区 返回水库
         list = baseMapper.getTaskReportReservoir(page,patrolTaskReport);

      switch (patrolTaskReport.getRegionFlag()){
         case "1": //省  获取市级数据
            list = baseMapper.getCityReportPage(page,patrolTaskReport);
            break;
         case "2"://市   获取区县级数据
            list = baseMapper.getCountyReportPage(page,patrolTaskReport);
            break;
         case "3"://区县 获取乡镇级数据
            list = baseMapper.getTownReportPage(page,patrolTaskReport);
            break;
         case "4"://乡镇  获取水库数据
            list = baseMapper.getReservoirReportPage(page,patrolTaskReport);
            break;
         default:
            break;
      }
      return page.setRecords(list);
   }

   @Override
   public List<PatrolTaskReport> getTaskReportList(PatrolTaskReport patrolTaskReport) {
      List<PatrolTaskReport> list = new ArrayList();

      switch (patrolTaskReport.getRegionFlag()){
         case "1": //省  获取市级数据
            list = baseMapper.getCityReportList(patrolTaskReport);
            break;
         case "2"://市   获取区县级数据
            list = baseMapper.getCountyReportList(patrolTaskReport);
            break;
         case "3"://区县 获取乡镇级数据
            list = baseMapper.getTownReportList(patrolTaskReport);
            break;
         case "4"://乡镇  获取水库数据
            list = baseMapper.getReservoirReportList(patrolTaskReport);
            break;
         default:
            break;
      }
      return list;
   }

   @Override
@@ -245,6 +279,8 @@
      return page.setRecords(list);
   }


   @Transactional(rollbackFor = Exception.class)
   public void saveReport(PatrolTask patrolTask){
      //拿到当前任务下的异常巡查记录
      PatrolRecord patrolRecord = new PatrolRecord();