From 7829982bb3566494f4eb7807dd5b5b1cb7c7184a Mon Sep 17 00:00:00 2001 From: hayu <1604366271@qq.com> Date: Tue, 30 Sep 2025 18:27:11 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../material/clz/domain/lease/MaterialLeaseApplyDetails.java | 3 +++ .../resources/mapper/material/clz/MaterialLeaseInfoMapper.xml | 3 ++- 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/bonus-modules/bonus-material/src/main/java/com/bonus/material/clz/domain/lease/MaterialLeaseApplyDetails.java b/bonus-modules/bonus-material/src/main/java/com/bonus/material/clz/domain/lease/MaterialLeaseApplyDetails.java index 21e210fa..8e2a352c 100644 --- a/bonus-modules/bonus-material/src/main/java/com/bonus/material/clz/domain/lease/MaterialLeaseApplyDetails.java +++ b/bonus-modules/bonus-material/src/main/java/com/bonus/material/clz/domain/lease/MaterialLeaseApplyDetails.java @@ -180,6 +180,9 @@ public class MaterialLeaseApplyDetails extends BaseEntity { private String maIds; private String maCodes; + @ApiModelProperty("机具类型（1机具，2安全工器具）") + private int jiJuType; + public MaterialLeaseApplyDetails(Long id, Long parentId, Long typeId, BigDecimal preNum, BigDecimal auditNum, BigDecimal alNum, String status, Long companyId) { this.id = id; this.parentId = parentId; 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 e4ec2891..55c7d4f3 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 @@ -117,7 +117,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" IFNULL(lad.pre_num,0) as pre_num, IFNULL(lad.audit_num,0) as audit_num, IFNULL(lad.al_num,0) as al_num, - IFNULL(lad.status,0) as status, mt.unit_name ,mt.unit_value, + IFNULL(lad.status,0) as status, mt.unit_name ,mt.unit_value,mt.jiju_type as jijuType, lad.create_by, lad.create_time, lad.update_by, lad.update_time, lad.remark as remark, lad.company_id from clz_lease_apply_details lad @@ -642,6 +642,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" SUM( IFNULL(lod.out_num, 0) ) AS preNum, mt.manage_type AS manageType, mt.type_id AS typeId, + mt.jiju_type AS jijuType, lod.parent_id AS parentId FROM clz_lease_out_details lod