From cf49f4f936a11b27de3f9ec3cbb50603f3b1cd5b Mon Sep 17 00:00:00 2001
From: luodangjia <luodangjia>
Date: 星期六, 28 十二月 2024 16:16:18 +0800
Subject: [PATCH] merge
---
medicalWaste-admin/src/main/java/com/sinata/web/controller/applet/AppMwWarningRecordController.java | 15 ++++++++++-----
1 files changed, 10 insertions(+), 5 deletions(-)
diff --git a/medicalWaste-admin/src/main/java/com/sinata/web/controller/applet/AppMwWarningRecordController.java b/medicalWaste-admin/src/main/java/com/sinata/web/controller/applet/AppMwWarningRecordController.java
index 312aebf..c282814 100644
--- a/medicalWaste-admin/src/main/java/com/sinata/web/controller/applet/AppMwWarningRecordController.java
+++ b/medicalWaste-admin/src/main/java/com/sinata/web/controller/applet/AppMwWarningRecordController.java
@@ -1,6 +1,10 @@
package com.sinata.web.controller.applet;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.sinata.common.core.domain.R;
+import com.sinata.common.core.domain.entity.SysUser;
+import com.sinata.common.utils.SecurityUtils;
+import com.sinata.system.domain.MwWarningRecord;
import com.sinata.system.domain.dto.CollectTotalUpDto;
import com.sinata.system.service.MwWarningRecordService;
import io.swagger.annotations.Api;
@@ -24,16 +28,17 @@
*/
@RestController
@RequestMapping("/applet/mwWarningRecord")
-@Api(tags = {"医院工作人员-预警"})
+@Api(tags = {"医院工作人员"})
@AllArgsConstructor
public class AppMwWarningRecordController {
private final MwWarningRecordService mwWarningRecordService;
- @ApiOperation("记录")
+ @ApiOperation("预警记录")
@PostMapping("/record")
- public R<List<CollectTotalUpDto>> record(@RequestParam Integer pageNum,@RequestParam Integer pageSize) {
-
-
+ public R<Page<MwWarningRecord>> record(@RequestParam Integer pageNum,@RequestParam Integer pageSize) {
+ SysUser sysUser = SecurityUtils.getLoginUser().getUser();
+ Page<MwWarningRecord> page = mwWarningRecordService.lambdaQuery().eq(MwWarningRecord::getDepartmentId, sysUser.getDepartmentId()).page(Page.of(pageNum, pageSize));
+ return R.ok(page);
}
}
--
Gitblit v1.7.1