330任务完成

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

@@ -28,4 +28,53 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     </select>
 
 
+    <select id="selectVoPageThreshold" resultType="com.ruoyi.oa.domain.vo.SysOaWarehouseVo">
+        select id,
+               inventory,
+               model,
+               unit,
+               name,
+               brand,
+               specifications,
+               remark,
+               create_time,
+               create_by,
+               update_time,
+               update_by,
+               del_flag
+        from sys_oa_warehouse
+
+                 ${ew.getCustomSqlSegment}
+    </select>
+    <select id="selectListVoPage" resultType="com.ruoyi.oa.domain.vo.SysOaWarehouseVo">
+        select
+            sow.id,
+            sow.inventory,
+            sow.model,
+            sow.unit,
+            sow.name,
+            sow.brand,
+            sow.specifications,
+            sow.remark,
+            sow.create_time,
+            sow.create_by,
+            sow.update_time,
+            sow.update_by,
+            sow.del_flag,
+            sow.price,
+            sow.threshold,
+            (
+                select sum(sowt.task_inventory)
+                from sys_oa_warehouse_task sowt
+                         left join sys_oa_warehouse_master sowm on sowm.master_id = sowt.master_id
+                where sowt.warehouse_id = sow.id
+                  and sowm.type = 2
+                  and sowm.status = 0
+            ) as task_inventory
+        from sys_oa_warehouse sow
+            ${ew.getCustomSqlSegment}
+
+    </select>
+
+
 </mapper>