报汛调整

guoshilong

2023-05-18 3de5848ecc5984b31ae847d216f3881924f9d927

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

@@ -137,8 +137,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 +155,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 +205,11 @@
      return baseMapper.customizeGetById(businessId);
   }

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

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