pms 单井 队伍 左侧树层级

yudao-module-pms/yudao-module-pms-biz/src/main/java/cn/iocoder/yudao/module/pms/controller/admin/iotprojecttask/IotProjectTaskController.java

@@ -10,20 +10,17 @@ import cn.iocoder.yudao.framework.common.util.object.BeanUtils;
 import cn.iocoder.yudao.framework.datapermission.core.util.DataPermissionUtils;
 import cn.iocoder.yudao.framework.excel.core.util.ExcelUtils;
 import cn.iocoder.yudao.module.pms.controller.admin.iotprojectinfo.vo.IotProjectInfoPageReqVO;
-import cn.iocoder.yudao.module.pms.controller.admin.iotprojecttask.vo.IotProjectTaskPageReqVO;
-import cn.iocoder.yudao.module.pms.controller.admin.iotprojecttask.vo.IotProjectTaskPlatformVO;
-import cn.iocoder.yudao.module.pms.controller.admin.iotprojecttask.vo.IotProjectTaskRespVO;
-import cn.iocoder.yudao.module.pms.controller.admin.iotprojecttask.vo.IotTaskSaveVO;
+import cn.iocoder.yudao.module.pms.controller.admin.iotprojecttask.vo.*;
 import cn.iocoder.yudao.module.pms.controller.admin.iotrddailyreport.vo.IotRdDailyReportPageReqVO;
 import cn.iocoder.yudao.module.pms.controller.admin.iotrddailyreport.vo.IotRdDailyReportStatisticsItemVO;
 import cn.iocoder.yudao.module.pms.dal.dataobject.iotprojectinfo.IotProjectInfoDO;
 import cn.iocoder.yudao.module.pms.dal.dataobject.iotprojecttask.IotProjectTaskDO;
 import cn.iocoder.yudao.module.pms.dal.dataobject.iotprojecttaskattrs.IotTaskAttrModelProperty;
 import cn.iocoder.yudao.module.pms.dal.dataobject.iotrddailyreport.IotRdDailyReportDO;
+import cn.iocoder.yudao.module.pms.dal.mysql.iotprojectinfo.IotProjectInfoMapper;
 import cn.iocoder.yudao.module.pms.dal.mysql.iotrddailyreport.IotRdDailyReportMapper;
 import cn.iocoder.yudao.module.pms.service.iotprojectinfo.IotProjectInfoService;
 import cn.iocoder.yudao.module.pms.service.iotprojecttask.IotProjectTaskService;
-import cn.iocoder.yudao.module.pms.service.iotrddailyreport.IotRdDailyReportService;
 import cn.iocoder.yudao.module.system.dal.dataobject.dept.DeptDO;
 import cn.iocoder.yudao.module.system.service.dept.DeptService;
 import io.swagger.v3.oas.annotations.Operation;
