Merge remote-tracking branch 'origin/master'

xiebin

2026-01-22 c680e9ae370e75fbf90d54192d0f6cf2e8fc619a

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

@@ -28,7 +28,11 @@
import org.springframework.transaction.annotation.Transactional;
import org.sxkj.common.constant.WordOrderConstant;
import org.sxkj.common.utils.OrderNumUtils;
import org.springblade.core.tool.api.R;
import org.springblade.core.tool.constant.BladeConstant;
import org.springblade.core.tool.utils.StringUtil;
import org.sxkj.gd.workorder.entity.GdPatrolTaskEntity;
import org.sxkj.gd.workorder.entity.GdTaskResultEntity;
import org.sxkj.gd.workorder.entity.GdWorkOrderEntity;
import org.sxkj.gd.workorder.entity.GdWorkOrderFlowEntity;
import org.sxkj.gd.workorder.enums.PatrolTaskStatusEnum;
@@ -39,9 +43,16 @@
import org.sxkj.gd.workorder.param.GdPatrolTaskAuditParam;
import org.sxkj.gd.workorder.param.GdPatrolTaskPageParam;
import org.sxkj.gd.workorder.service.IGdPatrolTaskService;
import org.sxkj.gd.workorder.service.IGdTaskResultService;
import org.sxkj.gd.workorder.service.IGdWorkOrderFlowService;
import org.sxkj.gd.workorder.utils.GdPatrolReportWordUtil;
import org.sxkj.gd.workorder.vo.GdPatrolTaskVO;
import org.sxkj.system.entity.Dept;
import org.sxkj.system.entity.User;
import org.sxkj.system.feign.ISysClient;
import org.sxkj.system.feign.IUserClient;

import java.io.File;
import java.util.Date;
import java.util.List;

@@ -59,7 +70,12 @@

    // @Autowired
    // private IGdWorkOrderService gdWorkOrderService;

   @Autowired
   private ISysClient sysClient;
   @Autowired
   private IUserClient userClient;
   @Autowired
   private IGdTaskResultService gdTaskResultService;
    @Override
    public IPage<GdPatrolTaskVO> selectGdPatrolTaskPage(IPage<GdPatrolTaskVO> page, GdPatrolTaskPageParam gdPatrolTask, List<Long> deptIdList) {
        return page.setRecords(baseMapper.selectGdPatrolTaskPage(page, gdPatrolTask, deptIdList));
@@ -277,10 +293,10 @@

    @Override
    @Transactional(rollbackFor = Exception.class)
    public boolean republishPatrolTask(GdPatrolTaskEntity taskEntity) {
   public boolean republishPatrolTask(GdPatrolTaskEntity taskEntity) {
        if (taskEntity == null || taskEntity.getId() == null) {
            throw new RuntimeException("任务信息或ID不能为空");
        }
      }

        // 1. 验证任务是否存在
        GdPatrolTaskEntity existingTask = getById(taskEntity.getId());
@@ -336,6 +352,27 @@

        return gdWorkOrderFlowService.save(flowEntity);
    }

   @Override
   public File exportPatrolReport(Long patrolTaskId) {
      if (patrolTaskId == null) {
         throw new RuntimeException("巡查任务主键不能为空");
      }
      GdPatrolTaskEntity taskEntity = getById(patrolTaskId);
      if (taskEntity == null) {
         throw new RuntimeException("巡查任务不存在");
      }
      List<GdTaskResultEntity> resultList = gdTaskResultService.list(Wrappers.<GdTaskResultEntity>lambdaQuery()
         .eq(GdTaskResultEntity::getPatrolTaskId, patrolTaskId)
         .eq(GdTaskResultEntity::getIsDeleted, BladeConstant.DB_NOT_DELETED));
      String creatorName = getUserName(taskEntity.getCreateUser());
      String deptName = getDeptName(taskEntity.getCreateDept());
      try {
         return GdPatrolReportWordUtil.generateReportFile(taskEntity, resultList, creatorName, deptName);
      } catch (Exception e) {
         throw new RuntimeException("生成巡查报告失败", e);
      }
   }


    /**
@@ -411,5 +448,33 @@
        return baseDesc + newStatus.getDesc();
    }

   private String getDeptName(Long deptId) {
      if (deptId == null) {
         return "/";
      }
      R<Dept> deptResult = sysClient.getDept(deptId);
      Dept dept = deptResult != null ? deptResult.getData() : null;
      if (dept == null || StringUtil.isBlank(dept.getDeptName())) {
         return "/";
      }
      return dept.getDeptName();
   }

   private String getUserName(Long userId) {
      if (userId == null) {
         return "/";
      }
      R<User> userResult = userClient.userInfoById(userId);
      User user = userResult != null ? userResult.getData() : null;
      if (user == null) {
         return "/";
      }
      String realName = user.getRealName();
      if (StringUtil.isBlank(realName)) {
         realName = user.getName();
      }
      return StringUtil.isBlank(realName) ? "/" : realName;
   }


}