From 780fa6d4016c6e616bbb4b3d29d33dbf3a40cbd6 Mon Sep 17 00:00:00 2001
From: zqy <2522236926@qq.com>
Date: 星期日, 07 七月 2024 10:22:12 +0800
Subject: [PATCH] 修改bug&新加配偶接口
---
ruoyi-admin/src/main/java/com/ruoyi/web/controller/zhang/ZfDoctorShareController.java | 15 ++++++++++++---
1 files changed, 12 insertions(+), 3 deletions(-)
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/zhang/ZfDoctorShareController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/zhang/ZfDoctorShareController.java
index 554f9ee..cab2981 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/zhang/ZfDoctorShareController.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/zhang/ZfDoctorShareController.java
@@ -2,6 +2,8 @@
import com.ruoyi.common.core.controller.BaseController;
import com.ruoyi.common.core.domain.AjaxResult;
+import com.ruoyi.common.core.text.Convert;
+import com.ruoyi.common.utils.ServletUtils;
import com.ruoyi.domain.ShareMore;
import com.ruoyi.domain.ZfDoctor;
import com.ruoyi.domain.ZfDoctorDownload;
@@ -14,6 +16,9 @@
import javax.annotation.Resource;
import java.util.ArrayList;
import java.util.List;
+
+import static com.ruoyi.common.core.page.TableSupport.PAGE_NUM;
+import static com.ruoyi.common.core.page.TableSupport.PAGE_SIZE;
@RestController
@RequestMapping("/ZfDoctorShare")
@@ -42,8 +47,10 @@
*/
@PostMapping("/getInfoByUserId")
public AjaxResult empowerGetInfo(@RequestBody ShareMore zfDoctor){
+ Integer pageNum = Convert.toInt(ServletUtils.getParameter(PAGE_NUM), 1);
+ Integer pageSize = Convert.toInt(ServletUtils.getParameter(PAGE_SIZE), 10);
- return zfDoctorShareService.listByFidAid(zfDoctor);
+ return zfDoctorService.selectListById(zfDoctorShareService.listByFidAid(zfDoctor),pageNum,pageSize);
}
/**
@@ -51,7 +58,7 @@
*/
@GetMapping("/getInfoByShareId")
public AjaxResult empowerGetInfo2(){
- return zfDoctorShareService.listByUserId();
+ return zfDoctorShareService.listUserId();
}
/**
* 鏍规嵁userId鍜宻hareId鏀跺洖宸茬粡鎺堟潈缁欓偅浜涗汉
@@ -74,7 +81,9 @@
*/
@GetMapping("/all")
public List<ZfDoctor> data(ZfDoctorDownload zfDoctorDownload){
- List<ZfDoctorDownload> as = zfDoctorDownloadService.selectDoctorList(zfDoctorDownload);
+ Integer pageNum = Convert.toInt(ServletUtils.getParameter(PAGE_NUM), 1);
+ Integer pageSize = Convert.toInt(ServletUtils.getParameter(PAGE_SIZE), 10);
+ List<ZfDoctorDownload> as = zfDoctorDownloadService.selectDoctorList(zfDoctorDownload,pageNum,pageSize);
List<ZfDoctor> bs = new ArrayList<>();
for (ZfDoctorDownload a: as) {
if (zfDoctorService.getById(a.getDownloadContent()) != null) {
--
Gitblit v1.9.1