From 3128a684d6654131f01472ee95aa3f09a9d12dac Mon Sep 17 00:00:00 2001
From: liurunyu <lry9898@163.com>
Date: 星期三, 26 三月 2025 14:24:50 +0800
Subject: [PATCH] 1、git同步冲突引起文件丢失，进行系统恢复，并屏蔽一个非git提交的模块； 2、增加文件《增加一个单位（orgTag）》。
---
pipIrr-platform/pipIrr-global/src/main/resources/mapper/StClientAmountMonthMapper.xml | 5 +++--
1 files changed, 3 insertions(+), 2 deletions(-)
diff --git a/pipIrr-platform/pipIrr-global/src/main/resources/mapper/StClientAmountMonthMapper.xml b/pipIrr-platform/pipIrr-global/src/main/resources/mapper/StClientAmountMonthMapper.xml
index d43e655..4ada802 100644
--- a/pipIrr-platform/pipIrr-global/src/main/resources/mapper/StClientAmountMonthMapper.xml
+++ b/pipIrr-platform/pipIrr-global/src/main/resources/mapper/StClientAmountMonthMapper.xml
@@ -520,7 +520,7 @@
select
count(*)
from se_client mtb
- where mtb.deleted != 0
+ where mtb.deleted != 1
<trim prefix="and" suffixOverrides="and">
<if test="name != null and name != ''">
mtb.name like concat('%', #{name}, '%')
@@ -531,6 +531,7 @@
<select id="selectMonthStatistics" resultType="com.dy.pipIrrGlobal.voSt.VoStClientAmountMonth">
select
mtb.clientNum as clientNum,
+ mtb.name as clientName,
mtb.phone as clientPhone,
mtb.address as clientAddress,
<include refid="Base_Column_List_with_alias" >
@@ -538,7 +539,7 @@
</include>
from se_client mtb
LEFT JOIN st_client_amount_month stTb on stTb.client_id = mtb.id
- where mtb.deleted != 0
+ where mtb.deleted != 1
<trim prefix="and" suffixOverrides="and">
<if test = "year != null">
stTb.year = #{year, jdbcType=INTEGER}
--
Gitblit v1.8.0