Merge remote-tracking branch 'origin/feature-Contract-8.12-wyw' into feature-Contract-8.12-wyw

yudao-module-cms/yudao-module-cms-biz/src/main/java/cn/iocoder/yudao/module/cms/dal/dataobject/contract/ProjectScheduleDetailRespDO.java

@@ -0,0 +1,13 @@
+package cn.iocoder.yudao.module.cms.dal.dataobject.contract;
+
+import lombok.Data;
+
+@Data
+public class ProjectScheduleDetailRespDO extends ContractDO{
+
+    /**
+     * 项目负责人
+     */
+    private String projectManager;
+
+}

yudao-module-cms/yudao-module-cms-biz/src/main/java/cn/iocoder/yudao/module/cms/dal/dataobject/contract/ProjectTrackDetailRespDO.java

@@ -0,0 +1,31 @@
+package cn.iocoder.yudao.module.cms.dal.dataobject.contract;
+
+import lombok.Data;
+
+import java.math.BigDecimal;
+
+@Data
+public class ProjectTrackDetailRespDO extends ContractDO{
+
+    /**
+     * 项目编号
+     */
+    private String code;
+
+    /**
+     * 出图公司
+     */
+    private String drawingCompany;
+
+    /**
+     * 主控部门
+     */
+    private String trackingDepName;
+
+    /**
+     * 预计合同金额
+     */
+    private BigDecimal expectedContractAmount;
+
+
+}

yudao-module-pms/yudao-module-pms-api/src/main/java/cn/iocoder/yudao/module/pms/api/projectschedule/ProjectScheduleApi.java

@@ -0,0 +1,15 @@
+package cn.iocoder.yudao.module.pms.api.projectschedule;
+
+import cn.iocoder.yudao.module.pms.api.projectschedule.dto.ProjectScheduleDetailRespDTO;
+import cn.iocoder.yudao.module.pms.api.projecttracking.dto.ProjectTrackDetailRespDTO;
+
+public interface ProjectScheduleApi {
+    /**
+     * 获得项目进度信息
+     * @param id 项目进度信息id
+     * @return ProjectScheduleDetailRespDTO
+     */
+    ProjectScheduleDetailRespDTO getProjectScheduleDetail(Long id);
+
+    ProjectScheduleDetailRespDTO getProjectTrackDetailByProjectId(Long projectId);
+}

yudao-module-pms/yudao-module-pms-api/src/main/java/cn/iocoder/yudao/module/pms/api/projectschedule/dto/ProjectScheduleDetailRespDTO.java

@@ -0,0 +1,13 @@
+package cn.iocoder.yudao.module.pms.api.projectschedule.dto;
+
+import lombok.Data;
+
+@Data
+public class ProjectScheduleDetailRespDTO {
+
+    /**
+     * 项目负责人
+     */
+    private String projectManager;
+
+}

yudao-module-pms/yudao-module-pms-api/src/main/java/cn/iocoder/yudao/module/pms/api/projecttracking/ProjectTrackingApi.java

@@ -0,0 +1,15 @@
+package cn.iocoder.yudao.module.pms.api.projecttracking;
+
+import cn.iocoder.yudao.module.pms.api.projecttracking.dto.ProjectTrackDetailRespDTO;
+
+public interface ProjectTrackingApi {
+    /**
+     * 获得项目追踪信息
+     * @param id 项目追踪信息id
+     * @return ProjectScheduleDetailRespDTO
+     */
+    ProjectTrackDetailRespDTO getProjectTrackDetail(Long id);
+
+
+
+}

yudao-module-pms/yudao-module-pms-api/src/main/java/cn/iocoder/yudao/module/pms/api/projecttracking/dto/ProjectTrackDetailRespDTO.java

