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/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/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/MeetingBasicDTO.java b/pmapi/src/main/java/com/ningdatech/pmapi/meeting/entity/dto/MeetingBasicDTO.java index 1440751..437c598 100644 --- a/pmapi/src/main/java/com/ningdatech/pmapi/meeting/entity/dto/MeetingBasicDTO.java +++ b/pmapi/src/main/java/com/ningdatech/pmapi/meeting/entity/dto/MeetingBasicDTO.java @@ -66,7 +66,7 @@ public class MeetingBasicDTO { private String contact; @ApiModelProperty("内部项目ID") - private List projectIdList; + private List innerProjects; @ApiModelProperty("外部项目") private List projects; diff --git a/pmapi/src/main/java/com/ningdatech/pmapi/meeting/entity/dto/MeetingReviewProjectDTO.java b/pmapi/src/main/java/com/ningdatech/pmapi/meeting/entity/dto/MeetingReviewProjectDTO.java index fd6d1dd..59fef4d 100644 --- a/pmapi/src/main/java/com/ningdatech/pmapi/meeting/entity/dto/MeetingReviewProjectDTO.java +++ b/pmapi/src/main/java/com/ningdatech/pmapi/meeting/entity/dto/MeetingReviewProjectDTO.java @@ -19,6 +19,9 @@ public class MeetingReviewProjectDTO { @ApiModelProperty("项目ID") private Long projectId; + @ApiModelProperty("项目编码") + private String projectCode; + @ApiModelProperty("项目名称") private String projectName; diff --git a/pmapi/src/main/java/com/ningdatech/pmapi/meeting/entity/dto/ProjectIdCodeDTO.java b/pmapi/src/main/java/com/ningdatech/pmapi/meeting/entity/dto/ProjectIdCodeDTO.java new file mode 100644 index 0000000..94b8641 --- /dev/null +++ b/pmapi/src/main/java/com/ningdatech/pmapi/meeting/entity/dto/ProjectIdCodeDTO.java @@ -0,0 +1,23 @@ +package com.ningdatech.pmapi.meeting.entity.dto; + +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +/** + *

+ * ProjectIdCodeDTO + *

+ * + * @author WendyYang + * @since 2023/4/28 + **/ +@Data +public class ProjectIdCodeDTO { + + @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/helper/MeetingManageHelper.java b/pmapi/src/main/java/com/ningdatech/pmapi/meeting/helper/MeetingManageHelper.java index 680b92a..984d8cd 100644 --- a/pmapi/src/main/java/com/ningdatech/pmapi/meeting/helper/MeetingManageHelper.java +++ b/pmapi/src/main/java/com/ningdatech/pmapi/meeting/helper/MeetingManageHelper.java @@ -63,7 +63,7 @@ public class MeetingManageHelper { public void checkReviewProject(MeetingBasicDTO meetingBasic) { if (meetingBasic.getIsInnerProject()) { - Assert.notEmpty(meetingBasic.getProjectIdList(), "评审项目不能为空"); + Assert.notEmpty(meetingBasic.getInnerProjects(), "评审项目不能为空"); } else { Assert.notEmpty(meetingBasic.getProjects(), "评审项目不能为空"); } 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..c3e01a9 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 @@ -137,12 +137,14 @@ public class MeetingManage { meeting.setInviteType(inviteRule.getInviteType()); meetingService.save(meeting); if (meetingBasic.getIsInnerProject()) { - List projects = meetingBasic.getProjectIdList().stream().map(w -> { - MeetingInnerProject project = new MeetingInnerProject(); - project.setMeetingId(meeting.getId()); - project.setProjectId(w); - return project; - }).collect(Collectors.toList()); + List projects = meetingBasic.getInnerProjects() + .stream().map(w -> { + MeetingInnerProject project = new MeetingInnerProject(); + project.setMeetingId(meeting.getId()); + project.setProjectId(w.getProjectId()); + project.setProjectCode(w.getProjectCode()); + return project; + }).collect(Collectors.toList()); meetingInnerProjectService.saveBatch(projects); } else { List projects = meetingBasic.getProjects().stream().map(w -> { @@ -450,6 +452,7 @@ public class MeetingManage { mrp.setProjectType(w.getProjectType().toString()); mrp.setProjectYear(w.getProjectYear()); mrp.setDeclareAmount(w.getDeclareAmount()); + mrp.setProjectCode(w.getProjectCode()); ExpertReview review = reviewMap.get(w.getId()); if (review != null) { mrp.setReviewResult(ReviewResultEnum.getByCode(review.getReviewResult()).getValue()); @@ -584,7 +587,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()); @@ -897,6 +900,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 @@