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

# Conflicts:
#	watero-rst-core/src/main/java/com.iamberry.rst.core/order/ProductColor.java

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

@@ -174,6 +174,14 @@ public class CustomerInfo  implements Serializable {
 
     private Integer relationId;//处理主键
 
+    private Integer receivingOne;//签收待寄回条数
+    private Integer receivingTwo;//签收已寄回条数
+    private Integer beDetected;//待检测条数
+    private Integer beMaintenance;//待维修条数
+    private Integer beRefurbished;//待翻新条数
+    private Integer beScrapped;//待报废条数
+    private Integer beContact;//待联系条数
+
     public void setComplaintDetectList(List<ComplaintDetectInfo> complaintDetectList) {
         this.complaintDetectList = complaintDetectList;
     }
@@ -891,4 +899,60 @@ public class CustomerInfo  implements Serializable {
     public void setRelationId(Integer relationId) {
         this.relationId = relationId;
     }
+
+    public Integer getReceivingOne() {
+        return receivingOne;
+    }
+
+    public void setReceivingOne(Integer receivingOne) {
+        this.receivingOne = receivingOne;
+    }
+
+    public Integer getReceivingTwo() {
+        return receivingTwo;
+    }
+
+    public void setReceivingTwo(Integer receivingTwo) {
+        this.receivingTwo = receivingTwo;
+    }
+
+    public Integer getBeDetected() {
+        return beDetected;
+    }
+
+    public void setBeDetected(Integer beDetected) {
+        this.beDetected = beDetected;
+    }
+
+    public Integer getBeMaintenance() {
+        return beMaintenance;
+    }
+
+    public void setBeMaintenance(Integer beMaintenance) {
+        this.beMaintenance = beMaintenance;
+    }
+
+    public Integer getBeRefurbished() {
+        return beRefurbished;
+    }
+
+    public void setBeRefurbished(Integer beRefurbished) {
+        this.beRefurbished = beRefurbished;
+    }
+
+    public Integer getBeScrapped() {
+        return beScrapped;
+    }
+
+    public void setBeScrapped(Integer beScrapped) {
+        this.beScrapped = beScrapped;
+    }
+
+    public Integer getBeContact() {
+        return beContact;
+    }
+
+    public void setBeContact(Integer beContact) {
+        this.beContact = beContact;
+    }
 }

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

@@ -295,7 +295,14 @@
     cc.procMethodIsBack as procMethodIsBack,
     cc.procMethodIsSend as procMethodIsSend,
     cc.relationSendAddress as customerSendAddress,
-    cc.relationId as relationId
+    cc.relationId as relationId,
+    ri.receivingOne as receivingOne,
+    ri.receivingTwo as receivingTwo,
+    cs.beDetected as beDetected,
+    cs.beMaintenance as beMaintenance,
+    cs.beRefurbished as beRefurbished,
+    cs.beScrapped as beScrapped,
+    cs.beContact as beContact
     FROM
     tb_rst_cm_customer_info c
     LEFT JOIN (
@@ -356,6 +363,48 @@
     sendback_create_time desc
     ) ss
     ) sss ON sss.customer_id = c.customer_id
+    LEFT JOIN (SELECT
+    signclosed_id,
+    signclosed_customer_id,
+    COUNT(
+    CASE signclosed_is_receiving
+    WHEN 1 THEN
+    1
+    END
+    ) AS receivingOne,
+    COUNT(
+    CASE signclosed_is_receiving
+    WHEN 2 THEN
+    2
+    END
+    ) AS receivingTwo
+    FROM
+    tb_rst_complaint_signclosed
+    GROUP BY
+    signclosed_customer_id) ri ON ri.signclosed_customer_id = c.customer_id
+    LEFT JOIN (SELECT
+    detect_id,
+    customer_id,
+    COUNT(
+    CASE detect_state
+    WHEN 1 THEN
+    1
+    END
+    ) AS beDetected,
+    COUNT(case detect_state when 31 then 1
+    when 35 then 1
+    end) as beMaintenance,
+    COUNT(case detect_state when 20 then 1
+    end) as beRefurbished,
+    COUNT(case detect_state when 22 then 1
+    end) as beScrapped,
+    COUNT(case detect_state when 30 then 1
+    when 34 then 1 WHEN 38 then 1
+    end) as beContact
+    FROM
+    tb_rst_complaint_detect
+    GROUP BY
+    customer_id) cs ON cs.customer_id = c.customer_id
     LEFT JOIN tb_rst_cm_visit v ON v.customer_id = c.customer_id
     LEFT JOIN tb_rst_sales_order_info oi ON cc.orderId = oi.sales_id
     LEFT JOIN tb_rst_cm_question_describe qd ON c.customer_id = qd.customer_id
@@ -696,7 +745,7 @@
     sa.admin_name AS  visitDesignatedAdminName,
     q.question_profile,
     d.describe_handle_desc,
-    d.describe_content
+    d.describe_content,
     from
     tb_rst_cm_customer_info c
     LEFT JOIN tb_rst_cm_question_describe d ON c.customer_id = d.customer_id

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

@@ -223,7 +223,7 @@
                                 <#if customer.customerOutDamaged == '2' >否</#if></td>
 -->
 
-                            <td><customer.customerSecondaryCustomer??>
+                            <td>
                             <#if customer.customerSecondaryCustomer == '1' >是</#if>
                             <#if customer.customerSecondaryCustomer == '2' >否</#if></td>
 
@@ -231,8 +231,14 @@
                             <td>${(customer.salesTime?string("yyyy-MM-dd"))!''}</td>
                             <#--<td>${customer.customerArea!''}</td>
                             <td>进${customer.customerInTDS!'0'}PPM<br/>出${customer.customerOutTDS!'0'}PPM</td>-->
-                            <td></td>
-                            <td></td>
+                            <td><#if customer.receivingOne??><#if customer.receivingOne gt 0 >待签收：<span class="c-red">${customer.receivingOne}</span><br></#if></#if>
+                                <#if customer.receivingTwo??><#if customer.receivingTwo gt 0 >已签收：<span class="c-success">${customer.receivingTwo}</span></#if></#if></td>
+                            <td><#if customer.beDetected??><#if customer.beDetected gt 0 >待检测：<span class="c-red">${customer.beDetected}</span><br></#if></#if>
+                                <#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>
+                            </td>
                             <td>
                                 <#if customer.sendbackInfoList?? &&  (customer.sendbackInfoList?size > 0) >
                                     寄回：