DeXun/fad_oa
9
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

三期内容优化

Browse Source
This commit is contained in:
hdka
2025-03-20 18:19:31 +08:00
parent ed7012e2dd
commit 72036bc7bd
44 changed files with 780 additions and 366 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
ruoyi-oa/src/main/resources/mapper/oa/SysOaProjectMapper.xml
View File

@@ -72,7 +72,7 @@
</resultMap>
<resultMap type="com.ruoyi.oa.domain.vo.SysOaOutWarehouseVo" id="outWarehouseResult">
<resultMap type="com.ruoyi.oa.domain.vo.SysOaWarehouseDetailVo" id="outWarehouseResult">
<result property="id" column="soow_id"/>
<result property="amount" column="amount"/>
<result property="warehouseId" column="warehouse_id"/>
@@ -90,7 +90,7 @@
soow.create_time as out_create_time,
sow.name
from sys_oa_project sop
left join sys_oa_out_warehouse soow on soow.project_id = sop.project_id
left join sys_oa_warehouse_detail soow on soow.project_id = sop.project_id
left join sys_oa_warehouse sow on sow.id = soow.warehouse_id
${ew.getCustomSqlSegment}
</select>

14
ruoyi-oa/src/main/resources/mapper/oa/SysOaOutWarehouseMapper.xml → ruoyi-oa/src/main/resources/mapper/oa/SysOaWarehouseDetailMapper.xml
View File

@@ -2,9 +2,9 @@
<!DOCTYPE mapper
PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.ruoyi.oa.mapper.SysOaOutWarehouseMapper">
<mapper namespace="com.ruoyi.oa.mapper.SysOaWarehouseDetailMapper">
<resultMap type="com.ruoyi.oa.domain.SysOaOutWarehouse" id="SysOaOutWarehouseResult">
<resultMap type="com.ruoyi.oa.domain.SysOaWarehouseDetail" id="SysOaOutWarehouseResult">
<result property="id" column="id"/>
<result property="projectId" column="project_id"/>
<result property="amount" column="amount"/>
@@ -15,6 +15,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<result property="updateTime" column="update_time"/>
<result property="updateBy" column="update_by"/>
<result property="delFlag" column="del_flag"/>
<result property="signPrice" column="sign_price"/>
<result property="masterId" column="master_id"/>
</resultMap>
@@ -29,9 +31,11 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
project.project_name as projectName,
warehouse.name as warehouseName,
ware.create_time,
ware.create_by
ware.create_by,
ware.master_id,
ware.sign_price
from
sys_oa_out_warehouse ware
sys_oa_warehouse_detail ware
left join sys_oa_project project on ware.project_id = project.project_id
left join sys_oa_warehouse warehouse on warehouse.id = ware.warehouse_id
<where>
@@ -69,7 +73,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
select
count(*)
from
sys_oa_out_warehouse ware
sys_oa_warehouse_detail ware
left join sys_oa_project project on ware.project_id = project.project_id
left join sys_oa_warehouse warehouse on warehouse.id = ware.warehouse_id

41
ruoyi-oa/src/main/resources/mapper/oa/SysOaWarehouseMasterMapper.xml
View File

@@ -4,19 +4,48 @@
"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.ruoyi.oa.mapper.SysOaWarehouseMasterMapper">
<resultMap type="com.ruoyi.oa.domain.SysOaWarehouseMaster" id="SysOaWarehouseMasterResult">
<resultMap type="com.ruoyi.oa.domain.vo.SysOaWarehouseMasterVo" id="SysOaWarehouseMasterResult">
<result property="masterId" column="master_id"/>
<result property="masterNum" column="master_num"/>
<result property="type" column="type"/>
<result property="projectId" column="project_id"/>
<result property="signTime" column="sign_time"/>
<result property="signUser" column="sign_user"/>
<result property="createTime" column="create_time"/>
<result property="updateTime" column="update_time"/>
<result property="createBy" column="create_by"/>
<result property="updateBy" column="update_by"/>
<result property="delFlag" column="del_flag"/>
<result property="remark" column="remark"/>
<result property="projectName" column="project_name"/>
<collection property="warehouseList" ofType="com.ruoyi.oa.domain.vo.SysOaWarehouseDetailVo" javaType="list">
<result property="signPrice" column="sign_price"/>
<result property="id" column="outId"/>
<result property="projectName" column="project_name"/>
<result property="model" column="model"/>
<result property="specifications" column="specifications"/>
<result property="projectId" column="project_id"/>
<result property="amount" column="amount"/>
<result property="warehouseName" column="warehouseName"/>
</collection>
</resultMap>
<select id="selectVoPagePlus" resultMap="SysOaWarehouseMasterResult">
select sowm.master_id,
sowm.sign_time,
sowm.sign_user,
sowd.sign_price,
sowm.master_num,
sowd.amount,
sow.name as warehouseName,
sow.model,
sowm.remark,
sow.specifications,
sop.project_id,
sop.project_name,
sowd.id as outId
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_project sop on sowm.project_id = sop.project_id
${ew.getCustomSqlSegment}
</select>
</mapper>