From efd1b003b0d86190717621c49883ae3fdaaf0261 Mon Sep 17 00:00:00 2001 From: zhaoqifeng Date: Mon, 18 May 2020 16:52:29 +0800 Subject: [PATCH 1/5] =?UTF-8?q?=E6=97=B6=E9=97=B4=E6=88=B3=E7=B2=BE?= =?UTF-8?q?=E7=A1=AE=E5=88=B0=E7=A7=92?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/java/com/epmet/service/impl/IssueServiceImpl.java | 2 +- .../java/com/epmet/service/impl/ProjectServiceImpl.java | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/service/impl/IssueServiceImpl.java b/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/service/impl/IssueServiceImpl.java index 066333305c..822055a280 100644 --- a/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/service/impl/IssueServiceImpl.java +++ b/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/service/impl/IssueServiceImpl.java @@ -195,7 +195,7 @@ public class IssueServiceImpl extends BaseServiceImpl imp shiftProject.setIssueTitle(issue.getIssueTitle()); shiftProject.setDepartmentNameList(project.getDepartmentNameList()); shiftProject.setPublicReply(project.getPublicReply()); - shiftProject.setShiftedTime(project.getCreatedTime().getTime()); + shiftProject.setShiftedTime(project.getCreatedTime().getTime()/NumConstant.ONE_THOUSAND); shiftProject.setProjectStatus(project.getStatus()); return shiftProject; })).collect(Collectors.toList()); diff --git a/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/impl/ProjectServiceImpl.java b/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/impl/ProjectServiceImpl.java index 64b6a08ede..6aa25ec3b8 100644 --- a/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/impl/ProjectServiceImpl.java +++ b/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/impl/ProjectServiceImpl.java @@ -146,7 +146,7 @@ public class ProjectServiceImpl extends BaseServiceImpl finalDays) { pend.setWarningFlag(true); @@ -178,7 +178,7 @@ public class ProjectServiceImpl extends BaseServiceImpl Date: Mon, 18 May 2020 18:07:08 +0800 Subject: [PATCH 2/5] =?UTF-8?q?=E9=83=A8=E9=97=A8=E4=BA=BA=E5=91=98?= =?UTF-8?q?=E6=9F=A5=E8=AF=A2=E6=8E=A5=E5=8F=A3Bug=E4=BF=AE=E5=A4=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../impl/CustomerAgencyServiceImpl.java | 64 +++++++++++-------- 1 file changed, 36 insertions(+), 28 deletions(-) diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/CustomerAgencyServiceImpl.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/CustomerAgencyServiceImpl.java index f93114f028..b333f09cd3 100644 --- a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/CustomerAgencyServiceImpl.java +++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/CustomerAgencyServiceImpl.java @@ -198,41 +198,49 @@ public class CustomerAgencyServiceImpl extends BaseServiceImpl listDept = customerDepartmentDao.selectDepartmentList(canTick.getAgencyId()); List departmentList = ConvertUtils.sourceToTarget(listDept, DeptListResultDTO.class); - //2.2:查询每一个部门下人员列表 - List deptIdList = departmentList.stream().map(DeptListResultDTO::getDepartmentId).collect(Collectors.toList()); - List deptStaffs = customerStaffDepartmentDao.selectDeptStaffs(deptIdList); - departmentList.forEach(dept->{ - List departmentStaffList = new ArrayList<>(); - deptStaffs.forEach(ds->{ - if (dept.getDepartmentId().equals(ds.getDepartmentId())) { - if (!"project".equals(canTick.getType()) || "".equals(canTick.getDeptOrGridId()) || !dept.getDepartmentId().equals(canTick.getDeptOrGridId())) { - StaffListResultDTO sf = new StaffListResultDTO(); - sf.setStaffId(ds.getUserId()); - departmentStaffList.add(sf); + List deptStaffs = new ArrayList<>(); + if (null != departmentList && departmentList.size() > NumConstant.ZERO) { + //2.2:查询每一个部门下人员列表 + List deptIdList = departmentList.stream().map(DeptListResultDTO::getDepartmentId).collect(Collectors.toList()); + deptStaffs = customerStaffDepartmentDao.selectDeptStaffs(deptIdList); + List finalDeptStaffs = deptStaffs; + departmentList.forEach(dept->{ + List departmentStaffList = new ArrayList<>(); + finalDeptStaffs.forEach(ds->{ + if (dept.getDepartmentId().equals(ds.getDepartmentId())) { + if (!"project".equals(canTick.getType()) || "".equals(canTick.getDeptOrGridId()) || !dept.getDepartmentId().equals(canTick.getDeptOrGridId())) { + StaffListResultDTO sf = new StaffListResultDTO(); + sf.setStaffId(ds.getUserId()); + departmentStaffList.add(sf); + } } - } + }); + dept.setDepartmentStaffList(departmentStaffList); }); - dept.setDepartmentStaffList(departmentStaffList); - }); + } //3:根据组织Id查询该组织下网格、人员列表 //3.1:查询组织下网格列表 List gridList = customerGridDao.selectGridList(canTick.getAgencyId()); - //3.2:查询每一个网格下人员列表 - List gridIdList = gridList.stream().map(GridListResultDTO::getGridId).collect(Collectors.toList()); - List gridStaffs = customerStaffGridDao.selectGridStaffs(gridIdList); - gridList.forEach(grid->{ - List gridStaffList = new ArrayList<>(); - gridStaffs.forEach(gs->{ - if(grid.getGridId().equals(gs.getGridId())){ - if (!"project".equals(canTick.getType()) || "".equals(canTick.getDeptOrGridId()) || !grid.getGridId().equals(canTick.getDeptOrGridId())) { - StaffListResultDTO sf = new StaffListResultDTO(); - sf.setStaffId(gs.getUserId()); - gridStaffList.add(sf); + List gridStaffs = new ArrayList<>(); + if (null != gridList && gridList.size() > NumConstant.ZERO) { + //3.2:查询每一个网格下人员列表 + List gridIdList = gridList.stream().map(GridListResultDTO::getGridId).collect(Collectors.toList()); + gridStaffs = customerStaffGridDao.selectGridStaffs(gridIdList); + List finalGridStaffs = gridStaffs; + gridList.forEach(grid->{ + List gridStaffList = new ArrayList<>(); + finalGridStaffs.forEach(gs->{ + if(grid.getGridId().equals(gs.getGridId())){ + if (!"project".equals(canTick.getType()) || "".equals(canTick.getDeptOrGridId()) || !grid.getGridId().equals(canTick.getDeptOrGridId())) { + StaffListResultDTO sf = new StaffListResultDTO(); + sf.setStaffId(gs.getUserId()); + gridStaffList.add(sf); + } } - } + }); + grid.setGridStaffList(gridStaffList); }); - grid.setGridStaffList(gridStaffList); - }); + } //4:汇总组织下人员、组织下部门下人员、组织下网格下人员Id集合，调用epmet-user服务查询工作人员基本信息 List staffIdList1 = agencyStaffList.stream().map(StaffListResultDTO::getStaffId).collect(Collectors.toList()); List staffIdList2 = deptStaffs.stream().map(CustomerStaffDepartmentDTO::getUserId).collect(Collectors.toList()); From b24113d92b9c62e40135f4321249178d71638826 Mon Sep 17 00:00:00 2001 From: wangchao Date: Mon, 18 May 2020 18:24:54 +0800 Subject: [PATCH 3/5] =?UTF-8?q?=E6=9F=A5=E8=AF=A2=E8=AE=AE=E9=A2=98?= =?UTF-8?q?=E7=9B=B8=E5=85=B3=E8=AF=9D=E9=A2=98=E7=9A=84=E4=BF=A1=E6=81=AF?= =?UTF-8?q?=E6=97=B6sql=E4=BF=AE=E6=AD=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- epmet-gateway/pom.xml | 5 +++-- .../src/main/resources/mapper/topic/ResiTopicDao.xml | 4 ++-- .../src/main/java/com/epmet/controller/IssueController.java | 2 +- 3 files changed, 6 insertions(+), 5 deletions(-) diff --git a/epmet-gateway/pom.xml b/epmet-gateway/pom.xml index a9582675e3..7e8232f7fb 100644 --- a/epmet-gateway/pom.xml +++ b/epmet-gateway/pom.xml @@ -140,7 +140,7 @@ lb://resi-mine-server - + lb://resi-group-server @@ -158,9 +158,10 @@ lb://resi-hall-server - + lb://gov-issue-server + lb://gov-project-server lb://common-service-server diff --git a/epmet-module/resi-group/resi-group-server/src/main/resources/mapper/topic/ResiTopicDao.xml b/epmet-module/resi-group/resi-group-server/src/main/resources/mapper/topic/ResiTopicDao.xml index 46dc79434a..40a791819e 100644 --- a/epmet-module/resi-group/resi-group-server/src/main/resources/mapper/topic/ResiTopicDao.xml +++ b/epmet-module/resi-group/resi-group-server/src/main/resources/mapper/topic/ResiTopicDao.xml @@ -425,10 +425,10 @@ resi_topic_attachment attachment ON topic.ID = attachment.TOPIC_ID - WHERE - topic.DEL_FLAG = '0' AND attachment.DEL_FLAG = '0' + WHERE + topic.DEL_FLAG = '0' AND topic.ID = #{topicId} ORDER BY diff --git a/epmet-module/resi-hall/resi-hall-server/src/main/java/com/epmet/controller/IssueController.java b/epmet-module/resi-hall/resi-hall-server/src/main/java/com/epmet/controller/IssueController.java index 08a38bc643..c03000e354 100644 --- a/epmet-module/resi-hall/resi-hall-server/src/main/java/com/epmet/controller/IssueController.java +++ b/epmet-module/resi-hall/resi-hall-server/src/main/java/com/epmet/controller/IssueController.java @@ -173,7 +173,7 @@ public class IssueController { } /** - * @Description 满意度评价列表——已转项目 + * @Description 已转项目列表 * @param formDTO * @author zxc */ From fa16def5bf1f89c1bf65e6d8a98ab36b65bdc9a6 Mon Sep 17 00:00:00 2001 From: zhaoqifeng Date: Tue, 19 May 2020 09:10:56 +0800 Subject: [PATCH 4/5] =?UTF-8?q?=E9=A1=B9=E7=9B=AE=E4=BA=BA=E5=91=98?= =?UTF-8?q?=E5=85=B3=E8=81=94=E8=A1=A8=E5=AD=97=E6=AE=B5=E9=95=BF=E5=BA=A6?= =?UTF-8?q?=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/resources/db.migration/epmet_gov_project.sql | 2 ++ 1 file changed, 2 insertions(+) diff --git a/epmet-module/gov-project/gov-project-server/src/main/resources/db.migration/epmet_gov_project.sql b/epmet-module/gov-project/gov-project-server/src/main/resources/db.migration/epmet_gov_project.sql index 9265cad8c9..d52915c027 100644 --- a/epmet-module/gov-project/gov-project-server/src/main/resources/db.migration/epmet_gov_project.sql +++ b/epmet-module/gov-project/gov-project-server/src/main/resources/db.migration/epmet_gov_project.sql @@ -150,3 +150,5 @@ alter table project_staff add column DEPARTMENT_NAME varchar(200) NOT NULL COMME alter table project_process add column DEPARTMENT_NAME varchar(200) NOT NULL COMMENT '处理部门' after PROJECT_ID; alter table project add column CUSTOMER_ID varchar(64) NOT NULL COMMENT '客户ID' after ID; + +ALTER TABLE project_staff MODIFY COLUMN ORG_ID_PATH varchar(1000) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci DEFAULT NULL COMMENT '所属机关（11:22:33）'; From 9f63625c0e03186f6276f07a46ac973205ca4c99 Mon Sep 17 00:00:00 2001 From: sunyuchao Date: Tue, 19 May 2020 10:13:12 +0800 Subject: [PATCH 5/5] =?UTF-8?q?=E8=AE=AE=E9=A2=98=E7=AE=A1=E7=90=86?= =?UTF-8?q?=E3=80=81=E9=A1=B9=E7=9B=AE=E8=B7=9F=E8=B8=AA-=E7=A8=8B?= =?UTF-8?q?=E5=BA=8F=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/com/epmet/constant/IssueConstant.java | 2 ++ .../java/com/epmet/service/impl/IssueServiceImpl.java | 9 +++++++++ .../java/com/epmet/dto/result/StaffListResultDTO.java | 2 +- .../epmet/service/impl/CustomerAgencyServiceImpl.java | 2 +- .../main/java/com/epmet/constant/ProjectConstant.java | 4 ++++ .../epmet/service/impl/ProjectProcessServiceImpl.java | 9 ++++++--- .../java/com/epmet/service/impl/ProjectServiceImpl.java | 6 +++--- 7 files changed, 26 insertions(+), 8 deletions(-) diff --git a/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/constant/IssueConstant.java b/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/constant/IssueConstant.java index d2f4938490..b3b9381487 100644 --- a/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/constant/IssueConstant.java +++ b/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/constant/IssueConstant.java @@ -57,4 +57,6 @@ public interface IssueConstant { String SELECT_GOV_ORG_EXCEPTION = "获取议题所属组织、网格信息失败"; String OPERATION_EXCEPTION = "议题已关闭，不能再次关闭"; String GOV_PRJECT_EXCEPTION = "议题转项目，获取项目数据失败"; + String ISSUE_VOTING_EXCEPTION = "非表决中议题，不允许转成项目"; + String ISSUE_SHIFT_PROJECT_EXCEPTION = "议题已转项目，不允许再次操作"; } diff --git a/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/service/impl/IssueServiceImpl.java b/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/service/impl/IssueServiceImpl.java index 822055a280..7eac6655c3 100644 --- a/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/service/impl/IssueServiceImpl.java +++ b/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/service/impl/IssueServiceImpl.java @@ -469,6 +469,15 @@ public class IssueServiceImpl extends BaseServiceImpl imp //因需要保证议题表中的转项目时间与创建项目时间一致 因此先新增项目数据再更新议题数据 //1:查询议题数据 IssueEntity entity = baseDao.selectById(formDTO.getIssueId()); + if (null == entity) { + throw new RenException(IssueConstant.SELECT_EXCEPTION); + } + if (IssueConstant.ISSUE_SHIFT_PROJECT.equals(entity.getIssueStatus())) { + throw new RenException(IssueConstant.ISSUE_SHIFT_PROJECT_EXCEPTION); + } + if (!IssueConstant.ISSUE_VOTING.equals(entity.getIssueStatus())) { + throw new RenException(IssueConstant.ISSUE_VOTING_EXCEPTION); + } formDTO.setIssueDTO(ConvertUtils.sourceToTarget(entity, IssueDTO.class)); //2:调用gov-project服务，新增项目各业务表初始数据 diff --git a/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/result/StaffListResultDTO.java b/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/result/StaffListResultDTO.java index ef496b28e5..fe4d260c8f 100644 --- a/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/result/StaffListResultDTO.java +++ b/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/result/StaffListResultDTO.java @@ -27,7 +27,7 @@ public class StaffListResultDTO implements Serializable { /** * 性别 */ - private String gender; + private String gender="0"; /** * 角色名称(机关领导、部门领导、网格长) */ diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/CustomerAgencyServiceImpl.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/CustomerAgencyServiceImpl.java index b333f09cd3..142a3d05aa 100644 --- a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/CustomerAgencyServiceImpl.java +++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/CustomerAgencyServiceImpl.java @@ -247,7 +247,7 @@ public class CustomerAgencyServiceImpl extends BaseServiceImpl staffIdList3 = gridStaffs.stream().map(CustomerStaffGridDTO::getUserId).collect(Collectors.toList()); List staffIdList = new ArrayList<>(); staffIdList.addAll(staffIdList1); staffIdList.addAll(staffIdList2); staffIdList.addAll(staffIdList3); - staffIdList = new ArrayList(new LinkedHashSet<>(staffIdList)); + staffIdList = new ArrayList(new LinkedHashSet<>(staffIdList));staffIdList.removeAll(Collections.singleton("")); Result userList = epmetUserFeignClient.getCustomerStaffList(staffIdList); if(!userList.success()||null==userList.getData()){ throw new RenException(CustomerAgencyConstant.SELECT_USER_EXCEPTION); diff --git a/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/constant/ProjectConstant.java b/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/constant/ProjectConstant.java index c2919ffbfd..ecd82ff5d3 100644 --- a/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/constant/ProjectConstant.java +++ b/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/constant/ProjectConstant.java @@ -89,4 +89,8 @@ public interface ProjectConstant { * 调用gov-org服务查询数据失败 */ String SELECT_GOV_ORG_EXCEPTION = "获取组织、部门、网格信息失败"; + /** + * 调用gov-org服务查询数据失败 + */ + String UNHANDLED_EXCEPTION = "已转过其他部门，不能再次操作"; } diff --git a/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/impl/ProjectProcessServiceImpl.java b/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/impl/ProjectProcessServiceImpl.java index b7ab25727b..9afab22488 100644 --- a/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/impl/ProjectProcessServiceImpl.java +++ b/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/impl/ProjectProcessServiceImpl.java @@ -178,6 +178,9 @@ public class ProjectProcessServiceImpl extends BaseServiceImpl agencyIdList = staffList.stream().map(TickStaffFormDTO::getAgencyId).collect(Collectors.toList()); - agencyIdList = new ArrayList(new LinkedHashSet<>(agencyIdList)); + agencyIdList = new ArrayList(new LinkedHashSet<>(agencyIdList));agencyIdList.removeAll(Collections.singleton("")); List deptIdList = staffList.stream().map(TickStaffFormDTO::getDepartmentId).collect(Collectors.toList()); - deptIdList = new ArrayList(new LinkedHashSet<>(deptIdList)); + deptIdList = new ArrayList(new LinkedHashSet<>(deptIdList));deptIdList.removeAll(Collections.singleton("")); List gridIdList = staffList.stream().map(TickStaffFormDTO::getGridId).collect(Collectors.toList()); - gridIdList = new ArrayList(new LinkedHashSet<>(gridIdList)); + gridIdList = new ArrayList(new LinkedHashSet<>(gridIdList));gridIdList.removeAll(Collections.singleton("")); AgencyDeptGridFormDTO agencyDeptGridFormDTO = new AgencyDeptGridFormDTO(); agencyDeptGridFormDTO.setAgencyIdList(agencyIdList); agencyDeptGridFormDTO.setDeptIdList(deptIdList); diff --git a/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/impl/ProjectServiceImpl.java b/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/impl/ProjectServiceImpl.java index 6aa25ec3b8..11089feddb 100644 --- a/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/impl/ProjectServiceImpl.java +++ b/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/impl/ProjectServiceImpl.java @@ -422,12 +422,12 @@ public class ProjectServiceImpl extends BaseServiceImpl agencyIdList = staffList.stream().map(TickStaffFormDTO::getAgencyId).collect(Collectors.toList()); agencyIdList.add(issueDTO.getOrgId()); - agencyIdList = new ArrayList(new LinkedHashSet<>(agencyIdList)); + agencyIdList = new ArrayList(new LinkedHashSet<>(agencyIdList));agencyIdList.removeAll(Collections.singleton("")); List deptIdList = staffList.stream().map(TickStaffFormDTO::getDepartmentId).collect(Collectors.toList()); - deptIdList = new ArrayList(new LinkedHashSet<>(deptIdList)); + deptIdList = new ArrayList(new LinkedHashSet<>(deptIdList));deptIdList.removeAll(Collections.singleton("")); List gridIdList = staffList.stream().map(TickStaffFormDTO::getGridId).collect(Collectors.toList()); gridIdList.add(issueDTO.getGridId()); - gridIdList = new ArrayList(new LinkedHashSet<>(gridIdList)); + gridIdList = new ArrayList(new LinkedHashSet<>(gridIdList));gridIdList.removeAll(Collections.singleton("")); AgencyDeptGridFormDTO agencyDeptGridFormDTO = new AgencyDeptGridFormDTO(); agencyDeptGridFormDTO.setAgencyIdList(agencyIdList); agencyDeptGridFormDTO.setDeptIdList(deptIdList);