From 204cb91c9c0a6cbb508cb0f96e6bc54860bbcade Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?niohe=C2=B7erbao?= Date: Fri, 28 Apr 2023 09:13:07 +0800 Subject: [PATCH 1/4] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E4=B8=93=E5=AE=B6?= =?UTF-8?q?=E5=BA=93=E7=AD=9B=E9=80=89=E6=9D=A1=E4=BB=B6=E4=B8=8D=E7=94=9F?= =?UTF-8?q?=E6=95=88=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../expert/mapper/ExpertAdminManageMapper.xml | 3 +-- .../pmapi/user/manage/UserInfoManage.java | 24 +++++++++++++++++----- 2 files changed, 20 insertions(+), 7 deletions(-) diff --git a/pmapi/src/main/java/com/ningdatech/pmapi/expert/mapper/ExpertAdminManageMapper.xml b/pmapi/src/main/java/com/ningdatech/pmapi/expert/mapper/ExpertAdminManageMapper.xml index 8eceaf9..425f052 100644 --- a/pmapi/src/main/java/com/ningdatech/pmapi/expert/mapper/ExpertAdminManageMapper.xml +++ b/pmapi/src/main/java/com/ningdatech/pmapi/expert/mapper/ExpertAdminManageMapper.xml @@ -42,8 +42,7 @@ ) - -- ORDER BY create_on DESC - + ORDER BY update_on DESC diff --git a/pmapi/src/main/java/com/ningdatech/pmapi/user/manage/UserInfoManage.java b/pmapi/src/main/java/com/ningdatech/pmapi/user/manage/UserInfoManage.java index 7a2d392..fb052a2 100644 --- a/pmapi/src/main/java/com/ningdatech/pmapi/user/manage/UserInfoManage.java +++ b/pmapi/src/main/java/com/ningdatech/pmapi/user/manage/UserInfoManage.java @@ -145,14 +145,28 @@ public class UserInfoManage { // 查重符合筛选条件的组织列表 if (StringUtils.isNotBlank(orgName)) { List dingOrganizationList = iDingOrganizationService.list(Wrappers.lambdaQuery(DingOrganization.class) - .like(DingOrganization::getOrganizationName, orgName)); - List compliantOrgNameList = dingOrganizationList.stream() + .like(DingOrganization::getOrganizationName, orgName) + .notIn(DingOrganization::getTypeCode, "GOV_INTERNAL_INSTITUTION") + ); + + List compliantOrgNameCodeList = dingOrganizationList.stream() .map(DingOrganization::getOrganizationCode) .collect(Collectors.toList()); - if (CollUtil.isEmpty(compliantOrgNameList)) { + if (CollUtil.isEmpty(compliantOrgNameCodeList)) { + return new ArrayList<>(); + } + + // 取交集 + List tempCompliantOrgCodeList = new ArrayList<>(); + for (String compliantOrgNameCode : compliantOrgNameCodeList) { + if (compliantOrgCodeList.contains(compliantOrgNameCode)) { + tempCompliantOrgCodeList.add(compliantOrgNameCode); + } + } + compliantOrgCodeList = tempCompliantOrgCodeList; + if (CollUtil.isEmpty(compliantOrgCodeList)) { return new ArrayList<>(); } - compliantOrgCodeList.addAll(compliantOrgNameList); } if (StringUtils.isNotBlank(orgCode)) { @@ -417,7 +431,7 @@ public class UserInfoManage { resUserDetailVO.setOrgName(userFullInfo.getOrganizationName()); resUserDetailVO.setRegionCode(userFullInfo.getRegionCode()); resUserDetailVO.setRegionName(regionCacheHelper.getRegionName(userFullInfo.getRegionCode() - ,RegionConst.RL_COUNTY)); + , RegionConst.RL_COUNTY)); resUserDetailVO.setEmpPosUnitCode(userFullInfo.getEmpPosUnitCode()); resUserDetailVO.setEmpPosUnitName(userFullInfo.getEmpPosUnitName()); } From db1c8b630c042394d87ad13a96c04fff8454667b Mon Sep 17 00:00:00 2001 From: WendyYang Date: Fri, 28 Apr 2023 09:20:45 +0800 Subject: [PATCH 2/4] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=9B=9E=E9=81=BF?= =?UTF-8?q?=E4=BF=A1=E6=81=AF=E6=9F=A5=E8=AF=A2=E6=96=B9=E6=B3=95=E5=90=8D?= =?UTF-8?q?=E7=A7=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/java/com/ningdatech/pmapi/meeting/manage/MeetingManage.java | 2 +- .../pmapi/meeting/service/IExpertInviteAvoidRuleService.java | 4 ++-- .../pmapi/meeting/service/impl/ExpertInviteAvoidRuleServiceImpl.java | 2 +- .../com/ningdatech/pmapi/meeting/task/ExpertRandomInviteTask.java | 2 +- 4 files changed, 5 insertions(+), 5 deletions(-) diff --git a/pmapi/src/main/java/com/ningdatech/pmapi/meeting/manage/MeetingManage.java b/pmapi/src/main/java/com/ningdatech/pmapi/meeting/manage/MeetingManage.java index cfd2abc..2605f46 100644 --- a/pmapi/src/main/java/com/ningdatech/pmapi/meeting/manage/MeetingManage.java +++ b/pmapi/src/main/java/com/ningdatech/pmapi/meeting/manage/MeetingManage.java @@ -584,7 +584,7 @@ public class MeetingManage { } result.getRandomRules().add(randomRule); }); - AvoidRuleDTO avoidInfo = inviteAvoidRuleService.getAvoidInfoDto(meetingId); + AvoidRuleDTO avoidInfo = inviteAvoidRuleService.getAvoidInfo(meetingId); AvoidInfoVO vo = new AvoidInfoVO(); vo.setWeekInviteCount(avoidInfo.getWeekInviteCount()); vo.setAvoidOrgIds(avoidInfo.getAvoidOrgIdList()); diff --git a/pmapi/src/main/java/com/ningdatech/pmapi/meeting/service/IExpertInviteAvoidRuleService.java b/pmapi/src/main/java/com/ningdatech/pmapi/meeting/service/IExpertInviteAvoidRuleService.java index 7b25003..ab44e87 100644 --- a/pmapi/src/main/java/com/ningdatech/pmapi/meeting/service/IExpertInviteAvoidRuleService.java +++ b/pmapi/src/main/java/com/ningdatech/pmapi/meeting/service/IExpertInviteAvoidRuleService.java @@ -20,9 +20,9 @@ public interface IExpertInviteAvoidRuleService extends IService ruleMap = inviteRuleService.randomRuleByMeetingId(meetingId); // 回避规则 - AvoidRuleDTO avoidRule = inviteAvoidRuleService.getAvoidInfoDto(meetingId); + AvoidRuleDTO avoidRule = inviteAvoidRuleService.getAvoidInfo(meetingId); // 还需要抽取的规则数量 AtomicInteger notIgnoreCnt = new AtomicInteger(ruleMap.size()); AtomicInteger notSupportCnt = new AtomicInteger(0); From d804645b45599093086ad68e7d3c1f5e30ea924e Mon Sep 17 00:00:00 2001 From: WendyYang Date: Fri, 28 Apr 2023 11:43:28 +0800 Subject: [PATCH 3/4] =?UTF-8?q?=E8=AF=84=E5=AE=A1=E5=A2=9E=E5=8A=A0?= =?UTF-8?q?=E9=A1=B9=E7=9B=AE=E7=BC=96=E5=8F=B7?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../pmapi/expert/controller/ExpertReviewController.java | 8 ++++---- .../com/ningdatech/pmapi/expert/manage/ExpertReviewManage.java | 7 ++++--- .../com/ningdatech/pmapi/expert/model/entity/ExpertReview.java | 2 ++ .../ningdatech/pmapi/expert/model/req/ExpertReviewDetailReq.java | 4 ++++ .../pmapi/meeting/entity/domain/MeetingInnerProject.java | 3 +++ .../ningdatech/pmapi/meeting/entity/dto/ReviewProjectDTO.java | 3 +++ .../pmapi/meeting/entity/vo/MeetingReviewProjectVO.java | 3 +++ .../java/com/ningdatech/pmapi/meeting/manage/MeetingManage.java | 1 + .../com/ningdatech/pmapi/meeting/mapper/MeetingExpertMapper.xml | 2 +- .../pmapi/meeting/service/IMeetingInnerProjectService.java | 9 +++++++++ .../meeting/service/impl/MeetingInnerProjectServiceImpl.java | 7 +++++++ 11 files changed, 41 insertions(+), 8 deletions(-) diff --git a/pmapi/src/main/java/com/ningdatech/pmapi/expert/controller/ExpertReviewController.java b/pmapi/src/main/java/com/ningdatech/pmapi/expert/controller/ExpertReviewController.java index b4718f4..dbda6c1 100644 --- a/pmapi/src/main/java/com/ningdatech/pmapi/expert/controller/ExpertReviewController.java +++ b/pmapi/src/main/java/com/ningdatech/pmapi/expert/controller/ExpertReviewController.java @@ -73,13 +73,13 @@ public class ExpertReviewController { return expertReviewManage.listReviews(projectId, meetingId, false); } - @GetMapping("/detail/{projectId}") + @GetMapping("/detail/{projectCode}") @ApiImplicitParams({ - @ApiImplicitParam(name = "projectId", value = "项目ID"), + @ApiImplicitParam(name = "projectCode", value = "项目编号"), }) @ApiOperation("查看项目的所有评审意见") - public ProjectReviewDetailVO projectExpertReviewDetail(@PathVariable Long projectId) { - return expertReviewManage.projectExpertReviewDetail(projectId); + public ProjectReviewDetailVO projectExpertReviewDetail(@PathVariable String projectCode) { + return expertReviewManage.projectExpertReviewDetail(projectCode); } } diff --git a/pmapi/src/main/java/com/ningdatech/pmapi/expert/manage/ExpertReviewManage.java b/pmapi/src/main/java/com/ningdatech/pmapi/expert/manage/ExpertReviewManage.java index f05220b..d77a4e8 100644 --- a/pmapi/src/main/java/com/ningdatech/pmapi/expert/manage/ExpertReviewManage.java +++ b/pmapi/src/main/java/com/ningdatech/pmapi/expert/manage/ExpertReviewManage.java @@ -107,6 +107,7 @@ public class ExpertReviewManage { review.setReviewResult(req.getReviewResult()); review.setContent(JSONUtil.toJsonStr(req.getReviewTemplateOptions())); review.setProjectId(req.getProjectId()); + review.setProjectCode(req.getProjectCode()); review.setTemplateId(req.getTemplateId()); review.setMeetingId(req.getMeetingId()); review.setOtherAdvice(req.getOtherAdvice()); @@ -151,9 +152,9 @@ public class ExpertReviewManage { }); } - public ProjectReviewDetailVO projectExpertReviewDetail(Long projectId) { + public ProjectReviewDetailVO projectExpertReviewDetail(String projectCode) { ProjectReviewDetailVO detail = new ProjectReviewDetailVO(); - List meetingIds = meetingInnerProjectService.listMeetingIdByProjectId(projectId); + List meetingIds = meetingInnerProjectService.listMeetingIdByProjectCode(projectCode); if (meetingIds.isEmpty()) { return detail; } @@ -166,7 +167,7 @@ public class ExpertReviewManage { }))).values(); LambdaQueryWrapper erQuery = Wrappers.lambdaQuery(ExpertReview.class) .in(ExpertReview::getMeetingId, tmpMeetingIds) - .eq(ExpertReview::getProjectId, projectId) + .eq(ExpertReview::getProjectCode, projectCode) .orderByDesc(ExpertReview::getCreateOn); List expertReviews = expertReviewService.list(erQuery); if (expertReviews.isEmpty()) { diff --git a/pmapi/src/main/java/com/ningdatech/pmapi/expert/model/entity/ExpertReview.java b/pmapi/src/main/java/com/ningdatech/pmapi/expert/model/entity/ExpertReview.java index 5a73039..99d0efe 100644 --- a/pmapi/src/main/java/com/ningdatech/pmapi/expert/model/entity/ExpertReview.java +++ b/pmapi/src/main/java/com/ningdatech/pmapi/expert/model/entity/ExpertReview.java @@ -30,6 +30,8 @@ public class ExpertReview implements Serializable { @ApiModelProperty("项目ID") private Long projectId; + private String projectCode; + @ApiModelProperty("会议ID") private Long meetingId; diff --git a/pmapi/src/main/java/com/ningdatech/pmapi/expert/model/req/ExpertReviewDetailReq.java b/pmapi/src/main/java/com/ningdatech/pmapi/expert/model/req/ExpertReviewDetailReq.java index 0423e54..b0e4696 100644 --- a/pmapi/src/main/java/com/ningdatech/pmapi/expert/model/req/ExpertReviewDetailReq.java +++ b/pmapi/src/main/java/com/ningdatech/pmapi/expert/model/req/ExpertReviewDetailReq.java @@ -28,6 +28,10 @@ public class ExpertReviewDetailReq { @NotNull(message = "项目ID不能为空") private Long projectId; + @ApiModelProperty("项目编号") + @NotNull(message = "项目编号不能为空") + private String projectCode; + @ApiModelProperty("会议ID") @NotNull(message = "会议ID不能为空") private Long meetingId; diff --git a/pmapi/src/main/java/com/ningdatech/pmapi/meeting/entity/domain/MeetingInnerProject.java b/pmapi/src/main/java/com/ningdatech/pmapi/meeting/entity/domain/MeetingInnerProject.java index 64ae07b..f17d70f 100644 --- a/pmapi/src/main/java/com/ningdatech/pmapi/meeting/entity/domain/MeetingInnerProject.java +++ b/pmapi/src/main/java/com/ningdatech/pmapi/meeting/entity/domain/MeetingInnerProject.java @@ -34,4 +34,7 @@ public class MeetingInnerProject implements Serializable { @ApiModelProperty("项目ID") private Long projectId; + @ApiModelProperty("项目编号") + private String projectCode; + } diff --git a/pmapi/src/main/java/com/ningdatech/pmapi/meeting/entity/dto/ReviewProjectDTO.java b/pmapi/src/main/java/com/ningdatech/pmapi/meeting/entity/dto/ReviewProjectDTO.java index 93f5f76..2a882fd 100644 --- a/pmapi/src/main/java/com/ningdatech/pmapi/meeting/entity/dto/ReviewProjectDTO.java +++ b/pmapi/src/main/java/com/ningdatech/pmapi/meeting/entity/dto/ReviewProjectDTO.java @@ -28,6 +28,9 @@ public class ReviewProjectDTO { @ApiModelProperty("项目名称") private String projectName; + @ApiModelProperty("项目编号") + private String projectCode; + @ApiModelProperty("项目类型") private Integer projectType; diff --git a/pmapi/src/main/java/com/ningdatech/pmapi/meeting/entity/vo/MeetingReviewProjectVO.java b/pmapi/src/main/java/com/ningdatech/pmapi/meeting/entity/vo/MeetingReviewProjectVO.java index 1519e06..a43f272 100644 --- a/pmapi/src/main/java/com/ningdatech/pmapi/meeting/entity/vo/MeetingReviewProjectVO.java +++ b/pmapi/src/main/java/com/ningdatech/pmapi/meeting/entity/vo/MeetingReviewProjectVO.java @@ -28,6 +28,9 @@ public class MeetingReviewProjectVO { @ApiModelProperty("项目ID") private Long id; + @ApiModelProperty("项目编号") + private String projectCode; + @ApiModelProperty("项目名称") private String projectName; diff --git a/pmapi/src/main/java/com/ningdatech/pmapi/meeting/manage/MeetingManage.java b/pmapi/src/main/java/com/ningdatech/pmapi/meeting/manage/MeetingManage.java index 2605f46..b2cba8d 100644 --- a/pmapi/src/main/java/com/ningdatech/pmapi/meeting/manage/MeetingManage.java +++ b/pmapi/src/main/java/com/ningdatech/pmapi/meeting/manage/MeetingManage.java @@ -897,6 +897,7 @@ public class MeetingManage { return MeetingReviewProjectVO .builder() .id(project.getId()) + .projectCode(project.getProjectCode()) .projectName(project.getProjectName()) .declaredAmount(project.getDeclareAmount()) .projectType(project.getProjectType()) diff --git a/pmapi/src/main/java/com/ningdatech/pmapi/meeting/mapper/MeetingExpertMapper.xml b/pmapi/src/main/java/com/ningdatech/pmapi/meeting/mapper/MeetingExpertMapper.xml index 5f5f1d1..f83ff1d 100644 --- a/pmapi/src/main/java/com/ningdatech/pmapi/meeting/mapper/MeetingExpertMapper.xml +++ b/pmapi/src/main/java/com/ningdatech/pmapi/meeting/mapper/MeetingExpertMapper.xml @@ -104,7 +104,7 @@