hhyykk/ipms-sjy
1
1
Fork 0
mirror of https://gitee.com/hhyykk/ipms-sjy.git synced 2025-07-25 00:15:06 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

[fix] 优化合同管理

Browse Source
This commit is contained in:
wyw
2024-08-14 16:53:38 +08:00
parent 39c410f56e
commit 97c7a8abc8
47 changed files with 426 additions and 904 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
yudao-module-pms/yudao-module-pms-api/src/main/java/cn/iocoder/yudao/module/pms/api/project/ProjectApi.java
View File

@ -1,23 +0,0 @@
package cn.iocoder.yudao.module.pms.api.project;
import cn.iocoder.yudao.module.pms.api.project.dto.ProjectDetailRespDTO;
import cn.iocoder.yudao.module.pms.api.project.dto.ProjectRespDTO;
public interface ProjectApi {
/**
* 获得项目部分信息
*/
ProjectRespDTO getProject(Long projectId);
/**
* 获得项目detail信息
*/
ProjectDetailRespDTO getProjectDetailById(Long projectId);
/**
* 判断项目是否存在
* @param projectId
*/
void validProjectExist(Long projectId);
}

23
yudao-module-pms/yudao-module-pms-api/src/main/java/cn/iocoder/yudao/module/pms/api/project/dto/ProjectDetailRespDTO.java
View File

@ -1,23 +0,0 @@
package cn.iocoder.yudao.module.pms.api.project.dto;
import lombok.Data;
@Data
public class ProjectDetailRespDTO {
/**
* 跟踪部门
*/
private String trackingDepName;
/**
* 项目经理
*/
private String projectManagerName;
/**
* 客户公司
*/
private String customerCompanyName;
}

46
yudao-module-pms/yudao-module-pms-api/src/main/java/cn/iocoder/yudao/module/pms/api/project/dto/ProjectRespDTO.java
View File

@ -1,46 +0,0 @@
package cn.iocoder.yudao.module.pms.api.project.dto;
import lombok.Data;
import java.math.BigDecimal;
/**
* 项目基本信息 dto
*/
@Data
public class ProjectRespDTO{
/**
* 项目编号
*/
private String code;
/**
* 出图公司
*/
private String drawingCompany;
/**
* 跟踪部门id
*/
private Long trackingDepId;
/**
* 客户公司id
*/
private Long customerCompanyId;
/**
* 项目经理id
*/
private Long projectManagerId;
/**
* 预计合同金额
*/
private BigDecimal contractAmount;
}

15
yudao-module-pms/yudao-module-pms-api/src/main/java/cn/iocoder/yudao/module/pms/api/projectschedule/ProjectScheduleApi.java Normal file
View File

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

18
yudao-module-pms/yudao-module-pms-api/src/main/java/cn/iocoder/yudao/module/pms/api/projectschedule/dto/ProjectScheduleDetailDTO.java Normal file
View File

@ -0,0 +1,18 @@
package cn.iocoder.yudao.module.pms.api.projectschedule.dto;
import lombok.Data;
/**
* @author wyw
* @description
* @date 2024/8/14
*/
@Data
public class ProjectScheduleDetailDTO {
/**
* 项目负责人
*/
private String projectManager;
}

21
yudao-module-pms/yudao-module-pms-api/src/main/java/cn/iocoder/yudao/module/pms/api/projecttracking/ProjectTrackingApi.java Normal file
View File

@ -0,0 +1,21 @@
package cn.iocoder.yudao.module.pms.api.projecttracking;
import cn.iocoder.yudao.module.pms.api.projecttracking.dto.ProjectTrackingDetailDTO;
public interface ProjectTrackingApi {
/**
* 得到项目跟踪信息
* @param projectId 项目id
* @return
*/
ProjectTrackingDetailDTO getProjectTracking(Long projectId);
/**
* 判断项目是否存在
* @param id
*/
void validateProjectExists(Long id);
}

36
yudao-module-pms/yudao-module-pms-api/src/main/java/cn/iocoder/yudao/module/pms/api/projecttracking/dto/ProjectTrackingDetailDTO.java Normal file
View File

@ -0,0 +1,36 @@
package cn.iocoder.yudao.module.pms.api.projecttracking.dto;
import lombok.Data;
import java.math.BigDecimal;
/**
* @author wyw
* @description
* @date 2024/8/14
*/
@Data
public class ProjectTrackingDetailDTO {
/**
* 项目编号
*/
private String code;
/**
* 跟踪部门
*/
private String trackingDep;
/**
* 出图公司
*/
private String drawingCompany;
/**
* 预计公司合同总金额
*/
private BigDecimal expectedContractAmount;
}

