bonus
/
Bonus-Cloud-Material
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

修改

This commit is contained in:
hongchao 2025-10-10 12:08:14 +08:00
parent 73f3c4bcbf
commit 8a362ef695
1 changed files with 19 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
bonus-modules/bonus-material/src/main/resources/mapper/material/clz/MaterialMachineMapper.xml
View File

@ -1369,6 +1369,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
AND sai.end_time IS NULL AND sai.end_time IS NULL
AND sai.back_id IS NULL AND sai.back_id IS NULL
AND bp.external_id IS NOT NULL AND bp.external_id IS NOT NULL
and sd.dept_id not in (342,345,347,348,101)
<if test="impUnitName != null and impUnitName != ''"> <if test="impUnitName != null and impUnitName != ''">
AND sd.dept_name like concat('%',#{impUnitName},'%') AND sd.dept_name like concat('%',#{impUnitName},'%')
</if> </if>
@ -1437,6 +1438,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
sai.`status` = '0' sai.`status` = '0'
AND sai.end_time IS NULL AND sai.end_time IS NULL
AND sai.back_id IS NULL AND sai.back_id IS NULL
and sd.dept_id not in (342,345,347,348,101)
<if test="impUnitName != null and impUnitName != ''"> <if test="impUnitName != null and impUnitName != ''">
AND sd.dept_name like concat('%',#{impUnitName},'%') AND sd.dept_name like concat('%',#{impUnitName},'%')
</if> </if>
@ -1524,6 +1526,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
AND sai.back_id IS NULL AND sai.back_id IS NULL
AND bu.unit_name is not null AND bu.unit_name is not null
AND bp.external_id is not NULL AND bp.external_id is not NULL
and sd.dept_id not in (342,345,347,348,101)
<if test="impUnitName != null and impUnitName != ''"> <if test="impUnitName != null and impUnitName != ''">
AND sd.dept_name LIKE CONCAT('%', #{impUnitName}, '%') AND sd.dept_name LIKE CONCAT('%', #{impUnitName}, '%')
</if> </if>
@ -1601,6 +1604,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
LEFT JOIN sys_dept sd ON sd.dept_id = bp.imp_unit LEFT JOIN sys_dept sd ON sd.dept_id = bp.imp_unit
WHERE WHERE
sd.dept_name IS NOT NULL sd.dept_name IS NOT NULL
and sd.dept_id not in (342,345,347,348,101)
<if test="impUnitName != null and impUnitName != ''"> <if test="impUnitName != null and impUnitName != ''">
AND sd.dept_name LIKE CONCAT('%', #{impUnitName}, '%') AND sd.dept_name LIKE CONCAT('%', #{impUnitName}, '%')
</if> </if>
@ -1617,6 +1621,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
AND bp.imp_unit = #{impUnit} AND bp.imp_unit = #{impUnit}
</if> </if>
GROUP BY sd.dept_name GROUP BY sd.dept_name
ORDER BY
sd.order_num
</select> </select>
<select id="getDepartNameList" resultType="com.bonus.material.clz.domain.vo.MaterialRetainedEquipmentInfo"> <select id="getDepartNameList" resultType="com.bonus.material.clz.domain.vo.MaterialRetainedEquipmentInfo">
@ -1628,7 +1634,6 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
LEFT JOIN sbd_audit.sg_project_department sp ON sd.company_code = sp.parent_id LEFT JOIN sbd_audit.sg_project_department sp ON sd.company_code = sp.parent_id
WHERE WHERE
sp.`name` IS NOT NULL sp.`name` IS NOT NULL
AND sp.`status` IN (0, 1)
<if test="impUnitName != null and impUnitName != ''"> <if test="impUnitName != null and impUnitName != ''">
AND sd.dept_name LIKE CONCAT('%', #{impUnitName}, '%') AND sd.dept_name LIKE CONCAT('%', #{impUnitName}, '%')
</if> </if>
@ -1652,7 +1657,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<select id="getProjectList" resultType="com.bonus.material.clz.domain.vo.MaterialRetainedEquipmentInfo"> <select id="getProjectList" resultType="com.bonus.material.clz.domain.vo.MaterialRetainedEquipmentInfo">
SELECT SELECT
DISTINCT bp.pro_name AS proName,bp.pro_id AS proId DISTINCT bp.pro_name AS proName,bp.pro_id AS proId,bp.external_id AS projectId
FROM FROM
bm_project bp bm_project bp
LEFT JOIN sys_dept sd ON sd.dept_id = bp.imp_unit LEFT JOIN sys_dept sd ON sd.dept_id = bp.imp_unit
@ -1680,6 +1685,18 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
</if> </if>
and bp.del_flag='0' and bp.del_flag='0'
GROUP BY bp.pro_name GROUP BY bp.pro_name
ORDER BY sd.order_num,
CASE
WHEN df.voltage_level = '其他' THEN 999 -- 其他放在最后
WHEN df.voltage_level LIKE '%kV' THEN
CASE
WHEN df.voltage_level LIKE '±%' THEN
CAST(REPLACE(REPLACE(df.voltage_level, '±', ''), 'kV', '') AS DECIMAL) + 1000 -- 直流电压特殊处理
ELSE
CAST(REPLACE(df.voltage_level, 'kV', '') AS DECIMAL)
END
ELSE 998 -- 其他未知格式
END ASC
</select> </select>
<select id="getTeamList" resultType="com.bonus.material.clz.domain.vo.MaterialRetainedEquipmentInfo"> <select id="getTeamList" resultType="com.bonus.material.clz.domain.vo.MaterialRetainedEquipmentInfo">
@ -1693,7 +1710,6 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
LEFT JOIN data_center.dx_fb_son df ON bp.external_id = df.id LEFT JOIN data_center.dx_fb_son df ON bp.external_id = df.id
WHERE WHERE
bz.bzmc IS NOT NULL bz.bzmc IS NOT NULL
AND bp.external_id IS NOT NULL
<if test="impUnitName != null and impUnitName != ''"> <if test="impUnitName != null and impUnitName != ''">
AND sd.dept_name LIKE CONCAT('%', #{impUnitName}, '%') AND sd.dept_name LIKE CONCAT('%', #{impUnitName}, '%')
</if> </if>
@ -1729,7 +1745,6 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
LEFT JOIN data_center.dx_fb_son df ON bp.external_id = df.id LEFT JOIN data_center.dx_fb_son df ON bp.external_id = df.id
WHERE WHERE
bz.bzmc IS NOT NULL bz.bzmc IS NOT NULL
AND bp.external_id IS NOT NULL
<if test="impUnitName != null and impUnitName != ''"> <if test="impUnitName != null and impUnitName != ''">
AND sd.dept_name LIKE CONCAT('%', #{impUnitName}, '%') AND sd.dept_name LIKE CONCAT('%', #{impUnitName}, '%')
</if> </if>