bonus
/
Zlpt-Cloud
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fix

This commit is contained in:
sxu 2023-12-07 11:05:51 +08:00
parent 4db92c15f1
commit 9e511829f7
2 changed files with 10 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
zlpt-common/zlpt-common-core/src/main/java/com/bonus/zlpt/common/core/domain/order/OrderInfo.java
View File

@ -40,6 +40,11 @@ public class OrderInfo extends BaseEntity
@ApiModelProperty(value = "订单日期")
private String time;
/** 订单结束日期 */
@Excel(name = "订单结束日期")
@ApiModelProperty(value = "订单结束日期")
private String endTime;
/** 订金 */
@Excel(name = "订金")
@ApiModelProperty(value = "订金")

6
zlpt-modules/zlpt-order/src/main/resources/mapper/OrderInfoMapper.xml
View File

@ -9,6 +9,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<result property="pId" column="p_id" />
<result property="code" column="code" />
<result property="time" column="time" />
<result property="endTime" column="end_time" />
<result property="deposit" column="deposit" />
<result property="cost" column="cost" />
<result property="payType" column="pay_type" />
@ -19,7 +20,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
</resultMap>
<sql id="selectOrderInfoVo">
select order_id, p_id, code, time, deposit, cost, pay_type, supplier, order_status, order_user, order_company from ma_order_info
select order_id, p_id, code, time, end_time, deposit, cost, pay_type, supplier, order_status, order_user, order_company from ma_order_info
</sql>
<select id="selectOrderInfoList" parameterType="com.bonus.zlpt.common.core.domain.order.vo.OrderInfoVo" resultType="com.bonus.zlpt.common.core.domain.order.vo.OrderInfoVo">
@ -56,6 +57,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<if test="pId != null">p_id,</if>
<if test="code != null">code,</if>
<if test="time != null">time,</if>
<if test="endTime != null">end_time,</if>
<if test="deposit != null">deposit,</if>
<if test="cost != null">cost,</if>
<if test="payType != null">pay_type,</if>
@ -69,6 +71,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<if test="pId != null">#{pId},</if>
<if test="code != null">#{code},</if>
<if test="time != null">#{time},</if>
<if test="endTime != null">#{endTime},</if>
<if test="deposit != null">#{deposit},</if>
<if test="cost != null">#{cost},</if>
<if test="payType != null">#{payType},</if>
@ -135,6 +138,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<if test="pId != null">p_id = #{pId},</if>
<if test="code != null">code = #{code},</if>
<if test="time != null">time = #{time},</if>
<if test="endTime != null">time = #{endTime},</if>
<if test="deposit != null">deposit = #{deposit},</if>
<if test="cost != null">cost = #{cost},</if>
<if test="payType != null">pay_type = #{payType},</if>