Merge remote-tracking branch 'origin/master'

zhongrj

2023-11-09 9e754d4c91e41b02a1e39d7ca709ec9491558da2

 src/main/java/org/springblade/modules/task/service/impl/TaskReportForRepairsServiceImpl.java

@@ -28,6 +28,9 @@
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import com.baomidou.mybatisplus.core.metadata.IPage;
import org.springframework.transaction.annotation.Transactional;

import java.util.Date;

/**
 * 报事报修任务表 服务实现类
@@ -84,4 +87,44 @@
      }
      return flag;
   }

   /**
    * 报事报修任务表 自定义修改
    * @param taskReportForRepairs
    * @return
    */
   @Override
   public boolean updateTaskReportForRepairs(TaskReportForRepairsEntity taskReportForRepairs) {
      // 设置参数
      taskReportForRepairs.setUpdateTime(new Date());
      taskReportForRepairs.setUpdateUser(AuthUtil.getUserId());
      // 更新
      return updateById(taskReportForRepairs);
   }

   /**
    * 报事报修任务表 审核
    * @param taskReportForRepairs
    * @return
    */
   @Override
   @Transactional(rollbackFor = Exception.class)
   public boolean checkReportForRepairs(TaskReportForRepairsEntity taskReportForRepairs) {
      boolean flag = false;
      // 设置更新时间
      taskReportForRepairs.setConfirmTime(new Date());
      taskReportForRepairs.setConfirmUserId(AuthUtil.getUserId());
      // 更新数据
      boolean b = updateById(taskReportForRepairs);
      if (b) {
         TaskReportForRepairsEntity entity = getById(taskReportForRepairs.getId());
         // 更新任务表状态
         TaskEntity taskEntity = new TaskEntity();
         taskEntity.setId(entity.getTaskId());
         taskEntity.setStatus(taskReportForRepairs.getConfirmFlag());
         flag = taskService.updateById(taskEntity);
      }
      // 返回
      return flag;
   }
}