From 04ac765c34ee28462f3e916ca800e45830fb3ea8 Mon Sep 17 00:00:00 2001
From: yxm <zhp1521624>
Date: Wed, 17 Jul 2024 14:04:38 +0800
Subject: [PATCH] 白蚁项目管理优化
---
skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sjztmd/mapper/TbProjectMapper.xml | 14 +++++++-------
1 files changed, 7 insertions(+), 7 deletions(-)
diff --git a/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sjztmd/mapper/TbProjectMapper.xml b/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sjztmd/mapper/TbProjectMapper.xml
index 497d7cb..5e59b41 100644
--- a/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sjztmd/mapper/TbProjectMapper.xml
+++ b/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sjztmd/mapper/TbProjectMapper.xml
@@ -320,7 +320,7 @@
<if test="params.tbMonth != null and params.tbMonth !=''">
AND "month" = #{params.tbMonth}
</if>
- ) b ON a."guid" = b."tb_project_id"
+ ) b ON a."guid" = b."tb_project_id" and a."check_state" = 3
</select>
<select id="getStatisticsPies" resultType="cn.gistack.sm.sjztmd.vo.StatisticsPrice">
SELECT
@@ -334,14 +334,14 @@
FROM
sjzt_md."tb_project" a
LEFT JOIN ( SELECT * FROM sjzt_md."tb_project_schedule"
- WHERE "check_state" = 3
+ WHERE
<if test="params.tbYear != null and params.tbYear !=''">
AND "year" = #{params.tbYear}
</if>
<if test="params.tbMonth != null and params.tbMonth !=''">
AND "month" = #{params.tbMonth}
</if>
- ) b ON a."guid" = b."tb_project_id"
+ ) b ON a."guid" = b."tb_project_id" and a."check_state" = 3
LEFT JOIN YWXT."att_ad_base" c ON ( a."city_code" = c."guid" )
OR ( a."county_code" = c."guid" )
WHERE
@@ -362,14 +362,14 @@
FROM
sjzt_md."tb_project" a
LEFT JOIN ( SELECT * FROM sjzt_md."tb_project_schedule"
- WHERE "check_state" = 3
+ WHERE 1=1
<if test="params.tbYear != null and params.tbYear !=''">
AND "year" = #{params.tbYear}
</if>
<if test="params.tbMonth != null and params.tbMonth !=''">
AND "month" = #{params.tbMonth}
</if>
- ) b ON a."guid" = b."tb_project_id"
+ ) b ON a."guid" = b."tb_project_id" and a."check_state" = 3
RIGHT JOIN YWXT."att_ad_base" c on c."ad_code" = a."city_code"
where c."p_ad_code" = #{params.adCode}
GROUP BY
@@ -399,14 +399,14 @@
FROM
sjzt_md."tb_project" a
LEFT JOIN ( SELECT * FROM sjzt_md."tb_project_schedule"
- WHERE 1=1
+ WHERE 1=1
<if test="params.tbYear != null and params.tbYear !=''">
AND "year" = #{params.tbYear}
</if>
<if test="params.tbMonth != null and params.tbMonth !=''">
AND "month" = #{params.tbMonth}
</if>
- ) b ON a."guid" = b."tb_project_id"
+ ) b ON a."guid" = b."tb_project_id" and a."check_state" = 3
GROUP BY
a."county_code",
a."county_name",
--
Gitblit v1.9.3