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-07-23 17:30:02 +08:00
parent 5c4b2e1271
commit c44b48ec3f
28 changed files with 92 additions and 614 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1,7 +1,7 @@
package cn.iocoder.yudao.module.pms.api;
import cn.iocoder.yudao.module.pms.api.dto.project.ProjectDetailRespDTO;
import cn.iocoder.yudao.module.pms.api.dto.project.ProjectRespDTO;
import cn.iocoder.yudao.module.pms.api.project.dto.ProjectDetailRespDTO;
import cn.iocoder.yudao.module.pms.api.project.dto.ProjectRespDTO;
public interface ProjectApi {
/**

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

@ -1,4 +1,4 @@
package cn.iocoder.yudao.module.pms.api.dto.project;
package cn.iocoder.yudao.module.pms.api.project.dto;
import lombok.Data;

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

@ -1,4 +1,4 @@
package cn.iocoder.yudao.module.pms.api.dto.project;
package cn.iocoder.yudao.module.pms.api.project.dto;
import lombok.Data;

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

@ -2,14 +2,19 @@ package cn.iocoder.yudao.module.pms.api.project;
import cn.iocoder.yudao.framework.common.util.object.BeanUtils;
import cn.iocoder.yudao.module.pms.api.ProjectApi;
import cn.iocoder.yudao.module.pms.api.dto.project.ProjectDetailRespDTO;
import cn.iocoder.yudao.module.pms.api.dto.project.ProjectRespDTO;
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;
@Service
@Validated
public class ProjectImpl implements ProjectApi {
@Resource
private ProjectMapper projectMapper;

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

@ -3,7 +3,6 @@ package cn.iocoder.yudao.module.pms.dal.mysql.project;
import cn.iocoder.yudao.framework.common.pojo.PageResult;
import cn.iocoder.yudao.framework.mybatis.core.mapper.BaseMapperX;
import cn.iocoder.yudao.framework.mybatis.core.query.LambdaQueryWrapperX;
import cn.iocoder.yudao.module.cms.dal.dataobject.customerCompany.CustomerCompanyDO;
import cn.iocoder.yudao.module.pms.controller.admin.project.vo.ProjectPageReqVO;
import cn.iocoder.yudao.module.pms.dal.dataobject.project.ProjectDO;
import cn.iocoder.yudao.module.pms.dal.dataobject.project.ProjectDetailDO;
@ -33,7 +32,6 @@ public interface ProjectMapper extends BaseMapperX<ProjectDO> {
.selectAll(ProjectDO.class)
.selectAs(DeptDO::getName, ProjectDetailDO::getTrackingDepName) // 映射到ProjectDetailDO的trackingDeptName
.selectAs(AdminUserDO::getNickname, ProjectDetailDO::getProjectManagerName) // 映射到ProjectDetailDO的projectManagerName
.selectAs(CustomerCompanyDO::getName, ProjectDetailDO::getCustomerCompanyName)
.likeIfExists(ProjectDO::getName, reqVO.getName())
.eqIfExists(ProjectDO::getTrackingCode, reqVO.getTrackingCode())
.eqIfExists(ProjectDO::getType, reqVO.getType())
@ -41,7 +39,6 @@ public interface ProjectMapper extends BaseMapperX<ProjectDO> {
.orderByDesc(ProjectDO::getId)
.leftJoin(DeptDO.class, DeptDO::getId, ProjectDO::getTrackingDepId)
.leftJoin(AdminUserDO.class, AdminUserDO::getId, ProjectDO::getProjectManagerId)
.leftJoin(CustomerCompanyDO.class, CustomerCompanyDO::getId, ProjectDO::getCustomerCompanyId)
);
}
@ -50,11 +47,9 @@ public interface ProjectMapper extends BaseMapperX<ProjectDO> {
.selectAll(ProjectDO.class)
.selectAs(DeptDO::getName, ProjectDetailDO::getTrackingDepName) // 映射到ProjectDetailDO的trackingDeptName
.selectAs(AdminUserDO::getNickname, ProjectDetailDO::getProjectManagerName) // 映射到ProjectDetailDO的projectManagerName
.selectAs(CustomerCompanyDO::getName, ProjectDetailDO::getCustomerCompanyName)
.eqIfExists(ProjectDO::getId, id)
.leftJoin(DeptDO.class, DeptDO::getId, ProjectDO::getTrackingDepId)
.leftJoin(AdminUserDO.class, AdminUserDO::getId, ProjectDO::getProjectManagerId)
.leftJoin(CustomerCompanyDO.class, CustomerCompanyDO::getId, ProjectDO::getCustomerCompanyId)
);
}