From 89ee5d117dddeb52b01229ae014d60179eda38c3 Mon Sep 17 00:00:00 2001 From: mashuai Date: Fri, 7 Mar 2025 17:01:12 +0800 Subject: [PATCH] =?UTF-8?q?=E8=81=94=E8=B0=83?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../mapper/material/basic/ComplexQueryMapper.xml | 8 ++++---- .../resources/mapper/material/lease/LeaseTaskMapper.xml | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/bonus-modules/bonus-material/src/main/resources/mapper/material/basic/ComplexQueryMapper.xml b/bonus-modules/bonus-material/src/main/resources/mapper/material/basic/ComplexQueryMapper.xml index 67828154..892de484 100644 --- a/bonus-modules/bonus-material/src/main/resources/mapper/material/basic/ComplexQueryMapper.xml +++ b/bonus-modules/bonus-material/src/main/resources/mapper/material/basic/ComplexQueryMapper.xml @@ -861,7 +861,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" mt.type_name AS typeModelName, mt.buy_price AS buyPrice, mm.ma_code AS maCode, - su.nick_name AS scrapBy, + sad.create_by AS scrapBy, su2.nick_name AS auditBy, sad.ledger_time AS auditTime, 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 mt2 ON mt.parent_id = mt2.type_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 - WHERE 1 = 1 + WHERE + sad.ledger_status = '1' AND sad.type_id = #{typeId} @@ -886,7 +886,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" AND ( mt2.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 mm.ma_code like concat('%',#{keyWord},'%') ) diff --git a/bonus-modules/bonus-material/src/main/resources/mapper/material/lease/LeaseTaskMapper.xml b/bonus-modules/bonus-material/src/main/resources/mapper/material/lease/LeaseTaskMapper.xml index a24cdce9..5bb1c33c 100644 --- a/bonus-modules/bonus-material/src/main/resources/mapper/material/lease/LeaseTaskMapper.xml +++ b/bonus-modules/bonus-material/src/main/resources/mapper/material/lease/LeaseTaskMapper.xml @@ -395,7 +395,7 @@ GROUP_CONCAT(DISTINCT mt1.type_name) AS maTypeNames, bp.contract_part as contractPart, sd.dept_name as impUnitName, - bai.agreement_code as agreementCode + bai.agreement_code from lease_apply_info lai left join tm_task tt on lai.task_id = tt.task_id