PEP得分查询bug修复

yd-api/src/main/java/com/yd/api/practitioner/PractitionerController.java

@@ -539,13 +539,13 @@ public class PractitionerController {
 
 
     /**
     /**
      * 根据id删除日程记录
      * 根据id删除日程记录
-     * @param scheduleTrackId
+     * @param requestVO
      * @return
      * @return
      */
      */
     @RequestMapping("/deleteScheduleTrackById")
     @RequestMapping("/deleteScheduleTrackById")
-    public Object deleteScheduleTrackById(Long scheduleTrackId){
+    public Object deleteScheduleTrackById(@RequestBody DeleteScheduleTrackByIdRequestVO requestVO){
         JsonResult result = new JsonResult();
         JsonResult result = new JsonResult();
-        DeleteScheduleByIdResponseVO responseVO = scheduleTrackService.deleteScheduleTrackById(scheduleTrackId);
+        DeleteScheduleByIdResponseVO responseVO = scheduleTrackService.deleteScheduleTrackById(requestVO);
         result.addResult(responseVO);
         result.addResult(responseVO);
         result.setData(responseVO);
         result.setData(responseVO);
         return result;
         return result;
@@ -553,13 +553,13 @@ public class PractitionerController {
 
 
     /**
     /**
      * 查询战队PEP得分
      * 查询战队PEP得分
-     * @param practitionerId
+     * @param requestVO
      * @return
      * @return
      */
      */
     @RequestMapping("/queryPEPScore")
     @RequestMapping("/queryPEPScore")
-    public Object queryPEPScore(String practitionerId){
+    public Object queryPEPScore(@RequestBody QueryPEPScoreRequestVO requestVO){
         JsonResult result = new JsonResult();
         JsonResult result = new JsonResult();
-        QueryPEPScoreResponseVO responseVO = scheduleTrackService.queryPEPScore(Long.parseLong(practitionerId));
+        QueryPEPScoreResponseVO responseVO = scheduleTrackService.queryPEPScore(requestVO);
         result.addResult(responseVO);
         result.addResult(responseVO);
         result.setData(responseVO);
         result.setData(responseVO);
         return result;
         return result;
@@ -567,13 +567,13 @@ public class PractitionerController {
 
 
     /**
     /**
      * 查询个人PEP得分详情
      * 查询个人PEP得分详情
-     * @param practitionerId
+     * @param requestVO
      * @return
      * @return
      */
      */
     @RequestMapping("/queryPEPScoreDetail")
     @RequestMapping("/queryPEPScoreDetail")
-    public Object queryPEPScoreDetail(String practitionerId, String time){
+    public Object queryPEPScoreDetail(@RequestBody QueryPEPScoreDetailRequestVO requestVO){
         JsonResult result = new JsonResult();
         JsonResult result = new JsonResult();
-        QueryPEPScoreDetailResponseVO responseVO = scheduleTrackService.queryPEPScoreDetail(Long.parseLong(practitionerId), time);
+        QueryPEPScoreDetailResponseVO responseVO = scheduleTrackService.queryPEPScoreDetail(requestVO);
         result.addResult(responseVO);
         result.addResult(responseVO);
         result.setData(responseVO);
         result.setData(responseVO);
         return result;
         return result;

yd-api/src/main/java/com/yd/api/practitioner/service/ScheduleTrackService.java

@@ -7,9 +7,9 @@ public interface ScheduleTrackService {
 
 
     QueryScheduleTrackListResponseVO queryScheduleTrackList(QueryScheduleTrackListRequestVO requestVO);
     QueryScheduleTrackListResponseVO queryScheduleTrackList(QueryScheduleTrackListRequestVO requestVO);
 
 
-    QueryPEPScoreResponseVO queryPEPScore(Long practitionerId);
+    QueryPEPScoreResponseVO queryPEPScore(QueryPEPScoreRequestVO requestVO);
 
 
-    QueryPEPScoreDetailResponseVO queryPEPScoreDetail(Long practitionerId, String time);
+    QueryPEPScoreDetailResponseVO queryPEPScoreDetail(QueryPEPScoreDetailRequestVO requestVO);
 
 
-    DeleteScheduleByIdResponseVO deleteScheduleTrackById(Long scheduleTrackId);
+    DeleteScheduleByIdResponseVO deleteScheduleTrackById(DeleteScheduleTrackByIdRequestVO requestVO);
 }
 }

yd-api/src/main/java/com/yd/api/practitioner/service/impl/ScheduleTrackServiceImpl.java

@@ -219,8 +219,9 @@ public class ScheduleTrackServiceImpl implements ScheduleTrackService {
     }
     }
 
 
     @Override
     @Override
-    public QueryPEPScoreResponseVO queryPEPScore(Long practitionerId) {
+    public QueryPEPScoreResponseVO queryPEPScore(QueryPEPScoreRequestVO requestVO) {
         QueryPEPScoreResponseVO resp = new QueryPEPScoreResponseVO();
         QueryPEPScoreResponseVO resp = new QueryPEPScoreResponseVO();
+        Long practitionerId = requestVO.getPractitionerId();
         try {
         try {
             // 获取本月第一天
             // 获取本月第一天
             Calendar cal = Calendar.getInstance();
             Calendar cal = Calendar.getInstance();
@@ -266,8 +267,10 @@ public class ScheduleTrackServiceImpl implements ScheduleTrackService {
     }
     }
 
 
     @Override
     @Override
-    public QueryPEPScoreDetailResponseVO queryPEPScoreDetail(Long practitionerId, String time) {
+    public QueryPEPScoreDetailResponseVO queryPEPScoreDetail(QueryPEPScoreDetailRequestVO requestVO) {
         QueryPEPScoreDetailResponseVO resp = new QueryPEPScoreDetailResponseVO();
         QueryPEPScoreDetailResponseVO resp = new QueryPEPScoreDetailResponseVO();
+        Long practitionerId = requestVO.getPractitionerId();
+        String time = requestVO.getTime();
 
 
         Calendar cal = Calendar.getInstance();
         Calendar cal = Calendar.getInstance();
 
 
@@ -337,8 +340,9 @@ public class ScheduleTrackServiceImpl implements ScheduleTrackService {
     }
     }
 
 
     @Override
     @Override
-    public DeleteScheduleByIdResponseVO deleteScheduleTrackById(Long scheduleTrackId) {
+    public DeleteScheduleByIdResponseVO deleteScheduleTrackById(DeleteScheduleTrackByIdRequestVO requestVO) {
         DeleteScheduleByIdResponseVO resp = new DeleteScheduleByIdResponseVO();
         DeleteScheduleByIdResponseVO resp = new DeleteScheduleByIdResponseVO();
+        Long scheduleTrackId = requestVO.getScheduleTrackId();
         try {
         try {
             // 根据id删除记录
             // 根据id删除记录
             scheduleTrackMapper.deleteScheduleTrackById(scheduleTrackId);
             scheduleTrackMapper.deleteScheduleTrackById(scheduleTrackId);

yd-api/src/main/java/com/yd/api/practitioner/vo/sechedule/DeleteScheduleTrackByIdRequestVO.java

+package com.yd.api.practitioner.vo.sechedule;
+
+import lombok.Data;
+
+@Data
+public class DeleteScheduleTrackByIdRequestVO {
+    private Long scheduleTrackId;
+}

yd-api/src/main/java/com/yd/api/practitioner/vo/sechedule/QueryPEPScoreDetailRequestVO.java

+package com.yd.api.practitioner.vo.sechedule;
+
+import lombok.Data;
+
+@Data
+public class QueryPEPScoreDetailRequestVO {
+    private Long practitionerId;
+    private String time;
+}

yd-api/src/main/java/com/yd/api/practitioner/vo/sechedule/QueryPEPScoreRequestVO.java

+package com.yd.api.practitioner.vo.sechedule;
+
+import lombok.Data;
+
+@Data
+public class QueryPEPScoreRequestVO {
+    private Long practitionerId;
+}