租赁增加字段

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;
 }

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;
 }

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;
 

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;
 

mhd-modules/mhd-system/src/main/resources/mapper/basic/lease/LeaseMapper.xml

@@ -19,6 +19,14 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <result property="startDate"    column="start_date"    />
         <result property="endDate"    column="end_date"    />
         <result property="remark"    column="remark"    />
+        <result property="serviceItemsCode"    column="service_items_code"    />
+        <result property="serviceItemsName"    column="service_items_name"    />
+        <result property="secondSubjectCode"    column="second_subject_code"    />
+        <result property="secondSubjectName"    column="second_subject_name"    />
+        <result property="billDays"    column="bill_days"    />
+        <result property="billTime"    column="bill_time"    />
+        <result property="salesmanName"    column="salesman_name"    />
+        <result property="settlementCurrency"    column="settlement_currency"    />
         <!-- 继承自BaseVOEntity的字段 -->
         <result property="createTime"    column="create_time"    />
         <result property="createBy"    column="create_by"    />
@@ -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
     </sql>