From 2dc478231fd09a88a4d86d44388ae807aca08bc5 Mon Sep 17 00:00:00 2001
From: luodangjia <luodangjia>
Date: 星期三, 01 一月 2025 10:14:28 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
medicalWaste-system/src/main/resources/mapper/system/MwProtectionTaskMapper.xml | 5 ++++-
1 files changed, 4 insertions(+), 1 deletions(-)
diff --git a/medicalWaste-system/src/main/resources/mapper/system/MwProtectionTaskMapper.xml b/medicalWaste-system/src/main/resources/mapper/system/MwProtectionTaskMapper.xml
index 00226aa..5249a23 100644
--- a/medicalWaste-system/src/main/resources/mapper/system/MwProtectionTaskMapper.xml
+++ b/medicalWaste-system/src/main/resources/mapper/system/MwProtectionTaskMapper.xml
@@ -36,7 +36,8 @@
MPT.REMARK,
MPT.CREATE_TIME,
SD.DEPARTMENT_NAME,
- LISTAGG(MA.FILE_NAME, ',') WITHIN GROUP (ORDER BY MA.FILE_NAME) AS fileName
+ WM_CONCAT(MA.FILE_NAME) AS fileName,
+ MPT.RELATION
FROM MW_PROTECTION_TASK MPT
LEFT JOIN SYS_DEPARTMENT SD ON MPT.DEPARTMENT_ID = SD.ID
LEFT JOIN (SELECT * FROM MW_ATTACHMENT WHERE "TYPE" = 2) MA ON MA.TARGET_ID = MPT.ID
@@ -55,6 +56,8 @@
AND MPT.CREATE_TIME BETWEEN #{query.startTime} AND #{query.endTime}
</if>
</where>
+ GROUP BY MA.TARGET_ID
+ ORDER BY MPT.CREATE_TIME DESC
</select>
</mapper>
--
Gitblit v1.7.1