330任务完成

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

@@ -13,6 +13,7 @@
         <result property="signUser" column="sign_user"/>
         <result property="remark" column="remark"/>
         <result property="projectName" column="project_name"/>
+        <result property="status" column="status"/>
         <collection property="warehouseList" ofType="com.ruoyi.oa.domain.vo.SysOaWarehouseDetailVo" javaType="list">
             <result property="signPrice" column="sign_price"/>
             <result property="id" column="outId"/>
@@ -23,26 +24,46 @@
             <result property="amount" column="amount"/>
             <result property="warehouseName" column="warehouseName"/>
         </collection>
+        <collection property="warehouseTaskList" resultMap="SysOaWarehouseTaskResult" javaType="list"/>
     </resultMap>
 
 
+    <resultMap type="com.ruoyi.oa.domain.SysOaWarehouseTask" id="SysOaWarehouseTaskResult">
+        <result property="taskId" column="task_id"/>
+        <result property="masterId" column="master_id"/>
+        <result property="name" column="name"/>
+        <result property="model" column="model"/>
+        <result property="taskInventory" column="task_inventory"/>
+        <result property="brand" column="brand"/>
+        <result property="specifications" column="specifications"/>
+    </resultMap>
+
+
+
     <select id="selectVoPagePlus" resultMap="SysOaWarehouseMasterResult">
         select sowm.master_id,
                sowm.sign_time,
                sowm.sign_user,
                sowd.sign_price,
                sowm.master_num,
+               sowm.type,
                sowd.amount,
                sow.name as warehouseName,
-               sow.model,
                sowm.remark,
-               sow.specifications,
                sop.project_id,
                sop.project_name,
-               sowd.id as outId
+               sowm.status,
+               sowd.id as outId,
+               task_id,
+               sowt.name,
+               COALESCE(sow.model,sowt.model) as model,
+               task_inventory,
+               COALESCE(sow.brand,sowt.brand) as brand,
+               COALESCE(sow.specifications,sowt.specifications) as specifications
         from sys_oa_warehouse_master sowm
                  left join sys_oa_warehouse_detail sowd on sowd.master_id = sowm.master_id and sowd.del_flag='0'
                  left join sys_oa_warehouse sow on sow.id = sowd.warehouse_id
+                 left join sys_oa_warehouse_task sowt on sowm.master_id = sowt.master_id
             left join sys_oa_project sop on sowm.project_id = sop.project_id
             ${ew.getCustomSqlSegment}
     </select>