套接了查看回访信息的页面

watero-rst-core/src/main/java/com.iamberry.rst.core/cm/Visit.java

@@ -13,10 +13,14 @@ public class Visit implements Serializable {
 
     //客诉基本信息主键
     private Integer customerId;
-    //提醒人
+    //提醒人Id
     private Integer adminId;
-    //指定人
+    //提醒人
+    private String adminName;
+    //指定人Id
     private Integer designatedAdminId;
+    //指定人名称
+    private String designatedAdminName;
     //回访人姓名
     private String visitName;
     //回访人手机号码
@@ -178,4 +182,20 @@ public class Visit implements Serializable {
     public void setDesignatedAdminId(Integer designatedAdminId) {
         this.designatedAdminId = designatedAdminId;
     }
+
+    public String getDesignatedAdminName() {
+        return designatedAdminName;
+    }
+
+    public void setDesignatedAdminName(String designatedAdminName) {
+        this.designatedAdminName = designatedAdminName;
+    }
+
+    public String getAdminName() {
+        return adminName;
+    }
+
+    public void setAdminName(String adminName) {
+        this.adminName = adminName;
+    }
 }

watero-rst-service/src/main/java/com/iamberry/rst/service/cm/mapper/visitMapper.xml

@@ -32,9 +32,13 @@
   <!-- 查询回访列表 -->
   <select id="listVisit" parameterType="Visit" resultType="Visit">
     SELECT
-      *
+      v.*,
+      a.admin_name designatedAdminName,
+      sa.admin_name adminName
     FROM
-      tb_rst_visit
+      tb_rst_visit v
+    LEFT JOIN tb_rst_sys_admin a ON v.designated_admin_id = a.admin_id
+    LEFT JOIN tb_rst_sys_admin sa ON v.admin_id = sa.admin_id
     <where>
       customer_id = #{customerId}
     </where>

watero-rst-web/src/main/webapp/WEB-INF/views/cm/customer/visit_detail.ftl

@@ -18,15 +18,15 @@
 <article class="cl pd-20">
     <form action="" method="post" class="form form-horizontal" id="form-article-add">
         <div class="row cl">
-            <div class="formControls col-2 col-sm-2">
+            <div class="formControls col-2 col-sm-2 text-r">
                 <strong>回访客服：</strong>
             </div>
-            <div class="formControls col-10 col-sm-10">
-                王笑笑(杨继林指定)
+            <div class="formControls col-10 col-sm-10" id="adminName">
+
             </div>
         </div>
         <div class="row cl">
-            <div class="formControls col-2 col-sm-2">
+            <div class="formControls col-2 col-sm-2 text-r">
                 <strong>回访日期：</strong>
             </div>
             <div class="formControls col-10 col-sm-10" id="txtVisitCompleteDate">
@@ -34,7 +34,7 @@
             </div>
         </div>
         <div class="row cl">
-            <div class="formControls col-2 col-sm-2">
+            <div class="formControls col-2 col-sm-2 text-r">
                 <strong>回访客户：</strong>
             </div>
             <div class="formControls col-10 col-sm-10" id="txtVisitCompleteName">
@@ -42,7 +42,7 @@
             </div>
         </div>
         <div class="row cl">
-            <div class="formControls col-2 col-sm-2">
+            <div class="formControls col-2 col-sm-2 text-r">
                 <strong>客户电话：</strong>
             </div>
             <div class="formControls col-10 col-sm-10" id="txtVisitCompleteTel">
@@ -50,7 +50,7 @@
             </div>
         </div>
         <div class="row cl">
-            <div class="formControls col-2 col-sm-2">
+            <div class="formControls col-2 col-sm-2 text-r">
                 <strong>回访备注：</strong>
             </div>
             <div class="formControls col-10 col-sm-10" id="txtVisitCompleteRemark">
@@ -78,6 +78,11 @@
             success: function(data){
                 if (data.returnCode == 200) {
                     var visit = data.returnMsg.visit;
+                    if (visit.adminId == visit.designatedAdminId) {
+                        $('#adminName').html(visit.adminName+"(自己指定)");
+                    } else {
+                        $('#adminName').html(visit.adminName+"("+visit.designatedAdminName+"指定)");
+                    }
                     $('#txtVisitCompleteDate').html(visit.visitCompleteDate);
                     $('#txtVisitCompleteName').html(visit.visitCompleteName);
                     $('#txtVisitCompleteTel').html(visit.visitCompleteTel);