From f5a4bae239e86c489d85474a9678be82c1d0f739 Mon Sep 17 00:00:00 2001
From: guoshilong <123456>
Date: Thu, 06 Jul 2023 11:10:05 +0800
Subject: [PATCH] 质量管理

---
 skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/resDataCheck/mapper/QualityManageMapper.xml |   23 +++++++++++++++++++++++
 1 files changed, 23 insertions(+), 0 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 4e29858..bcb477e 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
@@ -7,6 +7,14 @@
         SELECT
                arb."name" AS resName,
                arb."res_loc" AS resLoc,
+                CASE aab."ad_name"
+                when '' then
+                CASE aa."ad_name" when '' then
+                CASE ab."ad_name" when '' then ac."ad_name" else ab."ad_name" end
+                else aa."ad_name"
+                END
+                else aab."ad_name"
+                END  adName,
                arb."res_reg_code" AS resRegCode,
                arb."eng_scal" AS engScal,
                rule.name AS ruleName,
@@ -17,6 +25,12 @@
             SM_RES_DATA_QUALITY_MANAGE 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_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"
+        left join "SJZT_MD"."att_ad_base" ac on ab."p_ad_code" = ac."ad_code"
+
         WHERE qm.is_deleted = 0
         <if test="vo.resName !=null and vo.resName !='' ">
             AND arb."name" LIKE CONCAT('%',#{vo.resName},'%')
@@ -27,6 +41,15 @@
         <if test="vo.ruleName !=null and vo.ruleName !='' ">
             AND rule.name LIKE CONCAT('%',#{vo.ruleName},'%')
         </if>
+        <if test="vo.startTime !=null and vo.startTime !=''">
+            AND DATE_FORMAT(qm.create_time,'%Y-%m-%d') &gt;= #{vo.startTime}
+        </if>
+        <if test="vo.endTime !=null and vo.endTime !=''">
+            AND DATE_FORMAT(qm.create_time,'%Y-%m-%d') &lt;= #{vo.endTime}
+        </if>
+        <if test="vo.adCode != null and vo.adCode != '' ">
+            and (aab."ad_code" = #{vo.adCode} or aa."ad_code" = #{vo.adCode} or ab."ad_code" = #{vo.adCode} or ac."ad_code" = #{vo.adCode})
+        </if>
 
     </select>
     <select id="getDetail" resultType="cn.gistack.sm.resDataCheck.vo.QualityManageVO">

--
Gitblit v1.9.3