autumn/jsowell-charger-web
1
0
Fork 0
mirror of https://codeup.aliyun.com/67c68d4e484ca2f0a13ac3c1/ydc/jsowell-charger-web.git synced 2026-04-20 02:55:04 +08:00
Code Issues Packages Projects Releases Wiki Activity

update 订单报表实体类

Browse Source
This commit is contained in:
autumn.g@foxmail.com
2023-06-05 13:49:12 +08:00
parent f1e670684e
commit f520642fba
2 changed files with 11 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
jsowell-pile/src/main/java/com/jsowell/pile/domain/SettleOrderReport.java
View File

@@ -96,8 +96,7 @@ public class SettleOrderReport extends BaseEntity {
/**
* 删除标识（0-正常；1-删除）
*/
@Excel(name = "删除标识", readConverterExp = "0=-正常；1-删除")
private String delFalg;
private String delFlag;
public void setId(Long id) {
this.id = id;
@@ -203,12 +202,12 @@ public class SettleOrderReport extends BaseEntity {
return tradeFee;
}
public void setDelFalg(String delFalg) {
this.delFalg = delFalg;
public void setDelFlag(String delFlag) {
this.delFlag = delFlag;
}
public String getDelFalg() {
return delFalg;
public String getDelFlag() {
return delFlag;
}
@Override
@@ -228,7 +227,7 @@ public class SettleOrderReport extends BaseEntity {
.append("tradeAmount", getTradeAmount())
.append("tradeFee", getTradeFee())
.append("createTime", getCreateTime())
.append("delFalg", getDelFalg())
.append("delFlag", getDelFlag())
.toString();
}
}

11
jsowell-pile/src/main/resources/mapper/pile/SettleOrderReportMapper.xml
View File

@@ -19,11 +19,11 @@
<result property="tradeAmount" column="trade_amount" />
<result property="tradeFee" column="trade_fee" />
<result property="createTime" column="create_time" />
<result property="delFalg" column="del_falg" />
<result property="delFlag" column="del_flag" />
</resultMap>
<sql id="selectSettleOrderReportVo">
select id, merchant_id, station_id, use_electricity, charge_num, charge_time, electricity_amount, service_amount, total_amount, virtual_amount, trade_date, trade_amount, trade_fee, create_time, del_falg from settle_order_report
select id, merchant_id, station_id, use_electricity, charge_num, charge_time, electricity_amount, service_amount, total_amount, virtual_amount, trade_date, trade_amount, trade_fee, create_time, del_flag from settle_order_report
</sql>
<select id="selectSettleOrderReportList" parameterType="SettleOrderReport" resultMap="SettleOrderReportResult">
@@ -41,7 +41,6 @@
<if test="tradeDate != null and tradeDate != ''"> and trade_date = #{tradeDate}</if>
<if test="tradeAmount != null "> and trade_amount = #{tradeAmount}</if>
<if test="tradeFee != null "> and trade_fee = #{tradeFee}</if>
<if test="delFalg != null and delFalg != ''"> and del_falg = #{delFalg}</if>
</where>
</select>
@@ -67,7 +66,7 @@
<if test="tradeAmount != null">trade_amount,</if>
<if test="tradeFee != null">trade_fee,</if>
<if test="createTime != null">create_time,</if>
<if test="delFalg != null">del_falg,</if>
<if test="delFlag != null">del_flag,</if>
</trim>
<trim prefix="values (" suffix=")" suffixOverrides=",">
<if test="id != null">#{id},</if>
@@ -84,7 +83,7 @@
<if test="tradeAmount != null">#{tradeAmount},</if>
<if test="tradeFee != null">#{tradeFee},</if>
<if test="createTime != null">#{createTime},</if>
<if test="delFalg != null">#{delFalg},</if>
<if test="delFlag != null">#{delFlag},</if>
</trim>
</insert>
@@ -104,7 +103,7 @@
<if test="tradeAmount != null">trade_amount = #{tradeAmount},</if>
<if test="tradeFee != null">trade_fee = #{tradeFee},</if>
<if test="createTime != null">create_time = #{createTime},</if>
<if test="delFalg != null">del_falg = #{delFalg},</if>
<if test="delFlag != null">del_flag = #{delFlag},</if>
</trim>
where id = #{id}
</update>