diff --git a/hz-pm-api/src/main/java/com/hz/pm/api/external/controller/MhSyncController.java b/hz-pm-api/src/main/java/com/hz/pm/api/external/controller/MhSyncController.java new file mode 100644 index 0000000..fcb5058 --- /dev/null +++ b/hz-pm-api/src/main/java/com/hz/pm/api/external/controller/MhSyncController.java @@ -0,0 +1,46 @@ +package com.hz.pm.api.external.controller; + +import com.hz.pm.api.external.MhUserOrgClient; +import lombok.RequiredArgsConstructor; +import org.springframework.format.annotation.DateTimeFormat; +import org.springframework.web.bind.annotation.GetMapping; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RequestParam; +import org.springframework.web.bind.annotation.RestController; + +import java.time.LocalDateTime; + +/** + *
+ * MhSyncController + *
+ * + * @author WendyYang + * @since 09:56 2023/12/22 + */ +@RestController +@RequiredArgsConstructor +@RequestMapping("/api/v1/mh/sync") +public class MhSyncController { + + private final MhUserOrgClient mhUserOrgClient; + + @GetMapping("/users") + public Object getUsers(@RequestParam(value = "syncTime", required = false) + @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss") LocalDateTime syncTime) { + return mhUserOrgClient.queryUsers(syncTime); + } + + @GetMapping("/orges") + public Object getOrges() { + return mhUserOrgClient.queryOrges(); + } + + @GetMapping("/experts") + public Object getExperts(@RequestParam(value = "syncTime", required = false) + @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss") LocalDateTime syncTime) { + return mhUserOrgClient.queryExperts(syncTime); + } + + +} diff --git a/hz-pm-api/src/main/java/com/hz/pm/api/meeting/controller/MeetingExpertJudgeController.java b/hz-pm-api/src/main/java/com/hz/pm/api/meeting/controller/MeetingExpertJudgeController.java index 1e98862..e5fc724 100644 --- a/hz-pm-api/src/main/java/com/hz/pm/api/meeting/controller/MeetingExpertJudgeController.java +++ b/hz-pm-api/src/main/java/com/hz/pm/api/meeting/controller/MeetingExpertJudgeController.java @@ -35,9 +35,9 @@ public class MeetingExpertJudgeController { } @ApiOperation("查看履职评价") - @GetMapping("/detail/{expertJudgeId}") - public MeetingExpertJudgeReq expertJudgeDetail(@PathVariable Long expertJudgeId) { - return expertJudgeManage.expertJudgeDetail(expertJudgeId); + @GetMapping("/detail/{meetingExpertId}") + public MeetingExpertJudgeReq expertJudgeDetail(@PathVariable Long meetingExpertId) { + return expertJudgeManage.expertJudgeDetail(meetingExpertId); } } diff --git a/hz-pm-api/src/main/java/com/hz/pm/api/meeting/manage/MeetingExpertJudgeManage.java b/hz-pm-api/src/main/java/com/hz/pm/api/meeting/manage/MeetingExpertJudgeManage.java index 3274ab0..c78c5ad 100644 --- a/hz-pm-api/src/main/java/com/hz/pm/api/meeting/manage/MeetingExpertJudgeManage.java +++ b/hz-pm-api/src/main/java/com/hz/pm/api/meeting/manage/MeetingExpertJudgeManage.java @@ -83,8 +83,8 @@ public class MeetingExpertJudgeManage { } } - public MeetingExpertJudgeReq expertJudgeDetail(Long expertJudgeId) { - MeetingExpertJudge judge = expertJudgeService.getById(expertJudgeId); + public MeetingExpertJudgeReq expertJudgeDetail(Long meetingExpertId) { + MeetingExpertJudge judge = expertJudgeService.getByMeetingExpertId(meetingExpertId); if (judge == null) { throw BizException.wrap("履职评价未提交"); } 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 dd6e98f..7e717e2 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 @@ -1,9 +1,11 @@ package com.hz.pm.api.meeting.service; import cn.hutool.core.collection.CollUtil; +import com.baomidou.mybatisplus.core.conditions.Wrapper; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.toolkit.Wrappers; import com.baomidou.mybatisplus.extension.service.IService; +import com.hz.pm.api.common.constant.BizConst; import com.hz.pm.api.meeting.entity.domain.MeetingExpertJudge; import com.ningdatech.basic.util.CollUtils; @@ -32,6 +34,13 @@ public interface IMeetingExpertJudgeService extends IService