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

# Conflicts:
#	watero-rst-web/src/main/java/com/iamberry/rst/controllers/order/AdminSalesOrderController.java

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

@@ -355,6 +355,16 @@
       GROUP BY ss.relation_id
       ) sxx
       ) sx ON sx.customer_id = c.customer_id
+      LEFT JOIN (
+      SELECT ss.*
+      from (
+      select tb_rst_cm_sendback_info.*,tb_rst_cm_relation.customer_id
+      FROM tb_rst_cm_sendback_info
+      LEFT JOIN tb_rst_cm_relation on tb_rst_cm_relation.relation_id = tb_rst_cm_sendback_info.relation_id
+      ORDER BY
+      sendback_create_time desc
+      ) ss
+      ) sss ON sss.customer_id = c.customer_id
       LEFT JOIN (SELECT
       signclosed_id,
       signclosed_customer_id,

watero-rst-service/src/main/java/com/iamberry/rst/service/fm/ComplaintDetectInfoServiceImpl.java

@@ -534,7 +534,7 @@ public class ComplaintDetectInfoServiceImpl implements ComplaintDetectInfoServic
 
     @Override
     public Integer updatePrint(ComplaintDetectInfo detectInfo) {
-        ComplaintDetectInfo cdi = complaintDetectInfoMapper.getDetectByIdFast(detectInfo.getDetectId());
+        /*ComplaintDetectInfo cdi = complaintDetectInfoMapper.getDetectByIdFast(detectInfo.getDetectId());
         if(!Objects.equals(cdi.getDetectState(), detectInfo.getDetectState())){ //修改状态时判断状态，来调整库存
             switch (detectInfo.getDetectState()){    //detectState
                 case 23:
@@ -542,7 +542,7 @@ public class ComplaintDetectInfoServiceImpl implements ComplaintDetectInfoServic
                 default:
                     break;
             }
-        }
+        }*/
         return complaintDetectInfoMapper.updateDetectById(detectInfo);
     }
 

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

@@ -59,8 +59,7 @@
       cd.scrap_completion_time scrapCompletionTime,
       qd.describe_content describeContent,
       qd.describe_handle_desc describeHandleDesc,
-      sa.admin_name adminName,
-      cd.detect_is_whetherLess detectIsWhetherLess
+      sa.admin_name adminName
     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_info pi ON cd.product_id = pi.product_id
@@ -169,8 +168,7 @@
     cd.scrap_completion_time scrapCompletionTime,
     qd.describe_content describeContent,
     qd.describe_handle_desc describeHandleDesc,
-    sa.admin_name adminName,
-    cd.detect_is_whetherLess detectIsWhetherLess
+    sa.admin_name adminName
     from tb_rst_complaint_detect cd
     LEFT JOIN tb_rst_product_info pi ON cd.product_id = pi.product_id
     LEFT JOIN tb_rst_cm_question_describe qd on cd.customer_id = qd.customer_id
@@ -314,9 +312,6 @@
       <if test="maintenanceResults != null and maintenanceResults != ''">
         and cd.maintenance_results = #{maintenanceResults}
       </if>
-      <if test="detectIsWhetherLess != null and detectIsWhetherLess != ''">
-        and cd.detect_is_whetherLess  = #{detectIsWhetherLess}
-      </if>
     </where>
       GROUP BY cd.detect_id
       ORDER BY cd.detect_create_time DESC
@@ -427,9 +422,6 @@
       <if test="scrapCompletionTime != null and scrapCompletionTime != ''" >
         scrap_completion_time = #{scrapCompletionTime},
       </if>
-      <if test="detectIsWhetherLess != null and detectIsWhetherLess != ''">
-        detect_is_whetherLess  = #{detectIsWhetherLess}
-      </if>
     </set>
     where
         detect_id = #{detectId,jdbcType=INTEGER}
@@ -467,8 +459,7 @@
     detect_is_refurbishing,
     maintenance_results,
     detect_number,
-    maintenance_cut_time,
-    detect_is_whetherLess
+    maintenance_cut_time
     )
     values
       (
@@ -501,8 +492,7 @@
       #{detectIsRefurbishing},
       #{maintenanceResults},
       #{detectNumber},
-      #{maintenanceCutTime},
-      #{detectIsWhetherLess}
+      #{maintenanceCutTime}
       )
   </insert>
 

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

@@ -251,9 +251,9 @@
                                 <#if customer.beMaintenance??><#if customer.beMaintenance gt 0 >待维修：<span class="c-red">${customer.beMaintenance}</span><br></#if></#if>
                                 <#if customer.beRefurbished??><#if customer.beRefurbished gt 0 >待翻新：<span class="c-red">${customer.beRefurbished}</span><br></#if></#if>
                                 <#if customer.beScrapped??><#if customer.beScrapped gt 0 >待报废：<span class="c-red">${customer.beScrapped}</span><br></#if></#if>
-                                <#if customer.beContact??><#if customer.beContact gt 0 >待联系：<span class="c-red">${customer.beContact}</span></#if></#if>
-                                <#if customer.completeMaintenanceNum??><#if customer.completeMaintenanceNum gt 0 >维修完成：<span class="c-success">${customer.completeMaintenanceNum}</span></#if></#if>
-                                <#if customer.beenScrappedNum??><#if customer.beenScrappedNum gt 0 >已报废：<span class="c-success">${customer.beenScrappedNum}</span></#if></#if>
+                                <#if customer.beContact??><#if customer.beContact gt 0 >待联系：<span class="c-red">${customer.beContact}</span><br></#if></#if>
+                                <#if customer.completeMaintenanceNum??><#if customer.completeMaintenanceNum gt 0 >维修完成：<span class="c-success">${customer.completeMaintenanceNum}</span><br></#if></#if>
+                                <#if customer.beenScrappedNum??><#if customer.beenScrappedNum gt 0 >已报废：<span class="c-success">${customer.beenScrappedNum}</span><br></#if></#if>
                                 <#if customer.beenRenovatedNum??><#if customer.beenRenovatedNum gt 0 >已翻新：<span class="c-success">${customer.beenRenovatedNum}</span></#if></#if>
                             </td>
                             <td>

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

@@ -268,7 +268,7 @@
                     <td class="text-c" width="100"><div  title="${detect.detectContent!}">${detect.detectContent!'-'}</div></td>
                     <td class="text-c" width="100"><#if detect.detectOffer??>${detect.detectOffer/100}<#else>-</#if></td>-->
                     <td class="text-c" width="100"><span class="txt2" title="${detect.questionTitle!}" >${detect.questionTitle!'-'}</span><br><#if detect.questionTitle??><#if detect.questionTitle != ""><a href="#" onclick="getDescribeInfo(${detect.customerId!});" style="color : #50a2ea;">查看详情</a></#if></#if></td>
-                        <td class="text-c" width="100" id="print${detect.detectId}">
+                        <td class="text-c" width="100">
                     <#if detect.maintenanceResults??>
                         <#if detect.maintenanceResults == 1>
                                 通过
@@ -607,6 +607,7 @@
                     if (flag) {
                         layer.msg("打印成功", {icon: 6, time: 3000});
                     }
+                    alert(detectInfo.detectIsPrint);
                     //修改打印状态
                     if(detectInfo.detectIsPrint === 1){
                         $.ajax({