From 42968703ee1ce4e34991bc0f1e189d2245cbd600 Mon Sep 17 00:00:00 2001
From: shenyijian <1178253012@qq.com>
Date: Thu, 05 Sep 2024 19:27:26 +0800
Subject: [PATCH] 湖北水库：项目统计加上标段字段
---
skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sg/mapper/SgProjectInfoMapper.xml | 49 +++++++++++++++++++++++++++++++++++++++++--------
1 files changed, 41 insertions(+), 8 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 21c55cb..c8ee637 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
@@ -137,6 +137,12 @@
#{id}
</foreach>
</if>
+ <if test="dto.lot != null and dto.lot != ''">
+ and pro.lot like CONCAT(CONCAT('%',#{dto.lot}),'%')
+ </if>
+ <if test="dto.buildStage != null and dto.buildStage != ''">
+ and pro.build_stage like CONCAT(CONCAT('%',#{dto.buildStage}),'%')
+ </if>
ORDER BY pro.status desc ,pro.project_progress desc
</select>
@@ -154,6 +160,12 @@
</if>
<if test="dto.projectName != null and dto.projectName != ''">
and pro.project_name like CONCAT(CONCAT('%',#{dto.projectName}),'%')
+ </if>
+ <if test="dto.lot != null and dto.lot != ''">
+ and pro.lot like CONCAT(CONCAT('%',#{dto.lot}),'%')
+ </if>
+ <if test="dto.buildStage != null and dto.buildStage != ''">
+ and pro.build_stage like CONCAT(CONCAT('%',#{dto.buildStage}),'%')
</if>
</select>
<select id="getSgstatiss" resultType="cn.gistack.sm.sg.VO.SgStatisticsVO">
@@ -188,7 +200,8 @@
a."ad_name" NAME,
SUM( CASE WHEN b.STATUS IN ( 1, 2 ) THEN 1 ELSE 0 END ) AS commenceNum,
count( b.STATUS ) projectSum,
- LISTAGG(b.id, ',') as proIds
+ LISTAGG(b.id, ',') as proIds,
+ b.build_stage
FROM
(
SELECT
@@ -196,7 +209,8 @@
att."guid" AS cityCode,
ad."ad_code" AS provinceCode,
info.STATUS,
- info.id
+ info.id,
+ info.build_stage
FROM
YWXT.SG_PROJECT_INFO info
LEFT JOIN SJZT_DW."dim_res_info_a" dria ON dria."res_cd" = info.sk_id
@@ -212,7 +226,8 @@
a."p_ad_code" = #{code}
GROUP BY
a."ad_code",
- a."ad_name"
+ a."ad_name",
+ b.build_stage
</select>
<select id="getsgStatisticsZero" resultType="cn.gistack.sm.sg.VO.SgStatisProVO">
@@ -220,7 +235,8 @@
dria."city_cd" code, dria."city_nm" name ,
sum( CASE WHEN info.STATUS IN ( 1, 2 ) THEN 1 ELSE 0 END ) AS commenceNum,
count( info.STATUS ) projectSum,
- LISTAGG(info.id, ',') as proIds
+ LISTAGG(info.id, ',') as proIds,
+ info.build_stage as buildStage
FROM
YWXT.SG_PROJECT_INFO info
LEFT JOIN SJZT_DW."dim_res_info_a" dria ON dria."res_cd" = info.sk_id
@@ -229,7 +245,7 @@
<if test="code != null and code != ''">
AND info.lot =#{code}
</if>
- Group By dria."city_cd",dria."city_nm"
+ Group By dria."city_cd",dria."city_nm",info.build_stage
HAVING
dria."city_cd" IS NOT NULL AND
dria."city_nm" IS NOT NULL
@@ -243,14 +259,15 @@
info.lot as name,
sum( CASE WHEN info.STATUS IN ( 1, 2 ) THEN 1 ELSE 0 END ) AS commenceNum,
count( info.STATUS ) AS projectSum,
- LISTAGG(info.id, ',') as proIds
+ LISTAGG(info.id, ',') as proIds,
+ info.build_stage
FROM
YWXT.SG_PROJECT_INFO info
LEFT JOIN SJZT_DW."dim_res_info_a" dria ON dria."res_cd" = info.sk_id
WHERE
1 = 1
GROUP BY
- info.lot
+ info.lot,info.build_stage
<!-- dria."bas_guid", dria."bas_name" -->
HAVING
<!-- dria."bas_guid" IS NOT NULL AND
@@ -316,6 +333,8 @@
pro.project_name,
pro.lon_lat,
pro.status,
+ pro.lot,
+ pro.build_stage,
dria."county_cd" AS countyCode,
att."guid" AS cityCode,
ad."ad_code" AS provinceCode
@@ -335,6 +354,12 @@
</if>
<if test="dto.projectName != null and dto.projectName != ''">
and pro.project_name like CONCAT(CONCAT('%',#{dto.projectName}),'%')
+ </if>
+ <if test="dto.lot != null and dto.lot != ''">
+ and pro.lot like CONCAT(CONCAT('%',#{dto.lot}),'%')
+ </if>
+ <if test="dto.buildStage != null and dto.buildStage != ''">
+ and pro.build_stage like CONCAT(CONCAT('%',#{dto.buildStage}),'%')
</if>
</select>
<select id="queryStepByProject1" resultType="cn.gistack.sm.sg.VO.SgProjectInfoVO">
@@ -377,7 +402,9 @@
dria."county_cd" AS countyCode,
att."guid" AS cityCode,
ad."ad_code" AS provinceCode,
- pro.project_progress
+ pro.project_progress,
+ pro.lot,
+ pro.build_stage
FROM
ywxt.sg_project_info pro
LEFT JOIN ywxt.sg_device d ON pro.id = d.program_id
@@ -411,6 +438,12 @@
#{id}
</foreach>
</if>
+ <if test="dto.lot != null and dto.lot != ''">
+ and pro.lot like CONCAT(CONCAT('%',#{dto.lot}),'%')
+ </if>
+ <if test="dto.buildStage != null and dto.buildStage != ''">
+ and pro.build_stage like CONCAT(CONCAT('%',#{dto.buildStage}),'%')
+ </if>
ORDER BY pro.projectStatus desc ,pro.project_progress desc
</select>
<select id="selectVOById" resultType="cn.gistack.sm.sg.VO.SgProjectInfoVO">
--
Gitblit v1.9.3