From 11ecb9ee39fc61af04cd8d462faf9dce496d1773 Mon Sep 17 00:00:00 2001
From: xuhy <3313886187@qq.com>
Date: 星期四, 11 九月 2025 15:19:53 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/TErpMaintenanceReminderController.java | 49 +++++++++++++++++++++++++++++++++++++++++++++++--
1 files changed, 47 insertions(+), 2 deletions(-)
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/TErpMaintenanceReminderController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/TErpMaintenanceReminderController.java
index b32d471..76fa5c4 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/TErpMaintenanceReminderController.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/TErpMaintenanceReminderController.java
@@ -1,8 +1,21 @@
package com.ruoyi.web.controller.api;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
+import com.ruoyi.common.basic.PageInfo;
+import com.ruoyi.common.core.domain.R;
+import com.ruoyi.common.core.domain.entity.SysUser;
+import com.ruoyi.framework.web.service.TokenService;
+import com.ruoyi.system.query.TErpMaintenanceReminderQuery;
+import com.ruoyi.system.query.TErpProcurementQuery;
+import com.ruoyi.system.service.TErpMaintenanceReminderService;
+import com.ruoyi.system.service.TErpProcurementService;
+import com.ruoyi.system.vo.TErpMaintenanceReminderDetailVo;
+import com.ruoyi.system.vo.TErpMaintenanceReminderListVo;
+import com.ruoyi.system.vo.TErpProcurementVo;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
/**
* <p>
@@ -14,7 +27,39 @@
*/
@RestController
@RequestMapping("/t-erp-maintenance-reminder")
+@Api(tags = "erp保养提醒")
public class TErpMaintenanceReminderController {
+ private final TErpMaintenanceReminderService erpMaintenanceReminderService;
+ private final TokenService tokenService;
+
+ @Autowired
+ public TErpMaintenanceReminderController(TErpMaintenanceReminderService erpMaintenanceReminderService, TokenService tokenService) {
+ this.erpMaintenanceReminderService = erpMaintenanceReminderService;
+ this.tokenService = tokenService;
+ }
+
+
+ /**
+ * erp保养提醒分页列表
+ */
+ @ApiOperation(value = "erp保养提醒分页列表")
+ @PostMapping(value = "/pageList")
+ public R<PageInfo<TErpMaintenanceReminderListVo>> pageList(@RequestBody TErpMaintenanceReminderQuery query) {
+ SysUser user = tokenService.getLoginUser().getUser();
+ return R.ok(erpMaintenanceReminderService.pageList(query,user));
+ }
+
+
+ /**
+ * erp保养提醒详情
+ */
+ @ApiOperation(value = "erp保养提醒详情")
+ @GetMapping(value = "/detail/{id}")
+ public R<TErpMaintenanceReminderDetailVo> detail(@PathVariable String id) {
+ SysUser user = tokenService.getLoginUser().getUser();
+ return R.ok(erpMaintenanceReminderService.detail(id,user));
+ }
+
}
--
Gitblit v1.7.1