From caf24ff51f39e8026cd1f6d15b8258a6bdc3d997 Mon Sep 17 00:00:00 2001
From: gonglilong <328255720@qq.com>
Date: Sat, 14 Sep 2024 11:35:33 +0800
Subject: [PATCH] 修改我的审核和代办数量流程逻辑

---
 skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sg/mapper/SgProgressReportMapper.xml |    7 +++++--
 1 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sg/mapper/SgProgressReportMapper.xml b/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sg/mapper/SgProgressReportMapper.xml
index 3a744ca..e43c9be 100644
--- a/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sg/mapper/SgProgressReportMapper.xml
+++ b/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sg/mapper/SgProgressReportMapper.xml
@@ -39,9 +39,11 @@
         report.*,
         de.device_name,
         de.device_type,
-        dict."DICT_VALUE" as typeName
+        dict."DICT_VALUE" as typeName, si.control_unit,si.self_unit,dria."county_cd"
         FROM
         ywxt.SG_PROGRESS_REPORT report
+        LEFT JOIN ywxt.SG_PROJECT_INFO si ON report.profram_id = si.id
+        LEFT JOIN SJZT_DW."dim_res_info_a" dria ON dria."res_cd" = si.sk_id
         LEFT JOIN ywxt.sg_device de ON report.gx_device_id = de.id
         left join YWXT."BLADE_DICT_BIZ" as dict  on de.device_type=dict.DICT_KEY  and dict.CODE='SG_DEVICE_TYPE'
         where 1=1 and report."STATUS" != 4
@@ -83,10 +85,11 @@
         de.device_type,
        <!-- userR.approval_status, -->
         dict."DICT_VALUE" as typeName,
-        si.
+        si.control_unit,si.self_unit,dria."county_cd"
         FROM
         ywxt.SG_PROGRESS_REPORT report
         LEFT JOIN ywxt.SG_PROJECT_INFO si ON report.profram_id = si.id
+        LEFT JOIN SJZT_DW."dim_res_info_a" dria ON dria."res_cd" = si.sk_id
         LEFT JOIN ywxt.sg_device de ON report.gx_device_id = de.id
         left join YWXT."BLADE_DICT_BIZ" as dict  on de.device_type=dict.DICT_KEY  and dict.CODE='SG_DEVICE_TYPE'
         LEFT JOIN ywxt.sg_report_user userR ON report.id = userR.report_id

--
Gitblit v1.9.3