From 77b3266a1e3cd4ac3479da88e54bb28948fb5768 Mon Sep 17 00:00:00 2001 From: sunyuchao Date: Wed, 14 Apr 2021 09:42:10 +0800 Subject: [PATCH] =?UTF-8?q?=E9=A1=B9=E7=9B=AE=E5=88=86=E7=B1=BB=E4=BF=9D?= =?UTF-8?q?=E5=AD=98=E6=8E=A5=E5=8F=A3=E8=B0=83=E6=95=B4=20=E5=85=BC?= =?UTF-8?q?=E5=AE=B9=E7=AB=8B=E9=A1=B9=E7=B1=BB=E5=9E=8B=E9=A1=B9=E7=9B=AE?= =?UTF-8?q?=E5=88=86=E7=B1=BB=E4=BF=9D=E5=AD=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../IssueProjectCategoryDictServiceImpl.java | 13 ++++++----- .../dto/form/ProjectSaveCategoryFormDTO.java | 6 ++++- .../impl/ProjectCategoryServiceImpl.java | 22 ++++++++++++++----- 3 files changed, 30 insertions(+), 11 deletions(-) diff --git a/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/service/impl/IssueProjectCategoryDictServiceImpl.java b/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/service/impl/IssueProjectCategoryDictServiceImpl.java index d623d3f88a..8db5944db0 100644 --- a/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/service/impl/IssueProjectCategoryDictServiceImpl.java +++ b/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/service/impl/IssueProjectCategoryDictServiceImpl.java @@ -165,12 +165,15 @@ public class IssueProjectCategoryDictServiceImpl extends BaseServiceImpl%s", formDTO.getProjectId())); + ProjectIssueDTOResultDTO issueDTO = new ProjectIssueDTOResultDTO(); + if("issue".equals(formDTO.getOrigin())){ + //1.根据项目id查询对应的议题基本信息 + IssueDTO dto = issueProjectRelationDao.selectProjectToIssue(formDTO.getProjectId()); + if (null == dto) { + throw new RenException(String.format("保存项目分类信息，获取项目对应的议题基本信息失败，projectId->%s", formDTO.getProjectId())); + } + issueDTO = ConvertUtils.sourceToTarget(dto,ProjectIssueDTOResultDTO.class); } - ProjectIssueDTOResultDTO issueDTO = ConvertUtils.sourceToTarget(dto,ProjectIssueDTOResultDTO.class); resultDTO.setIssueDTO(issueDTO); //2.批量查询分类信息 List categoryIdList = formDTO.getCategoryList().stream().map(SaveIssueCategoryFormDTO::getId).collect(Collectors.toList()); diff --git a/epmet-module/gov-project/gov-project-client/src/main/java/com/epmet/dto/form/ProjectSaveCategoryFormDTO.java b/epmet-module/gov-project/gov-project-client/src/main/java/com/epmet/dto/form/ProjectSaveCategoryFormDTO.java index 34a8732be5..64709213b7 100644 --- a/epmet-module/gov-project/gov-project-client/src/main/java/com/epmet/dto/form/ProjectSaveCategoryFormDTO.java +++ b/epmet-module/gov-project/gov-project-client/src/main/java/com/epmet/dto/form/ProjectSaveCategoryFormDTO.java @@ -23,11 +23,15 @@ public class ProjectSaveCategoryFormDTO implements Serializable { * 议题分类集合 */ private List categoryList; - /** * 客户Id */ private String customerId; + /** + * 来源：议题issue 项目立项:agency + */ + private String origin; + public interface SaveCategory{} diff --git a/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/impl/ProjectCategoryServiceImpl.java b/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/impl/ProjectCategoryServiceImpl.java index 022e777d9a..85a2d6cc7e 100644 --- a/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/impl/ProjectCategoryServiceImpl.java +++ b/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/impl/ProjectCategoryServiceImpl.java @@ -27,6 +27,7 @@ import com.epmet.commons.tools.page.PageData; import com.epmet.commons.tools.utils.ConvertUtils; import com.epmet.commons.tools.utils.Result; import com.epmet.dao.ProjectCategoryDao; +import com.epmet.dao.ProjectDao; import com.epmet.dao.ProjectTagsDao; import com.epmet.dto.ProjectCategoryDTO; import com.epmet.dto.form.DelCategoryFormDTO; @@ -34,6 +35,7 @@ import com.epmet.dto.form.ProjectCategoryTagListFormDTO; import com.epmet.dto.form.ProjectSaveCategoryFormDTO; import com.epmet.dto.result.*; import com.epmet.entity.ProjectCategoryEntity; +import com.epmet.entity.ProjectEntity; import com.epmet.feign.GovIssueOpenFeignClient; import com.epmet.redis.ProjectCategoryRedis; import com.epmet.service.ProjectCategoryService; @@ -62,6 +64,8 @@ public class ProjectCategoryServiceImpl extends BaseServiceImpl page(Map params) { @@ -157,6 +161,14 @@ public class ProjectCategoryServiceImpl extends BaseServiceImpl%s", formDTO.getProjectId())); + } + formDTO.setOrigin(projectEntity.getOrigin()); + //end + //1.查询项目所属客户和所属网格信息以及分类对应的分类信息 Result result = govIssueOpenFeignClient.getProjectAndCategoryInfo(formDTO); if (!result.success()) { @@ -165,12 +177,12 @@ public class ProjectCategoryServiceImpl extends BaseServiceImpl categoryList = result.getData().getCategoryList(); - //2.汇总批量新增数据 + //2.汇总批量新增项目分类数据 List entityList = new ArrayList<>(); formDTO.getCategoryList().forEach(ca -> { ProjectCategoryEntity entity = new ProjectCategoryEntity(); - entity.setCustomerId(issue.getCustomerId()); - entity.setGridId(issue.getGridId()); + entity.setCustomerId(formDTO.getCustomerId()); + if("issue".equals(formDTO.getOrigin())){ entity.setGridId(issue.getGridId()); } entity.setProjectId(formDTO.getProjectId()); entity.setCategoryId(ca.getId()); categoryList.forEach(cl -> { @@ -182,10 +194,10 @@ public class ProjectCategoryServiceImpl extends BaseServiceImpl