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

退料申请表数据问题修改

This commit is contained in:
liang.chao 2024-03-21 11:29:39 +08:00
parent c3d5a9e53d
commit e2ce07dbd7
2 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
sgzb-modules/sgzb-base/src/main/resources/mapper/base/MaLabelBindMapper.xml
View File

@ -84,16 +84,18 @@
LEFT JOIN ma_machine ma ON ma.ma_id = a.ma_id
LEFT JOIN sys_user user on user.user_id =a.binder
WHERE mt.`level` = '4' AND mt.`del_flag` = '0'
<where>
<if test="keyWord != null and keyWord != ''">
and (b.label_code like concat('%', #{keyWord}, '%') or
ma.ma_code like concat('%', #{keyWord}, '%'))
</if>
<if test="labelCode != null and labelCode != ''"> and a.label_code = #{labelCode}</if>
<if test="typeId != null "> and a.type_id = #{typeId}</if>
<if test="typeId != null "> and mt2.type_id = #{typeId}</if>
<if test="bindTime != null and bindTime != ''"> and a.bind_time = #{bindTime}</if>
<if test="binder != null and binder != ''"> and a.binder = #{binder}</if>
<if test="labelType != null "> and a.label_type = #{labelType}</if>
<if test="companyId != null and companyId != ''"> and a.company_id = #{companyId}</if>
<if test="modelId != null and modelId != ''"> and mt2.type_id= #{modelId}</if>
<if test="modelId != null and modelId != ''"> and mt.type_id= #{modelId}</if>
<if test="wpName != null and wpName != ''"> and mt3.type_name = #{wpName}</if>
</where>
</select>
<select id="selectMaLabelBindByMaId" parameterType="Long" resultMap="MaLabelBindVOResult">

2
sgzb-modules/sgzb-system/src/main/resources/mapper/system/SysNoticeMapper.xml
View File

@ -42,7 +42,6 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
sn.remark
from sys_notice sn left join sys_user su on sn.create_by = su.user_name
where 1=1
<where>
<if test="noticeTitle != null and noticeTitle != ''">
AND sn.notice_title like concat('%', #{noticeTitle}, '%')
</if>
@ -52,7 +51,6 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<if test="createBy != null and createBy != ''">
AND sn.create_by like concat('%', #{createBy}, '%')
</if>
</where>
</select>
<insert id="insertNotice" parameterType="com.bonus.sgzb.system.domain.SysNotice">