Song/xkrs_ms
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

订单导出修改，增加进粉时间

Browse Source
This commit is contained in:
xiezhijun
2021-03-30 15:29:24 +08:00
parent 49d5364022
commit 8b07969264
3 changed files with 17 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
stdiet-custom/src/main/java/com/stdiet/custom/domain/SysOrder.java
View File

@@ -23,9 +23,16 @@ public class SysOrder extends BaseEntity {
/**
* 编号
*/
@Excel(name = "编号")
//@Excel(name = "编号")
private Long orderId;
/**
* 成交日期
*/
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
@Excel(name = "成交时间", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss")
private Date orderTime;
private Long cusId;
/**
@@ -171,7 +178,7 @@ public class SysOrder extends BaseEntity {
/**
* 推荐人
*/
@Excel(name = "推荐人")
//@Excel(name = "推荐人")
private String recommender;
/**
@@ -191,13 +198,6 @@ public class SysOrder extends BaseEntity {
@Excel(name = "审核状态", dictType = "cus_review_status")
private String reviewStatus;
/**
* 成交日期
*/
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
@Excel(name = "成交时间", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss")
private Date orderTime;
/**
* 调理项目id
*/
@@ -226,7 +226,7 @@ public class SysOrder extends BaseEntity {
/**
* 服务天数
*/
@Excel(name = "服务天数", width = 30)
//@Excel(name = "服务天数", width = 30)
private Integer serverDay;
/**

4
stdiet-custom/src/main/resources/mapper/custom/SysOrderMapper.xml
View File

@@ -57,10 +57,10 @@
</resultMap>
<sql id="selectSysOrderVo">
select o.order_id, o.review_status, o.cus_id, sc.name as customer, sc.phone, o.amount, o.start_time, o.pause_time, o.status, o.weight, ser.dict_label as serve_time,
select o.order_id, o.review_status, o.cus_id, sc.name as customer, sc.phone, sc.fans_time as become_fan_time, o.amount, o.start_time, o.pause_time, o.status, o.weight, ser.dict_label as serve_time,
o.serve_time_id, o.pay_type_id, pay.dict_label as pay_type, o.pre_sale_id, o.create_by, o.create_time, o.after_sale_id, o.update_by, o.update_time,
o.nutritionist_id, o.remark, o.nutri_assis_id, o.account_id, acc.dict_label as account, o.planner_id, o.planner_assis_id, o.operator_id, o.operator_assis_id,
o.recommender, o.order_time,o.give_serve_day,o.conditioning_project_id,cp.dict_label as conditioning_project,o.server_end_time,o.become_fan_time,
o.recommender, o.order_time,o.give_serve_day,o.conditioning_project_id,cp.dict_label as conditioning_project,o.server_end_time,
o.on_sale_id,o.order_type,o.order_count_type,o.order_money_type,o.main_order_id,o.after_sale_commiss_order
from sys_order o
LEFT JOIN sys_customer sc ON sc.id = o.cus_id