From 447a83ebbdceb8a015c02cfa982aa16587450380 Mon Sep 17 00:00:00 2001
From: zhangherong <571457620@qq.com>
Date: 星期四, 17 四月 2025 14:29:56 +0800
Subject: [PATCH] art: 设备管理-点检工单-点检查询 数据权限过滤
---
lxzn-module-eam/src/main/java/org/jeecg/modules/eam/controller/EamInspectionOrderController.java | 21 ++++++++++-----------
1 files changed, 10 insertions(+), 11 deletions(-)
diff --git a/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/controller/EamInspectionOrderController.java b/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/controller/EamInspectionOrderController.java
index 428905e..e6afd18 100644
--- a/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/controller/EamInspectionOrderController.java
+++ b/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/controller/EamInspectionOrderController.java
@@ -13,9 +13,9 @@
import org.jeecg.modules.eam.constant.BusinessCodeConst;
import org.jeecg.modules.eam.constant.OrderCreationMethodEnum;
import org.jeecg.modules.eam.entity.EamInspectionOrder;
+import org.jeecg.modules.eam.request.EamInspectionOrderQuery;
import org.jeecg.modules.eam.request.EamInspectionOrderRequest;
import org.jeecg.modules.eam.service.IEamInspectionOrderService;
-import org.jeecg.modules.eam.service.IEamMaintenanceStandardService;
import org.jeecg.modules.system.service.ISysBusinessCodeRuleService;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*;
@@ -40,12 +40,11 @@
private IEamInspectionOrderService eamInspectionOrderService;
@Autowired
private ISysBusinessCodeRuleService businessCodeRuleService;
- @Autowired
- private IEamMaintenanceStandardService eamMaintenanceStandardService;
+
/**
* 鍒嗛〉鍒楄〃鏌ヨ
*
- * @param eamInspectionOrder
+ * @param query
* @param pageNo
* @param pageSize
* @param req
@@ -54,13 +53,13 @@
//@AutoLog(value = "鐐规宸ュ崟-鍒嗛〉鍒楄〃鏌ヨ")
@ApiOperation(value="鐐规宸ュ崟-鍒嗛〉鍒楄〃鏌ヨ", notes="鐐规宸ュ崟-鍒嗛〉鍒楄〃鏌ヨ")
@GetMapping(value = "/list")
- public Result<IPage<EamInspectionOrder>> queryPageList(EamInspectionOrder eamInspectionOrder,
- @RequestParam(name="pageNo", defaultValue="1") Integer pageNo,
- @RequestParam(name="pageSize", defaultValue="10") Integer pageSize,
- HttpServletRequest req) {
- QueryWrapper<EamInspectionOrder> queryWrapper = QueryGenerator.initQueryWrapper(eamInspectionOrder, req.getParameterMap());
+ public Result<IPage<EamInspectionOrder>> queryPageList(EamInspectionOrderQuery query,
+ @RequestParam(name="pageNo", defaultValue="1") Integer pageNo,
+ @RequestParam(name="pageSize", defaultValue="10") Integer pageSize,
+ HttpServletRequest req) {
+// QueryWrapper<EamInspectionOrder> queryWrapper = QueryGenerator.initQueryWrapper(eamInspectionOrder, req.getParameterMap());
Page<EamInspectionOrder> page = new Page<EamInspectionOrder>(pageNo, pageSize);
- IPage<EamInspectionOrder> pageList = eamInspectionOrderService.page(page, queryWrapper);
+ IPage<EamInspectionOrder> pageList = eamInspectionOrderService.queryPageList(page, query);
return Result.OK(pageList);
}
@@ -89,7 +88,7 @@
public Result<String> add(@RequestBody EamInspectionOrderRequest eamInspectionOrderRequest) {
String codeSeq = businessCodeRuleService.generateBusinessCodeSeq(BusinessCodeConst.INSPECTION_ORDER_CODE_RULE);
eamInspectionOrderRequest.setOrderNum(codeSeq);
- eamInspectionOrderRequest.setCreationMethod(String.valueOf(OrderCreationMethodEnum.AUTO));
+ eamInspectionOrderRequest.setCreationMethod(String.valueOf(OrderCreationMethodEnum.MANUAL));
eamInspectionOrderService.addInspectionOrder(eamInspectionOrderRequest);
return Result.OK("娣诲姞鎴愬姛锛�");
}
--
Gitblit v1.9.3