guoshilong
2023-05-24 4d07c1c65427f6ba3cb968ddf0d0b2b669187575
skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/patrol/service/impl/PatrolTaskServiceImpl.java
@@ -199,7 +199,7 @@
   }
   @Override
   public PatrolTask customizeGetById(String businessId) {
   public PatrolTaskVO customizeGetById(String businessId) {
      return baseMapper.customizeGetById(businessId);
   }
@@ -209,19 +209,35 @@
   }
   @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);
         list =  baseMapper.getTaskReportProvincePage(page,patrolTaskReport);
      }else if (Func.equals(patrolTaskReport.getRegionFlag(),"1")){
         //市 返回区
         list = baseMapper.getTaskReportRegion(page,patrolTaskReport);
         list = baseMapper.getTaskReportRegionPage(page,patrolTaskReport);
      }else if (Func.equals(patrolTaskReport.getRegionFlag(),"2")){
         //区 返回水库
         list = baseMapper.getTaskReportReservoir(page,patrolTaskReport);
         list = baseMapper.getTaskReportReservoirPage(page,patrolTaskReport);
      }
      return page.setRecords(list);
   }
   @Override
   public List<PatrolTaskReport> getTaskReportList(PatrolTaskReport patrolTaskReport) {
      List<PatrolTaskReport> list = new ArrayList();
      if (Func.equals(patrolTaskReport.getRegionFlag(),"0")){
         //省  返回市
         list =  baseMapper.getTaskReportProvinceList(patrolTaskReport);
      }else if (Func.equals(patrolTaskReport.getRegionFlag(),"1")){
         //市 返回区
         list = baseMapper.getTaskReportRegionList(patrolTaskReport);
      }else if (Func.equals(patrolTaskReport.getRegionFlag(),"2")){
         //区 返回水库
         list = baseMapper.getTaskReportReservoirList(patrolTaskReport);
      }
      return list;
   }
   @Override
@@ -245,6 +261,8 @@
      return page.setRecords(list);
   }
   public void saveReport(PatrolTask patrolTask){
      //拿到当前任务下的异常巡查记录
      PatrolRecord patrolRecord = new PatrolRecord();