diff --git a/ruoyi-custom/src/main/java/com/ruoyi/custom/domain/SysOrder.java b/ruoyi-custom/src/main/java/com/ruoyi/custom/domain/SysOrder.java
index 1cd76494c..33d1eace5 100644
--- a/ruoyi-custom/src/main/java/com/ruoyi/custom/domain/SysOrder.java
+++ b/ruoyi-custom/src/main/java/com/ruoyi/custom/domain/SysOrder.java
@@ -158,8 +158,10 @@ public class SysOrder extends BaseEntity {
/**
* 服务月数
*/
- @Excel(name = "服务月数")
- private String serveMonth;
+ @Excel(name = "服务时长")
+ private String serveTime;
+
+ private Long serveTimeId;
@Excel(name = "审核状态", dictType = "cus_review_status")
private String reviewStatus;
@@ -171,6 +173,22 @@ public class SysOrder extends BaseEntity {
@Excel(name = "成交日期", width = 30, dateFormat = "yyyy-MM-dd")
private Date orderTime;
+ public String getServeTime() {
+ return serveTime;
+ }
+
+ public void setServeTimeId(Long serveTimeId) {
+ this.serveTimeId = serveTimeId;
+ }
+
+ public Long getServeTimeId() {
+ return serveTimeId;
+ }
+
+ public void setServeTime(String serveTime) {
+ this.serveTime = serveTime;
+ }
+
public void setOperatorAssis(String operatorAssis) {
this.operatorAssis = operatorAssis;
}
@@ -195,14 +213,6 @@ public class SysOrder extends BaseEntity {
this.reviewStatus = reviewStatus;
}
- public void setServeMonth(String serveMonth) {
- this.serveMonth = serveMonth;
- }
-
- public String getServeMonth() {
- return serveMonth;
- }
-
public void setOrderId(Long orderId) {
this.orderId = orderId;
}
@@ -429,7 +439,8 @@ public class SysOrder extends BaseEntity {
.append("operatorAssis", getOperatorAssis())
.append("recommender", getRecommender())
.append("orderTime", getOrderTime())
- .append("serveMonth", getServeMonth())
+ .append("serveTimeId", getServeTimeId())
+ .append("serveTime", getServeTime())
.append("reviewStatus", getReviewStatus())
.toString();
}
diff --git a/ruoyi-custom/src/main/resources/mapper/custom/SysOrderMapper.xml b/ruoyi-custom/src/main/resources/mapper/custom/SysOrderMapper.xml
index 33bf31e84..5a2d6c50d 100644
--- a/ruoyi-custom/src/main/resources/mapper/custom/SysOrderMapper.xml
+++ b/ruoyi-custom/src/main/resources/mapper/custom/SysOrderMapper.xml
@@ -28,14 +28,16 @@
-
+
+
- select o.order_id, o.review_status, o.customer, o.phone, o.amount, o.serve_month, 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 from sys_order o
+ select o.order_id, o.review_status, o.customer, o.phone, o.amount, 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 from sys_order o
LEFT JOIN (SELECT dict_label, dict_value FROM sys_dict_data WHERE dict_type = 'cus_pay_type') AS pay ON pay.dict_value = o.pay_type_id
LEFT JOIN (SELECT dict_label, dict_value FROM sys_dict_data WHERE dict_type = 'cus_account') AS acc ON acc.dict_value = o.account_id
+ LEFT JOIN (SELECT dict_label, dict_value FROM sys_dict_data WHERE dict_type = 'cus_serve_time') AS ser ON ser.dict_value = o.serve_time_id