推送项目重构代码

ruoyi-oa/src/main/resources/mapper/oa/OaRequirementsMapper.xml

@@ -27,7 +27,14 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         r.*,
         u1.nick_name AS requester_nick_name,
         u2.nick_name AS owner_nick_name,
-        p.project_name
+        p.project_name,
+        (
+          SELECT GROUP_CONCAT(CONCAT_WS('|', o.oss_id, COALESCE(o.original_name, o.file_name), o.url)
+                              ORDER BY FIND_IN_SET(o.oss_id, r.accessory) SEPARATOR ',,')
+          FROM sys_oss o
+          WHERE r.accessory IS NOT NULL AND r.accessory <> ''
+            AND FIND_IN_SET(o.oss_id, r.accessory)
+        ) AS accessory_files
         FROM oa_requirements r
         LEFT JOIN sys_user u1 ON r.requester_id = u1.user_id
         LEFT JOIN sys_user u2 ON r.owner_id = u2.user_id
@@ -40,7 +47,14 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         r.*,
         u1.nick_name AS requester_nick_name,
         u2.nick_name AS owner_nick_name,
-        p.project_name
+        p.project_name,
+        (
+          SELECT GROUP_CONCAT(CONCAT_WS('|', o.oss_id, COALESCE(o.original_name, o.file_name), o.url)
+                              ORDER BY FIND_IN_SET(o.oss_id, r.accessory) SEPARATOR ',,')
+          FROM sys_oss o
+          WHERE r.accessory IS NOT NULL AND r.accessory <> ''
+            AND FIND_IN_SET(o.oss_id, r.accessory)
+        ) AS accessory_files
         FROM oa_requirements r
         LEFT JOIN sys_user u1 ON r.requester_id = u1.user_id
         LEFT JOIN sys_user u2 ON r.owner_id = u2.user_id

ruoyi-oa/src/main/resources/mapper/oa/SysOaWarehouseMasterMapper.xml

@@ -26,6 +26,9 @@
         <result property="withdrawLock" column="withdraw_lock"/>
         <result property="requirementId" column="requirement_id"/>
         <result property="requirementName" column="requirementName"/>
+        <result property="itemCount"   column="item_count"/>
+        <result property="totalQty"    column="total_qty"/>
+        <result property="itemsSummary" column="items_summary"/>
 
         <collection property="warehouseList"
                     column="master_id"
@@ -55,12 +58,27 @@
             sowm.remark,
             sowm.status,
             sowm.is_like,
+            sowm.requirement_id,
             ${ew.sqlSelect},
             sop.project_name,
-            req.title AS requirementName
+            req.title AS requirementName,
+            agg.item_count,
+            agg.total_qty,
+            agg.items_summary
         FROM sys_oa_warehouse_master sowm
                  LEFT JOIN sys_oa_project sop ON sop.project_id = sowm.project_id
                  LEFT JOIN oa_requirements req ON req.requirement_id = sowm.requirement_id
+                 LEFT JOIN (
+                     SELECT
+                         d.master_id,
+                         COUNT(*)                                AS item_count,
+                         IFNULL(SUM(d.amount), 0)                AS total_qty,
+                         GROUP_CONCAT(w.name ORDER BY d.id SEPARATOR '、') AS items_summary
+                     FROM sys_oa_warehouse_detail d
+                     LEFT JOIN sys_oa_warehouse w ON w.id = d.warehouse_id
+                     WHERE d.del_flag = 0
+                     GROUP BY d.master_id
+                 ) agg ON agg.master_id = sowm.master_id
             ${ew.getCustomSqlSegment}
     </select>