From 1bbf30528c8d26109e3d6bd241f61d93a936e1ef Mon Sep 17 00:00:00 2001 From: fengguangyu <841028466@qq.com> Date: Fri, 25 Jun 2021 17:49:47 +0800 Subject: [PATCH] no message --- .../projectplan/dto/incomeplan/InComePlanOut.java | 8 ++++++++ .../InComePlan/InComePlanQueryServiceImpl.java | 15 +++++++++++++-- 2 files changed, 21 insertions(+), 2 deletions(-) diff --git a/ServiceSite/facade/src/main/java/com/seasky/projectplan/dto/incomeplan/InComePlanOut.java b/ServiceSite/facade/src/main/java/com/seasky/projectplan/dto/incomeplan/InComePlanOut.java index ac1298875..af67fb17e 100644 --- a/ServiceSite/facade/src/main/java/com/seasky/projectplan/dto/incomeplan/InComePlanOut.java +++ b/ServiceSite/facade/src/main/java/com/seasky/projectplan/dto/incomeplan/InComePlanOut.java @@ -3,6 +3,7 @@ package com.seasky.projectplan.dto.incomeplan; import com.baomidou.mybatisplus.annotation.TableField; import com.fasterxml.jackson.annotation.JsonInclude; import com.seasky.core.ddd.base.BaseDto; +import com.seasky.microflowapi.dto.FlowCanShowOut; import lombok.AllArgsConstructor; import lombok.Data; import lombok.EqualsAndHashCode; @@ -100,4 +101,11 @@ public class InComePlanOut extends BaseDto implements Serializable { * 瀛愯〃閾捐〃 */ private List<InComeSubOut> inComeSubList = new ArrayList<InComeSubOut>(); + + /** + * 娴佺▼缁勪欢淇℃伅 + * + */ + + private FlowCanShowOut flowCanShowOut; } diff --git a/ServiceSite/src/main/java/com/seasky/projectplan/infrastructure/reader/InComePlan/InComePlanQueryServiceImpl.java b/ServiceSite/src/main/java/com/seasky/projectplan/infrastructure/reader/InComePlan/InComePlanQueryServiceImpl.java index d25313225..0c3721cfa 100644 --- a/ServiceSite/src/main/java/com/seasky/projectplan/infrastructure/reader/InComePlan/InComePlanQueryServiceImpl.java +++ b/ServiceSite/src/main/java/com/seasky/projectplan/infrastructure/reader/InComePlan/InComePlanQueryServiceImpl.java @@ -6,6 +6,7 @@ import com.seasky.core.base.AbstractService; import com.seasky.core.common.Pagination; import com.seasky.micro.basedata.api.IUser; import com.seasky.micro.basedata.dto.OrganizationDTO; +import com.seasky.microflowapi.dto.FlowCanShowOut; import com.seasky.projectplan.application.query.InComePlan.InComePlanService; import com.seasky.projectplan.domain.aggregate.common.InComePlanEnum; import com.seasky.projectplan.domain.aggregate.common.PlanTypeEnum; @@ -21,6 +22,7 @@ import com.seasky.projectplan.infrastructure.db.mapper.table.BudgetInfoMapper; import com.seasky.projectplan.infrastructure.db.mapper.table.InComePlanMapper; import com.seasky.projectplan.infrastructure.db.mapper.table.InComeSubMapper; import com.seasky.projectplan.infrastructure.reader.budgetinfo.BudgetInfoConvert; +import com.seasky.projectplan.infrastructure.rpc.FlowRpc; import org.springframework.stereotype.Service; import javax.annotation.Resource; @@ -47,6 +49,9 @@ public class InComePlanQueryServiceImpl extends AbstractService<InComePlanPo, In @Resource IUser iUser; + @Resource + FlowRpc flowRpc; + /** * 鏍规嵁褰撳墠鐧诲綍浜烘墍鍦ㄩ儴闂ㄨ幏鍙栧叾閮ㄩ棬鐨勬敹鍏ョ紪鍒朵俊鎭甫鍒嗛〉 * @@ -73,16 +78,22 @@ public class InComePlanQueryServiceImpl extends AbstractService<InComePlanPo, In */ @Override public InComePlanOut queryInComeById(IncomeplanQry qry) { + InComePlanOut out = new InComePlanOut(); InComePlanPo records = mapper.queryInComeById(qry); //濡傛灉鏈夊瓙琛ㄥ垯鍙栧瓙琛ㄦ暟鎹� if (records.getPlanType() != InComePlanEnum.BAXIANG){ Map<String,Object> maps=new HashMap<>(2); maps.put("parentid",records.getId()); List<InComeSubPo> recordsSub = mapperSub.selectByMap(maps); - return inComePlanOutSetPlanTypeName(InComePlanConvert.PoToListSubOut(records,recordsSub)); + out = inComePlanOutSetPlanTypeName(InComePlanConvert.PoToListSubOut(records,recordsSub)); }else{ - return inComePlanOutSetPlanTypeName(InComePlanConvert.poToOut(records)); + out = inComePlanOutSetPlanTypeName(InComePlanConvert.poToOut(records)); + } + if (records.getProcessId() != null) { + FlowCanShowOut flowCanShowOut = flowRpc.queryFlowInfoByProcessId(records.getProcessId()); + out.setFlowCanShowOut(flowCanShowOut); } + return out; } /** -- GitLab