From c19de84fa332a00c651f28e3a52292fd14f143a1 Mon Sep 17 00:00:00 2001
From: liurunyu <lry9898@163.com>
Date: 星期二, 23 九月 2025 17:30:07 +0800
Subject: [PATCH] 陆常丽反应软件系统财务对账时而数据不准确，分析源码，找到bug原因是，财务对账统计只有用户点击后才会触发统计功能，把历史上及当天进行了统计，如果当天统计时未下班，例如是中午触发统计了，而下午又进行了充值售水，但下班后未再点击触发对账统计，那么今天的对账统计完成了但数据不对。编写自动任务，在下半夜进行对账统计。
---
pipIrr-platform/pipIrr-global/src/main/resources/mapper/SpecialMapper.xml | 20 ++++++++++++++++++--
1 files changed, 18 insertions(+), 2 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 01a5a70..5fbf9ed 100644
--- a/pipIrr-platform/pipIrr-global/src/main/resources/mapper/SpecialMapper.xml
+++ b/pipIrr-platform/pipIrr-global/src/main/resources/mapper/SpecialMapper.xml
@@ -72,7 +72,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
@@ -103,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