From f20611265f7d34fd4fbcdfdaff6cb9cccd0b25fc Mon Sep 17 00:00:00 2001
From: shenyijian <1178253012@qq.com>
Date: Fri, 21 Jun 2024 11:53:21 +0800
Subject: [PATCH] 湖北水库：施工：项目查询过滤无效修复、根据角色查询用户
---
skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sjztmd/mapper/AttResBaseMapper.xml | 17 ++++++++++++-----
1 files changed, 12 insertions(+), 5 deletions(-)
diff --git a/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sjztmd/mapper/AttResBaseMapper.xml b/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sjztmd/mapper/AttResBaseMapper.xml
index 2ba09fc..9c363ee 100644
--- a/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sjztmd/mapper/AttResBaseMapper.xml
+++ b/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sjztmd/mapper/AttResBaseMapper.xml
@@ -25,6 +25,10 @@
tmp.totalDangerNum,
tmp.termiteNum,
tmp.otherNum,
+ ifnull(tmp.totalDanger,0) totalDanger,
+ ifnull(tmp.totalDangerSr,0) totalDangerSr,
+ ifnull(tmp.totalDangerCb,0) totalDangerCb,
+ ifnull(tmp.totalDangerDw,0) totalDangerDw,
case when town."ad_grad" = 4 THEN town."ad_code" ELSE NULL END AS townCode,
case when town."ad_grad" = 4 THEN town."ad_name" ELSE NULL END AS townName,
@@ -61,7 +65,11 @@
SUM(CASE WHEN (trgi."hazard_rating" != '无危害') THEN 1 ELSE 0 END) AS totalDangerNum,
SUM(CASE WHEN (trgi."investigation_variety" = '白蚁' and trgi."hazard_rating" != '无危害') THEN 1 ELSE 0 END) AS termiteNum,
- SUM(CASE WHEN (trgi."investigation_variety" != '白蚁' and trgi."hazard_rating" != '无危害') THEN 1 ELSE 0 END) AS otherNum
+ SUM(CASE WHEN (trgi."investigation_variety" != '白蚁' and trgi."hazard_rating" != '无危害') THEN 1 ELSE 0 END) AS otherNum,
+ SUM(CASE WHEN (trgi."is_danger" != '否') THEN 1 ELSE 0 END) AS totalDanger,
+ SUM(CASE WHEN (json_value(trgi."danger_info", '$.sr') != '') THEN json_value(trgi."danger_info", '$.sr') ELSE 0 END) AS totalDangerSr,
+ SUM(CASE WHEN (json_value(trgi."danger_info", '$.cb') != '') THEN json_value(trgi."danger_info", '$.cb') ELSE 0 END) AS totalDangerCb,
+ SUM(CASE WHEN (json_value(trgi."danger_info", '$.dw') != '') THEN json_value(trgi."danger_info", '$.dw') ELSE 0 END) AS totalDangerDw
from sjzt_md."tb_res_general_investigation" trgi
where 1=1
<if test="attResBase.tbYear !=null and attResBase.tbYear !=''">
@@ -178,10 +186,8 @@
<!--获取水库对应责任人分页数据-->
<select id="getAttResBaseUserPage" resultType="cn.gistack.sm.sjztmd.dto.AttResBaseUserDTO">
select
- arb."guid", arb."name", arb."res_loc" as place, arb."res_reg_code" as resRegCode, arb."eng_scal" as engScal,
- REGEXP_SUBSTR (arb."res_loc",'[^-]+',1,2) as cityName,
- REGEXP_SUBSTR (arb."res_loc",'[^-]+',1,3) as countyName,
- REGEXP_SUBSTR (arb."res_loc",'[^-]+',1,4) as townName,
+ arb."guid", arb."name", arb."res_loc" as place, arb."res_reg_code" as resRegCode, arb."eng_scal" as engScal,arb."center_long" as lon,arb."center_lat" as lat,
+ dri."city_nm" cityName,dri."county_nm" countyName,dri."town_nm" townName,
aab."ad_name" as adName,
trmp1."user_unit" areaUnitName,trmp1."user_name" areaUsername,trmp1."user_phone" areaPhone,trmp1."position"
areaPosition,trmp1."guid" areaUserGuid,
@@ -198,6 +204,7 @@
trmp5."user_unit" patrolUnitName,trmp5."user_name" patrolUsername,trmp5."user_phone"
patrolPhone,trmp5."position" patrolPosition,trmp5."guid" patrolUserGuid
from SJZT_MD."att_res_base" arb
+ left join "SJZT_DW"."dim_res_info_a" dri on arb."guid" = dri."guid"
left join "SJZT_MD"."att_ad_base" aab on aab."guid" = arb."interior_ad_guid"
left join "SJZT_MD"."att_ad_base" aa on aab."p_ad_code" = aa."ad_code"
left join "SJZT_MD"."att_ad_base" ab on aa."p_ad_code" = ab."ad_code"
--
Gitblit v1.9.3