From 94b1a3bde93ad87f9347d8a08d70dd4f2318f1ce Mon Sep 17 00:00:00 2001 From: zqy <2522236926@qq.com> Date: 星期日, 21 七月 2024 17:47:51 +0800 Subject: [PATCH] 修改分享bug --- ruoyi-admin/src/main/java/com/ruoyi/web/controller/zhang/ZfDoctorShareController.java | 49 ++++++++++++++++++++++++++++++++++++++++++++++--- 1 files changed, 46 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 1cb8036..37f4325 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 @@ -1,12 +1,27 @@ package com.ruoyi.web.controller.zhang; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; 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.MapUtils; +import com.ruoyi.common.utils.ServletUtils; import com.ruoyi.domain.ShareMore; +import com.ruoyi.domain.ZfDoctor; +import com.ruoyi.domain.ZfDoctorDownload; +import com.ruoyi.service.ZInfoUserService; +import com.ruoyi.service.ZfDoctorDownloadService; +import com.ruoyi.service.ZfDoctorService; import com.ruoyi.service.ZfDoctorShareService; import org.springframework.web.bind.annotation.*; import javax.annotation.Resource; +import java.util.ArrayList; +import java.util.HashMap; +import java.util.List; +import java.util.stream.Collectors; + +import static com.ruoyi.common.core.page.TableSupport.*; @RestController @RequestMapping("/ZfDoctorShare") @@ -14,6 +29,14 @@ @Resource ZfDoctorShareService zfDoctorShareService; + @Resource + ZfDoctorService zfDoctorService; + + @Resource + ZInfoUserService zInfoUserService; + + @Resource + ZfDoctorDownloadService zfDoctorDownloadService; /** * 鍒嗕韩鏁版嵁 */ @@ -27,8 +50,9 @@ */ @PostMapping("/getInfoByUserId") public AjaxResult empowerGetInfo(@RequestBody ShareMore zfDoctor){ - - return zfDoctorShareService.listByFidAid(zfDoctor); + Integer pageNo = Convert.toInt(ServletUtils.getParameter(PAGE_NO), 1); + Integer pageSize = Convert.toInt(ServletUtils.getParameter(PAGE_SIZE), 10); + return zfDoctorShareService.listByFidAid(zfDoctor,pageNo,pageSize) ; } /** @@ -36,7 +60,9 @@ */ @GetMapping("/getInfoByShareId") public AjaxResult empowerGetInfo2(){ - return zfDoctorShareService.listByUserId(); + Integer pageNo = Convert.toInt(ServletUtils.getParameter(PAGE_NO), 1); + Integer pageSize = Convert.toInt(ServletUtils.getParameter(PAGE_SIZE), 10); + return zfDoctorShareService.listUserId(pageNo ,pageSize); } /** * 鏍规嵁userId鍜宻hareId鏀跺洖宸茬粡鎺堟潈缁欓偅浜涗汉 @@ -46,5 +72,22 @@ return zfDoctorShareService.deleteZa(zfDoctor); } + /** + * 涓嬭浇鍒嗕韩鐨勬暟鎹� + */ + @PostMapping("/downloadDate") + public AjaxResult ifDownLoad(@RequestBody ZfDoctorDownload zfDoctorDownload){ + return zfDoctorDownloadService.addData(zfDoctorDownload); + } + + /** + * 灞曠ず涓嬭浇鍒嗕韩鐨勬暟鎹� + */ + @GetMapping("/all") + public AjaxResult data(ZfDoctorDownload zfDoctorDownload){ + Integer pageNo = Convert.toInt(ServletUtils.getParameter(PAGE_NO), 1); + Integer pageSize = Convert.toInt(ServletUtils.getParameter(PAGE_SIZE), 10); + return zfDoctorDownloadService.selectDoctorList(zfDoctorDownload,pageNo ,pageSize); + } } -- Gitblit v1.9.1