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

# Conflicts:
#	watero-rst-interface/src/main/java/com/iamberry/rst/faces/cm/SalesOrderService.java

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

@@ -1650,7 +1650,7 @@
         update tb_rst_sales_order_info
         SET
         sales_post_firm = #{salesPostFirm},
-        sales_is_sublist = null,
+        sales_is_sublist = 1,
         sales_belong_orderId = null
         where
          sales_id IN

watero-rst-service/src/main/java/com/iamberry/rst/service/fm/mapper/complaintDetectInfoMapper.xml

@@ -516,7 +516,10 @@
         detect_confirm_time = #{detectConfirmTime},
       </if>
       <if test="detectBuytime != null" >
-        detect_buy_time = #{detectBuytime}
+        detect_buy_time = #{detectBuytime},
+      </if>
+      <if test="questionDescription != null" >
+        question_description = #{questionDescription}
       </if>
     </set>
     where

watero-rst-web/src/main/webapp/WEB-INF/views/cm/inspection/perfect_detect.ftl

@@ -83,11 +83,25 @@
                         </#list>
                     </#if>
             </select>
-            <div style="display: none;" id="questionProfileDiv">
-                <input class="my-input" type="text"   name="questionProfile" id="questionProfile"  style="width: 93%;"/>
-            </div>
         </div>
     </div>
+        <#--<div class="input-box">
+            <label class="form-label col-3 col-sm-3 " style="text-align: right;margin-top: 14px;"><span class="c-red">*</span>问题描述：</label>
+            <div id="questionProfile" class="formControls col-xs-9 col-sm-9 skin-minimal" style="margin: 10px 0px;padding-left: 0;">
+
+            </div>
+        </div>-->
+        <div class="input-box">
+            <label class="form-label col-3 col-sm-3 huanhang" style="text-align: right;margin-top: 14px;">问题描述：</label>
+            <div class="formControls col-xs-9 col-sm-9 skin-minimal" style="margin-top: -8px;">
+
+                <div class="radio-box">
+                    <textarea rows="3" style="width: 410px;margin-left: -15px;margin-top: 8px;" cols="20" id="questionProfile" name="questionDescription" class="my-textarea" placeholder="">
+
+                    </textarea>
+                </div>
+            </div>
+        </div>
     <div class="input-box">
         <label class="form-label col-3 col-sm-3 huanhang" style="text-align: right;margin-top: 14px;">业务员：</label>
         <div class="formControls col-xs-9 col-sm-9 skin-minimal" style="margin: 10px 0px;padding-left: 0;">
@@ -167,11 +181,20 @@
 </article>
 <script type="text/javascript" src="${path}/common/lib/My97DatePicker/4.8/WdatePicker.js"></script>
 <script type="text/javascript">
+
     function problemDescription() {
         var getvalue = $("#questionId").find("option:selected").attr("tag-id");
-        $("#questionProfile").val(getvalue);
-    }
+        if(getvalue == null || getvalue === "" || typeof(getvalue) === "undefined"){
+            getvalue = "没有问题描述";
+        }
+        $("#questionProfile").html(repalceHtml(getvalue));
 
+    }
+    function repalceHtml(str){
+        var dd=str.replace(/<\/?.+?>/g,"");
+        var dds=dd.replace(/ /g,"");//dds为得到后的内容
+        return dds;
+    }
 
     /**
      * 客诉处理方式回显 state
@@ -451,6 +474,9 @@
                 if (data.returnCode == 200) {
                     for(var i=0;i<data.returnMsg.complaintQuestionInfoList.length;i++){
                         var complaintQuestion= data.returnMsg.complaintQuestionInfoList[i];
+                        if(i === 0){
+                            $("#questionProfile").html(repalceHtml(complaintQuestion.questionProfile));
+                        }
                         html += '<option value="'+ complaintQuestion.questionId +'"  tag-id="'+complaintQuestion.questionProfile+'" >'+ complaintQuestion.questionName +'</option>';
                     }
                 }else{