8
yudao-module-pms/yudao-module-pms-biz/pom.xml
View File

@ -63,12 +63,8 @@
<groupId>cn.iocoder.boot</groupId>
<artifactId>yudao-spring-boot-starter-excel</artifactId>
</dependency>
<dependency>
<groupId>cn.iocoder.boot</groupId>
<artifactId>yudao-module-cms-biz</artifactId>
<version>2.1.0-snapshot</version>
<scope>compile</scope>
</dependency>
</dependencies>

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

@ -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);
}
}
}

28
yudao-module-pms/yudao-module-pms-biz/src/main/java/cn/iocoder/yudao/module/pms/api/projectschedule/ProjectScheduleImpl.java Normal file
View File

@ -0,0 +1,28 @@
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.ProjectScheduleDetailDTO;
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 ProjectScheduleDetailDTO getProjectScheduleDetail(Long projectId) {
ProjectScheduleDO projectScheduleDetail = projectScheduleService.getProjectScheduleDetail(projectId);
return BeanUtils.toBean(projectScheduleDetail, ProjectScheduleDetailDTO.class);
}
}

30
yudao-module-pms/yudao-module-pms-biz/src/main/java/cn/iocoder/yudao/module/pms/api/projecttracking/ProjectTrackingImpl.java Normal file
View File

@ -0,0 +1,30 @@
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.ProjectTrackingDetailDTO;
import cn.iocoder.yudao.module.pms.dal.dataobject.projecttracking.ProjectTrackingDetailDO;
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 ProjectTrackingDetailDTO getProjectTracking(Long id) {
ProjectTrackingDetailDO projectTrackingDetail = projectTrackingService.getProjectTrackingDetail(id);
return BeanUtils.toBean(projectTrackingDetail, ProjectTrackingDetailDTO.class);
}
@Override
public void validateProjectExists(Long id) {
projectTrackingService.validateProjectExists(id);
}
}

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

