From 6a4f68b8f99dca3a00c297cbcff82c065575212c Mon Sep 17 00:00:00 2001
From: liurunyu <lry9898@163.com>
Date: 星期六, 16 八月 2025 11:25:20 +0800
Subject: [PATCH] 1、完善代码；2、作物去除lat属性，采用关联气象站的lat；3、project模块增加查询全部气象站的方法。
---
pipIrr-platform/pipIrr-global/src/main/resources/mapper/SpecialMapper.xml | 84 +++++++++++++++++++++++++++++++++++++++++
1 files changed, 83 insertions(+), 1 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 9675dc5..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,9 +28,10 @@
</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.name as intakeNum, piTb.lng as intakeLng, piTb.lat as intakeLat,
scTb.name as clientName, scTb.clientNum as clientNum,
mTb.op_dt as openDt, mTb.op_type as opType, mTb.op_total_amount as openTotalAmount, mTb.op_remain_money as openRemainMoney,
mTb.cl_dt as closeDt, mTb.cl_type as clType, mTb.cl_total_amount as closeTotalAmount, mTb.cl_remain_money as closeRemainMoney,
@@ -63,4 +64,85 @@
</if>
</trim>
</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
+ <!-- 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
+ </if>
+ <if test = "atDateEnd != null">
+ mTb.cl_dt <![CDATA[<=]]> #{atDateEnd, javaType=DATE, jdbcType=TIMESTAMP} and
+ </if>
+ <if test = "intakeNum != null and intakeNum != '' ">
+ piTb.name = #{intakeNum, jdbcType=VARCHAR} and
+ </if>
+ <if test = "clientNum != null and clientNum != '' ">
+ scTb.clientNum = #{clientNum, jdbcType=VARCHAR} and
+ </if>
+ <if test = "clientName != null and clientName != '' ">
+ scTb.name = #{clientName, jdbcType=VARCHAR} and
+ </if>
+ </trim>
+ </select>
+
+
+ <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,
+ mTb.op_dt as openDt, mTb.op_type as opType, mTb.op_total_amount as openTotalAmount, mTb.op_remain_money as openRemainMoney,
+ mTb.cl_dt as closeDt, mTb.cl_type as clType, mTb.cl_total_amount as closeTotalAmount, mTb.cl_remain_money as closeRemainMoney,
+ mTb.cl_this_amount as thisAmount, mTb.cl_this_money as thisMoney, mTb.cl_this_time as thisTime
+ 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
+ <!-- 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
+ </if>
+ <if test = "atDateEnd != null">
+ mTb.cl_dt <![CDATA[<=]]> #{atDateEnd, javaType=DATE, jdbcType=TIMESTAMP} and
+ </if>
+ <if test = "intakeNum != null and intakeNum != '' ">
+ piTb.name = #{intakeNum, jdbcType=VARCHAR} and
+ </if>
+ <if test = "clientNum != null and clientNum != '' ">
+ scTb.clientNum = #{clientNum, jdbcType=VARCHAR} and
+ </if>
+ <if test = "clientName != null and clientName != '' ">
+ scTb.name = #{clientName, jdbcType=VARCHAR} and
+ </if>
+ </trim>
+ order by mTb.id DESC
+ <trim prefix="limit " >
+ <if test="start != null and count != null">
+ #{start,javaType=Integer, jdbcType=INTEGER}, #{count,javaType=Integer, jdbcType=INTEGER}
+ </if>
+ </trim>
+ </select>
+
</mapper>
\ No newline at end of file
--
Gitblit v1.8.0