From b89a8d4b78adb30b33a861952fe9820a7a2917b6 Mon Sep 17 00:00:00 2001 From: wxz Date: Thu, 19 Aug 2021 13:58:30 +0800 Subject: [PATCH 1/8] =?UTF-8?q?fix:=E6=9F=A5=E8=AF=A2=E5=AE=A2=E6=88=B7?= =?UTF-8?q?=E4=BA=BA=E5=A4=A7=E4=BB=A3=E8=A1=A8=E6=8E=A5=E5=8F=A3=EF=BC=8C?= =?UTF-8?q?=E5=A6=82=E6=9E=9C=E5=AE=A2=E6=88=B7=E4=B8=8B=E6=B2=A1=E6=9C=89?= =?UTF-8?q?=E4=BA=BA=E5=A4=A7=E4=BB=A3=E8=A1=A8=EF=BC=8C=E8=BF=94=E5=9B=9E?= =?UTF-8?q?=E7=A9=BA=E5=88=97=E8=A1=A8=EF=BC=8C=E8=80=8C=E4=B8=8D=E5=9C=A8?= =?UTF-8?q?=E6=9F=A5=E8=AF=A2org=E6=9C=8D=E5=8A=A1,=E9=98=B2=E6=AD=A2?= =?UTF-8?q?=E6=8A=A5=E9=94=99?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/epmet/service/impl/ResiEventServiceImpl.java | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/epmet-module/resi-home/resi-home-server/src/main/java/com/epmet/service/impl/ResiEventServiceImpl.java b/epmet-module/resi-home/resi-home-server/src/main/java/com/epmet/service/impl/ResiEventServiceImpl.java index bd6a1c4376..295c8bb6a1 100644 --- a/epmet-module/resi-home/resi-home-server/src/main/java/com/epmet/service/impl/ResiEventServiceImpl.java +++ b/epmet-module/resi-home/resi-home-server/src/main/java/com/epmet/service/impl/ResiEventServiceImpl.java @@ -13,6 +13,7 @@ import com.epmet.enums.OrgLevelEnums; import com.epmet.feign.EpmetUserOpenFeignClient; import com.epmet.feign.GovOrgOpenFeignClient; import com.epmet.service.ResiEventService; +import org.apache.commons.collections4.CollectionUtils; import org.apache.commons.lang3.StringUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; @@ -44,6 +45,8 @@ public class ResiEventServiceImpl implements ResiEventService, ResultDataResolve //String parentAgencyId = gridInfoData.getParentAgencyId(); //String pids = gridInfoData.getPids(); + List npcResultList = new ArrayList<>(); + //查询人大代表列表 ListUserByBadgeFormDTO npcForm = new ListUserByBadgeFormDTO(customerId, BadgeConstant.BADGE_KEY_NPC); Result> npcResult = epmetUserOpenFeignClient.listUsersByBadge(npcForm); @@ -55,9 +58,13 @@ public class ResiEventServiceImpl implements ResiEventService, ResultDataResolve Result> npcGridInfoResult = govOrgOpenFeignClient.selectOrgInfo(form); List npcGridInfos = getResultDataOrThrowsException(npcGridInfoResult, ServiceConstant.GOV_ORG_SERVER, null, null); + if(CollectionUtils.isEmpty(npcGridInfos)) { + // 没有人大代表，直接返回空列表即可 + return npcResultList; + } + Map npcGridInfoMap = convertNpcGridInfos2Map(npcGridInfos); - List npcResultList = new ArrayList<>(); npcData.stream().forEach(npc -> { if (StringUtils.isBlank(excludeUserId) || !npc.getUserId().equals(excludeUserId)) { OrgInfoResultDTO gridInfo = npcGridInfoMap.get(npc.getGridId()); From 6d7444012f24b64a90fc27fe1b45d0d5086e08d7 Mon Sep 17 00:00:00 2001 From: wxz Date: Thu, 19 Aug 2021 14:15:38 +0800 Subject: [PATCH 2/8] =?UTF-8?q?fix:=E5=88=9A=E6=89=8D=E6=94=B9=E9=94=99?= =?UTF-8?q?=E4=BA=86=E3=80=82=E3=80=82=E3=80=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/epmet/service/impl/ResiEventServiceImpl.java | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/epmet-module/resi-home/resi-home-server/src/main/java/com/epmet/service/impl/ResiEventServiceImpl.java b/epmet-module/resi-home/resi-home-server/src/main/java/com/epmet/service/impl/ResiEventServiceImpl.java index 295c8bb6a1..36a2a43684 100644 --- a/epmet-module/resi-home/resi-home-server/src/main/java/com/epmet/service/impl/ResiEventServiceImpl.java +++ b/epmet-module/resi-home/resi-home-server/src/main/java/com/epmet/service/impl/ResiEventServiceImpl.java @@ -52,17 +52,17 @@ public class ResiEventServiceImpl implements ResiEventService, ResultDataResolve Result> npcResult = epmetUserOpenFeignClient.listUsersByBadge(npcForm); List npcData = getResultDataOrThrowsException(npcResult, ServiceConstant.EPMET_USER_SERVER, null, null); + if(CollectionUtils.isEmpty(npcData)) { + // 没有人大代表，直接返回空列表即可 + return npcResultList; + } + //批量查询人大代表所在的网格信息 List npcGridIds = npcData.stream().map(d -> d.getGridId()).collect(Collectors.toList()); OrgInfoFormDTO form = new OrgInfoFormDTO(OrgInfoConstant.GRID, npcGridIds); Result> npcGridInfoResult = govOrgOpenFeignClient.selectOrgInfo(form); List npcGridInfos = getResultDataOrThrowsException(npcGridInfoResult, ServiceConstant.GOV_ORG_SERVER, null, null); - if(CollectionUtils.isEmpty(npcGridInfos)) { - // 没有人大代表，直接返回空列表即可 - return npcResultList; - } - Map npcGridInfoMap = convertNpcGridInfos2Map(npcGridInfos); npcData.stream().forEach(npc -> { From f6f7bee82e4acf98b5a9bd7c4df15c4edaeef703 Mon Sep 17 00:00:00 2001 From: zhaoqifeng Date: Mon, 23 Aug 2021 11:05:20 +0800 Subject: [PATCH 3/8] =?UTF-8?q?=E5=B7=A5=E4=BD=9C=E4=BA=BA=E5=91=98?= =?UTF-8?q?=E8=B0=83=E5=8A=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/epmet/dto/StaffTransferRecordDTO.java | 5 +- .../dto/form/StaffTransferV2FormDTO.java | 27 ++++ .../com/epmet/controller/StaffController.java | 15 ++ .../entity/StaffTransferRecordEntity.java | 16 +- .../service/StaffOrgRelationService.java | 9 ++ .../java/com/epmet/service/StaffService.java | 10 ++ .../impl/StaffOrgRelationServiceImpl.java | 19 +++ .../epmet/service/impl/StaffServiceImpl.java | 144 ++++++++++++++++++ 8 files changed, 238 insertions(+), 7 deletions(-) create mode 100644 epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/form/StaffTransferV2FormDTO.java diff --git a/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/StaffTransferRecordDTO.java b/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/StaffTransferRecordDTO.java index 79899e2e05..ce08a1e8f0 100644 --- a/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/StaffTransferRecordDTO.java +++ b/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/StaffTransferRecordDTO.java @@ -57,12 +57,15 @@ public class StaffTransferRecordDTO implements Serializable { * 调动前组织Id */ private String oldAgencyId; + private String oldOrgType; + private String oldOrgId; /** * 调动后组织Id */ private String agencyId; - + private String orgType; + private String orgId; /** * 备注说明 */ diff --git a/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/form/StaffTransferV2FormDTO.java b/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/form/StaffTransferV2FormDTO.java new file mode 100644 index 0000000000..dc26e0eef9 --- /dev/null +++ b/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/form/StaffTransferV2FormDTO.java @@ -0,0 +1,27 @@ +package com.epmet.dto.form; + +import lombok.Data; +import lombok.NoArgsConstructor; + +import javax.validation.constraints.NotBlank; +import java.io.Serializable; + +/** + * @Description + * @Author zhaoqifeng + * @Date 2021/8/20 15:26 + */ +@NoArgsConstructor +@Data +public class StaffTransferV2FormDTO implements Serializable { + + private static final long serialVersionUID = 1217329965082876795L; + @NotBlank(message = "组织ID不能为空") + private String orgId; + @NotBlank(message = "组织类型不能为空") + private String orgType; + @NotBlank(message = "工作人员ID不能为空") + private String staffId; + @NotBlank(message = "备注说明不能为空") + private String remarks; +} diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/controller/StaffController.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/controller/StaffController.java index 2dafc1e158..b95b96c0b9 100644 --- a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/controller/StaffController.java +++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/controller/StaffController.java @@ -145,6 +145,21 @@ public class StaffController { return new Result(); } + /** + * 工作人员调动V2 + * + * @author zhaoqifeng + * @date 2020/8/27 16:12 + * @param tokenDto + * @param formDTO + * @return com.epmet.commons.tools.utils.Result + */ + @PostMapping("stafftransferv2") + public Result staffTransferV2(@LoginUser TokenDto tokenDto, @RequestBody StaffTransferV2FormDTO formDTO){ + staffService.staffTransferV2(tokenDto, formDTO); + return new Result(); + } + /** * 根据staffId查询用户基本信息 * @author sun diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/entity/StaffTransferRecordEntity.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/entity/StaffTransferRecordEntity.java index b52c91c45e..2b31698659 100644 --- a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/entity/StaffTransferRecordEntity.java +++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/entity/StaffTransferRecordEntity.java @@ -53,15 +53,19 @@ public class StaffTransferRecordEntity extends BaseEpmetEntity { */ private String operatedStaffId; - /** - * 调动前组织Id - */ + /** + * 调动前组织Id + */ private String oldAgencyId; + private String oldOrgType; + private String oldOrgId; - /** - * 调动后组织Id - */ + /** + * 调动后组织Id + */ private String agencyId; + private String orgType; + private String orgId; /** * 备注说明 diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/StaffOrgRelationService.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/StaffOrgRelationService.java index ce5d6ba496..be1286c28e 100644 --- a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/StaffOrgRelationService.java +++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/StaffOrgRelationService.java @@ -92,4 +92,13 @@ public interface StaffOrgRelationService extends BaseService wrapper = new LambdaQueryWrapper<>(); + wrapper.eq(StaffOrgRelationEntity::getStaffId, staffId); + wrapper.eq(StaffOrgRelationEntity::getDelFlag, NumConstant.ZERO_STR); + + return ConvertUtils.sourceToTarget(baseDao.selectOne(wrapper), StaffOrgRelationDTO.class); + } + } \ No newline at end of file diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/StaffServiceImpl.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/StaffServiceImpl.java index 3aaa7a5484..811adc098c 100644 --- a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/StaffServiceImpl.java +++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/StaffServiceImpl.java @@ -1,14 +1,17 @@ package com.epmet.service.impl; import com.epmet.commons.tools.constant.NumConstant; +import com.epmet.commons.tools.dto.result.CustomerStaffInfoCacheResult; import com.epmet.commons.tools.exception.EpmetErrorCode; import com.epmet.commons.tools.exception.RenException; import com.epmet.commons.tools.redis.RedisKeys; import com.epmet.commons.tools.redis.RedisUtils; +import com.epmet.commons.tools.redis.common.CustomerStaffRedis; import com.epmet.commons.tools.security.dto.TokenDto; import com.epmet.commons.tools.utils.ConvertUtils; import com.epmet.commons.tools.utils.Result; import com.epmet.constant.CustomerAgencyConstant; +import com.epmet.constant.OrgInfoConstant; import com.epmet.dao.CustomerAgencyDao; import com.epmet.dao.CustomerStaffAgencyDao; import com.epmet.dto.*; @@ -24,6 +27,7 @@ import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; +import javax.annotation.Resource; import java.util.ArrayList; import java.util.List; import java.util.stream.Collectors; @@ -68,6 +72,8 @@ public class StaffServiceImpl implements StaffService { private CustomerStaffGridService customerStaffGridService; @Autowired private StaffOrgRelationService staffOrgRelationService; + @Resource + private CustomerStaffRedis customerStaffRedis; @Override public Result getStaffInfoForHome(StaffsInAgencyFromDTO fromDTO) { @@ -243,6 +249,7 @@ public class StaffServiceImpl implements StaffService { if (null != actInfoResult.getData() && actInfoResult.getData().size() > NumConstant.ZERO) { throw new RenException(EpmetErrorCode.EXIT_PUBLISHED_ACTIVITY.getCode()); } + //4.修改人员所属组织 CustomerStaffAgencyDTO staffAgency = new CustomerStaffAgencyDTO(); staffAgency.setId(staffAgencyDTO.getId()); @@ -283,6 +290,143 @@ public class StaffServiceImpl implements StaffService { //2021.6.7 添加逻辑-人员调动删除token sun end } + /** + * 工作人员调动 + * + * @param tokenDto + * @param fromDTO + * @return void + * @author zhaoqifeng + * @date 2020/8/27 16:13 + */ + @Override + public void staffTransferV2(TokenDto tokenDto, StaffTransferV2FormDTO fromDTO) { + if (tokenDto.getUserId().equals(fromDTO.getStaffId())) { + throw new RenException(EpmetErrorCode.CAN_NOT_SELF.getCode()); + } + //1.获取工作人员与机关关系 + CustomerStaffAgencyDTO staffAgencyDTO = customerStaffAgencyService.getInfoByUserId(fromDTO.getStaffId()); + String oldAgency = staffAgencyDTO.getAgencyId(); + //2.查询是否有未处理项目 + ProjectListFromDTO projectFromDTO = new ProjectListFromDTO(); + projectFromDTO.setCustomerId(staffAgencyDTO.getCustomerId()); + projectFromDTO.setUserId(fromDTO.getStaffId()); + projectFromDTO.setPageNo(1); + projectFromDTO.setPageSize(10); + Result> pendResult = govProjectOpenFeignClient.getPendProjectList(projectFromDTO); + if (!pendResult.success()) { + throw new RenException(pendResult.getCode(), pendResult.getMsg()); + } + if (null != pendResult.getData() && pendResult.getData().size() > NumConstant.ZERO) { + throw new RenException(EpmetErrorCode.EXIT_PEND_PROJECT.getCode()); + } + //3.查询是否有活动未结束 + Result> actInfoResult = epmetHeartOpenFeignClient.getPublishedAct(fromDTO.getStaffId()); + if (!actInfoResult.success()) { + throw new RenException(actInfoResult.getCode(), actInfoResult.getMsg()); + } + if (null != actInfoResult.getData() && actInfoResult.getData().size() > NumConstant.ZERO) { + throw new RenException(EpmetErrorCode.EXIT_PUBLISHED_ACTIVITY.getCode()); + } + //4.修改人员所属组织 + String agencyId = null; + String orgType = null; + String orgId = null; + if (OrgInfoConstant.AGENCY.equals(fromDTO.getOrgType())) { + agencyId = fromDTO.getOrgId(); + } else if (OrgInfoConstant.DEPT.equals(fromDTO.getOrgType())) { + orgType = fromDTO.getOrgType(); + orgId = fromDTO.getOrgId(); + CustomerDepartmentDTO departmentDTO = customerDepartmentService.get(orgId); + agencyId = departmentDTO.getAgencyId(); + } else { + orgType = fromDTO.getOrgType(); + orgId = fromDTO.getOrgId(); + CustomerGridDTO gridDTO = customerGridService.get(orgId); + agencyId = gridDTO.getPid(); + } + + CustomerStaffAgencyDTO staffAgency = new CustomerStaffAgencyDTO(); + staffAgency.setId(staffAgencyDTO.getId()); + staffAgency.setAgencyId(agencyId); + customerStaffAgencyService.update(staffAgency); + //原来组织总人数减一 + CustomerAgencyDTO oldAgencyDTO = customerAgencyService.get(oldAgency); + oldAgencyDTO.setTotalUser(oldAgencyDTO.getTotalUser() - NumConstant.ONE); + customerAgencyService.update(oldAgencyDTO); + //新组织总人数加一 + CustomerAgencyDTO newAgencyDTO = customerAgencyService.get(agencyId); + newAgencyDTO.setTotalUser(newAgencyDTO.getTotalUser() + NumConstant.ONE); + customerAgencyService.update(newAgencyDTO); + //逻辑删除工作人员原组织加入的部门、网格,部门、网格总人数减1 + customerDepartmentService.updateDepartment(fromDTO.getStaffId()); + customerGridService.updateGrid(fromDTO.getStaffId()); + if (OrgInfoConstant.DEPT.equals(orgType)) { + //添加新的部门关系 + CustomerStaffDepartmentDTO staffDepartmentDTO = new CustomerStaffDepartmentDTO(); + staffDepartmentDTO.setCustomerId(tokenDto.getCustomerId()); + staffDepartmentDTO.setDepartmentId(orgId); + staffDepartmentDTO.setUserId(fromDTO.getStaffId()); + customerStaffDepartmentService.save(staffDepartmentDTO); + //新部门总人数+1 + CustomerDepartmentDTO departmentDTO = customerDepartmentService.get(orgId); + departmentDTO.setTotalUser(departmentDTO.getTotalUser() + NumConstant.ONE); + departmentDTO.setUpdatedBy(null); + departmentDTO.setUpdatedTime(null); + customerDepartmentService.update(departmentDTO); + } + if (OrgInfoConstant.GRID.equals(orgType)) { + //添加新的网格关系 + CustomerStaffGridDTO staffGridDTO = new CustomerStaffGridDTO(); + staffGridDTO.setCustomerId(tokenDto.getCustomerId()); + staffGridDTO.setGridId(orgId); + staffGridDTO.setUserId(fromDTO.getStaffId()); + customerStaffGridService.save(staffGridDTO); + //新网格总人数+1 + CustomerGridDTO gridDTO = customerGridService.get(orgId); + gridDTO.setTotalUser(gridDTO.getTotalUser() + NumConstant.ONE); + gridDTO.setUpdatedBy(null); + gridDTO.setUpdatedTime(null); + customerGridService.update(gridDTO); + } + //6.更改工作人员组织角色 + StaffRoleDTO staffRoleDTO = new StaffRoleDTO(); + staffRoleDTO.setOrgId(agencyId); + staffRoleDTO.setStaffId(fromDTO.getStaffId()); + Result result = epmetUserOpenFeignClient.changeRoleOrg(staffRoleDTO); + if (!result.success()) { + throw new RenException(result.getCode(), result.getMsg()); + } + //7.操作记录表新增调动记录 + //获取工作人员注册组织关系 + StaffOrgRelationDTO staffOrgRelation = staffOrgRelationService.getByStaffId(fromDTO.getStaffId()); + StaffTransferRecordDTO staffTransferRecordDTO = new StaffTransferRecordDTO(); + staffTransferRecordDTO.setCustomerId(tokenDto.getCustomerId()); + staffTransferRecordDTO.setOperateStaffId(tokenDto.getUserId()); + staffTransferRecordDTO.setOperatedStaffId(fromDTO.getStaffId()); + staffTransferRecordDTO.setOldAgencyId(oldAgency); + if (!OrgInfoConstant.AGENCY.equals(staffOrgRelation.getOrgType())) { + staffTransferRecordDTO.setOldOrgType(staffOrgRelation.getOrgType()); + staffTransferRecordDTO.setOldOrgId(staffOrgRelation.getOrgId()); + } + staffTransferRecordDTO.setAgencyId(agencyId); + staffTransferRecordDTO.setOrgType(orgType); + staffTransferRecordDTO.setOrgId(orgId); + staffTransferRecordDTO.setRemarks(fromDTO.getRemarks()); + staffTransferRecordService.save(staffTransferRecordDTO); + //8.更改注册关系 + staffOrgRelation.setOrgId(fromDTO.getOrgId()); + staffOrgRelation.setOrgType(fromDTO.getOrgType()); + staffOrgRelation.setUpdatedBy(null); + staffOrgRelation.setUpdatedTime(null); + staffOrgRelationService.update(staffOrgRelation); + //9..清除可能存在的工作人员登陆token + String key = RedisKeys.getCpUserKey("gov", "wxmp", fromDTO.getStaffId()); + redisUtils.delete(key); + //10 清除工作人员缓存 + customerStaffRedis.delStaffInfoFormCache(tokenDto.getCustomerId(), fromDTO.getStaffId()); + } + /** * 根据staffId查询用户基本信息 * @author sun From a9e3160cd91f53f6a467702dbeb93f73cb238848 Mon Sep 17 00:00:00 2001 From: zhaoqifeng Date: Mon, 23 Aug 2021 11:11:35 +0800 Subject: [PATCH 4/8] =?UTF-8?q?=E5=85=9A=E5=91=98=E8=AE=A4=E8=AF=81?= =?UTF-8?q?=E9=98=B2=E9=87=8D=E5=A4=8D=E6=8F=90=E4=BA=A4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../partymember/controller/PartyMemberConfirmController.java | 2 ++ 1 file changed, 2 insertions(+) diff --git a/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partymember/controller/PartyMemberConfirmController.java b/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partymember/controller/PartyMemberConfirmController.java index 58d4d2edc2..099d9d434b 100644 --- a/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partymember/controller/PartyMemberConfirmController.java +++ b/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partymember/controller/PartyMemberConfirmController.java @@ -1,5 +1,6 @@ package com.epmet.modules.partymember.controller; +import com.epmet.commons.tools.aop.NoRepeatSubmit; import com.epmet.commons.tools.utils.Result; import com.epmet.modules.partymember.service.PartyMemberConfirmService; import com.epmet.resi.mine.dto.from.PartyMemberInitFromDTO; @@ -65,6 +66,7 @@ public class PartyMemberConfirmController { * @date 2020/3/31 10:50 */ @PostMapping("submit") + @NoRepeatSubmit public Result submit(@RequestBody PartymemberInfoDTO partyMemberInfoDTO) { return partyMemberConfirmService.submit(partyMemberInfoDTO); } From d1bbc2241fdd617f90a71d02140681383cdcd930 Mon Sep 17 00:00:00 2001 From: jianjun Date: Mon, 23 Aug 2021 13:29:25 +0800 Subject: [PATCH 5/8] =?UTF-8?q?=E6=8F=8F=E8=BF=B0=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/epmet/commons/tools/feign/CommonAggFeignClient.java | 1 + 1 file changed, 1 insertion(+) diff --git a/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/feign/CommonAggFeignClient.java b/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/feign/CommonAggFeignClient.java index d9ceb0f3a0..5bfb7b698f 100644 --- a/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/feign/CommonAggFeignClient.java +++ b/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/feign/CommonAggFeignClient.java @@ -10,6 +10,7 @@ import org.springframework.web.bind.annotation.PostMapping; /** + * desc:通用工具包里的 agg feignClient * @Description * @Author sun */ From e9a58b947e1c5d6548c206baa29d724d1e5aac74 Mon Sep 17 00:00:00 2001 From: sunyuchao Date: Mon, 23 Aug 2021 15:45:17 +0800 Subject: [PATCH 6/8] =?UTF-8?q?=E8=AE=AE=E9=A2=98=E8=BD=AC=E9=A1=B9?= =?UTF-8?q?=E7=9B=AE=E3=80=81=E9=A1=B9=E7=9B=AE=E6=B5=81=E8=BD=AC=E9=80=89?= =?UTF-8?q?=E4=BA=BA=E6=8E=A5=E5=8F=A3=E9=80=BB=E8=BE=91=E8=B0=83=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../impl/CustomerAgencyServiceImpl.java | 20 +++++++++++++------ .../mapper/CustomerStaffAgencyDao.xml | 12 +++++++---- 2 files changed, 22 insertions(+), 10 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 f19e1a8af5..38c0fc85b0 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 @@ -195,6 +195,9 @@ public class CustomerAgencyServiceImpl extends BaseServiceImpl agencyStaffList = customerStaffAgencyDao.selectAgencyStaffList(canTick.getAgencyId()); //2:根据组织Id查询该组织下部门、人员列表 //2.1:查询组织下部门列表 @@ -257,8 +260,8 @@ public class CustomerAgencyServiceImpl extends BaseServiceImpl staffList = dto.getStaffList(); List roleList = dto.getRoleList(); - //有时间再优化成jdk8的遍历方式 - //5.0:先把在部门或网格下存在的人员在组织中去掉，组织中只展示在部门、网格下不存在的人员 + //2021.8.23 sun 表述同上，屏蔽此处程序，组织下的人不做去重处理 start + /*//5.0:先把在部门或网格下存在的人员在组织中去掉，组织中只展示在部门、网格下不存在的人员 //部门 Iterator itDept = agencyStaffList.iterator(); while (itDept.hasNext()) { @@ -280,7 +283,8 @@ public class CustomerAgencyServiceImpl extends BaseServiceImpl{ //人员信息 @@ -357,6 +361,9 @@ public class CustomerAgencyServiceImpl extends BaseServiceImpl projectStaffList = canTick.getProjectStaffList(); //1:根据组织Id查询该组织下工作人员列表（去除组织下已经在项目节点上的人员） + /*2021.8.23 sun 应产品要求工作人员可以在组织、部门、网格下新增，对于部门、网格下添加的人在选人时不在组织层级展示； + 对于在组织添加的人即使有加入部门、网格也要在选人的组织层级上展示，组织添加的人不在做去重处理。 + 程序的调整是查询组织下人员时只查询在组织层级添加的，同时下边程序对部门、网格有的人要在组织去重的程序做屏蔽处理*/ List agencyAllStaffList = customerStaffAgencyDao.selectAgencyStaffList(canTick.getAgencyId()); List agencyStaffList = new ArrayList<>(); //1.1:去除组织下已在项目节点上的人员 @@ -451,8 +458,8 @@ public class CustomerAgencyServiceImpl extends BaseServiceImpl staffList = dto.getStaffList(); List roleList = dto.getRoleList(); - //有时间再优化成jdk8的遍历方式 - //5.0:先把在部门或网格下存在的人员在组织中去掉，组织中只展示在部门、网格下不存在的人员 + //2021.8.23 sun 表述同上，屏蔽此处程序，组织下的人不做去重处理 start + /*//5.0:先把在部门或网格下存在的人员在组织中去掉，组织中只展示在部门、网格下不存在的人员 //部门 Iterator itDept = agencyStaffList.iterator(); while (itDept.hasNext()) { @@ -474,7 +481,8 @@ public class CustomerAgencyServiceImpl extends BaseServiceImpl{ //人员信息 diff --git a/epmet-module/gov-org/gov-org-server/src/main/resources/mapper/CustomerStaffAgencyDao.xml b/epmet-module/gov-org/gov-org-server/src/main/resources/mapper/CustomerStaffAgencyDao.xml index 0235999cb4..c62306039f 100644 --- a/epmet-module/gov-org/gov-org-server/src/main/resources/mapper/CustomerStaffAgencyDao.xml +++ b/epmet-module/gov-org/gov-org-server/src/main/resources/mapper/CustomerStaffAgencyDao.xml @@ -96,13 +96,17 @@