From 7a90b194a7d1a213d01c323fd90ef5afbdeb4ea7 Mon Sep 17 00:00:00 2001
From: qushaowei <qushaowei@163.com>
Date: 星期二, 10 六月 2025 16:21:02 +0800
Subject: [PATCH] 保养修改
---
lxzn-module-eam/src/main/java/org/jeecg/modules/eam/controller/EamEquipmentController.java | 20 +++++++++++++++++---
1 files changed, 17 insertions(+), 3 deletions(-)
diff --git a/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/controller/EamEquipmentController.java b/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/controller/EamEquipmentController.java
index 1080626..dcdbd49 100644
--- a/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/controller/EamEquipmentController.java
+++ b/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/controller/EamEquipmentController.java
@@ -1190,7 +1190,7 @@
MessageDTO messageDTO = new MessageDTO();
messageDTO.setTitle(headInfo);
messageDTO.setFromUser("鏁版嵁瀵煎叆灏忓姪鎵�-灏忓");
- messageDTO.setCategory("瀵煎叆鎿嶄綔闄勫姞淇℃伅");
+ messageDTO.setCategory("瀵煎叆淇℃伅");
messageDTO.setContent(exceptionInfo);
messageDTO.setToUser(user.getUsername());
sysBaseApi.sendSysAnnouncement(messageDTO);
@@ -1315,13 +1315,27 @@
@RequestParam(name="pageNo", defaultValue="1") Integer pageNo,
@RequestParam(name="pageSize", defaultValue="10") Integer pageSize,
HttpServletRequest req) {
- QueryWrapper<Equipment> queryWrapper = QueryGenerator.initQueryWrapper(equipment, req.getParameterMap());
+// QueryWrapper<Equipment> queryWrapper = QueryGenerator.initQueryWrapper(equipment, req.getParameterMap());
+ QueryWrapper<Equipment> queryWrapper = new QueryWrapper<>();
+ String num = equipment.getNum();
+ if(StringUtils.isNotBlank(num)){
+ queryWrapper.like("num",num);
+ }
+ String name = equipment.getName();
+ if(StringUtils.isNotBlank(name)){
+ queryWrapper.like("name",name);
+ }
+ String workCenterId = equipment.getWorkCenterId();
+ if(StringUtils.isNotBlank(workCenterId)){
+ queryWrapper.eq("work_center_id",workCenterId);
+ }
//鏍规嵁涓嬫涓変繚鏃堕棿鎺掑簭
- queryWrapper.orderByAsc("next_third_maintenance_time");
+
//濡傛灉startTime鍜宔ndTime涓嶄负绌猴紝鍒欐煡璇笅娆′笁淇濇椂闂村湪杩欎釜鏃堕棿娈靛唴鐨勮澶�
if(equipment.getStartTime()!=null && equipment.getEndTime()!=null){
queryWrapper.between("next_third_maintenance_time",equipment.getStartTime(),equipment.getEndTime());
}
+ queryWrapper.orderByAsc("next_third_maintenance_time");
Page<Equipment> page = new Page<Equipment>(pageNo, pageSize);
IPage<Equipment> pageList = equipmentService.page(page, queryWrapper);
return Result.OK(pageList);
--
Gitblit v1.9.3