From f3277a3243cb85e2fc05c91bfc249b1bc805b441 Mon Sep 17 00:00:00 2001 From: WendyYang Date: Tue, 26 Dec 2023 16:06:26 +0800 Subject: [PATCH] =?UTF-8?q?=E4=B8=93=E5=AE=B6=E8=AF=A6=E6=83=85=E5=A2=9E?= =?UTF-8?q?=E5=8A=A0=E7=AE=80=E5=8E=86=E4=BF=A1=E6=81=AF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/hz/pm/api/expert/entity/ExpertUserFullInfo.java | 9 +++++++++ .../main/java/com/hz/pm/api/expert/model/vo/ExpertDetailVO.java | 9 ++++++--- .../com/hz/pm/api/meeting/entity/domain/MeetingExpertJudge.java | 2 +- .../java/com/hz/pm/api/meeting/entity/vo/MeetingByManagerVO.java | 3 +++ .../main/java/com/hz/pm/api/meeting/manage/MeetingManage.java | 9 +++++++-- .../hz/pm/api/meeting/service/IMeetingExpertJudgeService.java | 1 - .../main/java/com/hz/pm/api/user/manage/SyncMhUserOrgManage.java | 6 +++++- 7 files changed, 31 insertions(+), 8 deletions(-) diff --git a/hz-pm-api/src/main/java/com/hz/pm/api/expert/entity/ExpertUserFullInfo.java b/hz-pm-api/src/main/java/com/hz/pm/api/expert/entity/ExpertUserFullInfo.java index f50353d..549b95e 100644 --- a/hz-pm-api/src/main/java/com/hz/pm/api/expert/entity/ExpertUserFullInfo.java +++ b/hz-pm-api/src/main/java/com/hz/pm/api/expert/entity/ExpertUserFullInfo.java @@ -5,6 +5,7 @@ import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableName; import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; import lombok.Data; import java.io.Serializable; @@ -229,6 +230,14 @@ public class ExpertUserFullInfo implements Serializable { private String duties; /** + * 单位意见 + */ + private String unitAdvice; + + @ApiModelProperty("工作简历") + private String resume; + + /** * TODO：重新处理单位 */ @TableField(exist = false) diff --git a/hz-pm-api/src/main/java/com/hz/pm/api/expert/model/vo/ExpertDetailVO.java b/hz-pm-api/src/main/java/com/hz/pm/api/expert/model/vo/ExpertDetailVO.java index 45af9c3..71909eb 100644 --- a/hz-pm-api/src/main/java/com/hz/pm/api/expert/model/vo/ExpertDetailVO.java +++ b/hz-pm-api/src/main/java/com/hz/pm/api/expert/model/vo/ExpertDetailVO.java @@ -131,11 +131,9 @@ public class ExpertDetailVO { @ApiModelProperty(value = "籍贯") private String hometown; - @ApiModelProperty(value = "民族") private String nationality; - @ApiModelProperty(value = "出生日期") private LocalDate birthday; @@ -143,7 +141,6 @@ public class ExpertDetailVO { private LocalDateTime inPutTime; - @ApiModelProperty(value = "是否入库") private String isPut; @@ -174,6 +171,12 @@ public class ExpertDetailVO { @ApiModelProperty(value = "职务") private String duties; + @ApiModelProperty("单位意见") + private String unitAdvice; + + @ApiModelProperty("工作简历") + private String resume; + @ApiModelProperty("专家字典信息") private Map> dictionaries; diff --git a/hz-pm-api/src/main/java/com/hz/pm/api/meeting/entity/domain/MeetingExpertJudge.java b/hz-pm-api/src/main/java/com/hz/pm/api/meeting/entity/domain/MeetingExpertJudge.java index 224c2b6..19285c3 100644 --- a/hz-pm-api/src/main/java/com/hz/pm/api/meeting/entity/domain/MeetingExpertJudge.java +++ b/hz-pm-api/src/main/java/com/hz/pm/api/meeting/entity/domain/MeetingExpertJudge.java @@ -36,7 +36,7 @@ public class MeetingExpertJudge implements Serializable { private Long meetingExpertId; @ApiModelProperty("评分（1~10）") - private Integer score; + private Double score; @ApiModelProperty("是否参加：1 准时、2 迟到、3 缺席") private Integer attended; diff --git a/hz-pm-api/src/main/java/com/hz/pm/api/meeting/entity/vo/MeetingByManagerVO.java b/hz-pm-api/src/main/java/com/hz/pm/api/meeting/entity/vo/MeetingByManagerVO.java index f5c2db5..f8be7bb 100644 --- a/hz-pm-api/src/main/java/com/hz/pm/api/meeting/entity/vo/MeetingByManagerVO.java +++ b/hz-pm-api/src/main/java/com/hz/pm/api/meeting/entity/vo/MeetingByManagerVO.java @@ -21,6 +21,9 @@ import java.time.LocalDateTime; @ApiModel("会议实体（管理员列表）") public class MeetingByManagerVO { + @ApiModelProperty("专家评分") + private Double judgeScore; + @ApiModelProperty("会议ID") private Long meetingId; diff --git a/hz-pm-api/src/main/java/com/hz/pm/api/meeting/manage/MeetingManage.java b/hz-pm-api/src/main/java/com/hz/pm/api/meeting/manage/MeetingManage.java index d4af536..d72f697 100644 --- a/hz-pm-api/src/main/java/com/hz/pm/api/meeting/manage/MeetingManage.java +++ b/hz-pm-api/src/main/java/com/hz/pm/api/meeting/manage/MeetingManage.java @@ -347,14 +347,19 @@ public class MeetingManage { if (page.getTotal() == 0) { return PageVo.empty(); } - List existsMeIds = expertJudgeService.listExistsMeetingExpertIds(meetingExpertIds); + List expertJudges = expertJudgeService.listByMeetingExpertIds(meetingExpertIds); + Map expertJudgeMap = CollUtils.listToMap(expertJudges, MeetingExpertJudge::getMeetingExpertId); PageVo result = new PageVo<>(new ArrayList<>(), page.getTotal()); page.getRecords().forEach(meeting -> { MeetingByManagerVO item = meetingManageHelper.buildByMeeting(meeting); ExpertInvitedRecordDTO info = mapByMeetingId.get(meeting.getId()); item.setMeetingExpertId(info.getMeetingExpertId()); item.setExpertStatus(info.getStatus()); - item.setHasJudge(existsMeIds.contains(info.getMeetingExpertId())); + MeetingExpertJudge judge = expertJudgeMap.get(info.getMeetingExpertId()); + item.setHasJudge(judge!= null); + if (judge != null) { + item.setJudgeScore(judge.getScore()); + } result.getRecords().add(item); }); return result; diff --git a/hz-pm-api/src/main/java/com/hz/pm/api/meeting/service/IMeetingExpertJudgeService.java b/hz-pm-api/src/main/java/com/hz/pm/api/meeting/service/IMeetingExpertJudgeService.java index 7e717e2..0722fd5 100644 --- a/hz-pm-api/src/main/java/com/hz/pm/api/meeting/service/IMeetingExpertJudgeService.java +++ b/hz-pm-api/src/main/java/com/hz/pm/api/meeting/service/IMeetingExpertJudgeService.java @@ -29,7 +29,6 @@ public interface IMeetingExpertJudgeService extends IService return Collections.emptyList(); } LambdaQueryWrapper query = Wrappers.lambdaQuery(MeetingExpertJudge.class) - .select(MeetingExpertJudge::getMeetingExpertId) .in(MeetingExpertJudge::getMeetingExpertId, meetingExpertIds); return CollUtils.fieldList(list(query), MeetingExpertJudge::getMeetingExpertId); } diff --git a/hz-pm-api/src/main/java/com/hz/pm/api/user/manage/SyncMhUserOrgManage.java b/hz-pm-api/src/main/java/com/hz/pm/api/user/manage/SyncMhUserOrgManage.java index 56d5f7c..06cccc9 100644 --- a/hz-pm-api/src/main/java/com/hz/pm/api/user/manage/SyncMhUserOrgManage.java +++ b/hz-pm-api/src/main/java/com/hz/pm/api/user/manage/SyncMhUserOrgManage.java @@ -185,13 +185,15 @@ public class SyncMhUserOrgManage { eui.setPolitical(expert.getPolitical()); eui.setDuties(expert.getDuties()); eui.setAddress(expert.getPlace()); - + eui.setUnitAdvice(expert.getUnit()); + eui.setResume(expert.getRemark()); ExpertUserFullInfo oldEui = expertMap.get(eui.getMhExpertNo()); if (oldEui == null) { UserInfo expertUser = new UserInfo(); expertUser.setUsername(expert.getName()); expertUser.setMobile(expert.getPhone()); expertUser.setRealName(expert.getName()); + expertUser.setWechatOpenId(expert.getOpenId()); userInfoService.save(expertUser); eui.setUserId(expertUser.getId()); } else { @@ -236,6 +238,7 @@ public class SyncMhUserOrgManage { eui.setExpertName(expert.getName()); eui.setMhExpertNo(expert.getExpertNo()); eui.setExperience(expert.getTextExperience()); + eui.setResume(expert.getTextNotes()); eui.setGender(expert.getGender()); eui.setStar(expert.getStar()); eui.setIdCard(expert.getIdCard()); @@ -266,6 +269,7 @@ public class SyncMhUserOrgManage { expertUser.setUsername(expert.getName()); expertUser.setMobile(expert.getPhone()); expertUser.setRealName(expert.getName()); + expertUser.setWechatOpenId(expert.getOpenId()); userInfoService.save(expertUser); eui.setUserId(expertUser.getId()); } else {