From e6d701963edc05441f58b689b1ed18b89d0faff3 Mon Sep 17 00:00:00 2001
From: zhangherong <571457620@qq.com>
Date: 星期三, 05 三月 2025 10:41:01 +0800
Subject: [PATCH] art: 所有设备 台账 技术状态鉴定 根据设备id查询技术状态鉴定,并过滤掉已完成的技术状态鉴定
---
lxzn-module-eam/src/main/java/org/jeecg/modules/eam/controller/CalibrationOrderController.java | 7 +++++++
lxzn-module-eam/src/main/java/org/jeecg/modules/eam/entity/CalibrationOrder.java | 3 +++
2 files changed, 10 insertions(+), 0 deletions(-)
diff --git a/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/controller/CalibrationOrderController.java b/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/controller/CalibrationOrderController.java
index 30b0141..79650b8 100644
--- a/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/controller/CalibrationOrderController.java
+++ b/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/controller/CalibrationOrderController.java
@@ -485,6 +485,13 @@
@RequestParam(name="pageSize", defaultValue="10") Integer pageSize,
HttpServletRequest req) {
QueryWrapper<CalibrationOrder> queryWrapper = QueryGenerator.initQueryWrapper(calibrationOrder, req.getParameterMap());
+ //鐘舵�佺瓫閫�
+ List<String> statusEnumList = null;
+ if(StringUtils.isNotBlank(calibrationOrder.getStatusEnums())) {
+ String[] statusEnums = calibrationOrder.getStatusEnums().split(",");
+ statusEnumList = Arrays.asList(statusEnums);
+ queryWrapper.notIn("status", statusEnumList);
+ }
Page<CalibrationOrder> page = new Page<CalibrationOrder>(pageNo, pageSize);
IPage<CalibrationOrder> pageList = calibrationOrderService.page(page, queryWrapper);
for (CalibrationOrder record : pageList.getRecords()) {
diff --git a/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/entity/CalibrationOrder.java b/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/entity/CalibrationOrder.java
index aa55d51..e3b5ec8 100644
--- a/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/entity/CalibrationOrder.java
+++ b/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/entity/CalibrationOrder.java
@@ -257,4 +257,7 @@
@DateTimeFormat(pattern = "yyyy-MM-dd")
private Date issueEndDate;
+ @TableField(exist = false)
+ private String statusEnums;
+
}
--
Gitblit v1.9.3