From d465f6537bda4c5b3844a15b73badf704f44c9a1 Mon Sep 17 00:00:00 2001
From: zhangherong <571457620@qq.com>
Date: 星期一, 07 四月 2025 16:01:16 +0800
Subject: [PATCH] art: 设备管理-用户选择-根据岗位选择用户
---
lxzn-module-eam/src/main/java/org/jeecg/modules/eam/controller/EamWeekMaintenanceOrderController.java | 28 +++++++++++++++++-----------
1 files changed, 17 insertions(+), 11 deletions(-)
diff --git a/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/controller/EamWeekMaintenanceOrderController.java b/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/controller/EamWeekMaintenanceOrderController.java
index 536ae5f..51ee76c 100644
--- a/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/controller/EamWeekMaintenanceOrderController.java
+++ b/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/controller/EamWeekMaintenanceOrderController.java
@@ -1,7 +1,6 @@
package org.jeecg.modules.eam.controller;
import cn.hutool.core.collection.CollectionUtil;
-import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import io.swagger.annotations.Api;
@@ -10,9 +9,9 @@
import org.jeecg.common.api.vo.Result;
import org.jeecg.common.aspect.annotation.AutoLog;
import org.jeecg.common.system.base.controller.JeecgController;
-import org.jeecg.common.system.query.QueryGenerator;
import org.jeecg.modules.eam.constant.BusinessCodeConst;
import org.jeecg.modules.eam.entity.EamWeekMaintenanceOrder;
+import org.jeecg.modules.eam.request.EamWeekMaintenanceQuery;
import org.jeecg.modules.eam.request.EamWeekMaintenanceRequest;
import org.jeecg.modules.eam.service.IEamWeekMaintenanceOrderService;
import org.jeecg.modules.system.service.ISysBusinessCodeRuleService;
@@ -41,22 +40,21 @@
/**
* 鍒嗛〉鍒楄〃鏌ヨ
*
- * @param eamWeekMaintenanceOrder
+ * @param query
* @param pageNo
* @param pageSize
* @param req
* @return
*/
- @AutoLog(value = "鍛ㄤ繚宸ュ崟-鍒嗛〉鍒楄〃鏌ヨ")
@ApiOperation(value = "鍛ㄤ繚宸ュ崟-鍒嗛〉鍒楄〃鏌ヨ", notes = "鍛ㄤ繚宸ュ崟-鍒嗛〉鍒楄〃鏌ヨ")
@GetMapping(value = "/list")
- public Result<?> queryPageList(EamWeekMaintenanceOrder eamWeekMaintenanceOrder,
+ public Result<?> queryPageList(EamWeekMaintenanceQuery query,
@RequestParam(name = "pageNo", defaultValue = "1") Integer pageNo,
@RequestParam(name = "pageSize", defaultValue = "10") Integer pageSize,
HttpServletRequest req) {
- QueryWrapper<EamWeekMaintenanceOrder> queryWrapper = QueryGenerator.initQueryWrapper(eamWeekMaintenanceOrder, req.getParameterMap());
+// QueryWrapper<EamWeekMaintenanceOrder> queryWrapper = QueryGenerator.initQueryWrapper(eamWeekMaintenanceOrder, req.getParameterMap());
Page<EamWeekMaintenanceOrder> page = new Page<EamWeekMaintenanceOrder>(pageNo, pageSize);
- IPage<EamWeekMaintenanceOrder> pageList = eamWeekMaintenanceOrderService.page(page, queryWrapper);
+ IPage<EamWeekMaintenanceOrder> pageList = eamWeekMaintenanceOrderService.queryPageList(page, query);
return Result.OK(pageList);
}
@@ -88,14 +86,23 @@
/**
* 缂栬緫
*
- * @param eamWeekMaintenanceOrder
+ * @param request
* @return
*/
@AutoLog(value = "鍛ㄤ繚宸ュ崟-缂栬緫")
@ApiOperation(value = "鍛ㄤ繚宸ュ崟-缂栬緫", notes = "鍛ㄤ繚宸ュ崟-缂栬緫")
@RequestMapping(value = "/edit", method = {RequestMethod.PUT, RequestMethod.POST})
- public Result<?> edit(@RequestBody EamWeekMaintenanceOrder eamWeekMaintenanceOrder) {
- eamWeekMaintenanceOrderService.updateById(eamWeekMaintenanceOrder);
+ public Result<?> edit(@RequestBody EamWeekMaintenanceRequest request) {
+ if (request == null) {
+ return Result.error("娣诲姞鐨勫璞′笉鑳戒负绌猴紒");
+ }
+ if (CollectionUtil.isEmpty(request.getTableDetailList())) {
+ return Result.error("淇濆吇椤逛笉鑳戒负绌猴紒");
+ }
+ boolean b = eamWeekMaintenanceOrderService.editWeekMaintenance(request);
+ if (!b) {
+ return Result.error("缂栬緫澶辫触锛�");
+ }
return Result.OK("缂栬緫鎴愬姛!");
}
@@ -133,7 +140,6 @@
* @param id
* @return
*/
- @AutoLog(value = "鍛ㄤ繚宸ュ崟-閫氳繃id鏌ヨ")
@ApiOperation(value = "鍛ㄤ繚宸ュ崟-閫氳繃id鏌ヨ", notes = "鍛ㄤ繚宸ュ崟-閫氳繃id鏌ヨ")
@GetMapping(value = "/queryById")
public Result<?> queryById(@RequestParam(name = "id", required = true) String id) {
--
Gitblit v1.9.3