From 44d30cbd79df473dbdf6d28decde2bbc931c0821 Mon Sep 17 00:00:00 2001
From: shenyijian <1178253012@qq.com>
Date: Fri, 30 Aug 2024 18:19:47 +0800
Subject: [PATCH] 湖北水库：工程项目树数量修改
---
skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sg/mapper/SgProjectInfoMapper.xml | 112 ++++++++++++++++++++++++++++++++++++++++++++++++++-----
1 files changed, 101 insertions(+), 11 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 4f606ec..21c55cb 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
@@ -21,6 +21,9 @@
<if test="dto.skName != null and dto.skName != ''">
and info.sk_name like concat(concat('%',#{dto.skName}),'%')
</if>
+ <if test="dto.lot != null and dto.lot != ''">
+ and info.lot = #{dto.lot}
+ </if>
<if test="dto.resCd != null and dto.resCd != '' ">
and info.sk_id like CONCAT(CONCAT('%', #{dto.resCd}), '%')
</if>
@@ -36,11 +39,32 @@
<if test="dto.isBegin != null and dto.isBegin == 2">
and info.status = 0
</if>
+ <if test="dto.buildStage != null and dto.buildStage != ''">
+ and info.build_stage = #{dto.buildStage}
+ </if>
<if test="dto.projectIds != null and dto.projectIds.size > 0">
and info.id in
<foreach collection="dto.projectIds" item="id" separator="," open="(" close=")">
#{id}
</foreach>
+ </if>
+ <if test="dto.sgCodeS != null and dto.sgCodeS.size > 0">
+ and (dria."province_cd" in
+ <foreach collection="dto.sgCodeS" item="id" separator="," open="(" close=")">
+ #{id}
+ </foreach>
+ or dria."city_cd" in
+ <foreach collection="dto.sgCodeS" item="id" separator="," open="(" close=")">
+ #{id}
+ </foreach>
+ or dria."county_cd" in
+ <foreach collection="dto.sgCodeS" item="id" separator="," open="(" close=")">
+ #{id}
+ </foreach>
+ or dria."town_cd" in
+ <foreach collection="dto.sgCodeS" item="id" separator="," open="(" close=")">
+ #{id}
+ </foreach>)
</if>
<if test="dto.projectSort == null or dto.projectSort ==0">
ORDER BY info.status desc ,info.project_progress desc
@@ -52,6 +76,20 @@
ORDER BY info.sk_id asc
</if>
</select>
+
+ <sql id="sgCodeCondition">
+ <if test="dto.sgCodeS != null and dto.sgCodeS.size() > 0">
+ AND (
+ <foreach collection="dto.sgCodeS" item="id" separator="OR" open="(" close=")">
+ dria.province_cd = #{id}
+ OR dria.city_cd = #{id}
+ OR dria.county_cd = #{id}
+ or dria.town_cd = #{id}
+ </foreach>
+ )
+ </if>
+ </sql>
+
<select id="queryStepByProject" resultType="cn.gistack.sm.sg.VO.SgProjectInfoVO">
SELECT
@@ -72,7 +110,8 @@
d.STATUS AS deviceStatus,
pro.STATUS AS projectStatus,
re.id AS reportId,
- pro.lon_lat
+ pro.lon_lat,
+ re.resubmit
FROM
ywxt.sg_project_info pro
LEFT JOIN ywxt.sg_device d ON pro.id = d.program_id
@@ -98,6 +137,8 @@
#{id}
</foreach>
</if>
+ ORDER BY pro.status desc ,pro.project_progress desc
+
</select>
<select id="progressList" resultType="cn.gistack.sm.sg.VO.SgProjectInfoVO">
SELECT
@@ -146,14 +187,16 @@
a."ad_code" CODE,
a."ad_name" NAME,
SUM( CASE WHEN b.STATUS IN ( 1, 2 ) THEN 1 ELSE 0 END ) AS commenceNum,
- count( b.STATUS ) projectSum
+ count( b.STATUS ) projectSum,
+ LISTAGG(b.id, ',') as proIds
FROM
(
SELECT
dria."county_cd" AS countyCode,
att."guid" AS cityCode,
ad."ad_code" AS provinceCode,
- info.STATUS
+ info.STATUS,
+ info.id
FROM
YWXT.SG_PROJECT_INFO info
LEFT JOIN SJZT_DW."dim_res_info_a" dria ON dria."res_cd" = info.sk_id
@@ -176,8 +219,9 @@
SELECT
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
- FROM
+ count( info.STATUS ) projectSum,
+ LISTAGG(info.id, ',') as proIds
+ FROM
YWXT.SG_PROJECT_INFO info
LEFT JOIN SJZT_DW."dim_res_info_a" dria ON dria."res_cd" = info.sk_id
WHERE
@@ -198,7 +242,8 @@
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
+ count( info.STATUS ) AS projectSum,
+ LISTAGG(info.id, ',') as proIds
FROM
YWXT.SG_PROJECT_INFO info
LEFT JOIN SJZT_DW."dim_res_info_a" dria ON dria."res_cd" = info.sk_id
@@ -309,8 +354,9 @@
pro.deviceStatus,
pro.projectStatus,
pro.reportId,
- pro.lon_lat
- from
+ pro.lon_lat,
+ pro.project_progress
+ from
(SELECT
pro.id,
pro.project_name,
@@ -330,7 +376,8 @@
pro.lon_lat,
dria."county_cd" AS countyCode,
att."guid" AS cityCode,
- ad."ad_code" AS provinceCode
+ ad."ad_code" AS provinceCode,
+ pro.project_progress
FROM
ywxt.sg_project_info pro
LEFT JOIN ywxt.sg_device d ON pro.id = d.program_id
@@ -364,11 +411,54 @@
#{id}
</foreach>
</if>
+ ORDER BY pro.projectStatus desc ,pro.project_progress desc
</select>
<select id="selectVOById" resultType="cn.gistack.sm.sg.VO.SgProjectInfoVO">
select * from ywxt.sg_project_info pro where pro.id = #{proframId}
</select>
- <!-- <select id="getProjectIds" resultType="java.lang.String">-->
-<!-- </select>-->
+ <select id="getDeviceTypes" resultType="cn.gistack.sm.sg.VO.SgStatisDeviceVO">
+ SELECT
+ count( d.id) AS deviceCount,
+ sum( CASE WHEN d.STATUS IN ( 1, 2 ) THEN 1 ELSE 0 END) deviceStart,
+ Pdict.DICT_KEY as pType
+ FROM
+ ywxt.sg_device d
+ LEFT JOIN ywxt.blade_dict_biz dict ON d.device_type = dict.DICT_KEY
+ LEFT JOIN YWXT."BLADE_DICT_BIZ" Pdict ON dict.parent_id = Pdict.id
+ WHERE program_id IN ${s}
+ GROUP BY
+ Pdict.DICT_KEY
+ </select>
+ <select id="getSgCodeByUser" resultType="java.lang.String">
+ SELECT
+ dp."SG_CODE"
+ FROM
+ ywxt.BLADE_USER u
+ LEFT JOIN ywxt.blade_dept dp ON u.dept_id = cast( dp.id AS VARCHAR )
+ WHERE u.id = #{userId}
+
+ </select>
+ <select id="queryDept" resultType="cn.gistack.sm.sg.VO.SgAllDeptOrUser">
+ select id,full_name as name from "YWXT"."BLADE_DEPT"
+ </select>
+ <select id="queryUser" resultType="cn.gistack.sm.sg.VO.SgAllDeptOrUser">
+ select id,real_name as name from "YWXT"."BLADE_USER";
+ </select>
+ <select id="projectTree" resultType="cn.gistack.sm.sg.VO.SgProjectTreeVO">
+ SELECT
+ info.id,
+ dria."city_nm",
+ dria."province_nm",
+ dria."county_nm",
+ dria."res_nm"
+ 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
+ <if test="dto.buildStage != null and dto.buildStage != ''">
+ and info.build_stage = #{dto.buildStage}
+ </if>
+ </select>
</mapper>
--
Gitblit v1.9.3