巡查报表接口修改

guoshilong

2023-07-28 916b76ee90fceff31fe7969db9d9da995d919d52

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

@@ -215,23 +215,14 @@

   @Override
   public IPage<PatrolTaskReport> getTaskReportPage(IPage<PatrolTaskReport> page,PatrolTaskReport patrolTaskReport) {
      List<PatrolTaskReport> list = new ArrayList();
      List<PatrolTaskReport> list  = new ArrayList<>();

      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;
      //获取行政区划统计报表
      if (patrolTaskReport.getRegionFlag().equals("1")){
         list = baseMapper.getRegionReportPage(page,patrolTaskReport);
      }else {
         //获取水库巡查报表
         list = baseMapper.getReservoirReportPage(page,patrolTaskReport);
      }
      return page.setRecords(list);
   }
@@ -240,21 +231,12 @@
   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;
      //获取行政区划统计报表
      if (patrolTaskReport.getRegionFlag().equals("1")){
         list = baseMapper.getRegionReportList(patrolTaskReport);
      }else {
         //获取水库巡查报表
         list = baseMapper.getReservoirReportList(patrolTaskReport);
      }
      return list;
   }
@@ -273,20 +255,9 @@
   public IPage<PatrolTaskReport> getTaskReportDetail(IPage<PatrolTaskReport> page, PatrolTaskReport patrolTaskReport) {

      List<PatrolTaskReport> list = new ArrayList();
      if (Func.isNotEmpty(patrolTaskReport.getReservoirId())){
         //获取该水库的巡查
         list = baseMapper.getTaskReportDetailRegion(page,patrolTaskReport);
      }else {
         String code = patrolTaskReport.getAdCode();
         if (code.substring(0,4).indexOf("00") > -1) {
            //前4位包含00 =》省
            patrolTaskReport.setAdCode(code.substring(0,2));
         } else if (code.substring(0,6).indexOf("00") > -1) {
            //前六位包含00 =》市
            patrolTaskReport.setAdCode(code.substring(0,4));
         }
         list = baseMapper.getTaskReportDetailRegion(page,patrolTaskReport);
      }

      list = baseMapper.getTaskReportDetailRegion(page,patrolTaskReport);

      return page.setRecords(list);
   }