@ -20,7 +20,7 @@ public class ProjectSchedulePageReqVO extends PageParam {
private Long projectId;
@Schema(description = "项目负责人")
private String projectLeader;
private String projectManager;
@Schema(description = "主专业")
private String major;

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

@ -23,7 +23,7 @@ public class ProjectScheduleRespVO {
@Schema(description = "项目负责人", requiredMode = Schema.RequiredMode.REQUIRED)
@ExcelProperty("项目负责人")
private String projectLeader;
private String projectManager;
@Schema(description = "主专业", requiredMode = Schema.RequiredMode.REQUIRED)
@ExcelProperty("主专业")

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

@ -20,11 +20,9 @@ public class ProjectScheduleSaveReqVO {
private Long projectId;
@Schema(description = "项目负责人", requiredMode = Schema.RequiredMode.REQUIRED)
@NotEmpty(message = "项目负责人不能为空")
private String projectLeader;
private String projectManager;
@Schema(description = "主专业", requiredMode = Schema.RequiredMode.REQUIRED)
@NotEmpty(message = "主专业不能为空")
private String major;
@Schema(description = "其他专业")
@ -34,34 +32,27 @@ public class ProjectScheduleSaveReqVO {
private String minorUserIds;
@Schema(description = "规模", requiredMode = Schema.RequiredMode.REQUIRED)
@NotEmpty(message = "规模不能为空")
private String scale;
@Schema(description = "项目概况", requiredMode = Schema.RequiredMode.REQUIRED)
@NotEmpty(message = "项目概况不能为空")
private String survey;
@Schema(description = "相关批复文件url", example = "https://www.iocoder.cn")
private String replyFileUrl;
@Schema(description = "当前阶段", requiredMode = Schema.RequiredMode.REQUIRED)
@NotEmpty(message = "当前阶段不能为空")
private String stage;
@Schema(description = "已完成的项目阶段", requiredMode = Schema.RequiredMode.REQUIRED)
@NotEmpty(message = "已完成的项目阶段不能为空")
private String preStage;
@Schema(description = "工作进展", requiredMode = Schema.RequiredMode.REQUIRED)
@NotEmpty(message = "工作进展不能为空")
private String progress;
@Schema(description = "外部合同商议时间", requiredMode = Schema.RequiredMode.REQUIRED)
@NotNull(message = "外部合同商议时间不能为空")
private LocalDateTime contractNegotiationTime;
@Schema(description = "已完成百分比", requiredMode = Schema.RequiredMode.REQUIRED)
@NotNull(message = "已完成百分比不能为空")
private BigDecimal completed;
@Schema(description = "截至本月累计完成百分比")
@ -91,26 +82,4 @@ 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;
}

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

@ -38,16 +38,16 @@ public class ProjectTrackingPageReqVO extends PageParam {
private BigDecimal projectAmount;
@Schema(description = "预计公司合同总金额")
private BigDecimal companyContractAmount;
private BigDecimal expectedContractAmount;
@Schema(description = "有效合同额")
private BigDecimal effectiveContractAmount;
@Schema(description = "建设方")
private BigDecimal constructionSide;
private String constructionSide;
@Schema(description = "发包人")
private BigDecimal lettingPartyPeople;
private String drawingCompany;
@Schema(description = "客户联系人")
private String customerUser;

6
yudao-module-pms/yudao-module-pms-biz/src/main/java/cn/iocoder/yudao/module/pms/controller/admin/projecttracking/vo/ProjectTrackingRespVO.java
View File

@ -50,7 +50,7 @@ public class ProjectTrackingRespVO {
@Schema(description = "预计公司合同总金额")
@ExcelProperty("预计公司合同总金额")
private BigDecimal companyContractAmount;
private BigDecimal expectedContractAmount;
@Schema(description = "有效合同额")
@ExcelProperty("有效合同额")
@ -58,11 +58,11 @@ public class ProjectTrackingRespVO {
@Schema(description = "建设方")
@ExcelProperty("建设方")
private BigDecimal constructionSide;
private String constructionSide;
@Schema(description = "发包人")
@ExcelProperty("发包人")
private BigDecimal lettingPartyPeople;
private BigDecimal drawingCompany;
@Schema(description = "客户联系人")
@ExcelProperty("客户联系人")

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

@ -2,10 +2,8 @@ package cn.iocoder.yudao.module.pms.controller.admin.projecttracking.vo;
import io.swagger.v3.oas.annotations.media.Schema;
import lombok.*;
import java.util.*;
import jakarta.validation.constraints.*;
import java.math.BigDecimal;
import org.springframework.format.annotation.DateTimeFormat;
import java.time.LocalDateTime;
@Schema(description = "管理后台 - 项目跟踪信息新增/修改 Request VO")
@ -38,16 +36,16 @@ public class ProjectTrackingSaveReqVO {
private BigDecimal projectAmount;
@Schema(description = "预计公司合同总金额")
private BigDecimal companyContractAmount;
private BigDecimal expectedContractAmount;
@Schema(description = "有效合同额")
private BigDecimal effectiveContractAmount;
@Schema(description = "建设方")
private BigDecimal constructionSide;
private String constructionSide;
@Schema(description = "发包人")
private BigDecimal lettingPartyPeople;
private String drawingCompany;
@Schema(description = "客户联系人")
private String customerUser;

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

@ -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;
@ -42,7 +35,7 @@ public class ProjectScheduleDO extends BaseDO {
/**
* 项目负责人
*/
private String projectLeader;
private String projectManager;
/**
* 主专业
*/
@ -123,9 +116,5 @@ public class ProjectScheduleDO extends BaseDO {
* 最后编辑人
*/
private String finalEditor;
/**
* 更新人
*/
private String updator;
}

20
yudao-module-pms/yudao-module-pms-biz/src/main/java/cn/iocoder/yudao/module/pms/dal/dataobject/projectschedule/ProjectScheduleDetailDO.java Normal file
View File

@ -0,0 +1,20 @@
package cn.iocoder.yudao.module.pms.dal.dataobject.projectschedule;
import cn.iocoder.yudao.module.pms.dal.dataobject.project.ProjectDO;
import lombok.Data;
/**
* @author wyw
* @description
* @date 2024/8/14
*/
@Data
public class ProjectScheduleDetailDO extends ProjectDO {
/**
* 项目负责人
*/
private String projectManager;
}

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

@ -72,7 +72,7 @@ public class ProjectTrackingDO extends BaseDO {
/**
* 预计公司合同总金额
*/
private BigDecimal companyContractAmount;
private BigDecimal expectedContractAmount;
/**
* 有效合同额
*/
@ -80,11 +80,11 @@ public class ProjectTrackingDO extends BaseDO {
/**
* 建设方
*/
private BigDecimal constructionSide;
private String constructionSide;
/**
* 发包人
*/
private BigDecimal lettingPartyPeople;
private String drawingCompany;
/**
* 客户联系人
*/

39
yudao-module-pms/yudao-module-pms-biz/src/main/java/cn/iocoder/yudao/module/pms/dal/dataobject/projecttracking/ProjectTrackingDetailDO.java Normal file
View File

@ -0,0 +1,39 @@
package cn.iocoder.yudao.module.pms.dal.dataobject.projecttracking;
import cn.iocoder.yudao.module.pms.dal.dataobject.project.ProjectDO;
import lombok.Data;
import java.math.BigDecimal;
/**
* @author wyw
* @description
* @date 2024/8/14
*/
@Data
public class ProjectTrackingDetailDO extends ProjectDO {
/**
* 项目编号
*/
private String code;
/**
* 跟踪部门
*/
private String trackingDep;
/**
* 出图公司
*/
private String drawingCompany;
/**
* 预计公司合同总金额
*/
private BigDecimal expectedContractAmount;
}

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

@ -8,6 +8,8 @@ import cn.iocoder.yudao.module.pms.dal.dataobject.projectschedule.ProjectSchedul
import org.apache.ibatis.annotations.Mapper;
import cn.iocoder.yudao.module.pms.controller.admin.projectschedule.vo.*;
import java.util.List;
/**
* 项目进度管理 Mapper
*
@ -19,7 +21,6 @@ public interface ProjectScheduleMapper extends BaseMapperX<ProjectScheduleDO> {
default PageResult<ProjectScheduleDO> selectPage(ProjectSchedulePageReqVO reqVO) {
return selectPage(reqVO, new LambdaQueryWrapperX<ProjectScheduleDO>()
.eqIfPresent(ProjectScheduleDO::getProjectId, reqVO.getProjectId())
.eqIfPresent(ProjectScheduleDO::getProjectLeader, reqVO.getProjectLeader())
.eqIfPresent(ProjectScheduleDO::getMajor, reqVO.getMajor())
.eqIfPresent(ProjectScheduleDO::getMinorMajors, reqVO.getMinorMajors())
.eqIfPresent(ProjectScheduleDO::getMinorUserIds, reqVO.getMinorUserIds())
@ -29,23 +30,17 @@ public interface ProjectScheduleMapper extends BaseMapperX<ProjectScheduleDO> {
.eqIfPresent(ProjectScheduleDO::getStage, reqVO.getStage())
.eqIfPresent(ProjectScheduleDO::getPreStage, reqVO.getPreStage())
.eqIfPresent(ProjectScheduleDO::getProgress, reqVO.getProgress())
.betweenIfPresent(ProjectScheduleDO::getContractNegotiationTime, reqVO.getContractNegotiationTime())
.eqIfPresent(ProjectScheduleDO::getCompleted, reqVO.getCompleted())
.eqIfPresent(ProjectScheduleDO::getAccumulatedCompletion, reqVO.getAccumulatedCompletion())
.eqIfPresent(ProjectScheduleDO::getNewlyIncreasedCompletion, reqVO.getNewlyIncreasedCompletion())
.eqIfPresent(ProjectScheduleDO::getFinishOutput, reqVO.getFinishOutput())
.eqIfPresent(ProjectScheduleDO::getNewlyIncreasedOutput, reqVO.getNewlyIncreasedOutput())
.eqIfPresent(ProjectScheduleDO::getAccumulatedOutput, reqVO.getAccumulatedOutput())
.betweenIfPresent(ProjectScheduleDO::getCompletionTime, reqVO.getCompletionTime())
.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));
}
default List<ProjectScheduleDO> selectOneManager(Long projectId) {
return selectList(new LambdaQueryWrapperX<ProjectScheduleDO>()
.eqIfPresent(ProjectScheduleDO::getProjectId,projectId)
.orderByDesc(ProjectScheduleDO::getCreateTime));
}
}

5
yudao-module-pms/yudao-module-pms-biz/src/main/java/cn/iocoder/yudao/module/pms/dal/mysql/projecttracking/ProjectTrackingMapper.java
View File

@ -4,10 +4,13 @@ package cn.iocoder.yudao.module.pms.dal.mysql.projecttracking;
import cn.iocoder.yudao.framework.common.pojo.PageResult;
import cn.iocoder.yudao.framework.mybatis.core.query.LambdaQueryWrapperX;
import cn.iocoder.yudao.framework.mybatis.core.mapper.BaseMapperX;
import cn.iocoder.yudao.module.pms.dal.dataobject.projectschedule.ProjectScheduleDO;
import cn.iocoder.yudao.module.pms.dal.dataobject.projecttracking.ProjectTrackingDO;
import org.apache.ibatis.annotations.Mapper;
import cn.iocoder.yudao.module.pms.controller.admin.projecttracking.vo.*;
import java.util.List;
/**
* 项目跟踪信息 Mapper
*
@ -25,10 +28,8 @@ public interface ProjectTrackingMapper extends BaseMapperX<ProjectTrackingDO> {
.eqIfPresent(ProjectTrackingDO::getCity, reqVO.getCity())
.eqIfPresent(ProjectTrackingDO::getProjectOverview, reqVO.getProjectOverview())
.eqIfPresent(ProjectTrackingDO::getProjectAmount, reqVO.getProjectAmount())
.eqIfPresent(ProjectTrackingDO::getCompanyContractAmount, reqVO.getCompanyContractAmount())
.eqIfPresent(ProjectTrackingDO::getEffectiveContractAmount, reqVO.getEffectiveContractAmount())
.eqIfPresent(ProjectTrackingDO::getConstructionSide, reqVO.getConstructionSide())
.eqIfPresent(ProjectTrackingDO::getLettingPartyPeople, reqVO.getLettingPartyPeople())
.eqIfPresent(ProjectTrackingDO::getCustomerUser, reqVO.getCustomerUser())
.eqIfPresent(ProjectTrackingDO::getCustomerPhone, reqVO.getCustomerPhone())
.eqIfPresent(ProjectTrackingDO::getCooperationCompany, reqVO.getCooperationCompany())

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

@ -50,4 +50,13 @@ public interface ProjectScheduleService {
*/
PageResult<ProjectScheduleDO> getProjectSchedulePage(ProjectSchedulePageReqVO pageReqVO);
/**
* 获得项目进度信息
* @param projectId 项目id
* @return
*/
ProjectScheduleDO getProjectScheduleDetail(Long projectId);
}

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

@ -11,6 +11,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 +70,16 @@ public class ProjectScheduleServiceImpl implements ProjectScheduleService {
return projectScheduleMapper.selectPage(pageReqVO);
}
@Override
public ProjectScheduleDO getProjectScheduleDetail(Long projectId) {
List<ProjectScheduleDO> projectScheduleDOS = projectScheduleMapper.selectOneManager(projectId);
if (projectScheduleDOS == null || projectScheduleDOS.isEmpty()) {
throw exception(PROJECT_SCHEDULE_NOT_EXISTS);
}
return projectScheduleDOS.get(0);
}
}

15
yudao-module-pms/yudao-module-pms-biz/src/main/java/cn/iocoder/yudao/module/pms/service/projecttracking/ProjectTrackingService.java
View File

@ -1,6 +1,8 @@
package cn.iocoder.yudao.module.pms.service.projecttracking;
import java.util.*;
import cn.iocoder.yudao.module.pms.dal.dataobject.projecttracking.ProjectTrackingDetailDO;
import jakarta.validation.*;
import cn.iocoder.yudao.module.pms.controller.admin.projecttracking.vo.*;
import cn.iocoder.yudao.module.pms.dal.dataobject.projecttracking.ProjectTrackingDO;
@ -52,4 +54,17 @@ public interface ProjectTrackingService {
*/
PageResult<ProjectTrackingDO> getProjectTrackingPage(ProjectTrackingPageReqVO pageReqVO);
/**
* 判断项目是否存在
* @param id
*/
void validateProjectExists(Long id);
/**
* 获得项目跟踪基础信息
* @param id 项目id
* @return
*/
ProjectTrackingDetailDO getProjectTrackingDetail(Long id);
}

15
yudao-module-pms/yudao-module-pms-biz/src/main/java/cn/iocoder/yudao/module/pms/service/projecttracking/ProjectTrackingServiceImpl.java
View File

@ -1,5 +1,6 @@
package cn.iocoder.yudao.module.pms.service.projecttracking;
import cn.iocoder.yudao.module.pms.dal.dataobject.projecttracking.ProjectTrackingDetailDO;
import org.springframework.stereotype.Service;
import jakarta.annotation.Resource;
import org.springframework.validation.annotation.Validated;
@ -71,4 +72,18 @@ public class ProjectTrackingServiceImpl implements ProjectTrackingService {
return projectTrackingMapper.selectPage(pageReqVO);
}
@Override
public void validateProjectExists(Long id) {
if (projectTrackingMapper.selectById(id) == null) {
throw exception(PROJECT_NOT_EXISTS);
}
}
@Override
public ProjectTrackingDetailDO getProjectTrackingDetail(Long id) {
ProjectTrackingDO projectTrackingDO = projectTrackingMapper.selectById(id);
return BeanUtils.toBean(projectTrackingDO, ProjectTrackingDetailDO.class);
}
}