From d4c8e72800fcf6fbaa3804d383c7b6a23f826f3e Mon Sep 17 00:00:00 2001
From: liurunyu <lry9898@163.com>
Date: 星期三, 20 八月 2025 14:35:00 +0800
Subject: [PATCH] 修改bug
---
pipIrr-platform/pipIrr-global/src/main/resources/mapper/SpecialMapper.xml | 25 +++++++++++++++++++++----
1 files changed, 21 insertions(+), 4 deletions(-)
diff --git a/pipIrr-platform/pipIrr-global/src/main/resources/mapper/SpecialMapper.xml b/pipIrr-platform/pipIrr-global/src/main/resources/mapper/SpecialMapper.xml
index 9d6d8ec..5fbf9ed 100644
--- a/pipIrr-platform/pipIrr-global/src/main/resources/mapper/SpecialMapper.xml
+++ b/pipIrr-platform/pipIrr-global/src/main/resources/mapper/SpecialMapper.xml
@@ -28,6 +28,7 @@
</trim>
</select>
+
<select id="selectStealSome" parameterType="java.util.Map" resultType="com.dy.pipIrrGlobal.voSpecial.VoSteal">
select mTb.id as id, mTb.intake_id as intakeId, mTb.client_id as clientId,
piTb.name as intakeNum, piTb.lng as intakeLng, piTb.lat as intakeLat,
@@ -65,14 +66,21 @@
</select>
-
<select id="selectAbnormalCloseValveTotal" parameterType="java.util.Map" resultType="java.lang.Long">
select
count(*)
from rm_open_close_valve_history mTb
left join pr_intake piTb on piTb.id = mTb.intake_id
left join se_client scTb on scTb.id = mTb.client_id
- where mTb.cl_type != 2
+ <!-- 2025-07-31 鍙傝�僣ommon妯″潡鐨勭被CommonV1鍜孋ommonV202404
+ case 5 -> "浣欓涓嶈冻鍏抽榾";
+ case 6 -> "娴侀噺璁℃晠闅滃叧闃�";
+ case 7 -> "绱ф�ュ叧闃�";
+ case 10 -> "宸℃鍗″叧闃�";
+ case 12 -> "榛戝悕鍗曞懡浠ゅ叧闃�";
+ case 16 -> "绠￠亾鏃犳按鑷姩鍏抽榾";
+ -->
+ where (mTb.cl_type = 5 or mTb.cl_type = 6 or mTb.cl_type = 7 or mTb.cl_type = 10 or mTb.cl_type = 12 or mTb.cl_type = 16)
<trim prefix="and" suffixOverrides="and">
<if test = "atDateStart != null">
mTb.cl_dt <![CDATA[>=]]> #{atDateStart, javaType=DATE, jdbcType=TIMESTAMP} and
@@ -92,7 +100,8 @@
</trim>
</select>
- <select id="selectAbnormalCloseValveSome" parameterType="java.util.Map" resultType="com.dy.pipIrrGlobal.voSpecial.CoAbnormalCloseValve">
+
+ <select id="selectAbnormalCloseValveSome" parameterType="java.util.Map" resultType="com.dy.pipIrrGlobal.voSpecial.VoAbnormalCloseValve">
select mTb.id as id, mTb.intake_id as intakeId, mTb.client_id as clientId,
piTb.name as intakeNum, piTb.lng as intakeLng, piTb.lat as intakeLat,
scTb.name as clientName, scTb.clientNum as clientNum,
@@ -102,7 +111,15 @@
from rm_open_close_valve_history mTb
left join pr_intake piTb on piTb.id = mTb.intake_id
left join se_client scTb on scTb.id = mTb.client_id
- where mTb.cl_type != 2
+ <!-- 2025-07-31 鍙傝�僣ommon妯″潡鐨勭被CommonV1鍜孋ommonV202404
+ case 5 -> "浣欓涓嶈冻鍏抽榾";
+ case 6 -> "娴侀噺璁℃晠闅滃叧闃�";
+ case 7 -> "绱ф�ュ叧闃�";
+ case 10 -> "宸℃鍗″叧闃�";
+ case 12 -> "榛戝悕鍗曞懡浠ゅ叧闃�";
+ case 16 -> "绠￠亾鏃犳按鑷姩鍏抽榾";
+ -->
+ where (mTb.cl_type = 5 or mTb.cl_type = 6 or mTb.cl_type = 7 or mTb.cl_type = 10 or mTb.cl_type = 12 or mTb.cl_type = 16)
<trim prefix="and" suffixOverrides="and">
<if test = "atDateStart != null">
mTb.cl_dt <![CDATA[>=]]> #{atDateStart, javaType=DATE, jdbcType=TIMESTAMP} and
--
Gitblit v1.8.0