diff --git a/ServiceSite/facade/src/main/java/com/seasky/projectplan/dto/projectlibrary/ProjectLibraryOut.java b/ServiceSite/facade/src/main/java/com/seasky/projectplan/dto/projectlibrary/ProjectLibraryOut.java index f0961cc44372ce549e84a4498d3e18eebe56042d..0c40c17df1a47e43ce52013c6d3c8c091b9eb099 100644 --- a/ServiceSite/facade/src/main/java/com/seasky/projectplan/dto/projectlibrary/ProjectLibraryOut.java +++ b/ServiceSite/facade/src/main/java/com/seasky/projectplan/dto/projectlibrary/ProjectLibraryOut.java @@ -31,5 +31,28 @@ public class ProjectLibraryOut { @ApiModelProperty("璐熻矗浜篿d") private Long projectLeaderId; + @ApiModelProperty("椤圭洰搴撶姸鎬�") + private Integer projectLibraryState; + + @ApiModelProperty("椤圭洰搴撴枃瀛�") + private String projectLibraryName; + + @ApiModelProperty("涓€涓婄姸鎬�") + private Integer oneUPState; + + @ApiModelProperty("涓€涓婃枃瀛�") + private String oneUPName; + + @ApiModelProperty("浜屼笂鐘舵€�") + private Integer twoUPState; + + @ApiModelProperty("浜屼笂鏂囧瓧") + private String twoUPName; + + @ApiModelProperty("鎵瑰鐘舵€�") + private Integer replyState; + + @ApiModelProperty("鎵瑰鏂囧瓧") + private String replyName; } diff --git a/ServiceSite/src/main/java/com/seasky/projectplan/domain/aggregate/common/AuditEnum.java b/ServiceSite/src/main/java/com/seasky/projectplan/domain/aggregate/common/AuditEnum.java new file mode 100644 index 0000000000000000000000000000000000000000..af6a972cfd9dfc741234d9a3a80ea9ac10bcccfc --- /dev/null +++ b/ServiceSite/src/main/java/com/seasky/projectplan/domain/aggregate/common/AuditEnum.java @@ -0,0 +1,38 @@ +package com.seasky.projectplan.domain.aggregate.common; + +/** + * 椤圭洰搴� 娴佺▼鐘舵€� + * + * @author fengguangyu + * @date 2021/06/17 + */ +public enum AuditEnum { + DAITIJIAO("寰呮彁浜�","0"), + SHENHEWANCHENG("瀹℃牳瀹屾垚","1"); + + + final String k; + final String v; + + AuditEnum(final String k, final String v) { + this.k = k; + this.v = v; + } + + public String val() { + return v; + } + + public String key() { + return k; + } + + public static String getK(String v) { + for (AuditEnum e:values()) { + if (e.val().equals(v)){ + return v; + } + } + return null; + } +} diff --git a/ServiceSite/src/main/java/com/seasky/projectplan/infrastructure/reader/projectlibrary/ProjectLibraryQuerySvrImpl.java b/ServiceSite/src/main/java/com/seasky/projectplan/infrastructure/reader/projectlibrary/ProjectLibraryQuerySvrImpl.java index e34b7914c343b1f8ba86d040bd6b03c967de0acf..365399798a1fe0f8a93eaaea125779b91e860d18 100644 --- a/ServiceSite/src/main/java/com/seasky/projectplan/infrastructure/reader/projectlibrary/ProjectLibraryQuerySvrImpl.java +++ b/ServiceSite/src/main/java/com/seasky/projectplan/infrastructure/reader/projectlibrary/ProjectLibraryQuerySvrImpl.java @@ -3,13 +3,15 @@ package com.seasky.projectplan.infrastructure.reader.projectlibrary; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.seasky.core.common.Pagination; import com.seasky.projectplan.application.query.projectlibrary.ProjectLibraryQuerySvr; -import com.seasky.projectplan.domain.aggregate.projectInfoplan.ProjectInfoRepository; +import com.seasky.projectplan.domain.aggregate.common.AuditEnum; +import com.seasky.projectplan.domain.aggregate.common.PlanTypeEnum; import com.seasky.projectplan.dto.projectlibrary.ProjectLibraryOut; import com.seasky.projectplan.dto.projectlibrary.ProjectLibraryQry; -import com.seasky.projectplan.infrastructure.dataobject.co.ProjectInfoPlanDo; -import com.seasky.projectplan.infrastructure.dataobject.qo.ProjectPlanBookQo; +import com.seasky.projectplan.dto.projectplan.ProjectPlanBookQry; +import com.seasky.projectplan.infrastructure.dataobject.po.ProjectPlanBookPo; import com.seasky.projectplan.infrastructure.db.mapper.table.ProjectLibraryMapper; import com.seasky.projectplan.infrastructure.db.mapper.table.ProjectPlanBookMapper; +import com.seasky.projectplan.infrastructure.reader.projectplan.ProjectPlanQueryServiceImpl; import org.springframework.stereotype.Service; import org.springframework.util.ObjectUtils; @@ -30,6 +32,8 @@ public class ProjectLibraryQuerySvrImpl implements ProjectLibraryQuerySvr { @Resource ProjectPlanBookMapper projectPlanBookMapper; + @Resource + ProjectPlanQueryServiceImpl projectPlanQueryServiceImpl; @Override public Pagination queryProjectLibraryPage(ProjectLibraryQry qry) { @@ -59,7 +63,66 @@ public class ProjectLibraryQuerySvrImpl implements ProjectLibraryQuerySvr { } List<ProjectLibraryOut> outList = ProjectLibraryReaderConvert.posToOutList(projectLibraryMapper.queryList(page, ProjectLibraryQry.builder().departmentCode(qry.getDepartmentCode()).build()).getRecords()); - + ProjectPlanBookPo po; + for (ProjectLibraryOut item:outList) { + ProjectPlanBookQry qryTmp = new ProjectPlanBookQry(); + + qryTmp.setProjectLibraryId(item.getId()); + qryTmp.setState(PlanTypeEnum.XIANGMUKU.name()); + po = projectPlanQueryServiceImpl.makeProjectInfoPlanPo(qryTmp); + if (AuditEnum.DAITIJIAO.key().equals(po.getState())){ + item.setProjectLibraryState(1); + item.setProjectLibraryName("缂栬緫"); + }else { + item.setProjectLibraryState(2); + item.setProjectLibraryName(po.getState()); + } + + qryTmp.setProjectLibraryId(item.getId()); + qryTmp.setState(PlanTypeEnum.YISHANG.name()); + po = projectPlanQueryServiceImpl.makeProjectInfoPlanPo(qryTmp); + if (po==null && item.getProjectLibraryName().equals(AuditEnum.SHENHEWANCHENG.key())){ + item.setOneUPState(0); + item.setOneUPName("杩涘叆涓€涓�"); + }else if (po!=null &&AuditEnum.DAITIJIAO.key().equals(po.getState())){ + item.setOneUPState(1); + item.setOneUPName("鍙栨秷涓€涓�"); + }else if (po!=null &&!AuditEnum.DAITIJIAO.key().equals(po.getState())){ + item.setOneUPState(2); + item.setOneUPName(po.getState()); + }else{ + item.setOneUPState(2); + item.setOneUPName(""); + } + + qryTmp.setProjectLibraryId(item.getId()); + qryTmp.setState(PlanTypeEnum.ERSHANG.name()); + po = projectPlanQueryServiceImpl.makeProjectInfoPlanPo(qryTmp); + if (po==null && item.getOneUPName().equals(AuditEnum.SHENHEWANCHENG.key())){ + item.setTwoUPState(0); + item.setTwoUPName("杩涘叆浜屼笂"); + }else if (po!=null &&AuditEnum.DAITIJIAO.key().equals(po.getState())){ + item.setTwoUPState(1); + item.setTwoUPName("鍙栨秷浜屼笂"); + }else if (po!=null &&!AuditEnum.DAITIJIAO.key().equals(po.getState())){ + item.setTwoUPState(2); + item.setTwoUPName(po.getState()); + }else{ + item.setTwoUPState(2); + item.setTwoUPName(""); + } + + qryTmp.setProjectLibraryId(item.getId()); + qryTmp.setState(PlanTypeEnum.PIFU.name()); + po = projectPlanQueryServiceImpl.makeProjectInfoPlanPo(qryTmp); + if (po != null){ + item.setReplyState(0); + item.setReplyName("鏌ョ湅"); + }else{ + item.setReplyState(2); + item.setReplyName("寰呰繘鍏�"); + } + } page.setRecords(outList); return Pagination.fromPage(page); diff --git a/ServiceSite/src/main/java/com/seasky/projectplan/infrastructure/reader/projectplan/ProjectPlanQueryServiceImpl.java b/ServiceSite/src/main/java/com/seasky/projectplan/infrastructure/reader/projectplan/ProjectPlanQueryServiceImpl.java index d8bae528401d7baef5cd0d9f50e4f94cc1b80ed9..6b14505ebee782f4b4c7f64c8334d610d26c13d3 100644 --- a/ServiceSite/src/main/java/com/seasky/projectplan/infrastructure/reader/projectplan/ProjectPlanQueryServiceImpl.java +++ b/ServiceSite/src/main/java/com/seasky/projectplan/infrastructure/reader/projectplan/ProjectPlanQueryServiceImpl.java @@ -244,7 +244,11 @@ public class ProjectPlanQueryServiceImpl extends AbstractService<ProjectPlanBook * @param projectInfoPlanQry 椤圭洰璁″垝涔﹀叆鍙俀ry * @return {@link ProjectPlanBookPo} */ +<<<<<<< HEAD + public ProjectPlanBookPo makeProjectInfoPlanPo(ProjectPlanBookQry projectPlanBookQry){ +======= private ProjectPlanBookPo makeProjectInfoPlanPo(ProjectInfoPlanQry projectInfoPlanQry){ +>>>>>>> develop QueryWrapper<ProjectPlanBookPo> queryWrapper = new QueryWrapper<>(); queryWrapper.eq("project_library_id", projectInfoPlanQry.getProjectLibraryId()); queryWrapper.eq("plan_type", projectInfoPlanQry.getPlanType());