From 3014474c887a66f494f5bf2409cef5c1accd9633 Mon Sep 17 00:00:00 2001 From: mashuai Date: Thu, 4 Sep 2025 22:54:30 +0800 Subject: [PATCH 1/2] =?UTF-8?q?=E5=8A=9F=E8=83=BD=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../basic/domain/InputRecordInfo.java | 3 ++- .../material/basic/domain/OutRecordInfo.java | 3 ++- .../basic/domain/ProjUsingRecord.java | 11 ++++---- .../basic/domain/PurchaseInputInfo.java | 5 ++-- .../basic/domain/RepairInputRecord.java | 5 ++-- .../basic/domain/RepairStorageInfo.java | 5 ++-- .../basic/domain/RetainedEquipmentInfo.java | 25 ++++++++++--------- .../material/basic/domain/ScrapAuditInfo.java | 5 ++-- .../material/basic/domain/StorageInfo.java | 5 ++-- .../material/basic/domain/UseStorageInfo.java | 7 +++--- .../bonus/material/ma/mapper/TypeMapper.java | 7 ++++++ .../ma/service/impl/TypeServiceImpl.java | 14 +++++++---- .../material/basic/ComplexQueryMapper.xml | 3 ++- .../mapper/material/ma/TypeMapper.xml | 21 ++++++++++++++++ 14 files changed, 81 insertions(+), 38 deletions(-) diff --git a/bonus-modules/bonus-material/src/main/java/com/bonus/material/basic/domain/InputRecordInfo.java b/bonus-modules/bonus-material/src/main/java/com/bonus/material/basic/domain/InputRecordInfo.java index b133978b..b5623762 100644 --- a/bonus-modules/bonus-material/src/main/java/com/bonus/material/basic/domain/InputRecordInfo.java +++ b/bonus-modules/bonus-material/src/main/java/com/bonus/material/basic/domain/InputRecordInfo.java @@ -5,6 +5,7 @@ import com.fasterxml.jackson.annotation.JsonFormat; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.Data; +import org.apache.poi.ss.usermodel.HorizontalAlignment; import org.springframework.format.annotation.DateTimeFormat; import java.math.BigDecimal; @@ -44,7 +45,7 @@ public class InputRecordInfo { private String unit; @ApiModelProperty(value = "入库数量") - @Excel(name = "入库数量") + @Excel(name = "入库数量", align = HorizontalAlignment.RIGHT) private BigDecimal inputNum; @ApiModelProperty(value = "入库人员") diff --git a/bonus-modules/bonus-material/src/main/java/com/bonus/material/basic/domain/OutRecordInfo.java b/bonus-modules/bonus-material/src/main/java/com/bonus/material/basic/domain/OutRecordInfo.java index fc891ff2..243c270d 100644 --- a/bonus-modules/bonus-material/src/main/java/com/bonus/material/basic/domain/OutRecordInfo.java +++ b/bonus-modules/bonus-material/src/main/java/com/bonus/material/basic/domain/OutRecordInfo.java @@ -4,6 +4,7 @@ import com.bonus.common.core.annotation.Excel; import com.fasterxml.jackson.annotation.JsonFormat; import io.swagger.annotations.ApiModelProperty; import lombok.Data; +import org.apache.poi.ss.usermodel.HorizontalAlignment; import org.springframework.format.annotation.DateTimeFormat; import java.math.BigDecimal; @@ -67,7 +68,7 @@ public class OutRecordInfo { private String unit; @ApiModelProperty(value = "出库数量") - @Excel(name = "出库数量") + @Excel(name = "出库数量", align = HorizontalAlignment.RIGHT) private BigDecimal outNum; @ApiModelProperty(value = "出库人员") diff --git a/bonus-modules/bonus-material/src/main/java/com/bonus/material/basic/domain/ProjUsingRecord.java b/bonus-modules/bonus-material/src/main/java/com/bonus/material/basic/domain/ProjUsingRecord.java index dc626c49..c50c1a9d 100644 --- a/bonus-modules/bonus-material/src/main/java/com/bonus/material/basic/domain/ProjUsingRecord.java +++ b/bonus-modules/bonus-material/src/main/java/com/bonus/material/basic/domain/ProjUsingRecord.java @@ -5,6 +5,7 @@ import com.fasterxml.jackson.annotation.JsonFormat; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.Data; +import org.apache.poi.ss.usermodel.HorizontalAlignment; import org.springframework.format.annotation.DateTimeFormat; import java.math.BigDecimal; @@ -69,23 +70,23 @@ public class ProjUsingRecord { private String unit; @ApiModelProperty(value = "领用数量") - @Excel(name = "领用数量") + @Excel(name = "领用数量", align = HorizontalAlignment.RIGHT) private BigDecimal leaseNum; @ApiModelProperty(value = "归还数量") - @Excel(name = "归还数量") + @Excel(name = "归还数量", align = HorizontalAlignment.RIGHT) private BigDecimal backNum; @ApiModelProperty(value = "在用数量") - @Excel(name = "在用数量") + @Excel(name = "在用数量", align = HorizontalAlignment.RIGHT) private BigDecimal usNum; @ApiModelProperty(value = "在用总价值（元）") - @Excel(name = "在用总价值(元)") + @Excel(name = "在用总价值(元)", align = HorizontalAlignment.RIGHT) private BigDecimal usPrice; @ApiModelProperty(value = "投入总价值（元）") - @Excel(name = "投入总价值(元)") + @Excel(name = "投入总价值(元)", align = HorizontalAlignment.RIGHT) private BigDecimal totalPrice; @ApiModelProperty(value = "关键字") diff --git a/bonus-modules/bonus-material/src/main/java/com/bonus/material/basic/domain/PurchaseInputInfo.java b/bonus-modules/bonus-material/src/main/java/com/bonus/material/basic/domain/PurchaseInputInfo.java index e3eec745..365bcff6 100644 --- a/bonus-modules/bonus-material/src/main/java/com/bonus/material/basic/domain/PurchaseInputInfo.java +++ b/bonus-modules/bonus-material/src/main/java/com/bonus/material/basic/domain/PurchaseInputInfo.java @@ -4,6 +4,7 @@ import com.bonus.common.core.annotation.Excel; import com.fasterxml.jackson.annotation.JsonFormat; import io.swagger.annotations.ApiModelProperty; import lombok.Data; +import org.apache.poi.ss.usermodel.HorizontalAlignment; import org.springframework.format.annotation.DateTimeFormat; import java.math.BigDecimal; @@ -35,11 +36,11 @@ public class PurchaseInputInfo { private String typeModelName; @ApiModelProperty(value = "新购待入库数量") - @Excel(name = "新购待入库数量") + @Excel(name = "新购待入库数量", align = HorizontalAlignment.RIGHT) private BigDecimal inputNum; @ApiModelProperty(value = "购置单价") - @Excel(name = "原值（元）") + @Excel(name = "原值（元）", align = HorizontalAlignment.RIGHT) private BigDecimal buyPrice; @ApiModelProperty(value = "设备编码") diff --git a/bonus-modules/bonus-material/src/main/java/com/bonus/material/basic/domain/RepairInputRecord.java b/bonus-modules/bonus-material/src/main/java/com/bonus/material/basic/domain/RepairInputRecord.java index 8d0459b1..a3383701 100644 --- a/bonus-modules/bonus-material/src/main/java/com/bonus/material/basic/domain/RepairInputRecord.java +++ b/bonus-modules/bonus-material/src/main/java/com/bonus/material/basic/domain/RepairInputRecord.java @@ -4,6 +4,7 @@ import com.bonus.common.core.annotation.Excel; import com.fasterxml.jackson.annotation.JsonFormat; import io.swagger.annotations.ApiModelProperty; import lombok.Data; +import org.apache.poi.ss.usermodel.HorizontalAlignment; import org.springframework.format.annotation.DateTimeFormat; import java.math.BigDecimal; @@ -32,11 +33,11 @@ public class RepairInputRecord { private String typeModelName; @ApiModelProperty(value = "修饰待入库数量") - @Excel(name = "修饰待入库数量") + @Excel(name = "修饰待入库数量", align = HorizontalAlignment.RIGHT) private BigDecimal repairInputNum; @ApiModelProperty(value = "购置单价") - @Excel(name = "原值（元）") + @Excel(name = "原值（元）", align = HorizontalAlignment.RIGHT) private BigDecimal buyPrice; @ApiModelProperty(value = "设备编码") diff --git a/bonus-modules/bonus-material/src/main/java/com/bonus/material/basic/domain/RepairStorageInfo.java b/bonus-modules/bonus-material/src/main/java/com/bonus/material/basic/domain/RepairStorageInfo.java index ac9af58b..e8541a4a 100644 --- a/bonus-modules/bonus-material/src/main/java/com/bonus/material/basic/domain/RepairStorageInfo.java +++ b/bonus-modules/bonus-material/src/main/java/com/bonus/material/basic/domain/RepairStorageInfo.java @@ -4,6 +4,7 @@ import com.bonus.common.core.annotation.Excel; import com.fasterxml.jackson.annotation.JsonFormat; import io.swagger.annotations.ApiModelProperty; import lombok.Data; +import org.apache.poi.ss.usermodel.HorizontalAlignment; import org.springframework.format.annotation.DateTimeFormat; import java.math.BigDecimal; @@ -32,11 +33,11 @@ public class RepairStorageInfo { private String typeModelName; @ApiModelProperty(value = "在修数量") - @Excel(name = "在修数量") + @Excel(name = "在修数量", align = HorizontalAlignment.RIGHT) private BigDecimal repairNum; @ApiModelProperty(value = "购置单价") - @Excel(name = "原值（元）") + @Excel(name = "原值（元）", align = HorizontalAlignment.RIGHT) private BigDecimal buyPrice; @ApiModelProperty(value = "设备编码") diff --git a/bonus-modules/bonus-material/src/main/java/com/bonus/material/basic/domain/RetainedEquipmentInfo.java b/bonus-modules/bonus-material/src/main/java/com/bonus/material/basic/domain/RetainedEquipmentInfo.java index b5ff8ee3..b1f37f4f 100644 --- a/bonus-modules/bonus-material/src/main/java/com/bonus/material/basic/domain/RetainedEquipmentInfo.java +++ b/bonus-modules/bonus-material/src/main/java/com/bonus/material/basic/domain/RetainedEquipmentInfo.java @@ -5,6 +5,7 @@ import com.fasterxml.jackson.annotation.JsonFormat; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.Data; +import org.apache.poi.ss.usermodel.HorizontalAlignment; import org.springframework.format.annotation.DateTimeFormat; import java.math.BigDecimal; @@ -58,60 +59,60 @@ public class RetainedEquipmentInfo { private String unit; @ApiModelProperty(value = "在库数量") - @Excel(name = "在库数量") + @Excel(name = "在库数量", align = HorizontalAlignment.RIGHT) private BigDecimal storeNum; @ApiModelProperty(value = "在用数量") - @Excel(name = "在用数量") + @Excel(name = "在用数量", align = HorizontalAlignment.RIGHT) private BigDecimal usNum; @ApiModelProperty(value = "在修数量") - @Excel(name = "在修数量") + @Excel(name = "在修数量", align = HorizontalAlignment.RIGHT) private BigDecimal repairNum; @ApiModelProperty(value = "新购待入库") - @Excel(name = "新购待入库数量") + @Excel(name = "新购待入库数量", align = HorizontalAlignment.RIGHT) private BigDecimal inputNum; @ApiModelProperty(value = "修试后待入库") - @Excel(name = "修试后待入库数量") + @Excel(name = "修试后待入库数量", align = HorizontalAlignment.RIGHT) private BigDecimal repairInputNum; @ApiModelProperty(value = "待报废数量") - @Excel(name = "待报废数量") + @Excel(name = "待报废数量", align = HorizontalAlignment.RIGHT) private BigDecimal pendingScrapNum; @ApiModelProperty(value = "已审核报废数量") - @Excel(name = "已审核报废数量") + @Excel(name = "已审核报废数量", align = HorizontalAlignment.RIGHT) private BigDecimal scrapNum; @ApiModelProperty(value = "总保有量") - @Excel(name = "总保有数量") + @Excel(name = "总保有数量", align = HorizontalAlignment.RIGHT) private BigDecimal allNum; @ApiModelProperty(value = "购置单价") private BigDecimal buyPrice; @ApiModelProperty(value = "投入总价值") - @Excel(name = "总保有量资产(万元)") + @Excel(name = "总保有量资产(万元)", align = HorizontalAlignment.RIGHT) private BigDecimal totalPrice; @ApiModelProperty(value = "五年以内成新率") - @Excel(name = "五年以内成新率") + //@Excel(name = "五年以内成新率") private String fiveReplacementRate; @ApiModelProperty(value = "五年以内设备数量") private BigDecimal fiveReplacementNum; @ApiModelProperty(value = "五年至十年成新率") - @Excel(name = "五年至十年成新率") + //@Excel(name = "五年至十年成新率") private String tenReplacementRate; @ApiModelProperty(value = "五年至十年设备数量") private BigDecimal tenReplacementNum; @ApiModelProperty(value = "十年以上成新率") - @Excel(name = "十年以上成新率") + //@Excel(name = "十年以上成新率") private String tenPlusReplacementRate; @ApiModelProperty(value = "十年以上设备数量") diff --git a/bonus-modules/bonus-material/src/main/java/com/bonus/material/basic/domain/ScrapAuditInfo.java b/bonus-modules/bonus-material/src/main/java/com/bonus/material/basic/domain/ScrapAuditInfo.java index 0869c746..514d76cf 100644 --- a/bonus-modules/bonus-material/src/main/java/com/bonus/material/basic/domain/ScrapAuditInfo.java +++ b/bonus-modules/bonus-material/src/main/java/com/bonus/material/basic/domain/ScrapAuditInfo.java @@ -4,6 +4,7 @@ import com.bonus.common.core.annotation.Excel; import com.fasterxml.jackson.annotation.JsonFormat; import io.swagger.annotations.ApiModelProperty; import lombok.Data; +import org.apache.poi.ss.usermodel.HorizontalAlignment; import org.springframework.format.annotation.DateTimeFormat; import java.math.BigDecimal; @@ -32,11 +33,11 @@ public class ScrapAuditInfo { private String typeModelName; @ApiModelProperty(value = "报废数量") - @Excel(name = "报废数量") + @Excel(name = "报废数量", align = HorizontalAlignment.RIGHT) private BigDecimal scrapNum; @ApiModelProperty(value = "购置单价") - @Excel(name = "原值（元）") + @Excel(name = "原值（元）", align = HorizontalAlignment.RIGHT) private BigDecimal buyPrice; @ApiModelProperty(value = "设备编码") diff --git a/bonus-modules/bonus-material/src/main/java/com/bonus/material/basic/domain/StorageInfo.java b/bonus-modules/bonus-material/src/main/java/com/bonus/material/basic/domain/StorageInfo.java index b57fad42..44d9b1a6 100644 --- a/bonus-modules/bonus-material/src/main/java/com/bonus/material/basic/domain/StorageInfo.java +++ b/bonus-modules/bonus-material/src/main/java/com/bonus/material/basic/domain/StorageInfo.java @@ -4,6 +4,7 @@ import com.bonus.common.core.annotation.Excel; import com.fasterxml.jackson.annotation.JsonFormat; import io.swagger.annotations.ApiModelProperty; import lombok.Data; +import org.apache.poi.ss.usermodel.HorizontalAlignment; import org.springframework.format.annotation.DateTimeFormat; import java.math.BigDecimal; @@ -32,11 +33,11 @@ public class StorageInfo { private String typeModelName; @ApiModelProperty(value = "入库数量") - @Excel(name = "入库数量") + @Excel(name = "入库数量", align = HorizontalAlignment.RIGHT) private BigDecimal storeNum; @ApiModelProperty(value = "购置单价") - @Excel(name = "原值（元）") + @Excel(name = "原值（元）", align = HorizontalAlignment.RIGHT) private BigDecimal buyPrice; @ApiModelProperty(value = "设备编码") diff --git a/bonus-modules/bonus-material/src/main/java/com/bonus/material/basic/domain/UseStorageInfo.java b/bonus-modules/bonus-material/src/main/java/com/bonus/material/basic/domain/UseStorageInfo.java index 42fdf67e..850bf4ef 100644 --- a/bonus-modules/bonus-material/src/main/java/com/bonus/material/basic/domain/UseStorageInfo.java +++ b/bonus-modules/bonus-material/src/main/java/com/bonus/material/basic/domain/UseStorageInfo.java @@ -4,6 +4,7 @@ import com.bonus.common.core.annotation.Excel; import com.fasterxml.jackson.annotation.JsonFormat; import io.swagger.annotations.ApiModelProperty; import lombok.Data; +import org.apache.poi.ss.usermodel.HorizontalAlignment; import org.springframework.format.annotation.DateTimeFormat; import java.math.BigDecimal; @@ -35,11 +36,11 @@ public class UseStorageInfo { private String typeModelName; @ApiModelProperty(value = "在用数量") - @Excel(name = "在用数量") + @Excel(name = "在用数量", align = HorizontalAlignment.RIGHT) private BigDecimal usNum; @ApiModelProperty(value = "购置单价") - @Excel(name = "原值（元）") + @Excel(name = "原值（元）", align = HorizontalAlignment.RIGHT) private BigDecimal buyPrice; @ApiModelProperty(value = "设备编码") @@ -64,7 +65,7 @@ public class UseStorageInfo { private String code; @ApiModelProperty(value = "工程名称") - @Excel(name = "工程名称") + @Excel(name = "工程名称", width = 30) private String projectName; @ApiModelProperty(value = "关键字") diff --git a/bonus-modules/bonus-material/src/main/java/com/bonus/material/ma/mapper/TypeMapper.java b/bonus-modules/bonus-material/src/main/java/com/bonus/material/ma/mapper/TypeMapper.java index 19d5fb23..2cfd0011 100644 --- a/bonus-modules/bonus-material/src/main/java/com/bonus/material/ma/mapper/TypeMapper.java +++ b/bonus-modules/bonus-material/src/main/java/com/bonus/material/ma/mapper/TypeMapper.java @@ -238,4 +238,11 @@ public interface TypeMapper { * @param type */ int addStockNum(Type type); + + /** + * 获取编码库存 + * @param type + * @return + */ + BigDecimal getMaCodeNum(Type type); } diff --git a/bonus-modules/bonus-material/src/main/java/com/bonus/material/ma/service/impl/TypeServiceImpl.java b/bonus-modules/bonus-material/src/main/java/com/bonus/material/ma/service/impl/TypeServiceImpl.java index dde5b4e7..1efd60c8 100644 --- a/bonus-modules/bonus-material/src/main/java/com/bonus/material/ma/service/impl/TypeServiceImpl.java +++ b/bonus-modules/bonus-material/src/main/java/com/bonus/material/ma/service/impl/TypeServiceImpl.java @@ -239,18 +239,22 @@ public class TypeServiceImpl implements ITypeService { int result = 0; // 根据typeId查询物资名称和规格型号 Type info = typeMapper.selectTypeByTypeId(type.getTypeId()); + BigDecimal storageNum = BigDecimal.ZERO;; // 查询库存 - BigDecimal storageNum = typeMapper.getStorageNumByTypeId(type); + if (info != null) { + if ("1".equals(info.getManageType())) { + storageNum = typeMapper.getStorageNumByTypeId(type); + } else { + storageNum = typeMapper.getMaCodeNum(type); + } + } + type.setCreateBy(SecurityUtils.getLoginUser().getSysUser().getNickName()); type.setPreStoreNum(storageNum); type.setMaterialName(info.getMaterialName()); type.setTypeName(info.getTypeName()); // 插入修改记录 if ("1".equals(type.getStyle())) { - // 检查库存是否充足 - if (type.getOutNum() != null && storageNum.compareTo(type.getOutNum()) < 0) { - throw new RuntimeException("库存不足，当前库存: " + storageNum + ", 需要出库: " + type.getOutNum()); - } result = typeMapper.updateMaTypeStockNum(type); if (result > 0) { type.setStorageNum(type.getPreStoreNum().subtract(type.getOutNum())); 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 262ddce7..467f583e 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 @@ -874,7 +874,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" sai_agg.type_id, sai_agg.ma_id, bp.pro_id, - sai_agg.lease_id + sai_agg.lease_id, + sai_agg.agreement_id + + From ce1c35d31cd5157972693c21e5e2b91384d5b0cb Mon Sep 17 00:00:00 2001 From: mashuai Date: Thu, 4 Sep 2025 23:28:15 +0800 Subject: [PATCH 2/2] =?UTF-8?q?=E5=8A=9F=E8=83=BD=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../material/lease/LeaseApplyInfoMapper.xml | 5 +++-- .../mapper/material/ma/MachineMapper.xml | 15 ++++++++------- 2 files changed, 11 insertions(+), 9 deletions(-) diff --git a/bonus-modules/bonus-material/src/main/resources/mapper/material/lease/LeaseApplyInfoMapper.xml b/bonus-modules/bonus-material/src/main/resources/mapper/material/lease/LeaseApplyInfoMapper.xml index d755b9db..6fafe522 100644 --- a/bonus-modules/bonus-material/src/main/resources/mapper/material/lease/LeaseApplyInfoMapper.xml +++ b/bonus-modules/bonus-material/src/main/resources/mapper/material/lease/LeaseApplyInfoMapper.xml @@ -344,7 +344,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" lai.is_confirm AS isConfirm, lai.confirm_remark AS confirmRemark, mt3.type_id AS firstId, - lpd.create_time AS releaseTime + lpd.create_time AS releaseTime, + lpd.parent_id AS parentId FROM lease_publish_details lpd LEFT JOIN lease_apply_info lai ON lai.id = lpd.parent_id @@ -368,7 +369,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" AND lpd.project_id = bai.project_id left join sys_user su on lpd.create_by = su.user_id - JOIN ma_type_keeper mtk ON mtk.type_id = lpd.type_id AND mtk.user_id = #{userId} + JOIN ma_type_keeper mtk ON mtk.type_id = lpd.new_type AND mtk.user_id = #{userId} where 1 = 1 diff --git a/bonus-modules/bonus-material/src/main/resources/mapper/material/ma/MachineMapper.xml b/bonus-modules/bonus-material/src/main/resources/mapper/material/ma/MachineMapper.xml index 726872a2..d7714534 100644 --- a/bonus-modules/bonus-material/src/main/resources/mapper/material/ma/MachineMapper.xml +++ b/bonus-modules/bonus-material/src/main/resources/mapper/material/ma/MachineMapper.xml @@ -703,19 +703,20 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" sai.id, bu.unit_name AS leaseUnit, bp.pro_name AS leaseProject, - sai.start_time AS leaseTime, + lai.create_time AS leaseTime, IF( sai.status = 1, bu.unit_name,"") AS backUnit, IF( sai.status = 1, bp.pro_name ,"") AS backProject, - IF( sai.status = 1, sai.end_time ,"") AS backTime, - + IF( sai.status = 1, bai.create_time ,"") AS backTime, sai.status FROM slt_agreement_info sai - LEFT JOIN bm_agreement_info bai on sai.agreement_id = bai.agreement_id - LEFT JOIN bm_unit bu on bai.unit_id = bu.unit_id - LEFT JOIN bm_project bp on bai.project_id = bp.pro_id + LEFT JOIN bm_agreement_info ba on sai.agreement_id = ba.agreement_id + LEFT JOIN bm_unit bu on ba.unit_id = bu.unit_id + LEFT JOIN bm_project bp on ba.project_id = bp.pro_id + LEFT JOIN lease_apply_info lai ON sai.lease_id = lai.id + LEFT JOIN back_apply_info bai ON bai.id = sai.back_id WHERE sai.ma_id = #{maId} - ORDER BY sai.ID desc + ORDER BY lai.create_time desc limit 1