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

联调

This commit is contained in:
mashuai 2025-03-07 17:01:12 +08:00
parent 2e44ac9970
commit 89ee5d117d
2 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
bonus-modules/bonus-material/src/main/resources/mapper/material/basic/ComplexQueryMapper.xml
View File

@ -861,7 +861,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
mt.type_name AS typeModelName, mt.type_name AS typeModelName,
mt.buy_price AS buyPrice, mt.buy_price AS buyPrice,
mm.ma_code AS maCode, mm.ma_code AS maCode,
su.nick_name AS scrapBy, sad.create_by AS scrapBy,
su2.nick_name AS auditBy, su2.nick_name AS auditBy,
sad.ledger_time AS auditTime, sad.ledger_time AS auditTime,
CASE CASE
@ -876,9 +876,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
LEFT JOIN ma_type mt ON mt.type_id = sad.type_id LEFT JOIN ma_type mt ON mt.type_id = sad.type_id
LEFT JOIN ma_type mt2 ON mt.parent_id = mt2.type_id LEFT JOIN ma_type mt2 ON mt.parent_id = mt2.type_id
LEFT JOIN ma_machine mm ON mm.ma_id = sad.ma_id LEFT JOIN ma_machine mm ON mm.ma_id = sad.ma_id
LEFT JOIN sys_user su ON sad.create_by = su.user_id
LEFT JOIN sys_user su2 ON sad.ledger_by = su2.user_id LEFT JOIN sys_user su2 ON sad.ledger_by = su2.user_id
WHERE 1 = 1 WHERE
sad.ledger_status = '1'
<if test="typeId != null"> <if test="typeId != null">
AND sad.type_id = #{typeId} AND sad.type_id = #{typeId}
</if> </if>
@ -886,7 +886,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
AND ( AND (
mt2.type_name like concat('%',#{keyWord},'%') or mt2.type_name like concat('%',#{keyWord},'%') or
mt.type_name like concat('%',#{keyWord},'%') or mt.type_name like concat('%',#{keyWord},'%') or
su.nick_name like concat('%',#{keyWord},'%') or sad.create_by like concat('%',#{keyWord},'%') or
su2.nick_name like concat('%',#{keyWord},'%') or su2.nick_name like concat('%',#{keyWord},'%') or
mm.ma_code like concat('%',#{keyWord},'%') mm.ma_code like concat('%',#{keyWord},'%')
) )

2
bonus-modules/bonus-material/src/main/resources/mapper/material/lease/LeaseTaskMapper.xml
View File

@ -395,7 +395,7 @@
GROUP_CONCAT(DISTINCT mt1.type_name) AS maTypeNames, GROUP_CONCAT(DISTINCT mt1.type_name) AS maTypeNames,
bp.contract_part as contractPart, bp.contract_part as contractPart,
sd.dept_name as impUnitName, sd.dept_name as impUnitName,
bai.agreement_code as agreementCode bai.agreement_code
from from
lease_apply_info lai lease_apply_info lai
left join tm_task tt on lai.task_id = tt.task_id left join tm_task tt on lai.task_id = tt.task_id