Merge branch 'master' of http://git.iamberry.com/hexiugang/iamberry-common-parent

# Conflicts:
#	watero-rst-web/src/main/java/com/iamberry/rst/controllers/pts/MachineController.java

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

@@ -88,6 +88,8 @@ public class CustomerInfo  implements Serializable {
     private String visitCompleteName;   //回访联系人
     private String visitCompleteTel;    //回访完成时的电话
     private Integer visitAdminId; //回访提醒人  //指定客服id
+    private Integer visitDesignatedAdminId;  //指定客服id  主要用于指定回访的客服
+    private String visitDesignatedAdminName;  //指定客服名称  主要用于指定回访的客服
 
     /*  问题表 */
     private String describeContent;     //客诉问题描述
@@ -501,4 +503,12 @@ public class CustomerInfo  implements Serializable {
     public void setTypeCompany(Integer typeCompany) {
         this.typeCompany = typeCompany;
     }
+
+    public Integer getVisitDesignatedAdminId() {
+        return visitDesignatedAdminId;
+    }
+
+    public void setVisitDesignatedAdminId(Integer visitDesignatedAdminId) {
+        this.visitDesignatedAdminId = visitDesignatedAdminId;
+    }
 }

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

@@ -112,6 +112,9 @@
       <if test="typeId != null and typeId != ''">
         and c.type_id = #{typeId}
       </if>
+      <if test="visitDesignatedAdminId != null">
+        and v.designated_admin_id = #{visitDesignatedAdminId}
+      </if>
     </where>
     ORDER BY FIELD(c.customer_is_solve, 5, 3, 4, 6, 7, 2, 1),c.customer_id desc
   </select>

watero-rst-web/src/main/java/com/iamberry/rst/controllers/cm/AdminCustomerController.java

@@ -675,10 +675,10 @@ public class AdminCustomerController {
             String result = smsService.sendOtherCMS(phone, text);
 
             if (!"SUCCESS".equals(result)) {
-                return new ResponseJson(505, "添加客诉发送短信失败，失败原因：" + result + "<br>客诉信息发送失败并不影响客诉添加。客诉Id为："+ customerId, 505);
+                return new ResponseJson(505, "添加客诉发送短信失败，失败原因：" + result + "<br>客诉信息发送失败并不影响客诉添加。客诉编号为："+ customerId, 505);
             }
         }
-        return new ResponseJson(200, "添加客诉成功!客诉Id为：" + customerId, 200);
+        return new ResponseJson(200, "添加客诉成功!客诉编号为：" + customerId, 200);
     }
 
     /**

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

@@ -182,7 +182,18 @@
             </div>
 
             <div class="row cl">
-                <label class="form-label col-1 col-sm-1"><span class="c-red">*</span>问题内容：</label>
+            <#--处理描述 - 客诉备注-->
+                <label class="form-label col-1 col-sm-1">问题描述：</label>
+                <div class="formControls col-5 col-sm-5">
+                    <span>问题描述详情，内部使用，不会对外公布。</span>
+                    <script id="describeHandleDescText" type="text/plain" style="width:983px;height:250px;"></script>
+                    </script>
+                    <input type="hidden" id="describeHandleDesc" name="describeHandleDesc">
+                </div>
+            </div>
+
+            <div class="row cl">
+                <label class="form-label col-1 col-sm-1"><span class="c-red">*</span>问题回复：</label>
                 <div class="formControls col-5 col-sm-5">
                     <input type="hidden" name="questionId" id="questionId" value="">
                     <script id="describeContentText" type="text/plain" style="width:983px;height:250px;"></script>
@@ -196,9 +207,9 @@
                     <input type="text" class="input-text associated-phone" value="" placeholder="请输入手机号" id="p-phone" name="">
                 </div>
                 <div class="formControls col-2 col-sm-2" style="width: 10%">
-                    <input type="button" class="btn btn-primary" value="发短信给用户" onclick="sendPhone('p','p-msg');">
+                    <input type="button" class="btn btn-primary" value="发送问题回复给用户" onclick="sendPhone('p','p-msg');">
                 </div>
-                <div class="formControls col-2 col-sm-2" style="width: 10%">
+                <div class="formControls col-2 col-sm-2" style="width: 10%;    margin-left: 40px;">
                     <input type="button" class="btn btn-primary" value="保存QA" onclick="saveQuestion();">
                 </div>
                 <div class="formControls col-2 col-sm-2 msg-phone">
@@ -436,15 +447,7 @@
                 </div>
 
             </div>
-            <div class="row cl">
-                <#--处理描述-->
-                <label class="form-label col-1 col-sm-1">客诉备注：</label>
-                <div class="formControls col-5 col-sm-5">
-                    <script id="describeHandleDescText" type="text/plain" style="width:983px;height:250px;"></script>
-                    </script>
-                    <input type="hidden" id="describeHandleDesc" name="describeHandleDesc">
-                </div>
-            </div>
+
             <div class="row cl">
                 <label class="form-label col-1 col-sm-1"><span class="c-red">*</span>回访信息：</label>
                 <div class="formControls col-10 col-sm-10 skin-minimal">
@@ -1387,7 +1390,7 @@
             }
             if(desc == null || desc == ""){
                 layer.close(index);
-                layer.msg("请填写问题内容！", {icon: 5, time: 3000});
+                layer.msg("请填写问题回复！", {icon: 5, time: 3000});
                 return false;
             }
         }else if(type == "m"){
@@ -1479,7 +1482,7 @@
         }
         if(desc == null || desc == ""){
             layer.close(index);
-            layer.msg("请填写问题内容!", {icon: 5, time: 3000});
+            layer.msg("请填写问题回复!", {icon: 5, time: 3000});
             return false;
         }
 

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

@@ -373,7 +373,7 @@
                         var visitText = "";
                         if(customer.visitStatus == 1){
                             visitText = '(<span class="txt-red">'+convertUndefinedToEmpty(customer.visitName)+'</span>)&nbsp;&nbsp;'+
-                                    '在&nbsp;&nbsp;<span class="txt-red">'+convertUndefinedToEmpty(customer.visitDate)+
+                                    '需要在&nbsp;&nbsp;<span class="txt-red">'+convertUndefinedToEmpty(customer.visitDate)+
                                     '&nbsp;&nbsp;'+convertUndefinedToEmpty(visitTime)+'</span>对&nbsp;&nbsp;<span class="txt-red">'+
                                     convertUndefinedToEmpty(customer.visitName)+'&nbsp;&nbsp;'+
                                     convertUndefinedToEmpty(customer.visitTel)+'</span>&nbsp;&nbsp;进行回访';

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

@@ -91,6 +91,14 @@
                     </#list>
                 </#if>
             </select>
+            <select class="my-select" name="visitDesignatedAdminId" style="height: 36px;width: 120px;margin: 0px;">
+                <option value ="">回访客服</option>
+                <#if adminList?? &&  (adminList?size > 0) >
+                    <#list adminList as admin>
+                        <option value ="${admin.adminId!}" <#if customerInfo.visitDesignatedAdminId??><#if customerInfo.visitDesignatedAdminId ==admin.adminId >selected="selected"</#if></#if>>${admin.adminName!}</option>
+                    </#list>
+                </#if>
+            </select>
             <button type="submit" class="btn" style="background: #32a3d8;color: #fff;-webkit-transform:translateY(-5%);height: 35px;" id="" name=""><i class="Hui-iconfont">&#xe665;</i> 搜索</button>
         </form>
     </div>