From daa2861f0da1f44c21e57fc67ce6add02ed8c763 Mon Sep 17 00:00:00 2001 From: hayu <1604366271@qq.com> Date: Wed, 6 Aug 2025 20:47:10 +0800 Subject: [PATCH] =?UTF-8?q?=E9=97=AE=E9=A2=98=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../bonus/material/clz/domain/vo/MaterialRetainedTeamVo.java | 2 ++ .../resources/mapper/material/clz/MaterialLeaseInfoMapper.xml | 3 ++- .../resources/mapper/material/clz/MaterialMachineMapper.xml | 3 ++- 3 files changed, 6 insertions(+), 2 deletions(-) diff --git a/bonus-modules/bonus-material/src/main/java/com/bonus/material/clz/domain/vo/MaterialRetainedTeamVo.java b/bonus-modules/bonus-material/src/main/java/com/bonus/material/clz/domain/vo/MaterialRetainedTeamVo.java index 92adfaa4..c7bb4c55 100644 --- a/bonus-modules/bonus-material/src/main/java/com/bonus/material/clz/domain/vo/MaterialRetainedTeamVo.java +++ b/bonus-modules/bonus-material/src/main/java/com/bonus/material/clz/domain/vo/MaterialRetainedTeamVo.java @@ -63,4 +63,6 @@ public class MaterialRetainedTeamVo { @ApiModelProperty(value = "领料ID") private Long leaseId; + + private String unitName; } \ No newline at end of file diff --git a/bonus-modules/bonus-material/src/main/resources/mapper/material/clz/MaterialLeaseInfoMapper.xml b/bonus-modules/bonus-material/src/main/resources/mapper/material/clz/MaterialLeaseInfoMapper.xml index 8cd1a4f5..fbc0400e 100644 --- a/bonus-modules/bonus-material/src/main/resources/mapper/material/clz/MaterialLeaseInfoMapper.xml +++ b/bonus-modules/bonus-material/src/main/resources/mapper/material/clz/MaterialLeaseInfoMapper.xml @@ -813,7 +813,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" bp.external_id as externalId, bp.pro_name as projectName, lai.lease_person as leasePerson, - lod.create_by as outPerson, + su.nick_name as outPerson, lai.`code` as code, bp.imp_unit as impUnit, bt.bzz_idcard as idCard @@ -828,6 +828,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" LEFT JOIN clz_lease_apply_info lai ON lod.parent_id = lai.id LEFT JOIN bm_unit bt on lai.team_id = bt.unit_id LEFT JOIN bm_project bp ON lai.project_id = bp.pro_id + LEFT JOIN sys_user su on su.user_id=lod.create_by WHERE lod.is_finished = '1' diff --git a/bonus-modules/bonus-material/src/main/resources/mapper/material/clz/MaterialMachineMapper.xml b/bonus-modules/bonus-material/src/main/resources/mapper/material/clz/MaterialMachineMapper.xml index 996175d2..186d15fa 100644 --- a/bonus-modules/bonus-material/src/main/resources/mapper/material/clz/MaterialMachineMapper.xml +++ b/bonus-modules/bonus-material/src/main/resources/mapper/material/clz/MaterialMachineMapper.xml @@ -798,7 +798,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" lai.code AS code, lai.lease_person AS leasePerson, mt.manage_type AS manageType, - sai.agreement_id AS agreementId + sai.agreement_id AS agreementId, + mt.unit_name as unitName FROM clz_slt_agreement_info sai LEFT JOIN ma_type mt ON mt.type_id = sai.type_id