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-service/src/main/java/com/iamberry/rst/service/cm/mapper/complaintQuestionInfoMapper.xml

@@ -42,7 +42,8 @@
       tb_rst_complaint_question.question_create_time,
       tb_rst_complaint_question.question_update_time,
       tb_rst_complaint_question.question_resolved_num,
-      tb_rst_complaint_question.question_not_solved_num
+      tb_rst_complaint_question.question_not_solved_num,
+      tb_rst_complaint_type.complaint_id AS complaintId
     FROM
       tb_rst_complaint_question
     INNER JOIN tb_rst_complaint_small_class ON tb_rst_complaint_question.small_class_id = tb_rst_complaint_small_class.small_class_id

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

@@ -607,13 +607,25 @@
                                     case 4:renewedSchedule += '检查未通过';break;
                                 }
                             }
+                            var detectRevolutionProducedMsg = "";
+                            switch (this.detectRevolutionProduced){
+                                case 1:
+                                    detectRevolutionProducedMsg = "待转入";
+                                    break;
+                                case 2:
+                                    detectRevolutionProducedMsg = "已转入";
+                                    break;
+                                case 3:
+                                    detectRevolutionProducedMsg = "不需要转入";
+                                    break;
+                            }
                             var detect_tr = '<tr><td>'+convertUndefinedToEmpty(this.detectPhenomenon)+'</td>'
                                             + '<td>'+convertUndefinedToEmpty(this.detectFailureClassification)+'</td>'
                                             + '<td>'+convertUndefinedToEmpty(this.detectFailureCause)+'</td>'
                                             + '<td>'+convertUndefinedToEmpty(this.detectResults)+'</td>'
                                             + '<td>'+convertUndefinedToEmpty(this.detectPoint)+'</td>'
                                             + '<td>'+convertUndefinedToEmpty(this.detectAnalysis)+'</td>'
-                                            + '<td>'+convertUndefinedToEmpty(this.detectRevolutionProduced)+'</td></tr>';
+                                            + '<td>'+convertUndefinedToEmpty(detectRevolutionProducedMsg)+'</td></tr>';
                             detect_table.append(detect_tr);
                             var maintenance_tr = '<tr><td>'+convertUndefinedToEmpty(this.maintenanceIdRepair)+'</td>'
                                                 + '<td>'+convertUndefinedToEmpty(this.maintenanceContent)+'</td>'

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

@@ -603,13 +603,25 @@
                                     case 4:repairSchedule += '检查未通过';break;
                                 }
                             }
+                            var detectRevolutionProducedMsg = "";
+                            switch (this.detectRevolutionProduced){
+                                case 1:
+                                    detectRevolutionProducedMsg = "待转入";
+                                    break;
+                                case 2:
+                                    detectRevolutionProducedMsg = "已转入";
+                                    break;
+                                case 3:
+                                    detectRevolutionProducedMsg = "不需要转入";
+                                    break;
+                            }
                             var detect_tr = '<tr><td>'+convertUndefinedToEmpty(this.detectPhenomenon)+'</td>'
                                     + '<td>'+convertUndefinedToEmpty(this.detectFailureClassification)+'</td>'
                                     + '<td>'+convertUndefinedToEmpty(this.detectFailureCause)+'</td>'
                                     + '<td>'+convertUndefinedToEmpty(this.detectResults)+'</td>'
                                     + '<td>'+convertUndefinedToEmpty(this.detectPoint)+'</td>'
                                     + '<td>'+convertUndefinedToEmpty(this.detectAnalysis)+'</td>'
-                                    + '<td>'+convertUndefinedToEmpty(this.detectRevolutionProduced)+'</td></tr>';
+                                    + '<td>'+convertUndefinedToEmpty(detectRevolutionProducedMsg)+'</td></tr>';
                             detect_table.append(detect_tr);
                             var maintenance_tr = '<tr><td>'+convertUndefinedToEmpty(this.maintenanceIdRepair)+'</td>'
                                     + '<td>'+convertUndefinedToEmpty(this.maintenanceContent)+'</td>'

watero-rst-web/src/main/webapp/WEB-INF/views/cm/signclosed/complete_signclosed.ftl

@@ -78,7 +78,7 @@
                <#if ifcomplaintSignclosedInfo?? >${complaintSignclosedInfo.signclosedCustomerDesc!''}</#if>
             </div>
             <div class="row cl">
-                <label class="form-label col-3 col-sm-3">寄回产品：</label>
+                <label class="form-label col-3 col-sm-3"><span class="c-red">*</span>寄回产品：</label>
                 <div class="formControls col-8 col-sm-8 text-c" id="produceSelect">
                     <div>
                         <input type="text" oninput="selectProduct();" onpropertychange="selectProduct();" class="input-text" style="width: 100%;" id="selectProcuct" name="selectProcuct" placeholder="请输入产品名称搜索">

watero-rst-web/src/main/webapp/WEB-INF/views/cm/signclosed/update_sender.ftl

@@ -104,7 +104,7 @@
 
             <div class="row cl">
                 <label class="form-label col-3">
-                    <div class="tit-2">原寄送信息</div>
+                    <div class="tit-2">现寄送信息</div>
                 </label>
                 <div class="formControls col-9">
                 </div>