diff --git a/microservices-modules/microservices-modules-pms/src/main/java/com/microservices/pms/product/mapper/PmsProductReqOperationRecordMapper.java b/microservices-modules/microservices-modules-pms/src/main/java/com/microservices/pms/product/mapper/PmsProductReqOperationRecordMapper.java index eb6344a3a..20c80f31d 100644 --- a/microservices-modules/microservices-modules-pms/src/main/java/com/microservices/pms/product/mapper/PmsProductReqOperationRecordMapper.java +++ b/microservices-modules/microservices-modules-pms/src/main/java/com/microservices/pms/product/mapper/PmsProductReqOperationRecordMapper.java @@ -60,4 +60,6 @@ public interface PmsProductReqOperationRecordMapper { * @return 结果 */ public int deletePmsProductReqOperationRecordByIds(Long[] ids); + + PmsProductReqOperationRecord selectUserReqLatestReviewRecord(Long reqId); } diff --git a/microservices-modules/microservices-modules-pms/src/main/java/com/microservices/pms/product/service/IPmsProductReqOperationRecordService.java b/microservices-modules/microservices-modules-pms/src/main/java/com/microservices/pms/product/service/IPmsProductReqOperationRecordService.java index 67f1a39e0..f091ee6ac 100644 --- a/microservices-modules/microservices-modules-pms/src/main/java/com/microservices/pms/product/service/IPmsProductReqOperationRecordService.java +++ b/microservices-modules/microservices-modules-pms/src/main/java/com/microservices/pms/product/service/IPmsProductReqOperationRecordService.java @@ -58,4 +58,12 @@ public interface IPmsProductReqOperationRecordService { * @return 结果 */ public int deletePmsProductReqOperationRecordById(Long id); + + /** + * 查询用户需求最近一次评审记录 + * + * @param reqId 用户需求id + * @return 最近一次评审记录 + */ + PmsProductReqOperationRecord selectUserReqLatestReviewRecord(Long reqId); } diff --git a/microservices-modules/microservices-modules-pms/src/main/java/com/microservices/pms/product/service/impl/PmsProductReqOperationRecordServiceImpl.java b/microservices-modules/microservices-modules-pms/src/main/java/com/microservices/pms/product/service/impl/PmsProductReqOperationRecordServiceImpl.java index e2f5fbe58..2d50fe676 100644 --- a/microservices-modules/microservices-modules-pms/src/main/java/com/microservices/pms/product/service/impl/PmsProductReqOperationRecordServiceImpl.java +++ b/microservices-modules/microservices-modules-pms/src/main/java/com/microservices/pms/product/service/impl/PmsProductReqOperationRecordServiceImpl.java @@ -90,4 +90,9 @@ public class PmsProductReqOperationRecordServiceImpl implements IPmsProductReqOp public int deletePmsProductReqOperationRecordById(Long id) { return pmsProductReqOperationRecordMapper.deletePmsProductReqOperationRecordById(id); } + + @Override + public PmsProductReqOperationRecord selectUserReqLatestReviewRecord(Long reqId) { + return pmsProductReqOperationRecordMapper.selectUserReqLatestReviewRecord(reqId); + } } diff --git a/microservices-modules/microservices-modules-pms/src/main/java/com/microservices/pms/product/service/impl/PmsProductRequirementServiceImpl.java b/microservices-modules/microservices-modules-pms/src/main/java/com/microservices/pms/product/service/impl/PmsProductRequirementServiceImpl.java index dc38b0301..ab4a32074 100644 --- a/microservices-modules/microservices-modules-pms/src/main/java/com/microservices/pms/product/service/impl/PmsProductRequirementServiceImpl.java +++ b/microservices-modules/microservices-modules-pms/src/main/java/com/microservices/pms/product/service/impl/PmsProductRequirementServiceImpl.java @@ -75,20 +75,6 @@ public class PmsProductRequirementServiceImpl implements IPmsProductRequirementS @Autowired private RemoteFileService remoteFileService; - private PmsProductRequirementDetailVo toPmsProductRequirementDetailVo(PmsProductRequirement pmsProductRequirement) { - PmsProductRequirementDataVo pmsProductRequirementDataVo = toPmsProductRequirementDataVo(pmsProductRequirement, null); - PmsProductRequirementDetailVo pmsProductRequirementDetailVo = pmsProductRequirementDataVo.toPmsProductRequirementDetailVo(); - pmsProductRequirementDetailVo.setContent(pmsProductRequirement.getContent()); - // 设置文件列表 - pmsProductRequirementDetailVo.setFileList(pmsCommonService.getAllFileByFileIdentifiers(pmsProductRequirement.getFileIdentifiers()) - ); - // 设置产品计划 - if (pmsProductRequirement.getPmsProductPlanId() != null) { - pmsProductRequirementDetailVo.setPmsProductPlan(pmsProductPlanService.selectPmsProductPlanById(pmsProductRequirement.getPmsProductPlanId(), false)); - } - return pmsProductRequirementDetailVo; - } - @Override public PmsProductRequirement selectPmsProductRequirementById(Long id, boolean checkRole) { PmsProductRequirement pmsProductRequirement = pmsProductRequirementMapper.selectPmsProductRequirementById(id); @@ -102,69 +88,6 @@ public class PmsProductRequirementServiceImpl implements IPmsProductRequirementS return pmsProductRequirement; } - private PmsProductRequirementDataVo toPmsProductRequirementDataVo(PmsProductRequirement pmsProductRequirement, HashMap hashMap) { - PmsProductRequirementDataVo pmsProductRequirementDataVo = pmsProductRequirement.toPmsProductRequirementDataVo(); - // 设置优先级 - pmsProductRequirementDataVo.setPriority( - PmsUtils.getSelectObjectInCache( - hashMap - , pmsProductPriorityService::selectPmsProductPriorityById - , pmsProductRequirement.getPriorityId())); - // 设置产品模块 - if (pmsProductRequirement.getPmsProductModuleId() != null) { - pmsProductRequirementDataVo.setPmsProductModule( - PmsUtils.getSelectObjectInCache( - hashMap - , x -> pmsProductModuleService.selectPmsProductModuleById(x, false) - , pmsProductRequirement.getPmsProductModuleId()) - ); - } - // 设置产品 - pmsProductRequirementDataVo.setPmsProduct( - PmsUtils.getSelectObjectInCache( - hashMap - , pmsProductService::selectPmsProductByIdentifier - , pmsProductRequirement.getPmsProductIdentifier()) - ); - // 设置产品计划 - if (pmsProductRequirement.getPmsProductPlanId() != null) { - pmsProductRequirementDataVo.setPmsProductPlan( - PmsUtils.getSelectObjectInCache( - hashMap - , x -> pmsProductPlanService.selectPmsProductPlanById(x, false) - , pmsProductRequirement.getPmsProductPlanId()) - ); - } - - // 设置标记Id列表 - pmsProductRequirementDataVo.setTags(pmsProductRequirement.getTagIds()); - // 设置需求负责人 - pmsProductRequirementDataVo.setRequirementAssigneeList( - pmsCommonService.getSimpleSysUserListByGitlinkUserIdsAndCache(pmsProductRequirement.getRequirementAssigneeGitlinkIds(), hashMap)); - // 设置需求创建人 - pmsProductRequirementDataVo.setCreateByUser( - PmsUtils.getSelectObjectInCache( - hashMap - , pmsCommonService::getSimpleSysUserByUsername - , pmsProductRequirement.getCreateBy()) - ); - // 设置需求更新人 - pmsProductRequirementDataVo.setUpdateByUser( - PmsUtils.getSelectObjectInCache( - hashMap - , pmsCommonService::getSimpleSysUserByUsername - , pmsProductRequirement.getUpdateBy()) - ); - if (pmsProductRequirementDataVo.getCreateByUser() != null) { - pmsProductRequirementDataVo.setCreateBy(pmsProductRequirementDataVo.getCreateByUser().getNickName()); - } - if (pmsProductRequirementDataVo.getUpdateByUser() != null) { - pmsProductRequirementDataVo.setUpdateBy(pmsProductRequirementDataVo.getUpdateByUser().getNickName()); - } - - return pmsProductRequirementDataVo; - } - @Override public GenericsTableDataInfo selectUserReqList(ProductUserReqSearchVo productUserReqSearchVo) { @@ -190,6 +113,9 @@ public class PmsProductRequirementServiceImpl implements IPmsProductRequirementS @Override public ProductUserReqDetailVo selectUserReqDetailById(Long id) { PmsProductRequirement pmsProductRequirement = selectPmsProductRequirementById(id, false); + PmsProductReqOperationRecord record = pmsProductReqOperationRecordService.selectUserReqLatestReviewRecord(pmsProductRequirement.getId()); + pmsProductRequirement.setReviewContent(record.getContent()); + pmsProductRequirement.setReviewTime(record.getOperatingTime()); return toProductUserReqDetailVo(pmsProductRequirement); } diff --git a/microservices-modules/microservices-modules-pms/src/main/resources/mapper/pms/PmsProductReqOperationRecordMapper.xml b/microservices-modules/microservices-modules-pms/src/main/resources/mapper/pms/PmsProductReqOperationRecordMapper.xml index ede862f46..bb5f7e584 100644 --- a/microservices-modules/microservices-modules-pms/src/main/resources/mapper/pms/PmsProductReqOperationRecordMapper.xml +++ b/microservices-modules/microservices-modules-pms/src/main/resources/mapper/pms/PmsProductReqOperationRecordMapper.xml @@ -65,6 +65,14 @@ where id = #{id} +