From f4cb9a58483e295260be1c77be8286ae8eccc793 Mon Sep 17 00:00:00 2001 From: zhou-hongcheng <1064771933@qq.com> Date: Wed, 18 Mar 2026 10:45:54 +0800 Subject: [PATCH] =?UTF-8?q?=E7=A7=9F=E8=B5=81=E5=A2=9E=E5=8A=A0=E5=AD=97?= =?UTF-8?q?=E6=AE=B5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/mhd/basic/domain/lease/entity/Lease.java | 13 +++++++++++++ .../basic/domain/lease/repository/po/LeasePO.java | 11 +++++++++++ .../basic/domain/lease/repository/todo/LeaseDO.java | 12 ++++++++++++ .../mhd/basic/interfaces/dto/lease/LeaseDTO.java | 11 +++++++++++ .../resources/mapper/basic/lease/LeaseMapper.xml | 13 ++++++++++++- 5 files changed, 59 insertions(+), 1 deletion(-) diff --git a/mhd-modules/mhd-system/src/main/java/com/mhd/basic/domain/lease/entity/Lease.java b/mhd-modules/mhd-system/src/main/java/com/mhd/basic/domain/lease/entity/Lease.java index f1ac308fb..35857e2b9 100644 --- a/mhd-modules/mhd-system/src/main/java/com/mhd/basic/domain/lease/entity/Lease.java +++ b/mhd-modules/mhd-system/src/main/java/com/mhd/basic/domain/lease/entity/Lease.java @@ -2,10 +2,12 @@ package com.mhd.basic.domain.lease.entity; import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.TableId; +import com.fasterxml.jackson.annotation.JsonFormat; import com.mhd.common.core.annotation.Excel; import com.mhd.common.core.web.domain.BaseVOEntity; import io.swagger.annotations.ApiModelProperty; import lombok.Data; +import org.springframework.format.annotation.DateTimeFormat; import java.math.BigDecimal; import java.util.Date; @@ -76,4 +78,15 @@ public class Lease extends BaseVOEntity{ @ApiModelProperty(name = "出账日") private Integer billDays; + + @ApiModelProperty("出账时间") + @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd") + @DateTimeFormat(pattern = "yyyy-MM-dd") + private Date billTime; + + @ApiModelProperty("业务员") + private String salesmanName; + + @ApiModelProperty("结算币种") + private String settlementCurrency; } diff --git a/mhd-modules/mhd-system/src/main/java/com/mhd/basic/domain/lease/repository/po/LeasePO.java b/mhd-modules/mhd-system/src/main/java/com/mhd/basic/domain/lease/repository/po/LeasePO.java index 8670192bd..378a87f08 100644 --- a/mhd-modules/mhd-system/src/main/java/com/mhd/basic/domain/lease/repository/po/LeasePO.java +++ b/mhd-modules/mhd-system/src/main/java/com/mhd/basic/domain/lease/repository/po/LeasePO.java @@ -79,4 +79,15 @@ public class LeasePO extends BaseVOEntity{ @ApiModelProperty(name = "出账日") private Integer billDays; + + @ApiModelProperty("出账时间") + @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd") + @DateTimeFormat(pattern = "yyyy-MM-dd") + private Date billTime; + + @ApiModelProperty("业务员") + private String salesmanName; + + @ApiModelProperty("结算币种") + private String settlementCurrency; } diff --git a/mhd-modules/mhd-system/src/main/java/com/mhd/basic/domain/lease/repository/todo/LeaseDO.java b/mhd-modules/mhd-system/src/main/java/com/mhd/basic/domain/lease/repository/todo/LeaseDO.java index 36cac6dce..56af6a806 100644 --- a/mhd-modules/mhd-system/src/main/java/com/mhd/basic/domain/lease/repository/todo/LeaseDO.java +++ b/mhd-modules/mhd-system/src/main/java/com/mhd/basic/domain/lease/repository/todo/LeaseDO.java @@ -7,6 +7,7 @@ import com.mhd.common.core.annotation.Excel; import com.mhd.common.core.web.domain.BaseVOEntity; import io.swagger.annotations.ApiModelProperty; import lombok.Data; +import org.springframework.format.annotation.DateTimeFormat; import java.math.BigDecimal; import java.util.Date; @@ -83,6 +84,17 @@ public class LeaseDO extends BaseVOEntity{ @ApiModelProperty(name = "出账日") private Integer billDays; + @ApiModelProperty("出账时间") + @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd") + @DateTimeFormat(pattern = "yyyy-MM-dd") + private Date billTime; + + @ApiModelProperty("业务员") + private String salesmanName; + + @ApiModelProperty("结算币种") + private String settlementCurrency; + @ApiModelProperty(name = "创建时间查询条件开始日期") private String createTimeStart; diff --git a/mhd-modules/mhd-system/src/main/java/com/mhd/basic/interfaces/dto/lease/LeaseDTO.java b/mhd-modules/mhd-system/src/main/java/com/mhd/basic/interfaces/dto/lease/LeaseDTO.java index 3fd7986bd..a8966222d 100644 --- a/mhd-modules/mhd-system/src/main/java/com/mhd/basic/interfaces/dto/lease/LeaseDTO.java +++ b/mhd-modules/mhd-system/src/main/java/com/mhd/basic/interfaces/dto/lease/LeaseDTO.java @@ -81,6 +81,17 @@ public class LeaseDTO extends BaseVOEntity{ @ApiModelProperty(name = "出账日") private Integer billDays; + @ApiModelProperty("出账时间") + @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd") + @DateTimeFormat(pattern = "yyyy-MM-dd") + private Date billTime; + + @ApiModelProperty("业务员") + private String salesmanName; + + @ApiModelProperty("结算币种") + private String settlementCurrency; + @ApiModelProperty(name = "创建时间查询条件开始日期") private String createTimeStart; diff --git a/mhd-modules/mhd-system/src/main/resources/mapper/basic/lease/LeaseMapper.xml b/mhd-modules/mhd-system/src/main/resources/mapper/basic/lease/LeaseMapper.xml index bd95bdb68..d74661b96 100644 --- a/mhd-modules/mhd-system/src/main/resources/mapper/basic/lease/LeaseMapper.xml +++ b/mhd-modules/mhd-system/src/main/resources/mapper/basic/lease/LeaseMapper.xml @@ -19,6 +19,14 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" + + + + + + + + @@ -56,7 +64,10 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" a.second_subject_code, a.second_subject_name, a.service_items_name, - a.bill_days + a.bill_days, + a.bill_time, + a.salesman_name, + a.settlement_currency from lease a LEFT JOIN warehouse w ON a.warehouse_id = w.warehouse_id AND w.del_flag = 1