@@ -0,0 +1,32 @@
+package cn.iocoder.yudao.module.pms.api.projecttracking.dto;
+
+import lombok.Data;
+
+import java.math.BigDecimal;
+
+@Data
+public class ProjectTrackDetailRespDTO {
+
+    /**
+     * 项目编号
+     */
+    private String code;
+
+    /**
+     * 出图公司
+     */
+    private String drawingCompany;
+
+    /**
+     * 主控部门
+     */
+    private String trackingDepName;
+
+    /**
+     * 预计合同金额
+     */
+    private BigDecimal expectedContractAmount;
+
+
+
+}

yudao-module-pms/yudao-module-pms-biz/src/main/java/cn/iocoder/yudao/module/pms/api/project/ProjectImpl.java

@@ -1,44 +0,0 @@
-package cn.iocoder.yudao.module.pms.api.project;
-
-import cn.iocoder.yudao.framework.common.util.object.BeanUtils;
-import cn.iocoder.yudao.module.pms.api.project.dto.ProjectDetailRespDTO;
-import cn.iocoder.yudao.module.pms.api.project.dto.ProjectRespDTO;
-import cn.iocoder.yudao.module.pms.dal.dataobject.project.ProjectDO;
-import cn.iocoder.yudao.module.pms.dal.dataobject.project.ProjectDetailDO;
-import cn.iocoder.yudao.module.pms.dal.mysql.project.ProjectMapper;
-import jakarta.annotation.Resource;
-import org.springframework.stereotype.Service;
-import org.springframework.validation.annotation.Validated;
-
-import static cn.iocoder.yudao.framework.common.exception.util.ServiceExceptionUtil.exception;
-import static cn.iocoder.yudao.module.pms.enums.ErrorCodeConstants.PROJECT_NOT_EXISTS;
-
-@Service
-@Validated
-public class ProjectImpl implements ProjectApi {
-
-
-    @Resource
-    private ProjectMapper projectMapper;
-
-
-    @Override
-    public ProjectRespDTO getProject(Long projectId) {
-        ProjectDO projectDO = projectMapper.selectById(projectId);
-        return BeanUtils.toBean(projectDO, ProjectRespDTO.class);
-    }
-
-    @Override
-    public ProjectDetailRespDTO getProjectDetailById(Long projectId) {
-        ProjectDetailDO projectMapperDetail = projectMapper.getDetailById(projectId);
-        return BeanUtils.toBean(projectMapperDetail, ProjectDetailRespDTO.class);
-    }
-
-    @Override
-    public void validProjectExist(Long projectId) {
-        if (projectMapper.selectById(projectId) == null) {
-            throw exception(PROJECT_NOT_EXISTS);
-        }
-    }
-
-}

yudao-module-pms/yudao-module-pms-biz/src/main/java/cn/iocoder/yudao/module/pms/api/projectschedule/ProjectScheduleImpl.java

@@ -0,0 +1,31 @@
+package cn.iocoder.yudao.module.pms.api.projectschedule;
+
+import cn.iocoder.yudao.framework.common.util.object.BeanUtils;
+import cn.iocoder.yudao.module.pms.api.projectschedule.dto.ProjectScheduleDetailRespDTO;
+import cn.iocoder.yudao.module.pms.dal.dataobject.projectschedule.ProjectScheduleDO;
+import cn.iocoder.yudao.module.pms.service.projectschedule.ProjectScheduleService;
+import jakarta.annotation.Resource;
+import org.springframework.stereotype.Service;
+import org.springframework.validation.annotation.Validated;
+
+@Service
+@Validated
+public class ProjectScheduleImpl implements ProjectScheduleApi {
+
+    @Resource
+    private ProjectScheduleService projectScheduleService;
+
+
+    @Override
+    public ProjectScheduleDetailRespDTO getProjectScheduleDetail(Long id) {
+
+        ProjectScheduleDO projectSchedule = projectScheduleService.getProjectSchedule(id);
+        return BeanUtils.toBean(projectSchedule,ProjectScheduleDetailRespDTO.class);
+    }
+
+    @Override
+    public ProjectScheduleDetailRespDTO getProjectTrackDetailByProjectId(Long projectId) {
+        ProjectScheduleDO projectScheduleByProjectId = projectScheduleService.getProjectScheduleByProjectId(projectId);
+        return BeanUtils.toBean(projectScheduleByProjectId,ProjectScheduleDetailRespDTO.class);
+    }
+}

