From d1ebb26ab19f83f32c5314771a5381db6f1b2a6d Mon Sep 17 00:00:00 2001
From: liusuyi <1951119284@qq.com>
Date: 星期日, 28 四月 2024 11:49:37 +0800
Subject: [PATCH] 修改雷达井不存在到处excel
---
ard-work/src/main/java/com/ruoyi/alarmpoints/well/service/impl/ArdAlarmpointsWellServiceImpl.java | 16 ++++++++--------
1 files changed, 8 insertions(+), 8 deletions(-)
diff --git a/ard-work/src/main/java/com/ruoyi/alarmpoints/well/service/impl/ArdAlarmpointsWellServiceImpl.java b/ard-work/src/main/java/com/ruoyi/alarmpoints/well/service/impl/ArdAlarmpointsWellServiceImpl.java
index 00fefb1..b6a07eb 100644
--- a/ard-work/src/main/java/com/ruoyi/alarmpoints/well/service/impl/ArdAlarmpointsWellServiceImpl.java
+++ b/ard-work/src/main/java/com/ruoyi/alarmpoints/well/service/impl/ArdAlarmpointsWellServiceImpl.java
@@ -292,14 +292,14 @@
Integer pageNum = ardAlarmpointsWellParam.getPageNum();
Integer pageSize = ardAlarmpointsWellParam.getPageSize();
PageHelper.startPage(pageNum, pageSize);
-// QueryWrapper<ArdAlarmpointsWell> queryWrapper = new QueryWrapper<>();
-// queryWrapper.select("id","altitude","metering_station","displacement_mode","latitude","dehydration_station",
-// "well_type","production_date","well_id","transfer_station","oil_production","run_status","longitude",
-// "installed_load","dept_id","user_id","surrounding_environment","well_number","well_block")
-// .eq(!StringUtils.isBlank(ardAlarmpointsWellParam.getWellId()), "well_id", ardAlarmpointsWellParam.getWellId())
-// .in("dept_id", ardAlarmpointsWellParam.getDeptList());
-// List<ArdAlarmpointsWell> list = ardAlarmpointsWellMapper.selectList(queryWrapper);
- List<ArdAlarmpointsWell> list = ardAlarmpointsWellMapper.conditionList(ardAlarmpointsWellParam);
+ QueryWrapper<ArdAlarmpointsWell> queryWrapper = new QueryWrapper<>();
+ queryWrapper.select("id","altitude","metering_station","displacement_mode","latitude","dehydration_station",
+ "well_type","production_date","well_id","transfer_station","oil_production","run_status","longitude",
+ "installed_load","dept_id","user_id","surrounding_environment","well_number","well_block")
+ .like(!StringUtils.isBlank(ardAlarmpointsWellParam.getWellId()), "well_id", ardAlarmpointsWellParam.getWellId())
+ .in("dept_id", ardAlarmpointsWellParam.getDeptList());
+ List<ArdAlarmpointsWell> list = ardAlarmpointsWellMapper.selectList(queryWrapper);
+// List<ArdAlarmpointsWell> list = ardAlarmpointsWellMapper.conditionList(ardAlarmpointsWellParam.getWellId(),ardAlarmpointsWellParam.getDeptList());
return new PageInfo<>(list);
}
--
Gitblit v1.9.3