From b672cafe6a447c9b19691b583df9542ad84bce2c Mon Sep 17 00:00:00 2001
From: ke <893754509@qq.com>
Date: Tue, 26 Nov 2024 16:02:40 +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 | 273 ++++++++++++++++++++++++++++++++++++++++++++++++++----
1 files changed, 250 insertions(+), 23 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 13b2dde..d4beb56 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
@@ -9,17 +9,39 @@
dria."county_nm",
dria."town_nm",
dria."eng_scal",
- dria."bas_guid"
+ dria."bas_guid",
+ dria."oth_reg_cd"
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.selfUnit != null and dto.selfUnit.size>0 ">
+ and
+ <foreach collection="dto.selfUnit" item="item" index="index" open="(" separator="or" close=")">
+ info.CONSTRUCTION_UNIT Like CONCAT(CONCAT('%', #{item}), '%') or info.SELF_UNIT Like CONCAT(CONCAT('%', #{item}), '%')
+ </foreach>
+ </if>
+ <if test="dto.userUnit != null and dto.userUnit.size>0">
+ and
+ <foreach collection="dto.userUnit" item="item" index="index" open="(" separator="or" close=")">
+ info.CONTROL_UNIT Like CONCAT(CONCAT('%', #{item}), '%')
+ </foreach>
+ </if>
+ <if test="dto.countryUnit != null and dto.countryUnit.size>0">
+ and dria."county_cd" in
+ <foreach collection="dto.countryUnit" item="item" index="index" open="(" separator="," close=")">
+ #{item}
+ </foreach>
+ </if>
<if test="dto.projectName != null and dto.projectName != ''">
and info.project_name like concat( concat ('%',#{dto.projectName}),'%')
</if>
<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}), '%')
@@ -35,6 +57,9 @@
</if>
<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
@@ -60,14 +85,33 @@
#{id}
</foreach>)
</if>
- <if test="dto.projectSort == null or dto.projectSort ==0">
- ORDER BY info.status desc ,info.project_progress desc
+ <!--<if test="dto.deptId != null and dto.deptId !=''">
+ and (info.control_unit = #{dto.deptId} or info.construction_unit = #{dto.deptId})
+ </if>-->
+ <if test="dto.adCode != null and dto.adCode !=''">
+ and dria."county_cd" = #{dto.adCode}
</if>
- <if test="dto.projectSort ==1">
- ORDER BY info.project_progress desc
+ <if test="dto.projectSort == null">
+ ORDER BY TO_NUMBER(info.project_progress) desc NULLS LAST,info.status desc
</if>
- <if test="dto.projectSort != null and dto.projectSort ==2">
- ORDER BY info.sk_id asc
+ <!--
+ <if test="dto.projectSort ==1">
+ ORDER BY info.project_progress desc NULLS LAST
+ </if>
+ <if test="dto.projectSort != null and dto.projectSort ==2">
+ ORDER BY info.sk_id asc
+ </if>-->
+ <if test="dto.projectSort != null and dto.projectSort ==3">
+ ORDER BY TO_NUMBER(SUBSTR(info.surface_progress, 1, LENGTH(info.surface_progress) - 1)) desc NULLS LAST
+ </if>
+ <if test="dto.projectSort != null and dto.projectSort ==4">
+ ORDER BY TO_NUMBER(SUBSTR(info.video_progress, 1, LENGTH(info.video_progress) - 1)) desc NULLS LAST
+ </if>
+ <if test="dto.projectSort != null and dto.projectSort ==5">
+ ORDER BY TO_NUMBER(SUBSTR(info.trans_progress, 1, LENGTH(info.trans_progress) - 1)) desc NULLS LAST
+ </if>
+ <if test="dto.projectSort != null and dto.projectSort ==6">
+ ORDER BY TO_NUMBER(SUBSTR(info.seepage_progress , 1, LENGTH(info.seepage_progress ) - 1)) desc NULLS LAST
</if>
</select>
@@ -105,9 +149,13 @@
pro.STATUS AS projectStatus,
re.id AS reportId,
pro.lon_lat,
- re.resubmit
+ re.resubmit,
+ COALESCE(d.price, 99) as price,
+ COALESCE(Pdict.sort, 0) as sort,
+ COALESCE(dict.sort, 0) as dSort
FROM
ywxt.sg_project_info pro
+ LEFT JOIN SJZT_DW."dim_res_info_a" dria ON dria."res_cd" = pro.sk_id
LEFT JOIN ywxt.sg_device d ON pro.id = d.program_id
LEFT JOIN YWXT."BLADE_DICT_BIZ" AS dict ON d.device_type = dict.DICT_KEY AND dict.CODE = 'SG_DEVICE_TYPE'
LEFT JOIN YWXT."BLADE_DICT_BIZ" Pdict on dict.parent_id = Pdict.id
@@ -131,7 +179,14 @@
#{id}
</foreach>
</if>
- ORDER BY pro.status desc ,pro.project_progress desc
+ <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>
+ <include refid="queryBySgCodeS"></include>
+ ORDER BY pro.status desc ,pro.project_progress desc,step.gx_step_num asc
</select>
<select id="progressList" resultType="cn.gistack.sm.sg.VO.SgProjectInfoVO">
@@ -149,6 +204,16 @@
<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>
+ <if test="dto.deptId != null and dto.deptId !=''">
+ and (pro.control_unit = #{dto.deptId} or pro.construction_unit = #{dto.deptId})
+ </if>
+ ORDER BY pro.project_progress desc NULLS LAST
</select>
<select id="getSgstatiss" resultType="cn.gistack.sm.sg.VO.SgStatisticsVO">
SELECT
@@ -182,7 +247,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
@@ -190,7 +256,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
@@ -206,7 +273,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">
@@ -214,7 +282,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
@@ -223,7 +292,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
@@ -237,14 +306,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
@@ -300,19 +370,25 @@
select DISTINCT "bas_guid" from SJZT_DW."dim_res_info_a" where "bas_name" = #{code}
</select>
<select id="progressList1" resultType="cn.gistack.sm.sg.VO.SgProjectInfoVO">
- select pro.id,
+ select DISTINCT pro.id,
pro.project_name,
pro.lon_lat,
- pro.status
+ pro.status,
+ pro.project_progress
from
(SELECT
pro.id,
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
+ ad."ad_code" AS provinceCode,
+ pro.project_progress,
+ pro.control_unit,
+ pro.construction_unit
FROM
ywxt.sg_project_info pro
LEFT JOIN SJZT_DW."dim_res_info_a" dria ON dria."res_cd" = pro.sk_id
@@ -330,6 +406,16 @@
<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>
+ <if test="dto.deptId != null and dto.deptId !=''">
+ and (pro.control_unit = #{dto.deptId} or pro.construction_unit = #{dto.deptId})
+ </if>
+ order by pro.project_progress desc NULLS LAST
</select>
<select id="queryStepByProject1" resultType="cn.gistack.sm.sg.VO.SgProjectInfoVO">
select
@@ -371,7 +457,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
@@ -384,7 +472,10 @@
LEFT JOIN SJZT_DW."dim_res_info_a" dria ON dria."res_cd" = pro.sk_id
LEFT JOIN YWXT."att_ad_base" att ON att."ad_code" = dria."city_cd"
LEFT JOIN YWXT."att_ad_base" ad ON att."p_ad_code" = ad."ad_code"
- LEFT JOIN YWXT."att_ad_base" aad ON aad."ad_code" = ad."p_ad_code") pro
+ LEFT JOIN YWXT."att_ad_base" aad ON aad."ad_code" = ad."p_ad_code"
+ where 1=1
+ <include refid="queryBySgCodeS"></include>
+ ) pro
LEFT JOIN YWXT."att_ad_base" a ON (
( pro.countyCode = a."guid" )
OR ( pro.cityCode = a."guid" )
@@ -405,8 +496,54 @@
#{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>
+
+ <sql id="queryBySgCodeS">
+ <if test="dto.selfUnit != null and dto.selfUnit.size>0">
+ and
+ <foreach collection="dto.selfUnit" item="item" index="index" open="(" separator="or" close=")">
+ pro.CONSTRUCTION_UNIT Like CONCAT(CONCAT('%', #{item}), '%') or pro.SELF_UNIT Like CONCAT(CONCAT('%', #{item}), '%')
+ </foreach>
+ </if>
+ <if test="dto.userUnit != null and dto.userUnit.size>0">
+ and
+ <foreach collection="dto.userUnit" item="item" index="index" open="(" separator="or" close=")">
+ pro.CONTROL_UNIT Like CONCAT(CONCAT('%', #{item}), '%')
+ </foreach>
+ </if>
+ <if test="dto.countryUnit != null and dto.countryUnit.size>0">
+ and dria."county_cd" in
+ <foreach collection="dto.countryUnit" item="item" index="index" open="(" separator="," close=")">
+ #{item}
+ </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>
+ </sql>
+
<select id="selectVOById" resultType="cn.gistack.sm.sg.VO.SgProjectInfoVO">
select * from ywxt.sg_project_info pro where pro.id = #{proframId}
</select>
@@ -425,12 +562,102 @@
Pdict.DICT_KEY
</select>
<select id="getSgCodeByUser" resultType="java.lang.String">
- SELECT
+ <!-- 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}
+ WHERE u.id = #{userId} -->
+ SELECT
+ distinct dp."SG_CODE"
+ FROM
+ ywxt.BLADE_USER u
+
+ LEFT JOIN ywxt.blade_dept dp ON u.dept_id Like CONCAT('%', dp.id , '%')
+ WHERE u.id = #{userId} and dp."SG_CODE" is not null and <![CDATA[dp."SG_CODE" <>'' ]]> limit 1
+
+ </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
+ <!-- TOP 200 -->
+ info.id,
+ info.lot,
+ dria."province_nm",
+ dria."city_nm",
+ dria."county_nm",
+ dria."town_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>
+ <if test="dto.selfUnit != null and dto.selfUnit.size>0 ">
+ and
+ <foreach collection="dto.selfUnit" item="item" index="index" open="(" separator="or" close=")">
+ info.CONSTRUCTION_UNIT Like CONCAT(CONCAT('%', #{item}), '%') or info.SELF_UNIT Like CONCAT(CONCAT('%', #{item}), '%')
+ </foreach>
+ </if>
+ <if test="dto.userUnit != null and dto.userUnit.size>0">
+ and
+ <foreach collection="dto.userUnit" item="item" index="index" open="(" separator="or" close=")">
+ info.CONTROL_UNIT Like CONCAT(CONCAT('%', #{item}), '%')
+ </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.adCode != null and dto.adCode !=''">
+ and dria."county_cd" = #{dto.adCode}
+ </if>
+ </select>
+ <select id="getUserS" resultType="java.lang.String">
+
+ SELECT
+ user_id
+ FROM
+ "YWXT"."BLADE_USER_DEPT"
+ WHERE 1=1
+ <if test="list != null and list.size>0">
+ and dept_id in
+ <foreach collection="list" item="item" index="index" open="(" separator="," close=")">
+ #{item}
+ </foreach>
+ </if>
+ </select>
+ <select id="resList" resultType="cn.gistack.sm.sg.VO.ResVO">
+ select dria.* from "SJZT_DW"."dim_res_info_a" dria where 1=1
+ <if test="dto.adCode != null and dto.adCode != ''">
+ and (dria."province_cd" = #{dto.adCode} or dria."city_cd" = #{dto.adCode} or dria."county_cd" = #{dto.adCode})
+ </if>
+ <if test="dto.skName != null and dto.skName != ''">
+ and dria."res_nm" like CONCAT(CONCAT('%', #{dto.skName}), '%')
+ </if>
+ <include refid="queryBySgCodeS"></include>
</select>
</mapper>
--
Gitblit v1.9.3