Pārlūkot izejas kodu

申诉2.2.0申诉列表审核列表

zhanghang 3 gadi atpakaļ
vecāks
revīzija
aec776ab2b

+ 3 - 2
src/main/java/com/diagbot/client/MedAppealInfoServiceClientME.java

@@ -1,6 +1,7 @@
 package com.diagbot.client;
 
 import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.diagbot.client.hystrix.MedAppealInfoServiceHystrixME;
 import com.diagbot.dto.*;
 import com.diagbot.vo.MedAppealAuditVO;
@@ -27,7 +28,7 @@ public interface MedAppealInfoServiceClientME {
      * @return
      */
     @PostMapping(value = "/report-service/medAppealInfoManageME/getComplaintRecord")
-    RespDTO<IPage<MedAppealComplaintRecordDTO>> getComplaintRecord(@RequestBody MedAppealComplaintRecordPageVO medAppealComplaintRecordPageVO);
+    RespDTO<Page<MedAppealComplaintRecordDTO>> getComplaintRecord(@RequestBody MedAppealComplaintRecordPageVO medAppealComplaintRecordPageVO);
 
     /**
      * 获取申诉审核列表
@@ -35,7 +36,7 @@ public interface MedAppealInfoServiceClientME {
      * @return
      */
     @PostMapping(value = "/report-service/medAppealInfoManageME/getAppealReview")
-    RespDTO<MedAppealReviewDTO> getAppealReview(@RequestBody  MedAppealReviewPageVO medAppealReviewPageVO);
+    RespDTO<Page<MedAppealReviewDTO>> getAppealReview(@RequestBody  MedAppealReviewPageVO medAppealReviewPageVO);
 
     /**
      *审核获取申述详情

+ 3 - 2
src/main/java/com/diagbot/client/hystrix/MedAppealInfoServiceHystrixME.java

@@ -2,6 +2,7 @@ package com.diagbot.client.hystrix;
 
 
 import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.diagbot.client.MedAppealInfoServiceClientME;
 import com.diagbot.dto.*;
 import com.diagbot.vo.MedAppealAuditVO;
@@ -24,13 +25,13 @@ import java.util.List;
 public class MedAppealInfoServiceHystrixME implements MedAppealInfoServiceClientME {
 
     @Override
-    public RespDTO<IPage<MedAppealComplaintRecordDTO>> getComplaintRecord(@RequestBody MedAppealComplaintRecordPageVO medAppealComplaintRecordPageVO) {
+    public RespDTO<Page<MedAppealComplaintRecordDTO>> getComplaintRecord(@RequestBody MedAppealComplaintRecordPageVO medAppealComplaintRecordPageVO) {
         log.error("【hystrix】调用{}异常", "getComplaintRecord");
         return null;
     }
 
     @Override
-    public RespDTO<MedAppealReviewDTO> getAppealReview(@RequestBody MedAppealReviewPageVO medAppealReviewPageVO) {
+    public RespDTO<Page<MedAppealReviewDTO>> getAppealReview(@RequestBody MedAppealReviewPageVO medAppealReviewPageVO) {
         log.error("【hystrix】调用{}异常", "getAppealReview");
         return null;
     }

+ 7 - 2
src/main/java/com/diagbot/web/MedAppealInfoControllerME.java

@@ -2,6 +2,7 @@ package com.diagbot.web;
 
 
 import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.diagbot.annotation.SysLogger;
 import com.diagbot.client.MedAppealInfoServiceClientME;
 import com.diagbot.dto.MedAppealAuditDTO;
@@ -55,7 +56,7 @@ public class MedAppealInfoControllerME {
         String hospitalId = SysUserUtils.getCurrentHospitalID();
         medAppealComplaintRecordPageVO.setHospitalId(Long.valueOf(hospitalId));
         medAppealComplaintRecordPageVO.setComplaintId(Long.valueOf(userId));
-        RespDTO<IPage<MedAppealComplaintRecordDTO>> complaintRecord = medAppealInfoServiceClientME.getComplaintRecord(medAppealComplaintRecordPageVO);
+        RespDTO<Page<MedAppealComplaintRecordDTO>> complaintRecord = medAppealInfoServiceClientME.getComplaintRecord(medAppealComplaintRecordPageVO);
         return RespDTO.onSuc(complaintRecord);
     }
 
@@ -63,7 +64,11 @@ public class MedAppealInfoControllerME {
             notes = "获取申诉审核列表")
     @PostMapping("/getAppealReview")
     public RespDTO<MedAppealReviewDTO> getAppealReview(@RequestBody MedAppealReviewPageVO medAppealReviewPageVO) {
-        RespDTO<MedAppealReviewDTO> appealReview = medAppealInfoServiceClientME.getAppealReview(medAppealReviewPageVO);
+        String userId = SysUserUtils.getCurrentPrincipleID();
+        String hospitalId = SysUserUtils.getCurrentHospitalID();
+        medAppealReviewPageVO.setHospitalId(Long.valueOf(hospitalId));
+        medAppealReviewPageVO.setAppealId(Long.valueOf(userId));
+        RespDTO<Page<MedAppealReviewDTO>> appealReview = medAppealInfoServiceClientME.getAppealReview(medAppealReviewPageVO);
         return RespDTO.onSuc(appealReview);
     }