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 | 39 ++++++++++++++++++++++++++++++++++++---
1 files changed, 36 insertions(+), 3 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 a5a66e3..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>
@@ -35,6 +38,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
@@ -131,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
@@ -346,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,
@@ -367,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
@@ -401,6 +411,7 @@
#{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}
@@ -428,4 +439,26 @@
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