yudao-module-pms/yudao-module-pms-biz/src/main/java/cn/iocoder/yudao/module/pms/api/projecttracking/ProjectTrackingImpl.java

@@ -0,0 +1,23 @@
+package cn.iocoder.yudao.module.pms.api.projecttracking;
+
+import cn.iocoder.yudao.framework.common.util.object.BeanUtils;
+import cn.iocoder.yudao.module.pms.api.projecttracking.dto.ProjectTrackDetailRespDTO;
+import cn.iocoder.yudao.module.pms.dal.dataobject.projecttracking.ProjectTrackingDO;
+import cn.iocoder.yudao.module.pms.service.projecttracking.ProjectTrackingService;
+import jakarta.annotation.Resource;
+import org.springframework.stereotype.Service;
+import org.springframework.validation.annotation.Validated;
+@Service
+@Validated
+public class ProjectTrackingImpl implements ProjectTrackingApi {
+
+    @Resource
+    private ProjectTrackingService projectTrackingService;
+
+    @Override
+    public ProjectTrackDetailRespDTO getProjectTrackDetail(Long id) {
+        ProjectTrackingDO projectTracking = projectTrackingService.getProjectTracking(id);
+        return BeanUtils.toBean(projectTracking, ProjectTrackDetailRespDTO.class);
+    }
+
+}

yudao-module-pms/yudao-module-pms-biz/src/main/java/cn/iocoder/yudao/module/pms/controller/admin/projectschedule/vo/ProjectSchedulePageReqVO.java

@@ -1,7 +1,6 @@
 package cn.iocoder.yudao.module.pms.controller.admin.projectschedule.vo;
 
 import lombok.*;
-import java.util.*;
 import io.swagger.v3.oas.annotations.media.Schema;
 import cn.iocoder.yudao.framework.common.pojo.PageParam;
 import java.math.BigDecimal;
@@ -84,24 +83,4 @@ public class ProjectSchedulePageReqVO extends PageParam {
     @Schema(description = "最后编辑人")
     private String finalEditor;
 
-    @Schema(description = "创建人")
-    private String creator;
-
-    @Schema(description = "创建时间")
-    @DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND)
-    private LocalDateTime[] createTime;
-
-    @Schema(description = "更新人")
-    private String updator;
-
-    @Schema(description = "更新时间")
-    @DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND)
-    private LocalDateTime[] updateTime;
-
-    @Schema(description = "是否删除")
-    private Boolean deleted;
-
-    @Schema(description = "租户id", example = "1")
-    private Long tenantId;
-
 }

yudao-module-pms/yudao-module-pms-biz/src/main/java/cn/iocoder/yudao/module/pms/controller/admin/projectschedule/vo/ProjectScheduleRespVO.java

@@ -105,28 +105,4 @@ public class ProjectScheduleRespVO {
     @ExcelProperty("最后编辑人")
     private String finalEditor;
 
-    @Schema(description = "创建人", requiredMode = Schema.RequiredMode.REQUIRED)
-    @ExcelProperty("创建人")
-    private String creator;
-
-    @Schema(description = "创建时间")
-    @ExcelProperty("创建时间")
-    private LocalDateTime createTime;
-
-    @Schema(description = "更新人", requiredMode = Schema.RequiredMode.REQUIRED)
-    @ExcelProperty("更新人")
-    private String updator;
-
-    @Schema(description = "更新时间")
-    @ExcelProperty("更新时间")
-    private LocalDateTime updateTime;
-
-    @Schema(description = "是否删除", requiredMode = Schema.RequiredMode.REQUIRED)
-    @ExcelProperty("是否删除")
-    private Boolean deleted;
-
-    @Schema(description = "租户id", requiredMode = Schema.RequiredMode.REQUIRED, example = "1")
-    @ExcelProperty("租户id")
-    private Long tenantId;
-
 }

