Skip to content

P
peizhen-java
Commit eb899f2e by Wangmin
Options

修改订单显示业务名称

parent 898df538
Showing with 43 additions and 96 deletions
pz-system/src/main/java/com/pz/system/domain/vo/DbghOrderItemVo.java
...@@ -16,11 +16,6 @@ import java.util.Date; ...@@ -16,11 +16,6 @@ import java.util.Date;
public class DbghOrderItemVo extends OrderCommonVo { public class DbghOrderItemVo extends OrderCommonVo {
/** /**
* 业务项目
*/
private String project;
/**
* 用户名称 * 用户名称
*/ */
private String userName; private String userName;
...@@ -44,14 +39,6 @@ public class DbghOrderItemVo extends OrderCommonVo { ...@@ -44,14 +39,6 @@ public class DbghOrderItemVo extends OrderCommonVo {
*/ */
private String description; private String description;
/**
* 订单佣金
*/
private Float commission;
/**
* 凭证
*/
private String voucher;
} }
pz-system/src/main/java/com/pz/system/domain/vo/DbmyOrderItemVo.java
...@@ -14,11 +14,6 @@ import lombok.EqualsAndHashCode; ...@@ -14,11 +14,6 @@ import lombok.EqualsAndHashCode;
public class DbmyOrderItemVo extends OrderCommonVo { public class DbmyOrderItemVo extends OrderCommonVo {
/** /**
* 业务项目
*/
private String project;
/**
* 药品名称 * 药品名称
*/ */
private String ypName; private String ypName;
...@@ -78,13 +73,4 @@ public class DbmyOrderItemVo extends OrderCommonVo { ...@@ -78,13 +73,4 @@ public class DbmyOrderItemVo extends OrderCommonVo {
*/ */
private String description; private String description;
/**
* 订单佣金
*/
private Float commission;
/**
* 凭证
*/
private String voucher;
} }
pz-system/src/main/java/com/pz/system/domain/vo/DbwzOrderItemVo.java
...@@ -16,11 +16,6 @@ import java.util.Date; ...@@ -16,11 +16,6 @@ import java.util.Date;
public class DbwzOrderItemVo extends OrderCommonVo { public class DbwzOrderItemVo extends OrderCommonVo {
/** /**
* 业务项目
*/
private String project;
/**
* 用户名称 * 用户名称
*/ */
private String userName; private String userName;
...@@ -35,10 +30,6 @@ public class DbwzOrderItemVo extends OrderCommonVo { ...@@ -35,10 +30,6 @@ public class DbwzOrderItemVo extends OrderCommonVo {
*/ */
private Date visitTime; private Date visitTime;
/**
* 订单佣金
*/
private Float commission;
/** /**
* 主诉 * 主诉
...@@ -76,11 +67,6 @@ public class DbwzOrderItemVo extends OrderCommonVo { ...@@ -76,11 +67,6 @@ public class DbwzOrderItemVo extends OrderCommonVo {
private String description; private String description;
/** /**
* 凭证
*/
private String voucher;
/**
* 上次就医情况 * 上次就医情况
*/ */
private String lastMedicalTreatmentSituation; private String lastMedicalTreatmentSituation;
......
pz-system/src/main/java/com/pz/system/domain/vo/OrderCommonVo.java
...@@ -36,5 +36,28 @@ public class OrderCommonVo { ...@@ -36,5 +36,28 @@ public class OrderCommonVo {
*/ */
private Integer serviceStatus; private Integer serviceStatus;
/**
* 评价标志 0-未评价，1-好评，2-差评
*/
private Integer evaluationFlag;
/**
* 用户评价
*/
private String evaluationContent;
/**
* 凭证
*/
private String voucher;
/**
* 订单佣金
*/
private Float commission;
/**
* 业务项目
*/
private String project;
} }
pz-system/src/main/java/com/pz/system/domain/vo/YypzOrderItemVo.java
...@@ -16,10 +16,6 @@ import java.util.Date; ...@@ -16,10 +16,6 @@ import java.util.Date;
@Data @Data
public class YypzOrderItemVo extends OrderCommonVo { public class YypzOrderItemVo extends OrderCommonVo {
/**
* 业务项目
*/
private String project;
/** /**
* 用户名称 * 用户名称
...@@ -36,10 +32,6 @@ public class YypzOrderItemVo extends OrderCommonVo { ...@@ -36,10 +32,6 @@ public class YypzOrderItemVo extends OrderCommonVo {
*/ */
private String hospital; private String hospital;
/**
* 订单佣金
*/
private Float commission;
/** /**
* 预约电话 * 预约电话
...@@ -51,25 +43,12 @@ public class YypzOrderItemVo extends OrderCommonVo { ...@@ -51,25 +43,12 @@ public class YypzOrderItemVo extends OrderCommonVo {
*/ */
private Date visitTime; private Date visitTime;
/**
* 评价标志 0-未评价，1-好评，2-差评
*/
private Integer evaluationFlag;
/** /**
* 需求描述 * 需求描述
*/ */
private String description; private String description;
/**
* 用户评价
*/
private String evaluationContent;
/**
* 完成凭证
*/
private String voucher;
/** /**
* 备注 * 备注
......
pz-system/src/main/java/com/pz/system/domain/vo/ZyphOrderItemVo.java
...@@ -14,11 +14,6 @@ import lombok.EqualsAndHashCode; ...@@ -14,11 +14,6 @@ import lombok.EqualsAndHashCode;
public class ZyphOrderItemVo extends OrderCommonVo { public class ZyphOrderItemVo extends OrderCommonVo {
/** /**
* 业务项目
*/
private String project;
/**
* 用户名称 * 用户名称
*/ */
private String userName; private String userName;
...@@ -34,11 +29,6 @@ public class ZyphOrderItemVo extends OrderCommonVo { ...@@ -34,11 +29,6 @@ public class ZyphOrderItemVo extends OrderCommonVo {
private String hospital; private String hospital;
/** /**
* 订单佣金
*/
private Float commission;
/**
* 其他需求 * 其他需求
*/ */
private String description; private String description;
...@@ -52,19 +42,4 @@ public class ZyphOrderItemVo extends OrderCommonVo { ...@@ -52,19 +42,4 @@ public class ZyphOrderItemVo extends OrderCommonVo {
* 陪护时间 * 陪护时间
*/ */
private String visitTime; private String visitTime;
/**
* 凭证
*/
private String voucher;
/**
* 评价
*/
private String evaluationContent;
/**
* 是否好评，0-未评价，1-好评，2-差评
*/
private Integer evaluationFlag;
} }
pz-system/src/main/resources/mapper/system/DbghOrderMapper.xml
...@@ -70,7 +70,7 @@ ...@@ -70,7 +70,7 @@
total_order.business_id, total_order.business_id,
total_order.status as orderStatus, total_order.status as orderStatus,
dbgh_order.status as serviceStatus, dbgh_order.status as serviceStatus,
services.name as project, business.name as project,
CONVERT((1 - services.fenmo / 100), decimal(10, 2)) * CONVERT((1 - services.fenmo / 100), decimal(10, 2)) *
CONVERT(services.price, decimal(10, 2)) as commission, CONVERT(services.price, decimal(10, 2)) as commission,
user_vsitor.name as userName, user_vsitor.name as userName,
...@@ -79,8 +79,11 @@ ...@@ -79,8 +79,11 @@
dbgh_order.visit_time, dbgh_order.visit_time,
total_order.remark as description, total_order.remark as description,
dbgh_order.remark, dbgh_order.remark,
total_order.evaluation_content,
total_order.is_satisfaction as evaluation_flag,
dbgh_order.voucher dbgh_order.voucher
from total_order from total_order
left join business on total_order.business_id = business.id
left join dbgh_order on dbgh_order.order_id = total_order.id left join dbgh_order on dbgh_order.order_id = total_order.id
left join services on total_order.service_id = services.id left join services on total_order.service_id = services.id
left join user_vsitor on user_vsitor.id = dbgh_order.visitor left join user_vsitor on user_vsitor.id = dbgh_order.visitor
......
pz-system/src/main/resources/mapper/system/DbmyOrderMapper.xml
...@@ -71,7 +71,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" ...@@ -71,7 +71,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
total_order.business_id, total_order.business_id,
total_order.status as orderStatus, total_order.status as orderStatus,
dbmy_order.status as serviceStatus, dbmy_order.status as serviceStatus,
services.name as project, business.name as project,
CONVERT((1 - services.fenmo / 100), decimal(10, 2)) * CONVERT((1 - services.fenmo / 100), decimal(10, 2)) *
CONVERT(services.price, decimal(10, 2)) as commission, CONVERT(services.price, decimal(10, 2)) as commission,
dbmy_order.yp_name, dbmy_order.yp_name,
...@@ -81,13 +81,16 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" ...@@ -81,13 +81,16 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
dbmy_order.prescription_attachment, dbmy_order.prescription_attachment,
dbmy_order.phone, dbmy_order.phone,
dbmy_order.recipient, dbmy_order.recipient,
dbmy_order.address as address, dbmy_order.address as address,
dbmy_order.address_info, dbmy_order.address_info,
dbmy_order.is_refrigerate, dbmy_order.is_refrigerate,
total_order.remark as description, total_order.remark as description,
dbmy_order.remark, dbmy_order.remark,
dbmy_order.voucher dbmy_order.voucher,
total_order.evaluation_content,
total_order.is_satisfaction as evaluation_flag
from total_order from total_order
left join business on total_order.business_id = business.id
left join dbmy_order on dbmy_order.order_id = total_order.id left join dbmy_order on dbmy_order.order_id = total_order.id
left join services on total_order.service_id = services.id left join services on total_order.service_id = services.id
where total_order.id = #{id} where total_order.id = #{id}
......
pz-system/src/main/resources/mapper/system/DbwzOrderMapper.xml
...@@ -72,7 +72,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" ...@@ -72,7 +72,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
total_order.business_id, total_order.business_id,
total_order.status as orderStatus, total_order.status as orderStatus,
dbwz_order.status as serviceStatus, dbwz_order.status as serviceStatus,
services.name as project, business.name as project,
CONVERT((1 - services.fenmo / 100), decimal(10, 2)) * CONVERT((1 - services.fenmo / 100), decimal(10, 2)) *
CONVERT(services.price, decimal(10, 2)) as commission, CONVERT(services.price, decimal(10, 2)) as commission,
user_vsitor.name as userName, user_vsitor.name as userName,
...@@ -85,10 +85,13 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" ...@@ -85,10 +85,13 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
dbwz_order.service_requirements, dbwz_order.service_requirements,
dbwz_order.last_medical_treatment_situation, dbwz_order.last_medical_treatment_situation,
dbwz_order.post_treatment_condition, dbwz_order.post_treatment_condition,
total_order.remark as description, total_order.evaluation_content,
total_order.is_satisfaction as evaluation_flag,
total_order.remark as description,
dbwz_order.remark, dbwz_order.remark,
dbwz_order.voucher dbwz_order.voucher
from total_order from total_order
left join business on total_order.business_id = business.id
left join dbwz_order on dbwz_order.order_id = total_order.id left join dbwz_order on dbwz_order.order_id = total_order.id
left join services on total_order.service_id = services.id left join services on total_order.service_id = services.id
left join user_vsitor on user_vsitor.id = dbwz_order.visitor left join user_vsitor on user_vsitor.id = dbwz_order.visitor
......
pz-system/src/main/resources/mapper/system/YypzOrderMapper.xml
...@@ -74,7 +74,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" ...@@ -74,7 +74,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
yypz_order.status as serviceStatus, yypz_order.status as serviceStatus,
yypz_order.phone, yypz_order.phone,
yypz_order.visit_time, yypz_order.visit_time,
services.name as project, business.name as project,
total_order.evaluation_content, total_order.evaluation_content,
total_order.is_satisfaction as evaluation_flag, total_order.is_satisfaction as evaluation_flag,
total_order.remark as description, total_order.remark as description,
...@@ -86,6 +86,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" ...@@ -86,6 +86,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
department.title as department, department.title as department,
yypz_order.remark yypz_order.remark
from total_order from total_order
left join business on business.id = total_order.business_id
left join yypz_order on yypz_order.order_id = total_order.id left join yypz_order on yypz_order.order_id = total_order.id
left join services on total_order.service_id = services.id left join services on total_order.service_id = services.id
left join user_vsitor on user_vsitor.id = yypz_order.visitor left join user_vsitor on user_vsitor.id = yypz_order.visitor
......
pz-system/src/main/resources/mapper/system/ZyphOrderMapper.xml
...@@ -76,7 +76,7 @@ ...@@ -76,7 +76,7 @@
total_order.business_id, total_order.business_id,
total_order.status as orderStatus, total_order.status as orderStatus,
zyph_order.status as serviceStatus, zyph_order.status as serviceStatus,
services.name as project, business.name as project,
CONVERT((1 - services.fenmo / 100), decimal(10, 2)) * CONVERT((1 - services.fenmo / 100), decimal(10, 2)) *
CONVERT(services.price, decimal(10, 2)) as commission, CONVERT(services.price, decimal(10, 2)) as commission,
user_vsitor.name as userName, user_vsitor.name as userName,
...@@ -90,6 +90,7 @@ ...@@ -90,6 +90,7 @@
total_order.evaluation_content, total_order.evaluation_content,
total_order.is_satisfaction as evaluation_flag total_order.is_satisfaction as evaluation_flag
from total_order from total_order
left join business on total_order.business_id = business.id
left join zyph_order on zyph_order.order_id = total_order.id left join zyph_order on zyph_order.order_id = total_order.id
left join services on total_order.service_id = services.id left join services on total_order.service_id = services.id
left join user_vsitor on user_vsitor.id = zyph_order.visitor left join user_vsitor on user_vsitor.id = zyph_order.visitor
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment