diff --git a/ServiceSite/facade/pom.xml b/ServiceSite/facade/pom.xml index 784b1b236aac2db460de5f82632e01317922cb80..1abeffc17798ca9ec14f71b060e1c65ed85b5906 100644 --- a/ServiceSite/facade/pom.xml +++ b/ServiceSite/facade/pom.xml @@ -4,7 +4,7 @@ <modelVersion>4.0.0</modelVersion> <groupId>com.seasky</groupId> <artifactId>projectplan-api</artifactId> - <version>1.0.12</version> + <version>1.0.13</version> <name>projectplan-api</name> <description>projectplan-api project for projectplan</description> diff --git a/ServiceSite/facade/src/main/java/com/seasky/projectplan/api/IProjectLibrary.java b/ServiceSite/facade/src/main/java/com/seasky/projectplan/api/IProjectLibrary.java index 948985a322500f796c5d98558d96a5affc67dfc6..a3da411f540f71419a2b498a98da2a6c7b96a632 100644 --- a/ServiceSite/facade/src/main/java/com/seasky/projectplan/api/IProjectLibrary.java +++ b/ServiceSite/facade/src/main/java/com/seasky/projectplan/api/IProjectLibrary.java @@ -21,7 +21,7 @@ public interface IProjectLibrary { Result<Object> saveProjectLibrary(@RequestBody ProjectLibraryCmd cmd); @PostMapping("/copyHistoryProjectLibrary") - Result<Object> copyHistoryProjectLibrary(@RequestBody ProjectLibraryCmd cmd); + Result<Object> copyHistoryProjectLibrary(@RequestBody List<Long> idList); @PostMapping("/enterProjectPlanType1") Result<Object> enterProjectPlanType1(@RequestBody ProjectLibraryCmd cmd); 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 fef20efebdda8d3bbca32378ae6a3107f71199b4..da9b18ead9d8f98bc251772d0868ffed91318688 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 @@ -1,7 +1,10 @@ package com.seasky.projectplan.dto.projectlibrary; import io.swagger.annotations.ApiModelProperty; +import lombok.AllArgsConstructor; import lombok.Data; +import lombok.EqualsAndHashCode; +import lombok.NoArgsConstructor; import java.math.BigDecimal; @@ -12,6 +15,8 @@ import java.math.BigDecimal; * @date 2021/05/31 */ @Data +@NoArgsConstructor +@AllArgsConstructor public class ProjectLibraryOut { @ApiModelProperty("id") private Long id; diff --git a/ServiceSite/pom.xml b/ServiceSite/pom.xml index d2a288e1bdcd162d71dfe210fff27175dff5188d..ea9cb0a31557621d5eb48550de5d50b4a0cf4653 100644 --- a/ServiceSite/pom.xml +++ b/ServiceSite/pom.xml @@ -74,7 +74,7 @@ <dependency> <groupId>com.seasky</groupId> <artifactId>projectplan-api</artifactId> - <version>1.0.12</version> + <version>1.0.13</version> </dependency> <dependency> <groupId>com.seasky</groupId> diff --git a/ServiceSite/src/main/java/com/seasky/projectplan/application/command/projectlibrary/AProjectLibrarySvr.java b/ServiceSite/src/main/java/com/seasky/projectplan/application/command/projectlibrary/AProjectLibrarySvr.java index 558ab8982d8749929b4a142689dda861c9e9fd25..335e423d16a44a8d48996fec2aaa67d1d9b5c7c7 100644 --- a/ServiceSite/src/main/java/com/seasky/projectplan/application/command/projectlibrary/AProjectLibrarySvr.java +++ b/ServiceSite/src/main/java/com/seasky/projectplan/application/command/projectlibrary/AProjectLibrarySvr.java @@ -21,9 +21,9 @@ public interface AProjectLibrarySvr { /** * 鎷疯礉鍘嗗彶椤圭洰浣滀负鏈勾椤圭洰搴撲俊鎭� * - * @param cmd cmd + * @param idList cmd */ - void copyHistoryProjectLibrary(ProjectLibraryCmd cmd); + void copyHistoryProjectLibrary(List<Long> idList); /** * 椤圭洰缁忚垂杩涘叆涓€涓� diff --git a/ServiceSite/src/main/java/com/seasky/projectplan/application/command/projectlibrary/AProjectLibrarySvrImpl.java b/ServiceSite/src/main/java/com/seasky/projectplan/application/command/projectlibrary/AProjectLibrarySvrImpl.java index 0d8f87d61b62672165daf68ffefac9966128b275..582903372757310cbdf373bdf27e31677021f97a 100644 --- a/ServiceSite/src/main/java/com/seasky/projectplan/application/command/projectlibrary/AProjectLibrarySvrImpl.java +++ b/ServiceSite/src/main/java/com/seasky/projectplan/application/command/projectlibrary/AProjectLibrarySvrImpl.java @@ -52,37 +52,39 @@ public class AProjectLibrarySvrImpl implements AProjectLibrarySvr { } @Override - public void copyHistoryProjectLibrary(ProjectLibraryCmd cmd) { - //鐢熸垚 "鏂伴」鐩簱id" - ProjectLibraryAgg agg = projectLibraryRepository.buildAggById(cmd.getId()); - agg.setId(null); - Long newId = projectLibrarySvr.saveProjectLibrary(agg); - - //鏍规嵁 "鏃ч」鐩簱id" 鍜� "椤圭洰搴撶被鍨�" 鑾峰彇璁″垝涔﹁仛鍚堟牴,璧嬪€� "鏂伴」鐩簱id" - ProjectInfoPlanAgg agg2 = new ProjectInfoPlanAgg(); - agg2.setPlanType(PlanTypeEnum.XIANGMUKU); - agg2.setProjectLibraryId(cmd.getId()); - agg2 = projectInfoRepository.queryProjectInfoPlan(agg2); - if(ObjectUtils.isEmpty(agg2)){ - throw ExceptionUtil.getException(null,"null"); - } - agg2.setId(null); - if(!ObjectUtils.isEmpty(agg2.getProjectTargetInfo())){ - ProjectTargetEntity projectTargetInfo = agg2.getProjectTargetInfo(); - projectTargetInfo.setId(null); - } - if(!ObjectUtils.isEmpty(agg2.getPlanSubjectList())){ - for(PlanSubjectEntity planSubjectEntity:agg2.getPlanSubjectList()){ - planSubjectEntity.setId(null); - if(!ObjectUtils.isEmpty(planSubjectEntity.getSubjectDetailList())){ - for(SubjectDetailEntity subjectDetailEntity :planSubjectEntity.getSubjectDetailList()){ - subjectDetailEntity.setId(null); + public void copyHistoryProjectLibrary(List<Long> idList) { + for (Long curId : idList) { + //鐢熸垚 "鏂伴」鐩簱id" + ProjectLibraryAgg agg = projectLibraryRepository.buildAggById(curId); + agg.setId(null); + Long newId = projectLibrarySvr.saveProjectLibrary(agg); + + //鏍规嵁 "鏃ч」鐩簱id" 鍜� "椤圭洰搴撶被鍨�" 鑾峰彇璁″垝涔﹁仛鍚堟牴,璧嬪€� "鏂伴」鐩簱id" + ProjectInfoPlanAgg agg2 = new ProjectInfoPlanAgg(); + agg2.setPlanType(PlanTypeEnum.XIANGMUKU); + agg2.setProjectLibraryId(curId); + agg2 = projectInfoRepository.queryProjectInfoPlan(agg2); + if (ObjectUtils.isEmpty(agg2)) { + throw ExceptionUtil.getException(null, "null"); + } + agg2.setId(null); + if (!ObjectUtils.isEmpty(agg2.getProjectTargetInfo())) { + ProjectTargetEntity projectTargetInfo = agg2.getProjectTargetInfo(); + projectTargetInfo.setId(null); + } + if (!ObjectUtils.isEmpty(agg2.getPlanSubjectList())) { + for (PlanSubjectEntity planSubjectEntity : agg2.getPlanSubjectList()) { + planSubjectEntity.setId(null); + if (!ObjectUtils.isEmpty(planSubjectEntity.getSubjectDetailList())) { + for (SubjectDetailEntity subjectDetailEntity : planSubjectEntity.getSubjectDetailList()) { + subjectDetailEntity.setId(null); + } } } } + agg2.setProjectLibraryId(newId); + projectInfoPlanDomainSvr.saveProjectInfoPlan(agg2); } - agg2.setProjectLibraryId(newId); - projectInfoPlanDomainSvr.saveProjectInfoPlan(agg2); } @Override @@ -92,8 +94,8 @@ public class AProjectLibrarySvrImpl implements AProjectLibrarySvr { agg.setPlanType(PlanTypeEnum.XIANGMUKU); agg.setProjectLibraryId(cmd.getId()); agg = projectInfoRepository.queryProjectInfoPlan(agg); - if(ObjectUtils.isEmpty(agg)){ - throw ExceptionUtil.getException(null,"null"); + if (ObjectUtils.isEmpty(agg)) { + throw ExceptionUtil.getException(null, "null"); } agg.setPlanType(PlanTypeEnum.YISHANG); projectLibrarySvr.intoNextPlan(agg); @@ -120,6 +122,7 @@ public class AProjectLibrarySvrImpl implements AProjectLibrarySvr { projectLibrarySvr.cancelIntoNextPlan(agg); } + @Override public void cancelEnterProjectPlanType2(ProjectLibraryCmd cmd) { ProjectInfoPlanAgg agg = new ProjectInfoPlanAgg(); @@ -132,7 +135,7 @@ public class AProjectLibrarySvrImpl implements AProjectLibrarySvr { @Override public void removeProjectLibrary(List<Long> idList) { - for(Long id :idList) { + for (Long id : idList) { projectLibrarySvr.removeProjectPlan(id); } } 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 cf32424b6ac2cb342e404e0c57e69733f0ad5323..ab9fde48d61a5266b3b27658ded4f83d81943495 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 @@ -147,9 +147,9 @@ public class ProjectLibraryQuerySvrImpl implements ProjectLibraryQuerySvr { for(ProjectLibraryOut p:outList){ Map<String,Object> maps=new HashMap<>(2); maps.put("project_library_id",p.getId()); - maps.put("project_type",PlanTypeEnum.XIANGMUKU.name()); + maps.put("plan_type",PlanTypeEnum.XIANGMUKU.name()); List<ProjectPlanBookPo> poObject= projectPlanBookMapper.selectByMap(maps); - if(poObject!=null){ + if(poObject!=null&&poObject.size()>0){ p.setProjectLeaderName(poObject.get(0).getProjectLeaderName()); } } diff --git a/ServiceSite/src/main/java/com/seasky/projectplan/interfaces/controller/ProjectLibraryController.java b/ServiceSite/src/main/java/com/seasky/projectplan/interfaces/controller/ProjectLibraryController.java index 789c08dd57af6c5976da847ff7c76527004b3679..7a7d2724201891dd4c8cb1990c91e799b9b59566 100644 --- a/ServiceSite/src/main/java/com/seasky/projectplan/interfaces/controller/ProjectLibraryController.java +++ b/ServiceSite/src/main/java/com/seasky/projectplan/interfaces/controller/ProjectLibraryController.java @@ -45,8 +45,8 @@ public class ProjectLibraryController implements IProjectLibrary { @Override @ApiOperation("2.鎷疯礉鍘嗗彶椤圭洰浣滀负鏈勾椤圭洰搴撲俊鎭�") - public Result<Object> copyHistoryProjectLibrary(@RequestBody ProjectLibraryCmd cmd) { - service.copyHistoryProjectLibrary(cmd); + public Result<Object> copyHistoryProjectLibrary(@RequestBody List<Long> idList) { + service.copyHistoryProjectLibrary(idList); return ok(ResponseCode.SUCCESS); } diff --git a/ServiceSite/src/main/resources/bootstrap.yml b/ServiceSite/src/main/resources/bootstrap.yml index 4461de64b146e1d26ba002e714e30e9e9f2393c1..ad9ccaca4eeae04e04cf3647d2375bf84b45a2a8 100644 --- a/ServiceSite/src/main/resources/bootstrap.yml +++ b/ServiceSite/src/main/resources/bootstrap.yml @@ -18,5 +18,5 @@ spring: inetutils: preferred-networks: - 10.0.8 -configuration: - log-impl: org.apache.ibatis.logging.stdout.StdOutImpl + +