巡查报表接口

guoshilong

2023-05-22 1d725aba58f4bec25385ecccb3650032cca06421

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

@@ -15,6 +15,7 @@
import cn.gistack.sm.patrol.util.EnhancementServicesTool;
import cn.gistack.sm.patrol.util.IdWorker;
import cn.gistack.sm.patrol.vo.BladeFlowTask;
import cn.gistack.sm.patrol.vo.PatrolTaskReport;
import cn.gistack.sm.patrol.vo.PatrolTaskVO;
import com.baomidou.mybatisplus.core.metadata.IPage;
import lombok.AllArgsConstructor;
@@ -137,8 +138,8 @@
   }

   @Override
   @Transactional
   public boolean patrolCompleteTask(PatrolTask patrolTask,String currentUserId,String taskUser) {
   @Transactional(rollbackFor = Exception.class)
   public boolean patrolCompleteTask(PatrolTaskVO patrolTask,String currentUserId,String taskUser) {
      R<BladeFlow> res = flowClient.getBladeFlow(patrolTask.getId().toString(),currentUserId);
      if (res.isSuccess()){
         BladeFlow flow = res.getData();
@@ -155,6 +156,7 @@
         variables.put("taskUser",StringUtil.format("{}{}", TASK_USR_PREFIX, taskUser));
         // 完成任务
         flowClient.completeTask(taskId,processInstanceId,comment,variables);
         patrolRecordService.saveBatch(patrolTask.getPatrolRecordList());
         saveReport(patrolTask);
         return baseMapper.updateById(patrolTask) >0;
      }else {
@@ -204,6 +206,22 @@
      return baseMapper.customizeGetById(businessId);
   }

   @Override
   public List<PatrolTask> getAll(PatrolTaskVO patrolTaskVO) {
      return baseMapper.getAll(patrolTaskVO);
   }

   @Override
   public List<PatrolTaskReport> getTaskReport(PatrolTaskReport patrolTaskReport) {

      if (Func.equals(patrolTaskReport.getRegionFlag(),"2")){
         return baseMapper.getTaskReportReservoir(patrolTaskReport);
      }else {
         return baseMapper.getTaskReportRegion(patrolTaskReport);

      }
   }

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