yudao-module-pms/yudao-module-pms-biz/src/main/java/cn/iocoder/yudao/module/pms/controller/admin/projectschedule/vo/ProjectScheduleSaveReqVO.java

@@ -91,26 +91,5 @@ public class ProjectScheduleSaveReqVO {
     @Schema(description = "最后编辑人")
     private String finalEditor;
 
-    @Schema(description = "创建人", requiredMode = Schema.RequiredMode.REQUIRED)
-    @NotEmpty(message = "创建人不能为空")
-    private String creator;
-
-    @Schema(description = "创建时间")
-    private LocalDateTime createTime;
-
-    @Schema(description = "更新人", requiredMode = Schema.RequiredMode.REQUIRED)
-    @NotEmpty(message = "更新人不能为空")
-    private String updator;
-
-    @Schema(description = "更新时间")
-    private LocalDateTime updateTime;
-
-    @Schema(description = "是否删除", requiredMode = Schema.RequiredMode.REQUIRED)
-    @NotNull(message = "是否删除不能为空")
-    private Boolean deleted;
-
-    @Schema(description = "租户id", requiredMode = Schema.RequiredMode.REQUIRED, example = "1")
-    @NotNull(message = "租户id不能为空")
-    private Long tenantId;
 
 }

yudao-module-pms/yudao-module-pms-biz/src/main/java/cn/iocoder/yudao/module/pms/controller/admin/projecttracking/vo/ProjectTrackingPageReqVO.java

@@ -1,5 +1,6 @@
 package cn.iocoder.yudao.module.pms.controller.admin.projecttracking.vo;
 
+import com.alibaba.excel.annotation.ExcelProperty;
 import lombok.*;
 import java.util.*;
 import io.swagger.v3.oas.annotations.media.Schema;
