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 da9b18ead9d8f98bc251772d0868ffed91318688..3029d411c59e9529a9461e1eb5e8fb60ea296fb2 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 @@ -45,22 +45,34 @@ public class ProjectLibraryOut { @ApiModelProperty("椤圭洰搴撴枃瀛�") private String projectLibraryName; + @ApiModelProperty("椤圭洰搴撶敵鎶ヤ功id") + private Long projectLibraryBookID; + @ApiModelProperty("涓€涓婄姸鎬�") private Integer oneUPState; @ApiModelProperty("涓€涓婃枃瀛�") private String oneUPName; + @ApiModelProperty("涓€涓婄敵鎶ヤ功id") + private Long oneUPBookID; + @ApiModelProperty("浜屼笂鐘舵€�") private Integer twoUPState; @ApiModelProperty("浜屼笂鏂囧瓧") private String twoUPName; + @ApiModelProperty("浜屼笂鐢虫姤涔d") + private Long twoUPBookID; + @ApiModelProperty("鎵瑰鐘舵€�") private Integer replyState; @ApiModelProperty("鎵瑰鏂囧瓧") private String replyName; + @ApiModelProperty("鎵瑰鐢虫姤涔d") + private Long replyBookID; + } 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 308393943fee879528a23aa7e956d640b6b4c870..adfde7fdfd61d15c2cb07026ed3bf089386d0408 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 @@ -75,6 +75,7 @@ public class ProjectLibraryQuerySvrImpl implements ProjectLibraryQuerySvr { if (po != null &&AuditEnum.DAITIJIAO.key().equals(po.getState())){ item.setProjectLibraryState(1); item.setProjectLibraryName("缂栬緫"); + }else if(po==null){ item.setProjectLibraryState(2); item.setProjectLibraryName(""); @@ -83,7 +84,9 @@ public class ProjectLibraryQuerySvrImpl implements ProjectLibraryQuerySvr { item.setProjectLibraryState(2); item.setProjectLibraryName(po.getState()); } - + if (po != null){ + item.setProjectLibraryBookID(po.getId()); + } qryTmp.setProjectLibraryId(item.getId()); qryTmp.setPlanType(PlanTypeEnum.YISHANG.name()); @@ -101,6 +104,9 @@ public class ProjectLibraryQuerySvrImpl implements ProjectLibraryQuerySvr { item.setOneUPState(2); item.setOneUPName(""); } + if (po != null){ + item.setOneUPBookID(po.getId()); + } qryTmp.setProjectLibraryId(item.getId()); qryTmp.setPlanType(PlanTypeEnum.ERSHANG.name()); @@ -118,6 +124,9 @@ public class ProjectLibraryQuerySvrImpl implements ProjectLibraryQuerySvr { item.setTwoUPState(2); item.setTwoUPName(""); } + if (po != null){ + item.setTwoUPBookID(po.getId()); + } qryTmp.setProjectLibraryId(item.getId()); qryTmp.setPlanType(PlanTypeEnum.PIFU.name()); @@ -129,6 +138,9 @@ public class ProjectLibraryQuerySvrImpl implements ProjectLibraryQuerySvr { item.setReplyState(2); item.setReplyName("寰呰繘鍏�"); } + if (po != null){ + item.setReplyBookID(po.getId()); + } } page.setRecords(outList);