Skip to content

P
peizhen-java
Commit 94a97290 by 邹磊浩
Options

修改代码

parent 4575f592
Showing with 43 additions and 39 deletions
pz-system/src/main/java/com/pz/system/domain/vo/DbwzOrderVo.java
...@@ -170,4 +170,6 @@ public class DbwzOrderVo { ...@@ -170,4 +170,6 @@ public class DbwzOrderVo {
private String isSatisfaction; private String isSatisfaction;
private String evaluationContent; private String evaluationContent;
private Date createTime;
} }
pz-system/src/main/resources/mapper/system/DbwzOrderMapper.xml
<?xml version="1.0" encoding="UTF-8" ?> <?xml version="1.0" encoding="UTF-8" ?>
<!DOCTYPE mapper <!DOCTYPE mapper
PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
"http://mybatis.org/dtd/mybatis-3-mapper.dtd"> "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.pz.system.mapper.DbwzOrderMapper"> <mapper namespace="com.pz.system.mapper.DbwzOrderMapper">
<resultMap type="com.pz.system.domain.DbwzOrder" id="DbwzOrderResult"> <resultMap type="com.pz.system.domain.DbwzOrder" id="DbwzOrderResult">
...@@ -30,26 +30,27 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" ...@@ -30,26 +30,27 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
</resultMap> </resultMap>
<select id="findDbwzOrderVoPage" resultType="com.pz.system.domain.vo.DbwzOrderVo"> <select id="findDbwzOrderVoPage" resultType="com.pz.system.domain.vo.DbwzOrderVo">
SELECT SELECT
tlo.order_sn AS orderSn, tlo.order_sn AS orderSn,
tlo.pay_money AS PayMoney, tlo.pay_money AS PayMoney,
s.`name` AS serviceName, s.`name` AS serviceName,
c.`name` AS cityName, c.`name` AS cityName,
d.title AS title, d.title AS title,
e.`name` AS eName, e.`name` AS eName,
tlo.remark AS remark, tlo.remark AS remark,
yyod.visit_time AS visitTime, yyod.visit_time AS visitTime,
yyod.`status` AS yStatus, yyod.`status` AS yStatus,
tlo.`status` AS tStatus, tlo.`status` AS tStatus,
tlo.is_satisfaction AS isSatisfaction, tlo.is_satisfaction AS isSatisfaction,
tlo.evaluation_content AS evaluationContent, tlo.evaluation_content AS evaluationContent,
yyod.over_time AS overtime, yyod.over_time AS overtime,
yyod.voucher AS voucher yyod.voucher AS voucher,
yyod.*
FROM dbwz_order AS yyod FROM dbwz_order AS yyod
LEFT JOIN total_order AS tlo ON yyod.order_id = tlo.id LEFT JOIN total_order AS tlo ON yyod.order_id = tlo.id
LEFT JOIN city AS c ON c.id = tlo.city_id LEFT JOIN city AS c ON c.id = tlo.city_id
LEFT JOIN department AS d ON d.id = yyod.did LEFT JOIN department AS d ON d.id = yyod.did
LEFT JOIN services AS s ON s.id = tlo.service_id LEFT JOIN services AS s ON s.id = tlo.service_id
LEFT JOIN employees AS e ON e.id = tlo.em_id LEFT JOIN employees AS e ON e.id = tlo.em_id
<if test="bo.orderSn != null and bo.orderSn != ''"> <if test="bo.orderSn != null and bo.orderSn != ''">
where tlo.order_sn LIKE CONCAT('%', #{bo.orderSn}, '%') where tlo.order_sn LIKE CONCAT('%', #{bo.orderSn}, '%')
</if> </if>
...@@ -60,7 +61,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" ...@@ -60,7 +61,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
dbwz_order.status as orderStatus, dbwz_order.status as orderStatus,
sys_user.avatar, sys_user.avatar,
dbwz_order.visit_time, dbwz_order.visit_time,
dbwz_order.id as sonOrderId dbwz_order.id as sonOrderId
from dbwz_order from dbwz_order
left join user_vsitor as vsitor on vsitor.id = dbwz_order.visitor left join user_vsitor as vsitor on vsitor.id = dbwz_order.visitor
left join sys_user on sys_user.user_id = vsitor.uid left join sys_user on sys_user.user_id = vsitor.uid
...@@ -68,18 +69,18 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" ...@@ -68,18 +69,18 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
</select> </select>
<select id="selectDbwzOrderDetailDataByTotalId" resultType="com.pz.system.domain.vo.DbwzOrderItemVo"> <select id="selectDbwzOrderDetailDataByTotalId" resultType="com.pz.system.domain.vo.DbwzOrderItemVo">
select total_order.id as orderId, select total_order.id as orderId,
dbwz_order.id as serviceOrderId, dbwz_order.id as serviceOrderId,
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, services.name as project,
business.name as businessName, business.name as businessName,
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,
dbwz_order.visit_time, dbwz_order.visit_time,
department.title as department, department.title as department,
dbwz_order.chief_complaint, dbwz_order.chief_complaint,
dbwz_order.history_of_present_illness, dbwz_order.history_of_present_illness,
dbwz_order.past_history, dbwz_order.past_history,
...@@ -88,14 +89,14 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" ...@@ -88,14 +89,14 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
dbwz_order.last_medical_treatment_situation, dbwz_order.last_medical_treatment_situation,
dbwz_order.post_treatment_condition, dbwz_order.post_treatment_condition,
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,
dbwz_order.remark, dbwz_order.remark,
dbwz_order.voucher, dbwz_order.voucher,
total_order.uid as userId, total_order.uid as userId,
dbwz_order.voucher, dbwz_order.voucher,
dbwz_order.indications as doctor, dbwz_order.indications as doctor,
employees.uid as euserId employees.uid as euserId
from total_order from total_order
left join business on total_order.business_id = business.id 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
...@@ -107,8 +108,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" ...@@ -107,8 +108,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
</select> </select>
<select id="selectFinishTime" resultType="java.lang.String"> <select id="selectFinishTime" resultType="java.lang.String">
select visit_time select visit_time
from total_order t left join dbwz_order d on d.order_id = t.id from total_order t
where t.id = #{id} left join dbwz_order d on d.order_id = t.id
where t.id = #{id}
</select> </select>
......
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