From a1e7b27114eaf0bfd4d9768b76ba0db10e4d87bf Mon Sep 17 00:00:00 2001
From: yxm <zhp1521624>
Date: Wed, 17 Jul 2024 11:50:56 +0800
Subject: [PATCH] 项目查询进度添加区域筛选和白蚁项目管理优化
---
skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sg/mapper/SgProjectInfoMapper.xml | 110 +++++++++++++++++++++++++++++++++++++++++++++++++++++--
1 files changed, 106 insertions(+), 4 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 4364439..3d3c206 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
@@ -78,10 +78,7 @@
pro.id,
pro.project_name,
pro.lon_lat,
- pro.status,
- dria."county_cd" AS countyCode,
- att."guid" AS cityCode,
- ad."ad_code" AS provinceCode
+ pro.status
FROM
ywxt.sg_project_info pro
WHERE 1=1
@@ -233,6 +230,111 @@
<select id="getname" resultType="java.lang.String">
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,
+ pro.project_name,
+ pro.lon_lat,
+ pro.status
+ from
+ (SELECT
+ pro.id,
+ pro.project_name,
+ pro.lon_lat,
+ pro.status,
+ dria."county_cd" AS countyCode,
+ att."guid" AS cityCode,
+ ad."ad_code" AS provinceCode
+ 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."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" a ON (
+ ( pro.countyCode = a."guid" )
+ OR ( pro.cityCode = a."guid" )
+ OR ( pro.provinceCode = a."guid" ))
+ WHERE 1=1 and a."p_ad_code" = #{dto.adCode}
+ <if test="dto.status != null">
+ and pro.status = #{dto.status}
+ </if>
+ <if test="dto.projectName != null and dto.projectName != ''">
+ and pro.project_name like CONCAT(CONCAT('%',#{dto.projectName}),'%')
+ </if>
+ </select>
+ <select id="queryStepByProject1" resultType="cn.gistack.sm.sg.VO.SgProjectInfoVO">
+ select
+ pro.id,
+ pro.project_name,
+ pro.gxId,
+ pro.gx_name,
+ pro.device_name,
+ pro.device_type,
+ pro.typeName,
+ pro.dId,
+ pro.gx_step_name,
+ pro.gx_step_num,
+ pro.stepId,
+ pro.reportStatus,
+ pro.deviceStatus,
+ pro.projectStatus,
+ pro.reportId,
+ pro.lon_lat
+ from
+ (SELECT
+ pro.id,
+ pro.project_name,
+ gx.id AS gxId,
+ gx.gx_name,
+ d.device_name,
+ d.device_type,
+ dict."DICT_VALUE" AS typeName,
+ d.id AS dId,
+ step.gx_step_name,
+ step.gx_step_num,
+ step.id AS stepId,
+ re.STATUS AS reportStatus,
+ d.STATUS AS deviceStatus,
+ pro.STATUS AS projectStatus,
+ re.id AS reportId,
+ pro.lon_lat,
+ dria."county_cd" AS countyCode,
+ att."guid" AS cityCode,
+ ad."ad_code" AS provinceCode
+ FROM
+ ywxt.sg_project_info pro
+ 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.sg_gx gx ON d.device_type = gx.gx_type
+ LEFT JOIN ywxt.sg_gx_step step ON gx.id = step.gx_info_id
+ LEFT JOIN ywxt.sg_progress_report re ON re.gx_step_id = step.id
+ AND re.gx_device_id = d.id
+ 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" a ON (
+ ( pro.countyCode = a."guid" )
+ OR ( pro.cityCode = a."guid" )
+ OR ( pro.provinceCode = a."guid" ))
+ WHERE 1=1 and a."p_ad_code" = #{dto.adCode}
+ <if test="dto.projectId != null and dto.projectId != ''">
+ and pro.id = #{dto.projectId}
+ </if>
+ <if test="dto.projectName != null and dto.projectName != ''">
+ and pro.project_name like CONCAT(CONCAT('%', #{dto.projectName}), '%')
+ </if>
+ <if test="dto.status != null">
+ and pro.status = #{dto.status}
+ </if>
+ <if test="dto.projectIds != null and dto.projectIds.size > 0">
+ and pro.id in
+ <foreach collection="dto.projectIds" item="id" separator="," open="(" close=")">
+ #{id}
+ </foreach>
+ </if>
+ </select>
<!-- <select id="getProjectIds" resultType="java.lang.String">-->
<!-- </select>-->
--
Gitblit v1.9.3