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

watero-rst-core/src/main/java/com.iamberry.rst.core/fm/ComplaintDetectInfo.java

@@ -147,6 +147,8 @@ public class ComplaintDetectInfo implements Serializable {
     @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
     @JsonFormat(pattern="yyyy-MM-dd HH:mm:ss",timezone = "GMT+8")
     private Date detectBuytime;//购买时间
+
+    private String questionDescription;//问题描述
     public String getQuestionName() {
         return questionName;
     }
@@ -929,4 +931,12 @@ public class ComplaintDetectInfo implements Serializable {
     public void setDetectBuytime(Date detectBuytime) {
         this.detectBuytime = detectBuytime;
     }
+
+    public String getQuestionDescription() {
+        return questionDescription;
+    }
+
+    public void setQuestionDescription(String questionDescription) {
+        this.questionDescription = questionDescription;
+    }
 }

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

@@ -79,7 +79,8 @@
       cd.company_id companyId,
       si.store_name signclosedStoreName,
       cd.detect_confirm_time detectConfirmTime,
-      cd.detect_buy_time detectBuytime
+      cd.detect_buy_time detectBuytime,
+      cd.question_description questionDescription
     from tb_rst_complaint_detect cd
     LEFT JOIN tb_rst_cm_question_describe qd on cd.customer_id = qd.customer_id
     LEFT JOIN tb_rst_product_color ci on cd.product_color_id = ci.color_id
@@ -190,7 +191,8 @@
     cd.detect_is_download detectIsDownload,
     cs.signclosed_customer_desc signclosedCustomerDesc,
     cd.detect_confirm_time detectConfirmTime,
-    cd.detect_buy_time detectBuytime
+    cd.detect_buy_time detectBuytime,
+    cd.question_description questionDescription
     from tb_rst_complaint_detect cd
     LEFT JOIN tb_rst_cm_question_describe qd on cd.customer_id = qd.customer_id
     LEFT JOIN tb_rst_product_color ci on cd.product_color_id = ci.color_id
@@ -562,7 +564,8 @@
     detect_source,
     company_id,
     detect_confirm_time,
-    detect_buy_time
+    detect_buy_time,
+    question_description
     )
     values
       (
@@ -604,7 +607,8 @@
       #{detectSource},
       #{companyId},
       #{detectConfirmTime},
-      #{detectBuytime}
+      #{detectBuytime},
+      #{questionDescription}
       )
   </insert>
 

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

@@ -957,8 +957,8 @@ public class AdminDetectController {
             }
             if(detect.getDescribeHandleDesc()!=null){
                 row.createCell(14).setCellValue(detect.getDescribeHandleDesc());
-            }else if(detect.getQuestionProfile()!=null){
-                row.createCell(143).setCellValue(detect.getQuestionProfile());
+            }else if(detect.getQuestionDescription()!=null){
+                row.createCell(14).setCellValue(detect.getQuestionDescription());
             }else{
                 row.createCell(14).setCellValue("");
             }

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

@@ -92,14 +92,14 @@
             </select>
         </div>
     </div>
-        <#--<div class="input-box" >
+        <div class="input-box" >
             <label class="form-label col-3 col-sm-3 huanhang"  style="text-align: right;"><span class="c-red">*</span>问题描述：</label>
             <div class="formControls col-xs-9 col-sm-9">
                 <div class="radio-box">
-                    <textarea rows="3" style="width: 410px;margin-left: -15px;margin-top: 8px;" cols="20" name="detectItemDesc" id="detectItemDesc" class="my-textarea" placeholder="请输入备注！"></textarea>
+                    <textarea rows="2" style="width: 410px;margin-left: -15px;margin-top: 8px;" cols="20" name="questionDescription" id="questionDescription" class="my-textarea" placeholder="请输入问题描述！"></textarea>
                 </div>
             </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;">

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

@@ -213,7 +213,8 @@
                 <th width="10">问题描述：</th>
                 <td width="10" style="font-weight: normal;"><span><#if detectinfo.questionTitle??>${detectinfo.questionTitle!''}-${detectinfo.questionTitle!''}</#if>
                 <br><#if detectinfo.questionTitle??><#if detectinfo.questionTitle != ""><a href="#" onclick="getDescribeInfo(${detectinfo.customerId!});" style="color : #50a2ea;">查看详情</a></#if></#if>
-                </span></td>
+                </span>
+                <#if detectinfo.questionDescription??>${detectinfo.questionDescription!''}</#if></td>
                 <td width="10"></td>
                 <th width="10"></th>
                 <td width="10" style="font-weight: normal;"></td>

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

@@ -573,7 +573,7 @@
                             $("#signclosedDateTd").html(signclosedInfo.signclosedDate);
                         }
                         if(signclosedInfo.describeHandleDesc != null && signclosedInfo.describeHandleDesc != ""){
-                            $("#describeHandleDescTd").html(repalceHtml(detectInfo.describeHandleDesc));
+                            $("#describeHandleDescTd").html(repalceHtml(signclosedInfo.describeHandleDesc));
                         }
                         if(signclosedInfo.signclosedAddrProvincesName != null && signclosedInfo.signclosedAddrProvincesName != "" &&
                                 signclosedInfo.signclosedAddrCityName != null && signclosedInfo.signclosedAddrCityName != "" &&
@@ -581,7 +581,9 @@
                             $("#signclosedAddrTd").html(signclosedInfo.signclosedAddrProvincesName + "-"+signclosedInfo                                       .signclosedAddrCityName+"-"+signclosedInfo.signclosedAddrAreaName);
                         }
                     }
-
+                    if(detectInfo.questionDescription != null && detectInfo.questionDescription != ""){
+                        $("#describeHandleDescTd").html(detectInfo.questionDescription);
+                    }
                     if(detectInfo.detectConfirmTime != null && detectInfo.detectConfirmTime != ""){
                         $("#customerCreateTimeTd").html(detectInfo.detectConfirmTime);
                     }else if(detectInfo.customerCreateTime != null && detectInfo.customerCreateTime != ""){