bonus
/
devicesmgt
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/dev-nx' into dev-nx

This commit is contained in:
hongchao 2025-03-21 15:22:52 +08:00
parent c169b984ee 8fcb29555f
commit 188bf20b28
3 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
sgzb-modules/sgzb-base/src/main/resources/mapper/app/BackReceiveMapper.xml
View File

@ -1199,7 +1199,7 @@
type_id = #{typeId} type_id = #{typeId}
</select> </select>
<select id="getCheckDetails" resultType="java.lang.Integer"> <select id="getCheckDetails" resultType="java.lang.Integer">
select back_num from back_check_details where parent_id = #{parentId} and type_id = #{typeId} and (is_finished is null or is_finished != 1) select sum(back_num) from back_check_details where parent_id = #{parentId} and type_id = #{typeId} and (is_finished is null or is_finished != 1)
</select> </select>

3
sgzb-modules/sgzb-base/src/main/resources/mapper/base/WarehouseKeeperMapper.xml
View File

@ -37,6 +37,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<if test="typeName != null and typeName != ''"> <if test="typeName != null and typeName != ''">
AND mt2.type_name like concat('%', #{typeName}, '%') AND mt2.type_name like concat('%', #{typeName}, '%')
</if> </if>
<if test="userId != null">
AND mtk.user_id = #{userId}
</if>
<if test="modelName != null and modelName != ''"> <if test="modelName != null and modelName != ''">
AND mt.type_name like concat('%', #{modelName}, '%') AND mt.type_name like concat('%', #{modelName}, '%')
</if> </if>

2
sgzb-modules/sgzb-material/src/main/resources/mapper/material/ScrapApplyDetailsMapper.xml
View File

@ -1255,7 +1255,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
LEFT JOIN ma_type mt1 ON mt.parent_id = mt1.type_id LEFT JOIN ma_type mt1 ON mt.parent_id = mt1.type_id
AND mt1.del_flag = '0' AND mt1.del_flag = '0'
LEFT JOIN tm_task tt on sad.task_id = tt.task_id LEFT JOIN tm_task tt on sad.task_id = tt.task_id
AND tt.task_type = 128 AND tt.task_type = 141
where sad.scrap_source = '3' where sad.scrap_source = '3'
<if test="taskStatus != null "> and tt.task_status = #{taskStatus}</if> <if test="taskStatus != null "> and tt.task_status = #{taskStatus}</if>
<if test="startTime != null and startTime != '' and endTime != null and endTime != ''"> <if test="startTime != null and startTime != '' and endTime != null and endTime != ''">