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

同步代码

This commit is contained in:
sxu 2024-08-22 15:52:34 +08:00
parent 543e645dc2
commit 0b6e1f2959
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
sgzb-modules/sgzb-material/src/main/resources/mapper/material/BackRecordMapper.xml
View File

@ -100,7 +100,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
baif.`code`, baif.`code`,
mm.ma_code AS maCode, mm.ma_code AS maCode,
bcd.back_num AS backNum, bcd.back_num AS backNum,
su.nick_name AS backPerson, baif.back_person AS backPerson,
bcd.create_time AS createTime, bcd.create_time AS createTime,
bpl.lot_name AS proName, bpl.lot_name AS proName,
bui.unit_name AS unitName bui.unit_name AS unitName
@ -114,7 +114,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
LEFT JOIN ma_type mt ON mt.type_id = bcd.type_id LEFT JOIN ma_type mt ON mt.type_id = bcd.type_id
LEFT JOIN ma_type mt2 ON mt2.type_id = mt.parent_id LEFT JOIN ma_type mt2 ON mt2.type_id = mt.parent_id
LEFT JOIN ma_machine mm ON mm.ma_id = bcd.ma_id LEFT JOIN ma_machine mm ON mm.ma_id = bcd.ma_id
LEFT JOIN sys_user su ON su.user_id = baif.back_person -- LEFT JOIN sys_user su ON su.user_id = baif.back_person
where 1 = 1 where 1 = 1
<if test="keyWord != null and keyWord != ''"> <if test="keyWord != null and keyWord != ''">
and (baif.`code` like concat('%',#{keyWord},'%') or and (baif.`code` like concat('%',#{keyWord},'%') or

4
sgzb-modules/sgzb-material/src/main/resources/mapper/material/LeaseRecordMapper.xml
View File

@ -20,7 +20,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
mm.ma_code as maCode, mm.ma_code as maCode,
mt.unit_name as unit, mt.unit_name as unit,
lod.out_num as preNum, lod.out_num as preNum,
su.nick_name as leasePerson, lai.lease_person as leasePerson,
lod.create_time as createTime, lod.create_time as createTime,
bpl.lot_name as proName, bpl.lot_name as proName,
bui.unit_name as unitName bui.unit_name as unitName
@ -33,7 +33,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
LEFT JOIN ma_type mt on mt.type_id = lod.type_id LEFT JOIN ma_type mt on mt.type_id = lod.type_id
LEFT JOIN ma_type mt2 on mt2.type_id = mt.parent_id LEFT JOIN ma_type mt2 on mt2.type_id = mt.parent_id
LEFT JOIN ma_machine mm on mm.ma_id = lod.ma_id LEFT JOIN ma_machine mm on mm.ma_id = lod.ma_id
LEFT JOIN sys_user su on su.user_id = lai.lease_person -- LEFT JOIN sys_user su on su.user_id = lai.lease_person
where 1 = 1 where 1 = 1
<if test="keyWord != null and keyWord != ''"> <if test="keyWord != null and keyWord != ''">
and (bai.agreement_code like concat('%',#{keyWord},'%') or and (bai.agreement_code like concat('%',#{keyWord},'%') or