From 2e644445577d0773482753b7d08b3425afae7837 Mon Sep 17 00:00:00 2001
From: zxl <763096477@qq.com>
Date: 星期一, 29 九月 2025 13:58:20 +0800
Subject: [PATCH] 新问题 25-9-28
---
ycl-server/src/main/resources/mapper/zgyw/YwPointMapper.xml | 3 ++-
ycl-server/src/main/java/com/ycl/platform/service/impl/YwPointServiceImpl.java | 2 ++
2 files changed, 4 insertions(+), 1 deletions(-)
diff --git a/ycl-server/src/main/java/com/ycl/platform/service/impl/YwPointServiceImpl.java b/ycl-server/src/main/java/com/ycl/platform/service/impl/YwPointServiceImpl.java
index f5adcac..2c0193a 100644
--- a/ycl-server/src/main/java/com/ycl/platform/service/impl/YwPointServiceImpl.java
+++ b/ycl-server/src/main/java/com/ycl/platform/service/impl/YwPointServiceImpl.java
@@ -170,6 +170,7 @@
*/
@Override
public Result removeById(String id) {
+ log.info("鎵ц鍒犻櫎鏂规硶-------------------");
if (baseMapper.deleteById(id) > 0) {
return Result.ok("鍒犻櫎鎴愬姛");
}
@@ -340,6 +341,7 @@
needUpdateUnit) throws IOException, ExecutionException, InterruptedException {
List<Map<String, String>> list = EasyExcelImportUtils.makeData(file);
List<PointExport> dataList = new ArrayList<>();
+
// Consumer<List<PointExport>> consumer = (dataList) -> {
// try {
// this.updatePoint(dataList, unitId, startTime, endTime, needUpdateUnit);
diff --git a/ycl-server/src/main/resources/mapper/zgyw/YwPointMapper.xml b/ycl-server/src/main/resources/mapper/zgyw/YwPointMapper.xml
index 74a5004..f6b5108 100644
--- a/ycl-server/src/main/resources/mapper/zgyw/YwPointMapper.xml
+++ b/ycl-server/src/main/resources/mapper/zgyw/YwPointMapper.xml
@@ -60,8 +60,9 @@
t_yw_point typ
LEFT JOIN t_yw_unit tyu ON typ.unit_id = tyu.id AND tyu.deleted = 0
LEFT JOIN sys_dept sd ON typ.dept_id = sd.dept_id AND sd.del_flag = 0
+
<where>
- typ.examine_status = 1
+ typ.examine_status = 1 and typ.deleted = 0
<if test="query.pointName != null and query.pointName != ''">
AND typ.point_name like concat('%', #{query.pointName}, '%')
</if>
--
Gitblit v1.8.0