bugfix - 查询订单详情中添加emUserId字段

pz-system/src/main/java/com/pz/merchant/domain/vo/SonOrderVo.java

@@ -39,9 +39,4 @@ public class SonOrderVo {
      */
     private Date visitTime;
 
-    /**
-     * 接单员id
-     */
-    private Long euserId;
-
 }

pz-system/src/main/java/com/pz/system/domain/vo/DbwzOrderItemVo.java

@@ -71,5 +71,9 @@ public class DbwzOrderItemVo extends OrderCommonVo {
      */
     private String postTreatmentCondition;
 
+    /**
+     * 用户ID
+     */
     private Integer userId;
+
 }

pz-system/src/main/java/com/pz/system/domain/vo/OrderCommonVo.java

@@ -70,4 +70,9 @@ public class OrderCommonVo {
      */
     private String remark;
 
+    /**
+     * 接单人员ID
+     */
+    private Long emUserId;
+
 }

pz-system/src/main/resources/mapper/system/DbghOrderMapper.xml

@@ -56,11 +56,8 @@
                dbgh_order.status as orderStatus,
                sys_user.avatar,
                hospital.name     as hospital,
-               dbgh_order.visit_time,
-               e.uid as euserId
+               dbgh_order.visit_time
         from dbgh_order
-                 left join total_order as t on t.id = dbgh_order.order_id
-                 left join employees as e on e.id = t.em_id
                  left join user_vsitor as vsitor on vsitor.id = dbgh_order.visitor
                  left join sys_user on sys_user.user_id = vsitor.uid
                  left join hospital on hospital.id = dbgh_order.hid
@@ -84,9 +81,11 @@
                dbgh_order.remark,
                total_order.evaluation_content,
                total_order.is_satisfaction             as evaluation_flag,
-               dbgh_order.voucher
+               dbgh_order.voucher,
+               employees.uid                           as emUserId
         from total_order
                  left join business on total_order.business_id = business.id
+                 left join employees on employees.id = total_order.em_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 user_vsitor on user_vsitor.id = dbgh_order.visitor

pz-system/src/main/resources/mapper/system/DbmyOrderMapper.xml

@@ -58,11 +58,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     <select id="selectSonOrderInfoByTotalId" resultType="com.pz.merchant.domain.vo.SonOrderVo">
         select dbmy_order.status  as orderStatus,
                sys_user.nick_name as userName,
-               sys_user.avatar,
-               employees.uid as euserId
+               sys_user.avatar
         from dbmy_order
                  left join total_order on total_order.id = dbmy_order.order_id
-                 left join employees on employees.id = total_order.em_id
                  left join sys_user on sys_user.user_id = total_order.uid
         where dbmy_order.order_id = #{id}
     </select>
@@ -90,9 +88,11 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
                dbmy_order.remark,
                dbmy_order.voucher,
                total_order.evaluation_content,
-               total_order.is_satisfaction             as evaluation_flag
+               total_order.is_satisfaction             as evaluation_flag,
+               employees.uid                           as emUserId
         from total_order
                  left join business on total_order.business_id = business.id
+                 left join employees on total_order.em_id = employees.id
                  left join dbmy_order on dbmy_order.order_id = total_order.id
                  left join services on total_order.service_id = services.id
         where total_order.id = #{id}

pz-system/src/main/resources/mapper/system/DbwzOrderMapper.xml

@@ -59,11 +59,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         select vsitor.name       as userName,
                dbwz_order.status as orderStatus,
                sys_user.avatar,
-               dbwz_order.visit_time,
-               employees.uid as euserId
+               dbwz_order.visit_time
         from dbwz_order
-                 left join total_order on total_order.id = dbwz_order.order_id
-                 left join employees on employees.id = total_order.em_id
                  left join user_vsitor as vsitor on vsitor.id = dbwz_order.visitor
                  left join sys_user on sys_user.user_id = vsitor.uid
         where dbwz_order.order_id = #{id}
@@ -93,13 +90,15 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
                total_order.remark                      as description,
                dbwz_order.remark,
                dbwz_order.voucher,
-               total_order.uid              as userId,
+               total_order.uid                         as userId,
                dbwz_order.voucher,
-               dbwz_order.indications                  as doctor
+               dbwz_order.indications                  as doctor,
+               employees.uid                           as emUserId
         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 services on total_order.service_id = services.id
+                 left join employees on employees.id = total_order.em_id
                  left join user_vsitor on user_vsitor.id = dbwz_order.visitor
                  left join department on department.id = dbwz_order.did
         where total_order.id = #{id}

pz-system/src/main/resources/mapper/system/YypzOrderMapper.xml

@@ -58,11 +58,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
                yypz_order.status as orderStatus,
                sys_user.avatar,
                hospital.name as hospital,
-               yypz_order.visit_time,
-               employees.uid as euserId
+               yypz_order.visit_time
         from yypz_order
-                 left join total_order on total_order.id = yypz_order.order_id
-                 left join employees on employees.id = total_order.em_id
                  left join user_vsitor as vsitor on vsitor.id = yypz_order.visitor
                  left join sys_user on sys_user.user_id = vsitor.uid
                  left join hospital on hospital.id = yypz_order.hid
@@ -88,11 +85,13 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
                hospital.name                           as hospital,
                department.title                        as department,
                yypz_order.remark,
-               total_order.uid                         as uid
+               total_order.uid                         as uid,
+               employees.uid                           as emUserId
         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 services on total_order.service_id = services.id
+                 left join employees on employees.id = total_order.em_id
                  left join user_vsitor on user_vsitor.id = yypz_order.visitor
                  left join hospital on yypz_order.hid = hospital.id
                  left join department on department.id = yypz_order.did

pz-system/src/main/resources/mapper/system/ZqghOrderMapper.xml

@@ -56,12 +56,9 @@
     <select id="selectSonOrderInfoByTotalId" resultType="com.pz.merchant.domain.vo.SonOrderVo">
         select user.nick_name    as userName,
                zqgh_order.status as orderStatus,
-               user.avatar,
-               employees.uid     as euserId
+               user.avatar
         from zqgh_order
                  left join total_order on total_order.id = zqgh_order.order_id
-                 left join employees on employees.id = total_order.em_id
-                 left join total_order on total_order.id = zqgh_order.order_id
                  left join sys_user as user on user.user_id = total_order.uid
         where zqgh_order.order_id = #{id}
     </select>

pz-system/src/main/resources/mapper/system/ZyphOrderMapper.xml

@@ -62,11 +62,8 @@
                zyph_order.status as orderStatus,
                sys_user.avatar,
                hospital.name as hospital,
-               zyph_order.start_day as visitTime,
-               employees.uid  as euserId
+               zyph_order.start_day as visitTime
         from zyph_order
-                 left join total_order on total_order.id = zyph_order.order_id
-                 left join employees on employees.id = total_order.em_id
                  left join user_vsitor as vsitor on vsitor.id = zyph_order.visitor
                  left join sys_user on sys_user.user_id = vsitor.uid
                  left join hospital on hospital.id = zyph_order.hid
@@ -91,10 +88,12 @@
                concat(zyph_order.start_time, ' ~ ', zyph_order.end_time) as visitTime,
                zyph_order.voucher,
                total_order.evaluation_content,
-               total_order.is_satisfaction                               as evaluation_flag
+               total_order.is_satisfaction                               as evaluation_flag,
+               employees.uid                                             as emUserId
         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 employees on employees.id = total_order.em_id
                  left join services on total_order.service_id = services.id
                  left join user_vsitor on user_vsitor.id = zyph_order.visitor
                  left join hospital on zyph_order.hid = hospital.id