From b4895bdc5d9268e55c0023b92cc7c2d68ba33e46 Mon Sep 17 00:00:00 2001 From: feige <791364011@qq.com> Date: 星期二, 05 十一月 2024 10:07:37 +0800 Subject: [PATCH] Merge remote-tracking branch 'origin/master' --- ruoyi-admin/src/main/java/com/ruoyi/web/controller/zhang/ZfDoctorShareController.java | 43 ++++++++++++++++++++++--------------------- 1 files changed, 22 insertions(+), 21 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..cd26d0c 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,9 +2,10 @@ 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; +import com.ruoyi.domain.ZfDownload; import com.ruoyi.service.ZInfoUserService; import com.ruoyi.service.ZfDoctorDownloadService; import com.ruoyi.service.ZfDoctorService; @@ -12,8 +13,8 @@ import org.springframework.web.bind.annotation.*; import javax.annotation.Resource; -import java.util.ArrayList; -import java.util.List; + +import static com.ruoyi.common.core.page.TableSupport.*; @RestController @RequestMapping("/ZfDoctorShare") @@ -34,16 +35,18 @@ */ @PostMapping("/share") public AjaxResult share(@RequestBody ShareMore zfDoctor){ + zfDoctor.setSysMenuId(2019L); return zfDoctorShareService.saveZa(zfDoctor); } - /** * 鏍规嵁UserId鍜屽垎浜汉shareId鏌ョ湅宸茬粡鎺堟潈缁欓偅浜涗汉閭d簺鏁版嵁 */ @PostMapping("/getInfoByUserId") public AjaxResult empowerGetInfo(@RequestBody ShareMore zfDoctor){ - - return zfDoctorShareService.listByFidAid(zfDoctor); + zfDoctor.setSysMenuId(2019L); + Integer pageNo = Convert.toInt(ServletUtils.getParameter(PAGE_NO), 1); + Integer pageSize = Convert.toInt(ServletUtils.getParameter(PAGE_SIZE), 10); + return zfDoctorShareService.listByFidAid(zfDoctor,pageNo,pageSize) ; } /** @@ -51,13 +54,16 @@ */ @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鏀跺洖宸茬粡鎺堟潈缁欓偅浜涗汉 */ @PostMapping("/deleteInfoByUserId") public AjaxResult deleteEmpower(@RequestBody ShareMore zfDoctor){ + zfDoctor.setSysMenuId(2019L); return zfDoctorShareService.deleteZa(zfDoctor); } @@ -65,25 +71,20 @@ * 涓嬭浇鍒嗕韩鐨勬暟鎹� */ @PostMapping("/downloadDate") - public AjaxResult ifDownLoad(@RequestBody ZfDoctorDownload zfDoctorDownload){ - return zfDoctorDownloadService.addData(zfDoctorDownload); + public AjaxResult ifDownLoad(@RequestBody ZfDownload zfDownload){ + zfDownload.setSysMenuId(2019L); + return zfDoctorDownloadService.addData(zfDownload); } /** * 灞曠ず涓嬭浇鍒嗕韩鐨勬暟鎹� */ @GetMapping("/all") - public List<ZfDoctor> data(ZfDoctorDownload zfDoctorDownload){ - List<ZfDoctorDownload> as = zfDoctorDownloadService.selectDoctorList(zfDoctorDownload); - List<ZfDoctor> bs = new ArrayList<>(); - for (ZfDoctorDownload a: as) { - if (zfDoctorService.getById(a.getDownloadContent()) != null) { - ZfDoctor ds = zfDoctorService.getById(a.getDownloadContent()); - ds.setShareId(a.getShareId()); - bs.add(ds); - } - } - return bs; + public AjaxResult data(ZfDownload zfDownload){ + zfDownload.setSysMenuId(2019L); + Integer pageNo = Convert.toInt(ServletUtils.getParameter(PAGE_NO), 1); + Integer pageSize = Convert.toInt(ServletUtils.getParameter(PAGE_SIZE), 10); + return zfDoctorDownloadService.selectDoctorList(zfDownload,pageNo ,pageSize); } } -- Gitblit v1.9.1