@@ -62,7 +59,7 @@ public class IotProjectTaskController {
     @Resource
     private IotRdDailyReportMapper iotRdDailyReportMapper;
     @Resource
-    private IotRdDailyReportService iotRdDailyReportService;
+    private IotProjectInfoMapper iotProjectInfoMapper;
 
     @PostMapping("/create")
     @Operation(summary = "创建项目信息任务拆分")
@@ -362,6 +359,41 @@ public class IotProjectTaskController {
         return success(BeanUtils.toBean(wellNames, IotProjectTaskRespVO.class));
     }
 
+    @GetMapping("/taskTreeWellNames")
+    @Operation(summary = "查看某个专业公司下去重后的所有任务列表 构建树层级关系")
+    @PreAuthorize("@ss.hasPermission('rq:iot-project-task:query')")
+    public CommonResult<List<IotProjectTaskTreeRespVO>> taskTreeWellNames(IotProjectTaskPageReqVO pageReqVO) {
+        IotProjectInfoPageReqVO projectReqVO = new IotProjectInfoPageReqVO();
+        projectReqVO.setDeptId(pageReqVO.getCompanyId());
+        projectReqVO.setContractName(pageReqVO.getSearchKey());
+        List<IotProjectInfoDO> projects = iotProjectInfoMapper.sortedProjects(projectReqVO);
+        List<IotProjectTaskTreeRespVO> results = new ArrayList<>();
+
+        if (CollUtil.isNotEmpty(projects)) {
+            projects.forEach(project -> {
+                IotProjectTaskTreeRespVO tempProject = new IotProjectTaskTreeRespVO();
+                tempProject.setType("1");
+                tempProject.setProjectId(project.getId());
+                tempProject.setProjectName(project.getContractName());
+                tempProject.setProjectCreateTime(project.getCreateTime());
+                results.add(tempProject);
+            });
+        }
+        List<IotProjectTaskDO> wellNames = iotProjectTaskService.taskWellNames(pageReqVO);
+        if (CollUtil.isNotEmpty(wellNames)) {
+            wellNames.forEach(wellName -> {
+                IotProjectTaskTreeRespVO tempTask = new IotProjectTaskTreeRespVO();
+                tempTask.setType("2");
+                tempTask.setProjectId(wellName.getProjectId());
+                tempTask.setTaskId(wellName.getId());
+                tempTask.setWellName(wellName.getWellName());
+                tempTask.setTaskCreateTime(wellName.getCreateTime());
+                results.add(tempTask);
+            });
+        }
+        return success(results);
+    }
+
     private List<IotProjectTaskRespVO> buildProjectTaskList(List<IotProjectTaskDO> tasks) {
         if (CollUtil.isEmpty(tasks)) {
             return Collections.emptyList();

yudao-module-pms/yudao-module-pms-biz/src/main/java/cn/iocoder/yudao/module/pms/controller/admin/iotprojecttask/vo/IotProjectTaskTreeRespVO.java

@@ -0,0 +1,35 @@
+package cn.iocoder.yudao.module.pms.controller.admin.iotprojecttask.vo;
+
+import com.alibaba.excel.annotation.ExcelIgnoreUnannotated;
+import io.swagger.v3.oas.annotations.media.Schema;
+import lombok.Data;
+
+import java.time.LocalDateTime;
+
+@Schema(description = "管理后台 - 项目信息任务拆分 Response VO")
+@Data
+@ExcelIgnoreUnannotated
+public class IotProjectTaskTreeRespVO {
+
+    @Schema(description = "项目合同id", example = "298")
+    private Long projectId;
+
+    @Schema(description = "任务井id", example = "29")
+    private Long taskId;
+
+    @Schema(description = "节点类型 项目1 任务井2", example = "1")
+    private String type;
+
+    @Schema(description = "井号", example = "赵六")
+    private String wellName;
+
+    @Schema(description = "项目合同名称", example = "数智化项目一期")
+    private String projectName;
+
+    @Schema(description = "项目创建时间", example = "2025-12-25")
+    private LocalDateTime projectCreateTime;
+
+    @Schema(description = "任务创建时间", example = "2025-12-25")
+    private LocalDateTime taskCreateTime;
+
+}

yudao-module-pms/yudao-module-pms-biz/src/main/java/cn/iocoder/yudao/module/pms/dal/mysql/iotprojectinfo/IotProjectInfoMapper.java

@@ -84,5 +84,28 @@ public interface IotProjectInfoMapper extends BaseMapperX<IotProjectInfoDO> {
                 .likeIfPresent(IotProjectInfoDO::getRemark, reqVO.getRemark()));
     }
 
+    default List<IotProjectInfoDO> sortedProjects(IotProjectInfoPageReqVO reqVO) {
+        return selectList(new LambdaQueryWrapperX<IotProjectInfoDO>()
+                .inIfPresent(IotProjectInfoDO::getId,  reqVO.getProjectIds())
+                .eqIfPresent(IotProjectInfoDO::getDeptId, reqVO.getDeptId())
+                .likeIfPresent(IotProjectInfoDO::getManufactureName, reqVO.getManufactureName())
+                .likeIfPresent(IotProjectInfoDO::getDeptName, reqVO.getDeptName())
+                .likeIfPresent(IotProjectInfoDO::getContractName, reqVO.getContractName())
+                .eqIfPresent(IotProjectInfoDO::getContractCode, reqVO.getContractCode())
+                .eqIfPresent(IotProjectInfoDO::getWorkloadTotal, reqVO.getWorkloadTotal())
+                .eqIfPresent(IotProjectInfoDO::getWorkloadFinish, reqVO.getWorkloadFinish())
+                .betweenIfPresent(IotProjectInfoDO::getStartTime, reqVO.getStartTime())
+                .betweenIfPresent(IotProjectInfoDO::getEndTime, reqVO.getEndTime())
+                .eqIfPresent(IotProjectInfoDO::getLocation, reqVO.getLocation())
+                .eqIfPresent(IotProjectInfoDO::getTechnique, reqVO.getTechnique())
+                .eqIfPresent(IotProjectInfoDO::getPayment, reqVO.getPayment())
+                .betweenIfPresent(IotProjectInfoDO::getCreateTime, reqVO.getCreateTime())
+                .likeIfPresent(IotProjectInfoDO::getUserName, reqVO.getUserName())
+                .eqIfPresent(IotProjectInfoDO::getManufacturerId, reqVO.getManufacturerId())
+                .eqIfPresent(IotProjectInfoDO::getUserId, reqVO.getUserId())
+                .likeIfPresent(IotProjectInfoDO::getRemark, reqVO.getRemark())
+                .orderByDesc(IotProjectInfoDO::getCreateTime));
+    }
+
     List<IotProjectInfoDO> projectList();
 }