From e29a923e611090abd02044917ed717ed3eef6141 Mon Sep 17 00:00:00 2001
From: guoshilong <123456>
Date: Mon, 08 Apr 2024 17:27:40 +0800
Subject: [PATCH] 首页总览接口修改
---
skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/resDataCheck/mapper/QualityManageMapper.xml | 143 ++++++++++++++++++++++++++++++-----------------
1 files changed, 90 insertions(+), 53 deletions(-)
diff --git a/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/resDataCheck/mapper/QualityManageMapper.xml b/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/resDataCheck/mapper/QualityManageMapper.xml
index 6aee805..59ff49e 100644
--- a/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/resDataCheck/mapper/QualityManageMapper.xml
+++ b/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/resDataCheck/mapper/QualityManageMapper.xml
@@ -166,67 +166,104 @@
<select id="getList" resultType="cn.gistack.sm.resDataCheck.vo.QualityManageVO">
- SELECT
- arb."guid" AS resGuid,
- arb."name" AS resName,
- arb."res_loc" AS resLoc,
- 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,
- case when town."ad_grad" = 3 THEN town."ad_code"
- when county."ad_grad" = 3 THEN county."ad_code" END AS countyCode,
- case when town."ad_grad" = 3 THEN town."ad_name"
- when county."ad_grad" = 3 THEN county."ad_name" END AS countyName,
- case when town."ad_grad" = 2 THEN town."ad_code"
- when county."ad_grad" = 2 THEN county."ad_code"
- ELSE city."ad_code" END AS cityCode,
- case when town."ad_grad" = 2 THEN town."ad_name"
- when county."ad_grad" = 2 THEN county."ad_name"
- ELSE city."ad_name" END AS cityName,
- case when town."ad_grad" = 1 THEN town."ad_code"
- when county."ad_grad" = 1 THEN county."ad_code"
- when city."ad_grad" = 1 THEN city."ad_code"
- ELSE province."ad_code" END AS provinceCode,
- case when town."ad_grad" = 1 THEN town."ad_name"
- when county."ad_grad" = 1 THEN county."ad_name"
- when city."ad_grad" = 1 THEN city."ad_name"
- ELSE province."ad_name" END AS provinceName,
+<!-- SELECT-->
+<!-- arb."guid" AS resGuid,-->
+<!-- arb."name" AS resName,-->
+<!-- arb."res_loc" AS resLoc,-->
+<!-- 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,-->
+<!-- case when town."ad_grad" = 3 THEN town."ad_code"-->
+<!-- when county."ad_grad" = 3 THEN county."ad_code" END AS countyCode,-->
+<!-- case when town."ad_grad" = 3 THEN town."ad_name"-->
+<!-- when county."ad_grad" = 3 THEN county."ad_name" END AS countyName,-->
+<!-- case when town."ad_grad" = 2 THEN town."ad_code"-->
+<!-- when county."ad_grad" = 2 THEN county."ad_code"-->
+<!-- ELSE city."ad_code" END AS cityCode,-->
+<!-- case when town."ad_grad" = 2 THEN town."ad_name"-->
+<!-- when county."ad_grad" = 2 THEN county."ad_name"-->
+<!-- ELSE city."ad_name" END AS cityName,-->
+<!-- case when town."ad_grad" = 1 THEN town."ad_code"-->
+<!-- when county."ad_grad" = 1 THEN county."ad_code"-->
+<!-- when city."ad_grad" = 1 THEN city."ad_code"-->
+<!-- ELSE province."ad_code" END AS provinceCode,-->
+<!-- case when town."ad_grad" = 1 THEN town."ad_name"-->
+<!-- when county."ad_grad" = 1 THEN county."ad_name"-->
+<!-- when city."ad_grad" = 1 THEN city."ad_name"-->
+<!-- ELSE province."ad_name" END AS provinceName,-->
- qm.val,
- qm.create_time
- FROM (
- select * from SM_RES_DATA_QUALITY_MANAGE qm
- WHERE qm.is_deleted = 0
- <if test="vo.startTime !=null and vo.startTime !=''">
- AND qm.create_time >= #{vo.startTime}
- </if>
- <if test="vo.endTime !=null and vo.endTime !=''">
- AND qm.create_time <= #{vo.endTime}
- </if>
- ) as qm
+<!-- qm.val,-->
+<!-- qm.create_time-->
+<!-- FROM (-->
+<!-- select * from SM_RES_DATA_QUALITY_MANAGE qm-->
+<!-- WHERE qm.is_deleted = 0-->
+<!-- <if test="vo.startTime !=null and vo.startTime !=''">-->
+<!-- AND qm.create_time >= #{vo.startTime}-->
+<!-- </if>-->
+<!-- <if test="vo.endTime !=null and vo.endTime !=''">-->
+<!-- AND qm.create_time <= #{vo.endTime}-->
+<!-- </if>-->
+<!-- ) as qm-->
- LEFT JOIN SJZT_MD."att_res_base" arb ON arb."guid" = qm.res_id
- LEFT JOIN SM_RES_DATA_CHECK_RULES rule ON rule.id = qm.rule_id
+<!-- LEFT JOIN SJZT_MD."att_res_base" arb ON arb."guid" = qm.res_id-->
+<!-- LEFT JOIN SM_RES_DATA_CHECK_RULES rule ON rule.id = qm.rule_id-->
+<!-- left join "SJZT_MD"."att_ad_base" town on town."guid" = arb."interior_ad_guid"-->
+<!-- left join "SJZT_MD"."att_ad_base" county on county."ad_code" = town."p_ad_code"-->
+<!-- left join "SJZT_MD"."att_ad_base" city on city."ad_code" = county."p_ad_code"-->
+<!-- left join "SJZT_MD"."att_ad_base" province on province."ad_code" = city."p_ad_code"-->
+<!-- where qm.is_deleted = 0-->
+<!-- and qm.rule_id in ('1775403351266652162')-->
+<!-- <if test="vo.resName !=null and vo.resName !='' ">-->
+<!-- AND arb."name" LIKE CONCAT('%',#{vo.resName},'%')-->
+<!-- </if>-->
+<!-- <if test="vo.engScal !=null and vo.engScal !='' ">-->
+<!-- AND arb."eng_scal" = #{vo.engScal}-->
+<!-- </if>-->
+<!-- <if test="vo.ruleName !=null and vo.ruleName !='' ">-->
+<!-- AND rule.name LIKE CONCAT('%',#{vo.ruleName},'%')-->
+<!-- </if>-->
+<!-- <if test="vo.adCode != null and vo.adCode != '' ">-->
+<!-- and concat(province."ad_code",city."ad_code",county."ad_code",town."ad_code") like CONCAT('%',#{vo.adCode},'%')-->
+<!-- </if>-->
+<!-- order by qm.create_time desc-->
+
+ select
+ BASIC.*,
+ arb."guid" as resGuid,
+ arb."name" as resName,
+
+ 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 ,
+ case when town."ad_grad" = 3 then town."ad_code" when county."ad_grad" = 3 then county."ad_code" end as countyCode ,
+ case when town."ad_grad" = 3 then town."ad_name" when county."ad_grad" = 3 then county."ad_name" end as countyName ,
+ case when town."ad_grad" = 2 then town."ad_code" when county."ad_grad" = 2 then county."ad_code" else city."ad_code" end as cityCode ,
+ case when town."ad_grad" = 2 then town."ad_name" when county."ad_grad" = 2 then county."ad_name" else city."ad_name" end as cityName ,
+ case when town."ad_grad" = 1 then town."ad_code" when county."ad_grad" = 1 then county."ad_code" when city."ad_grad" = 1 then city."ad_code" else province."ad_code" end as provinceCode ,
+ case when town."ad_grad" = 1 then town."ad_name" when county."ad_grad" = 1 then county."ad_name" when city."ad_grad" = 1 then city."ad_name" else province."ad_name" end as provinceName
+ from (
+ select
+ qm.res_id,wm_concat(srdcr.description) ruleDesc
+
+ from ywxt.SM_RES_DATA_QUALITY_MANAGE qm
+ left join ywxt.SM_RES_DATA_CHECK_RULES srdcr on srdcr.id = qm.rule_id
+ where qm.is_deleted = 0
+ and qm.rule_id in ( '1777252387305783298', '1777252642021670914', '1777253026366717954', '1777253294051393537', '1777253523538542594', '1777253725028712449', '1777254213505744898', '1777254438337216514', '1777254629534564354', '1777254774644899841' )
+ <if test="vo.startTime !=null and vo.startTime !=''">
+ AND qm.create_time >= #{vo.startTime}
+ </if>
+ <if test="vo.endTime !=null and vo.endTime !=''">
+ AND qm.create_time <= #{vo.endTime}
+ </if>
+ group by qm.res_id
+ )
+ basic
+ left join SJZT_MD."att_res_base" arb on arb."guid" = basic.res_id
left join "SJZT_MD"."att_ad_base" town on town."guid" = arb."interior_ad_guid"
left join "SJZT_MD"."att_ad_base" county on county."ad_code" = town."p_ad_code"
left join "SJZT_MD"."att_ad_base" city on city."ad_code" = county."p_ad_code"
left join "SJZT_MD"."att_ad_base" province on province."ad_code" = city."p_ad_code"
- where qm.is_deleted = 0
- and qm.rule_id ='1775403351266652162'
- <if test="vo.resName !=null and vo.resName !='' ">
- AND arb."name" LIKE CONCAT('%',#{vo.resName},'%')
- </if>
- <if test="vo.engScal !=null and vo.engScal !='' ">
- AND arb."eng_scal" = #{vo.engScal}
- </if>
- <if test="vo.ruleName !=null and vo.ruleName !='' ">
- AND rule.name LIKE CONCAT('%',#{vo.ruleName},'%')
- </if>
- <if test="vo.adCode != null and vo.adCode != '' ">
- and concat(province."ad_code",city."ad_code",county."ad_code",town."ad_code") like CONCAT('%',#{vo.adCode},'%')
- </if>
+ where 1 = 1 and concat(province."ad_code", city."ad_code", county."ad_code", town."ad_code") like CONCAT('%', '422826200000', '%')
- order by qm.create_time desc
</select>
--
Gitblit v1.9.3