优尼雅售后系统上线

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

@@ -189,6 +189,10 @@ public class CustomerInfo  implements Serializable {
     private Integer stayQcConfirmNum;//待QC确认
     private Integer placeOrderNum;//待下单
     private Integer beenOrderedNum;//维修完成已下单
+    private Integer waitConfirmPay;//等等确认付费翻新
+    private Integer waitRenovate;//等待翻新
+    private Integer finishRenovate;//翻新完成
+    private Integer noRenovate;//不放心
 
     private Integer afterState;// 1今日签收 2昨日签收 3前日签收 4.待检测 5已检测待确认 6.检测完成 7原机退回,待下单 8维修完成,待下单
     private String afterTime;// 售后搜索日期条件
@@ -207,6 +211,39 @@ public class CustomerInfo  implements Serializable {
     private Integer tagFlag;//标记旗帜1红、2黄、3绿、4蓝、5紫
 
     private String detectNumber;//维修编号
+
+    public Integer getWaitConfirmPay() {
+        return waitConfirmPay;
+    }
+
+    public void setWaitConfirmPay(Integer waitConfirmPay) {
+        this.waitConfirmPay = waitConfirmPay;
+    }
+
+    public Integer getWaitRenovate() {
+        return waitRenovate;
+    }
+
+    public void setWaitRenovate(Integer waitRenovate) {
+        this.waitRenovate = waitRenovate;
+    }
+
+    public Integer getFinishRenovate() {
+        return finishRenovate;
+    }
+
+    public void setFinishRenovate(Integer finishRenovate) {
+        this.finishRenovate = finishRenovate;
+    }
+
+    public Integer getNoRenovate() {
+        return noRenovate;
+    }
+
+    public void setNoRenovate(Integer noRenovate) {
+        this.noRenovate = noRenovate;
+    }
+
     public Date getVisitDate() {
         return visitDate;
     }

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

@@ -305,6 +305,10 @@
           cs.completeMaintenanceNum as completeMaintenanceNum,
           cs.beenScrappedNum as beenScrappedNum,
           cs.beenRenovatedNum as beenRenovatedNum,
+          cs.waitConfirmPay,
+          cs.waitRenovate,
+          cs.finishRenovate,
+          cs.noRenovate,
           ti.tag_flag as tagFlag
       FROM
       tb_rst_cm_customer_info c
@@ -388,7 +392,11 @@
               COUNT(case detect_state when 30 then 1 when 34 then 1 WHEN 38 then 1 end) as beContact,
               COUNT(case detect_state when 32 then 1 when 36 then 1 end) as completeMaintenanceNum,
               COUNT(case detect_state when 23 then 1 end) as beenScrappedNum,
-              COUNT(case detect_state when 21 then 1 end) as beenRenovatedNum
+              COUNT(case detect_state when 21 then 1 end) as beenRenovatedNum,
+              COUNT(case detect_state when 24 then 1 end) as waitConfirmPay,
+              COUNT(case detect_state when 25 then 1 end) as waitRenovate,
+              COUNT(case detect_state when 26 then 1 end) as finishRenovate,
+              COUNT(case detect_state when 27 then 1 end) as noRenovate
           FROM
             tb_rst_complaint_detect
           GROUP BY
@@ -495,7 +503,7 @@
         and cd.detect_state = 1 AND cc.procTypeId = 3
       </if>
       <if test="afterState != null and afterState == 5">
-        and cd.detect_state in(30,34,38)
+        and cd.detect_state in(24,30,34,38)
       </if>
       <if test="afterState != null and afterState == 6">
         and cd.detect_state in(32,33,36,37)

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

@@ -781,7 +781,7 @@
     <select id="getCustomerDetectNum" parameterType="ComplaintDetectInfo" resultType="ComplaintAfterSalesNum">
       SELECT
       sum(CASE WHEN (detect_state = 1 AND cpt.proc_type_id = 3) then 1 else 0 end) AS beDetected,
-      sum(CASE WHEN detect_state in(30,34,38) then 1 else 0 end) AS beConfirmed,
+      sum(CASE WHEN detect_state in(24,30,34,38) then 1 else 0 end) AS beConfirmed,
       sum(CASE WHEN detect_state in(32,33,36,37) then 1 else 0 end) AS completeProcessing,
       sum(CASE WHEN (detect_state in(33,37,39) and detect_placeorder = 1) then 1 else 0 end) AS placeOrderNum,
       sum(CASE WHEN (detect_state in(32,36) and detect_placeorder = 1 AND maintenance_results = 1) then 1 else 0 end) AS detectplaceOrderNum,

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

@@ -515,7 +515,7 @@ public class AdminCustomerController {
                     }
                     String isOneself = request.getParameter("isOneself");
                     if(isOneself != null){
-                        if(isOneself.equals("2")){
+                        if("2".equals(isOneself)){
                             customerInfo.setAdminId(loginAdminId);
                         }
                     }

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

@@ -273,6 +273,10 @@
                                 <#if !customer.placeOrderNum??><#if customer.completeMaintenanceNum??><#if customer.completeMaintenanceNum gt 0 >维修完成：<span class="c-success">${customer.completeMaintenanceNum}</span><br></#if></#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>
+                                <#if customer.waitConfirmPay??><#if customer.waitConfirmPay gt 0 >待确认翻新：<span class="c-success">${customer.waitConfirmPay}</span></#if></#if>
+                                <#if customer.waitRenovate??><#if customer.waitRenovate gt 0 >待放心：<span class="c-success">${customer.waitRenovate}</span></#if></#if>
+                                <#if customer.finishRenovate??><#if customer.finishRenovate gt 0 >已翻新：<span class="c-success">${customer.finishRenovate}</span></#if></#if>
+                                <#if customer.noRenovate??><#if customer.noRenovate gt 0 >原机退回：<span class="c-success">${customer.noRenovate}</span></#if></#if>
                             </td>
                             <td>
                                 <#if customer.sendbackInfoList?? &&  (customer.sendbackInfoList?size > 0) >

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

@@ -3338,7 +3338,7 @@
             // 检测带订单-原机退回
             $("#updateDetect_wu_gu_zhang").hide();
         }
-        if(detectState === "37"){
+        if(detectState === "37" || detectState === "38"){
             // 检测待定(机器无故障，待用户确认)
             $("#updateDetect_3").show();
             $("#updateDetect_wu_gu_zhang").show();