From daf4ede1b07dd92aa3e5cbc80c401a56cb74d7ec Mon Sep 17 00:00:00 2001
From: ke <893754509@qq.com>
Date: Thu, 08 Aug 2024 14:53:22 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/jtdev' into jtdev
---
skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sg/mapper/SgProjectInfoMapper.xml | 35 ++++++++++++++++++++++-------------
1 files changed, 22 insertions(+), 13 deletions(-)
diff --git a/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sg/mapper/SgProjectInfoMapper.xml b/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sg/mapper/SgProjectInfoMapper.xml
index ad255da..0efb6c0 100644
--- a/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sg/mapper/SgProjectInfoMapper.xml
+++ b/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sg/mapper/SgProjectInfoMapper.xml
@@ -42,7 +42,12 @@
#{id}
</foreach>
</if>
- ORDER BY info.status desc
+ <if test="dto.projectSort == null or dto.projectSort ==0">
+ ORDER BY info.status desc
+ </if>
+ <if test="dto.projectSort != null and dto.projectSort ==2">
+ ORDER BY info.sk_id asc
+ </if>
</select>
<select id="queryStepByProject" resultType="cn.gistack.sm.sg.VO.SgProjectInfoVO">
@@ -117,7 +122,7 @@
1 = 1
<if test="grad == 0">
AND
- dria."bas_name" = #{code}
+ info.lot = #{code}
</if>
<if test="grad == 2">
AND
@@ -170,10 +175,11 @@
FROM
YWXT.SG_PROJECT_INFO info
LEFT JOIN SJZT_DW."dim_res_info_a" dria ON dria."res_cd" = info.sk_id
- WHERE
+ WHERE
1 = 1
- AND
- dria."bas_name" =#{code}
+ <if test="code != null and code != ''">
+ AND info.lot =#{code}
+ </if>
Group By dria."city_cd",dria."city_nm"
HAVING
dria."city_cd" IS NOT NULL AND
@@ -182,8 +188,10 @@
<select id="getsgStatisticsOne" resultType="cn.gistack.sm.sg.VO.SgStatisProVO">
SELECT
- dria."bas_name" AS code,
- dria."bas_guid" AS name,
+<!-- dria."bas_name" AS code,
+ dria."bas_guid" AS name,-->
+ info.lot as code,
+ info.lot as name,
sum( CASE WHEN info.STATUS IN ( 1, 2 ) THEN 1 ELSE 0 END ) AS commenceNum,
count( info.STATUS ) AS projectSum
FROM
@@ -192,11 +200,12 @@
WHERE
1 = 1
GROUP BY
- dria."bas_guid",
- dria."bas_name"
+ info.lot
+ <!-- dria."bas_guid", dria."bas_name" -->
HAVING
- dria."bas_guid" IS NOT NULL AND
- dria."bas_name" IS NOT NULL
+ <!-- dria."bas_guid" IS NOT NULL AND
+ dria."bas_name" IS NOT NULL -->
+ info.lot is not null
</select>
<select id="getProjectId" resultType="java.lang.String">
@@ -270,7 +279,7 @@
( pro.countyCode = a."guid" )
OR ( pro.cityCode = a."guid" )
OR ( pro.provinceCode = a."guid" ))
- WHERE 1=1 and a."p_ad_code" = #{dto.adCode}
+ WHERE 1=1 and (a."p_ad_code" = #{dto.adCode} or a."ad_code" = #{dto.adCode})
<if test="dto.status != null">
and pro.status = #{dto.status}
</if>
@@ -334,7 +343,7 @@
( pro.countyCode = a."guid" )
OR ( pro.cityCode = a."guid" )
OR ( pro.provinceCode = a."guid" ))
- WHERE 1=1 and a."p_ad_code" = #{dto.adCode}
+ WHERE 1=1 and (a."p_ad_code" = #{dto.adCode} or a."ad_code" = #{dto.adCode})
<if test="dto.projectId != null and dto.projectId != ''">
and pro.id = #{dto.projectId}
</if>
--
Gitblit v1.9.3