feat(report): 添加计算应收和计算公式字段
- 在 TOBOFSReturnGoodsDetailedDto、TOBOFSaleoutDetailedDto 和 TOCOFSReturnGoodsDetailedDto 中添加计算应收和计算公式字段 - 在 TOCOFSReturnGoodsDetailedDto 中添加平台优惠、支付优惠、达人优惠和商家优惠字段 - 更新数据库实体 XML 文件,添加对应字段的映射
This commit is contained in:
parent
5fe5caa851
commit
472964e254
|
@ -4,7 +4,7 @@ import com.alibaba.excel.annotation.ExcelProperty;
|
|||
import lombok.Data;
|
||||
|
||||
/**
|
||||
* TOC退货Excel报表导出
|
||||
* TOB退货Excel报表导出
|
||||
*
|
||||
* @Author:liuyang
|
||||
* @Package:com.hzya.frame.report.lets.dto
|
||||
|
@ -66,4 +66,10 @@ public class TobofsReturnGoodsDetailedDto {
|
|||
@ExcelProperty(value = "交易成功-下游主键")
|
||||
private String newSystemPrimary2;
|
||||
//TOC退货-交易成功 结束
|
||||
|
||||
@ExcelProperty(value = "计算应收")
|
||||
private String def7;
|
||||
|
||||
@ExcelProperty(value = "计算公式")
|
||||
private String def8;
|
||||
}
|
||||
|
|
|
@ -89,5 +89,8 @@ public class TobofsSaleoutDetailedDto {
|
|||
//应收 开始
|
||||
@ExcelProperty(value = "计算应收")
|
||||
private String def7;
|
||||
|
||||
@ExcelProperty(value = "计算公式")
|
||||
private String def8;
|
||||
//应收 结束
|
||||
}
|
|
@ -66,4 +66,24 @@ public class TocofsReturnGoodsDetailedDto {
|
|||
@ExcelProperty(value = "交易成功-下游主键")
|
||||
private String newSystemPrimary4;
|
||||
//TOC退货-交易成功 结束
|
||||
|
||||
//应收 开始
|
||||
@ExcelProperty(value = "计算应收")
|
||||
private String def7;
|
||||
|
||||
@ExcelProperty(value = "计算公式")
|
||||
private String def8;
|
||||
|
||||
@ExcelProperty(value = "平台优惠")
|
||||
private String def9;
|
||||
|
||||
@ExcelProperty(value = "支付优惠")
|
||||
private String def10;
|
||||
|
||||
@ExcelProperty(value = "达人优惠")
|
||||
private String def11;
|
||||
|
||||
@ExcelProperty(value = "商家优惠")
|
||||
private String def12;
|
||||
//应收 结束
|
||||
}
|
||||
|
|
|
@ -466,6 +466,13 @@
|
|||
<result property="newState4" column="newState4" jdbcType="VARCHAR"/>
|
||||
<result property="newSystemNumber4" column="newSystemNumber4" jdbcType="VARCHAR"/>
|
||||
<result property="newSystemPrimary4" column="newSystemPrimary4" jdbcType="VARCHAR"/>
|
||||
|
||||
<result property="def7" column="def7" jdbcType="VARCHAR"/>
|
||||
<result property="def8" column="def8" jdbcType="VARCHAR"/>
|
||||
<result property="def9" column="def9" jdbcType="VARCHAR"/>
|
||||
<result property="def10" column="def10" jdbcType="VARCHAR"/>
|
||||
<result property="def11" column="def11" jdbcType="VARCHAR"/>
|
||||
<result property="def12" column="def12" jdbcType="VARCHAR"/>
|
||||
</resultMap>
|
||||
|
||||
<!-- 查询 采用==查询,适用toc -->
|
||||
|
@ -730,6 +737,9 @@
|
|||
<result property="newState2" column="newState2" jdbcType="VARCHAR"/>
|
||||
<result property="newSystemNumber2" column="newSystemNumber2" jdbcType="VARCHAR"/>
|
||||
<result property="newSystemPrimary2" column="newSystemPrimary2" jdbcType="VARCHAR"/>
|
||||
|
||||
<result property="def7" column="def7" jdbcType="VARCHAR"/>
|
||||
<result property="def8" column="def8" jdbcType="VARCHAR"/>
|
||||
</resultMap>
|
||||
|
||||
|
||||
|
|
|
@ -475,6 +475,7 @@
|
|||
<result property="successfulTradeDate" column="successfulTradeDate" jdbcType="VARCHAR"/>
|
||||
|
||||
<result property="def7" column="def7" jdbcType="VARCHAR"/>
|
||||
<result property="def8" column="def8" jdbcType="VARCHAR"/>
|
||||
</resultMap>
|
||||
|
||||
<!-- TOC通用查询 采用==查询 -->
|
||||
|
|
Loading…
Reference in New Issue