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

添加运营助理岗位

Browse Source
This commit is contained in:
huangdeliang
2020-10-08 21:02:25 +08:00
parent c17f078f7b
commit 5522e23de2
6 changed files with 266 additions and 176 deletions
Download Patch File Download Diff File Expand all files Collapse all files

299
ruoyi-custom/src/main/java/com/ruoyi/custom/domain/SysOrder.java
View File

@ -2,6 +2,7 @@ package com.ruoyi.custom.domain;
import java.math.BigDecimal;
import java.util.Date;
import com.fasterxml.jackson.annotation.JsonFormat;
import org.apache.commons.lang3.builder.ToStringBuilder;
import org.apache.commons.lang3.builder.ToStringStyle;
@ -14,105 +15,178 @@ import com.ruoyi.common.core.domain.BaseEntity;
* @author wonder
* @date 2020-09-24
*/
public class SysOrder extends BaseEntity
{
public class SysOrder extends BaseEntity {
private static final long serialVersionUID = 1L;
/** 编号 */
/**
* 编号
*/
@Excel(name = "编号")
private Long orderId;
/** 客户姓名 */
/**
* 客户姓名
*/
@Excel(name = "客户姓名")
private String customer;
/** 电话 */
/**
* 电话
*/
@Excel(name = "电话")
private String phone;
/** 金额 */
/**
* 金额
*/
@Excel(name = "金额")
private BigDecimal amount;
/** 收款方式 */
/**
* 收款方式
*/
private Long payTypeId;
/** 收款方式 */
/**
* 收款方式
*/
@Excel(name = "收款方式")
private String payType;
/** 售前 */
/**
* 售前
*/
private Long preSaleId;
/** 售前 */
/**
* 售前
*/
@Excel(name = "售前")
private String preSale;
/** 售后 */
/**
* 售后
*/
private Long afterSaleId;
/** 售后 */
/**
* 售后
*/
@Excel(name = "售后")
private String afterSale;
/** 营养师 */
/**
* 营养师
*/
private Long nutritionistId;
/** 营养师 */
/**
* 营养师
*/
@Excel(name = "营养师")
private String nutritionist;
/** 助理营养师 */
/**
* 助理营养师
*/
private Long nutriAssisId;
/** 助理营养师 */
/**
* 助理营养师
*/
@Excel(name = "助理营养师")
private String nutriAssis;
/** 账号 */
/**
* 账号
*/
private Long accountId;
/** 账号 */
/**
* 账号
*/
@Excel(name = "账号")
private String account;
/** 策划 */
/**
* 策划
*/
private Long plannerId;
/** 策划 */
/**
* 策划
*/
@Excel(name = "策划")
private String planner;
/** 策划助理 */
/**
* 策划助理
*/
private Long plannerAssisId;
/** 策划助理 */
/**
* 策划助理
*/
@Excel(name = "策划助理")
private String plannerAssis;
/** 运营 */
/**
* 运营
*/
private Long operatorId;
/** 运营 */
/**
* 运营
*/
@Excel(name = "运营")
private String operator;
/** 推荐人 */
/**
* 运营助理
*/
private Long operatorAssisId;
@Excel(name = "运营助理")
private String operatorAssis;
/**
* 推荐人
*/
@Excel(name = "推荐人")
private String recommender;
/** 服务月数 */
/**
* 服务月数
*/
@Excel(name = "服务月数")
private String serveMonth;
@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")
private Date orderTime;
public void setOperatorAssis(String operatorAssis) {
this.operatorAssis = operatorAssis;
}
public void setOperatorAssisId(Long operatorAssisId) {
this.operatorAssisId = operatorAssisId;
}
public Long getOperatorAssisId() {
return operatorAssisId;
}
public String getOperatorAssis() {
return operatorAssis;
}
public String getReviewStatus() {
return reviewStatus;
}
@ -129,226 +203,201 @@ public class SysOrder extends BaseEntity
return serveMonth;
}
public void setOrderId(Long orderId)
{
public void setOrderId(Long orderId) {
this.orderId = orderId;
}
public Long getOrderId()
{
public Long getOrderId() {
return orderId;
}
public void setCustomer(String customer)
{
public void setCustomer(String customer) {
this.customer = customer;
}
public String getCustomer()
{
public String getCustomer() {
return customer;
}
public void setPhone(String phone)
{
public void setPhone(String phone) {
this.phone = phone;
}
public String getPhone()
{
public String getPhone() {
return phone;
}
public void setAmount(BigDecimal amount)
{
public void setAmount(BigDecimal amount) {
this.amount = amount;
}
public BigDecimal getAmount()
{
public BigDecimal getAmount() {
return amount;
}
public void setPayTypeId(Long payTypeId)
{
public void setPayTypeId(Long payTypeId) {
this.payTypeId = payTypeId;
}
public Long getPayTypeId()
{
public Long getPayTypeId() {
return payTypeId;
}
public void setPayType(String payType)
{
public void setPayType(String payType) {
this.payType = payType;
}
public String getPayType()
{
public String getPayType() {
return payType;
}
public void setPreSaleId(Long preSaleId)
{
public void setPreSaleId(Long preSaleId) {
this.preSaleId = preSaleId;
}
public Long getPreSaleId()
{
public Long getPreSaleId() {
return preSaleId;
}
public void setPreSale(String preSale)
{
public void setPreSale(String preSale) {
this.preSale = preSale;
}
public String getPreSale()
{
public String getPreSale() {
return preSale;
}
public void setAfterSaleId(Long afterSaleId)
{
public void setAfterSaleId(Long afterSaleId) {
this.afterSaleId = afterSaleId;
}
public Long getAfterSaleId()
{
public Long getAfterSaleId() {
return afterSaleId;
}
public void setAfterSale(String afterSale)
{
public void setAfterSale(String afterSale) {
this.afterSale = afterSale;
}
public String getAfterSale()
{
public String getAfterSale() {
return afterSale;
}
public void setNutritionistId(Long nutritionistId)
{
public void setNutritionistId(Long nutritionistId) {
this.nutritionistId = nutritionistId;
}
public Long getNutritionistId()
{
public Long getNutritionistId() {
return nutritionistId;
}
public void setNutritionist(String nutritionist)
{
public void setNutritionist(String nutritionist) {
this.nutritionist = nutritionist;
}
public String getNutritionist()
{
public String getNutritionist() {
return nutritionist;
}
public void setNutriAssisId(Long nutriAssisId)
{
public void setNutriAssisId(Long nutriAssisId) {
this.nutriAssisId = nutriAssisId;
}
public Long getNutriAssisId()
{
public Long getNutriAssisId() {
return nutriAssisId;
}
public void setNutriAssis(String nutriAssis)
{
public void setNutriAssis(String nutriAssis) {
this.nutriAssis = nutriAssis;
}
public String getNutriAssis()
{
public String getNutriAssis() {
return nutriAssis;
}
public void setAccountId(Long accountId)
{
public void setAccountId(Long accountId) {
this.accountId = accountId;
}
public Long getAccountId()
{
public Long getAccountId() {
return accountId;
}
public void setAccount(String account)
{
public void setAccount(String account) {
this.account = account;
}
public String getAccount()
{
public String getAccount() {
return account;
}
public void setPlannerId(Long plannerId)
{
public void setPlannerId(Long plannerId) {
this.plannerId = plannerId;
}
public Long getPlannerId()
{
public Long getPlannerId() {
return plannerId;
}
public void setPlanner(String planner)
{
public void setPlanner(String planner) {
this.planner = planner;
}
public String getPlanner()
{
public String getPlanner() {
return planner;
}
public void setPlannerAssisId(Long plannerAssisId)
{
public void setPlannerAssisId(Long plannerAssisId) {
this.plannerAssisId = plannerAssisId;
}
public Long getPlannerAssisId()
{
public Long getPlannerAssisId() {
return plannerAssisId;
}
public void setPlannerAssis(String plannerAssis)
{
public void setPlannerAssis(String plannerAssis) {
this.plannerAssis = plannerAssis;
}
public String getPlannerAssis()
{
public String getPlannerAssis() {
return plannerAssis;
}
public void setOperatorId(Long operatorId)
{
public void setOperatorId(Long operatorId) {
this.operatorId = operatorId;
}
public Long getOperatorId()
{
public Long getOperatorId() {
return operatorId;
}
public void setOperator(String operator)
{
public void setOperator(String operator) {
this.operator = operator;
}
public String getOperator()
{
public String getOperator() {
return operator;
}
public void setRecommender(String recommender)
{
public void setRecommender(String recommender) {
this.recommender = recommender;
}
public String getRecommender()
{
public String getRecommender() {
return recommender;
}
public void setOrderTime(Date orderTime)
{
public void setOrderTime(Date orderTime) {
this.orderTime = orderTime;
}
public Date getOrderTime()
{
public Date getOrderTime() {
return orderTime;
}
@Override
public String toString() {
return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)
return new ToStringBuilder(this, ToStringStyle.MULTI_LINE_STYLE)
.append("orderId", getOrderId())
.append("customer", getCustomer())
.append("phone", getPhone())
@ -376,6 +425,8 @@ public class SysOrder extends BaseEntity
.append("plannerAssis", getPlannerAssis())
.append("operatorId", getOperatorId())
.append("operator", getOperator())
.append("operatorAssisId", getOperatorAssisId())
.append("operatorAssis", getOperatorAssis())
.append("recommender", getRecommender())
.append("orderTime", getOrderTime())
.append("serveMonth", getServeMonth())

7
ruoyi-custom/src/main/resources/mapper/custom/SysOrderMapper.xml
View File

@ -25,6 +25,7 @@
<result property="plannerId" column="planner_id"/>
<result property="plannerAssisId" column="planner_assis_id"/>
<result property="operatorId" column="operator_id"/>
<result property="operatorAssisId" column="operator_assis_id"/>
<result property="recommender" column="recommender"/>
<result property="orderTime" column="order_time"/>
<result property="serveMonth" column="serve_month"/>
@ -32,7 +33,7 @@
</resultMap>
<sql id="selectSysOrderVo">
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.recommender, o.order_time from sys_order o
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
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
</sql>
@ -52,6 +53,7 @@
<if test="plannerId != null ">and planner_id = #{plannerId}</if>
<if test="plannerAssisId != null ">and planner_assis_id = #{plannerAssisId}</if>
<if test="operatorId != null ">and operator_id = #{operatorId}</if>
<if test="operatorAssisId != null ">and operator_assis_id = #{operatorAssisId}</if>
<if test="recommender != null and recommender != ''">and recommender = #{recommender}</if>
<if test="beginTime != null and beginTime != ''">and date_format(order_time,'%y%m%d') &gt;= date_format(#{beginTime},'%y%m%d')</if>
<if test="endTime != null and endTime != ''">and date_format(order_time,'%y%m%d') &lt;= date_format(#{endTime},'%y%m%d')</if>
@ -87,6 +89,7 @@
<if test="plannerId != null">planner_id,</if>
<if test="plannerAssisId != null">planner_assis_id,</if>
<if test="operatorId != null">operator_id,</if>
<if test="operatorAssisId != null">operator_assis_id,</if>
<if test="recommender != null">recommender,</if>
<if test="orderTime != null">order_time,</if>
<if test="serveMonth != null">serve_month,</if>
@ -111,6 +114,7 @@
<if test="plannerId != null">#{plannerId},</if>
<if test="plannerAssisId != null">#{plannerAssisId},</if>
<if test="operatorId != null">#{operatorId},</if>
<if test="operatorAssisId != null">#{operatorAssisId},</if>
<if test="recommender != null">#{recommender},</if>
<if test="orderTime != null">#{orderTime},</if>
<if test="serveMonth != null">#{serveMonth},</if>
@ -138,6 +142,7 @@
<if test="plannerId != null">planner_id = #{plannerId},</if>
<if test="plannerAssisId != null">planner_assis_id = #{plannerAssisId},</if>
<if test="operatorId != null">operator_id = #{operatorId},</if>
<if test="operatorAssisId != null">operator_assis_id = #{operatorAssisId},</if>
<if test="recommender != null">recommender = #{recommender},</if>
<if test="orderTime != null">order_time = #{orderTime},</if>
<if test="serveMonth != null">serve_month = #{serveMonth},</if>