Merge remote-tracking branch 'origin/master'

rain

2026-01-20 cdc60b89add7a32ee458c4b9c27acfdf40fc14fd

 drone-service/drone-gd/src/main/java/org/sxkj/gd/workorder/service/impl/GdPatrolTaskServiceImpl.java

@@ -27,6 +27,8 @@
import org.sxkj.gd.workorder.enums.PatrolTaskStatusEnum;
import org.sxkj.gd.workorder.enums.WorkOrderStatusEnum;
import org.sxkj.gd.workorder.enums.WorkOrderTypeEnum;
import org.sxkj.gd.workorder.param.GdPatrolTaskAuditParam;
import org.sxkj.gd.workorder.param.GdPatrolTaskPageParam;
import org.sxkj.gd.workorder.service.IGdWorkOrderFlowService;
import org.sxkj.gd.workorder.vo.GdPatrolTaskVO;
import org.sxkj.gd.workorder.excel.GdPatrolTaskExcel;
@@ -53,8 +55,8 @@
   private IGdWorkOrderFlowService gdWorkOrderFlowService;

   @Override
   public IPage<GdPatrolTaskVO> selectGdPatrolTaskPage(IPage<GdPatrolTaskVO> page, GdPatrolTaskVO gdPatrolTask) {
      return page.setRecords(baseMapper.selectGdPatrolTaskPage(page, gdPatrolTask));
   public IPage<GdPatrolTaskVO> selectGdPatrolTaskPage(IPage<GdPatrolTaskVO> page, GdPatrolTaskPageParam gdPatrolTask, List<Long> deptIdList) {
      return page.setRecords(baseMapper.selectGdPatrolTaskPage(page, gdPatrolTask, deptIdList));
   }


@@ -108,7 +110,10 @@

   @Override
   @Transactional(rollbackFor = Exception.class)
   public boolean auditPatrolTask(Long id, String auditStatus, String rejectReason) {
   public boolean auditPatrolTask(GdPatrolTaskAuditParam auditParam) {
      Long id = auditParam.getId();
      String auditStatus = auditParam.getAuditStatus();
      String rejectReason = auditParam.getRejectReason();
      // 1. 获取巡查任务
      GdPatrolTaskEntity task = getById(id);
      if (task == null) {
@@ -131,7 +136,7 @@
      }

      // 4. 更新任务状态
      task.setTaskStatus(Byte.valueOf(auditStatus));
      task.setTaskStatus(auditStatus);
      boolean updateResult = updateById(task);
      if (!updateResult) {
         throw new RuntimeException("更新任务状态失败");