diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/common/service/impl/MesFmProjectMilestoneServiceImpl.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/common/service/impl/MesFmProjectMilestoneServiceImpl.java index 5251c7432..9c1b07b6c 100644 --- a/blade-service/blade-desk/src/main/java/org/springblade/desk/common/service/impl/MesFmProjectMilestoneServiceImpl.java +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/common/service/impl/MesFmProjectMilestoneServiceImpl.java @@ -1,20 +1,31 @@ package org.springblade.desk.common.service.impl; +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import jakarta.annotation.Resource; +import org.checkerframework.checker.units.qual.A; +import org.springblade.core.mp.support.Condition; import org.springblade.desk.common.enums.MesApprovalRecordBizTypeEnum; import org.springblade.desk.common.service.ApprovalRecordDetailStrategy; +import org.springblade.desk.process.pojo.entity.FmProjectApplicationEntity; import org.springblade.desk.process.pojo.entity.FmProjectMilestoneEntity; +import org.springblade.desk.process.service.IFmProjectApplicationService; import org.springblade.desk.process.service.IFmProjectMilestoneService; +import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; +import java.util.List; + /** * 流程管理立项审批待办策略实现类 */ @Service -public class MesFmProjectMilestoneServiceImpl implements ApprovalRecordDetailStrategy { +public class MesFmProjectMilestoneServiceImpl implements ApprovalRecordDetailStrategy { + + @Autowired + IFmProjectApplicationService fmProjectApplicationService; - @Resource - private IFmProjectMilestoneService fmProjectMilestoneService; + @Autowired + IFmProjectMilestoneService fmProjectMilestoneService; @Override public String getBizType() { @@ -22,11 +33,14 @@ public class MesFmProjectMilestoneServiceImpl implements ApprovalRecordDetailStr } @Override - public FmProjectMilestoneEntity getDetail(Long bizId) { + public FmProjectApplicationEntity getDetail(Long bizId) { - FmProjectMilestoneEntity fmProjectMilestoneEntity = new FmProjectMilestoneEntity(); - fmProjectMilestoneEntity.setId(bizId); - FmProjectMilestoneEntity detail = fmProjectMilestoneService.getDetail(fmProjectMilestoneEntity); + FmProjectApplicationEntity fmProjectApplication = new FmProjectApplicationEntity(); + fmProjectApplication.setId(bizId); + FmProjectApplicationEntity detail = fmProjectApplicationService.getOne(Condition.getQueryWrapper(fmProjectApplication)); + List stoneList=fmProjectMilestoneService.list(new QueryWrapper().lambda() + .eq(FmProjectMilestoneEntity::getPaId,detail.getId())); + detail.setStoneList(stoneList); return detail; }