From abfbf712ed0599b3e0be3c1e502b0141de162ed1 Mon Sep 17 00:00:00 2001
From: gonglilong <328255720@qq.com>
Date: Sat, 14 Sep 2024 10:31:29 +0800
Subject: [PATCH] 修改我的审核和代办数量流程逻辑
---
skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sg/mapper/SgProgressReportMapper.xml | 6 ++++--
1 files changed, 4 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 614bb45..3a744ca 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
@@ -82,14 +82,16 @@
de.device_name,
de.device_type,
<!-- userR.approval_status, -->
- dict."DICT_VALUE" as typeName
+ dict."DICT_VALUE" as typeName,
+ si.
FROM
ywxt.SG_PROGRESS_REPORT report
+ LEFT JOIN ywxt.SG_PROJECT_INFO si ON report.profram_id = si.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
WHERE
- 1 = 1 and report."STATUS" != 4
+ 1 = 1 and report."STATUS" != 4 and si.CONTROL_UNIT=#{dto.userUnit} and userR.roleId=#{dto.roleUnit}
<!-- AND userR.is_his = 0 -->
<if test="dto.projectName != null and dto.projectName != ''">
and report.PROGRAM_NAME like CONCAT(CONCAT('%',#{dto.projectName}),'%')
--
Gitblit v1.9.3