退库管理取消退库

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

@@ -21,6 +21,7 @@
         <result property="projectName" column="project_name"/>
         <result property="status"      column="status"/>
         <result property="nearestEndTime"      column="nearest_end_time"/>
+        <result property="logCount"    column="logCount"/>
 
         <collection property="warehouseList"
                     column="master_id"
@@ -57,6 +58,37 @@
             ${ew.getCustomSqlSegment}
     </select>
 
+    <!-- ===================================================== -->
+    <!--  分页查询（包含日志操作次数）                          -->
+    <!-- ===================================================== -->
+    <select id="selectVoPagePlusWithLogCount"
+            resultMap="SysOaWarehouseMasterResult">
+        SELECT
+            sowm.master_id,
+            sowm.master_num,
+            sowm.type,
+            sowm.project_id,
+            sowm.sign_time,
+            sowm.sign_user,
+            sowm.remark,
+            sowm.status,
+            ${ew.sqlSelect},
+            sop.project_name,
+            IFNULL(log_count.log_count, 0) AS logCount
+        FROM sys_oa_warehouse_master sowm
+                 LEFT JOIN sys_oa_project sop
+                           ON sop.project_id = sowm.project_id
+                 LEFT JOIN (
+                     SELECT 
+                         master_id,
+                         COUNT(1) AS log_count
+                     FROM sys_oa_warehouse_log
+                     WHERE del_flag = 0
+                     GROUP BY master_id
+                 ) log_count ON log_count.master_id = sowm.master_id
+            ${ew.getCustomSqlSegment}
+    </select>
+
     <select id="selectDetailByMasterId"
             parameterType="long"
             resultType="com.ruoyi.oa.domain.vo.SysOaWarehouseDetailVo">