@@ -16,6 +17,7 @@ import static cn.iocoder.yudao.framework.common.util.date.DateUtils.FORMAT_YEAR_
 @ToString(callSuper = true)
 public class ProjectTrackingPageReqVO extends PageParam {
 
+
     @Schema(description = "跟踪项目名称", example = "张三")
     private String name;
 

yudao-module-pms/yudao-module-pms-biz/src/main/java/cn/iocoder/yudao/module/pms/controller/admin/projecttracking/vo/ProjectTrackingSaveReqVO.java

@@ -1,5 +1,6 @@
 package cn.iocoder.yudao.module.pms.controller.admin.projecttracking.vo;
 
+import com.alibaba.excel.annotation.ExcelProperty;
 import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.*;
 import java.util.*;

yudao-module-pms/yudao-module-pms-biz/src/main/java/cn/iocoder/yudao/module/pms/dal/dataobject/projectschedule/ProjectScheduleDO.java

@@ -1,17 +1,10 @@
 package cn.iocoder.yudao.module.pms.dal.dataobject.projectschedule;
 
 import lombok.*;
-import java.util.*;
+
 import java.time.LocalDateTime;
 import java.math.BigDecimal;
-import java.math.BigDecimal;
+
-import java.math.BigDecimal;
-import java.math.BigDecimal;
-import java.math.BigDecimal;
-import java.math.BigDecimal;
-import java.time.LocalDateTime;
-import java.time.LocalDateTime;
-import java.time.LocalDateTime;
 import com.baomidou.mybatisplus.annotation.*;
 import cn.iocoder.yudao.framework.mybatis.core.dataobject.BaseDO;
 
@@ -123,9 +116,5 @@ public class ProjectScheduleDO extends BaseDO {
      * 最后编辑人
      */
     private String finalEditor;
-    /**
-     * 更新人
-     */
-    private String updator;
 
 }

yudao-module-pms/yudao-module-pms-biz/src/main/java/cn/iocoder/yudao/module/pms/dal/dataobject/projecttracking/ProjectTrackingDO.java

@@ -40,6 +40,7 @@ public class ProjectTrackingDO extends BaseDO {
      */
     @TableId
     private Long id;
+
     /**
      * 跟踪项目名称
      */
@@ -81,11 +82,11 @@ public class ProjectTrackingDO extends BaseDO {
     /**
      * 建设方
      */
-    private BigDecimal constructionSide;
+    private String constructionSide;
     /**
      * 发包人
      */
-    private BigDecimal lettingPartyPeople;
+    private String lettingPartyPeople;
     /**
      * 客户联系人
      */

yudao-module-pms/yudao-module-pms-biz/src/main/java/cn/iocoder/yudao/module/pms/dal/mysql/projectschedule/ProjectScheduleMapper.java

@@ -40,12 +40,8 @@ public interface ProjectScheduleMapper extends BaseMapperX<ProjectScheduleDO> {
                 .eqIfPresent(ProjectScheduleDO::getChoose, reqVO.getChoose())
                 .eqIfPresent(ProjectScheduleDO::getCompletionFileUrl, reqVO.getCompletionFileUrl())
                 .eqIfPresent(ProjectScheduleDO::getFinalEditor, reqVO.getFinalEditor())
-                .eqIfPresent(ProjectScheduleDO::getCreator, reqVO.getCreator())
-                .betweenIfPresent(ProjectScheduleDO::getCreateTime, reqVO.getCreateTime())
-                .eqIfPresent(ProjectScheduleDO::getUpdator, reqVO.getUpdator())
-                .betweenIfPresent(ProjectScheduleDO::getUpdateTime, reqVO.getUpdateTime())
-                .eqIfPresent(ProjectScheduleDO::getDeleted, reqVO.getDeleted())
                 .orderByDesc(ProjectScheduleDO::getId));
     }
 
+
 }

yudao-module-pms/yudao-module-pms-biz/src/main/java/cn/iocoder/yudao/module/pms/service/projectschedule/ProjectScheduleService.java

@@ -50,4 +50,7 @@ public interface ProjectScheduleService {
      */
     PageResult<ProjectScheduleDO> getProjectSchedulePage(ProjectSchedulePageReqVO pageReqVO);
 
+
+    ProjectScheduleDO getProjectScheduleByProjectId(Long id);
+
 }

yudao-module-pms/yudao-module-pms-biz/src/main/java/cn/iocoder/yudao/module/pms/service/projectschedule/ProjectScheduleServiceImpl.java

@@ -1,5 +1,6 @@
 package cn.iocoder.yudao.module.pms.service.projectschedule;
 
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import org.springframework.stereotype.Service;
 import jakarta.annotation.Resource;
 import org.springframework.validation.annotation.Validated;
@@ -11,6 +12,8 @@ import cn.iocoder.yudao.framework.common.util.object.BeanUtils;
 
 import cn.iocoder.yudao.module.pms.dal.mysql.projectschedule.ProjectScheduleMapper;
 
+import java.util.List;
+
 import static cn.iocoder.yudao.framework.common.exception.util.ServiceExceptionUtil.exception;
 import static cn.iocoder.yudao.module.pms.enums.ErrorCodeConstants.*;
 
@@ -68,4 +71,16 @@ public class ProjectScheduleServiceImpl implements ProjectScheduleService {
         return projectScheduleMapper.selectPage(pageReqVO);
     }
 
+    @Override
+    public ProjectScheduleDO getProjectScheduleByProjectId(Long projectId) {
+        QueryWrapper<ProjectScheduleDO>  queryWrapper = new QueryWrapper<>();
+        queryWrapper.eq("project_id", projectId);
+        queryWrapper.orderByDesc("create_time");
+        List<ProjectScheduleDO> projectScheduleDOS = projectScheduleMapper.selectList(queryWrapper);
+        if (projectScheduleDOS == null || projectScheduleDOS.isEmpty()) {
+            throw exception(PROJECT_SCHEDULE_NOT_EXISTS);
+        }
+        return projectScheduleDOS.get(0);
+    }
+
 }