客诉导出功能修修改

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

@@ -40,6 +40,8 @@ public class CustomerStatisticalInfo implements Serializable {
     private String customerOutDamaged;//是否开箱损
     private String customerSecondaryCustomer;//是否二次客诉
     private String adminName;//根据客服姓名
+    private Integer relationFactoryCosts;//工厂维修报价
+    private Integer relationCustomerCosts;//客户报价
 
     public Integer getCustomerId() {
         return customerId;
@@ -256,4 +258,20 @@ public class CustomerStatisticalInfo implements Serializable {
     public void setAdminName(String adminName) {
         this.adminName = adminName;
     }
+
+    public Integer getRelationFactoryCosts() {
+        return relationFactoryCosts;
+    }
+
+    public void setRelationFactoryCosts(Integer relationFactoryCosts) {
+        this.relationFactoryCosts = relationFactoryCosts;
+    }
+
+    public Integer getRelationCustomerCosts() {
+        return relationCustomerCosts;
+    }
+
+    public void setRelationCustomerCosts(Integer relationCustomerCosts) {
+        this.relationCustomerCosts = relationCustomerCosts;
+    }
 }

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

@@ -4,167 +4,177 @@
 
     <select id="listCustomerCommon" parameterType="CustomerCommon" resultType="CustomerCommon">
         SELECT
-            cc.*
+        cc.*
         FROM (
-            SELECT
-                '3' AS customerIsSolve,
-                renewed_id AS relationId,
-                customer_id AS customerId,
-                order_id AS  orderId,
-                signclosed_id AS signclosedId,
-                renewed_back_efast_order_id AS  relationBackEfastOrderId,
-                renewed_back_name AS  relationBackName,
-                renewed_back_tel AS  relationBackTel,
-                renewed_back_status  AS relationBackStatus,
-                renewed_back_receipt_date  AS relationBackReceiptDate,
-                renewed_back_logistics_company AS relationBackLogisticsCompany,
-                renewed_back_logistics_no AS relationBackLogisticsNo,
-                renewed_back_postage AS relationBackPostage,
-                renewed_back_machine_no AS  relationBackMachineNo,
-                renewed_send_status AS relationSendStatus,
-                renewed_send_name AS  relationSendName,
-                renewed_send_tel AS relationSendTel,
-                province_number AS provinceNumber,
-                city_number AS cityNumber,
-                area_number AS areaNumber,
-                renewed_send_merge_address AS relationSendMergeAddress,
-                renewed_send_address AS relationSendAddress,
-                renewed_send_logistics_company AS relationSendLogisticsCompany,
-                renewed_send_logistics_no AS relationSendLogisticsNo,
-                renewed_desc AS relationDesc,
-                renewed_state AS relationState,
-                renewed_alipay AS relationAlipay,
-                renewed_is_transfer AS relationIsTransfer,
-                renewed_alipay_name AS relationAlipayName
-            FROM tb_rst_renewed
-            UNION ALL
-            SELECT
-                '4' AS customerIsSolve,
-                repair_id AS relationId,
-                customer_id AS customerId,
-                order_id AS  orderId,
-                signclosed_id AS signclosedId,
-                repair_back_efast_order_id AS  relationBackEfastOrderId,
-                repair_back_name AS  relationBackName,
-                repair_back_tel AS  relationBackTel,
-                repair_back_status  AS relationBackStatus,
-                repair_back_receipt_date  AS relationBackReceiptDate,
-                repair_back_logistics_company AS relationBackLogisticsCompany,
-                repair_back_logistics_no AS relationBackLogisticsNo,
-                repair_back_postage AS relationBackPostage,
-                repair_back_machine_no AS  relationBackMachineNo,
-                repair_send_status AS relationSendStatus,
-                repair_send_name AS  relationSendName,
-                repair_send_tel AS relationSendTel,
-                province_number AS provinceNumber,
-                city_number AS cityNumber,
-                area_number AS areaNumber,
-                repair_send_merge_address AS relationSendMergeAddress,
-                repair_send_address AS relationSendAddress,
-                repair_send_logistics_company AS relationSendLogisticsCompany,
-                repair_send_logistics_no AS relationSendLogisticsNo,
-                repair_desc AS relationDesc,
-                repair_state AS relationState,
-                repair_alipay AS relationAlipay,
-                repair_is_transfer AS relationIsTransfer,
-                repair_alipay_name AS relationAlipayName
-            FROM tb_rst_repair
-            UNION ALL
-            SELECT
-                '5' AS customerIsSolve,
-                reissue_id AS relationId,
-                customer_id AS customerId,
-                order_id AS  orderId,
-                NULL AS signclosedId,
-                reissue_back_efast_order_id AS  relationBackEfastOrderId,
-                NULL AS  relationBackName,
-                NULL AS  relationBackTel,
-                NULL  AS relationBackStatus,
-                NULL  AS relationBackReceiptDate,
-                NULL AS relationBackLogisticsCompany,
-                NULL AS relationBackLogisticsNo,
-                NULL AS relationBackPostage,
-                NULL AS  relationBackMachineNo,
-                reissue_send_status AS relationSendStatus,
-                reissue_send_name AS  relationSendName,
-                reissue_send_tel AS relationSendTel,
-                province_number AS provinceNumber,
-                city_number AS cityNumber,
-                area_number AS areaNumber,
-                reissue_send_merge_address AS relationSendMergeAddress,
-                reissue_send_address AS relationSendAddress,
-                reissue_send_logistics_company AS relationSendLogisticsCompany,
-                reissue_send_logistics_no AS relationSendLogisticsNo,
-                reissue_desc AS relationDesc,
-                reissue_state AS relationState,
-                NULL AS relationAlipay,
-                NULL AS relationIsTransfer,
-                NULL AS relationAlipayName
-            FROM tb_rst_reissue
-            UNION ALL
-            SELECT
-                '6' AS customerIsSolve,
-                back_goods_id AS relationId,
-                customer_id AS customerId,
-                order_id AS  orderId,
-                signclosed_id AS signclosedId,
-                NULL AS  relationBackEfastOrderId,
-                back_goods_back_name AS  relationBackName,
-                back_goods_back_tel AS  relationBackTel,
-                back_goods_back_status  AS relationBackStatus,
-                back_goods_back_receipt_date  AS relationBackReceiptDate,
-                back_goods_back_logistics_company AS relationBackLogisticsCompany,
-                back_goods_back_logistics_no AS relationBackLogisticsNo,
-                back_goods_back_postage AS relationBackPostage,
-                back_goods_back_machine_no AS  relationBackMachineNo,
-                NULL AS relationSendStatus,
-                NULL AS  relationSendName,
-                NULL AS relationSendTel,
-                NULL AS provinceNumber,
-                NULL AS cityNumber,
-                NULL AS areaNumber,
-                NULL AS relationSendMergeAddress,
-                NULL AS relationSendAddress,
-                NULL AS relationSendLogisticsCompany,
-                NULL AS relationSendLogisticsNo,
-                back_goods_desc AS relationDesc,
-                back_goods_state AS relationState,
-                back_goods_alipay AS relationAlipay,
-                back_goods_is_transfer AS relationIsTransfer,
-                back_goods_alipay_name AS relationAlipayName
-            FROM tb_rst_back_goods
-            UNION ALL
-            SELECT
-                '7' AS customerIsSolve,
-                noreason_back_id AS relationId,
-                customer_id AS customerId,
-                order_id AS  orderId,
-                signclosed_id AS signclosedId,
-                NULL AS  relationBackEfastOrderId,
-                noreason_back_back_name AS  relationBackName,
-                noreason_back_back_tel AS  relationBackTel,
-                noreason_back_back_status  AS relationBackStatus,
-                noreason_back_receipt_date  AS relationBackReceiptDate,
-                noreason_back_back_logistics_company AS relationBackLogisticsCompany,
-                noreason_back_back_logistics_no AS relationBackLogisticsNo,
-                noreason_back_back_postage AS relationBackPostage,
-                noreason_back_back_machine_no AS  relationBackMachineNo,
-                NULL AS relationSendStatus,
-                NULL AS  relationSendName,
-                NULL AS relationSendTel,
-                NULL AS provinceNumber,
-                NULL AS cityNumber,
-                NULL AS areaNumber,
-                NULL AS relationSendMergeAddress,
-                NULL AS relationSendAddress,
-                NULL AS relationSendLogisticsCompany,
-                NULL AS relationSendLogisticsNo,
-                noreason_back_desc AS relationDesc,
-                noreason_back_state AS relationState,
-                noreason_back_alipay AS relationAlipay,
-                noreason_back_is_transfer AS relationIsTransfer,
-                noreason_back_alipay_name AS relationAlipayName
-            FROM tb_rst_noreason_back
+        SELECT
+        '3' AS customerIsSolve,
+        renewed_id AS relationId,
+        customer_id AS customerId,
+        order_id AS  orderId,
+        signclosed_id AS signclosedId,
+        renewed_back_efast_order_id AS  relationBackEfastOrderId,
+        renewed_back_name AS  relationBackName,
+        renewed_back_tel AS  relationBackTel,
+        renewed_back_status  AS relationBackStatus,
+        renewed_back_receipt_date  AS relationBackReceiptDate,
+        renewed_back_logistics_company AS relationBackLogisticsCompany,
+        renewed_back_logistics_no AS relationBackLogisticsNo,
+        renewed_back_postage AS relationBackPostage,
+        renewed_back_machine_no AS  relationBackMachineNo,
+        renewed_send_status AS relationSendStatus,
+        renewed_send_name AS  relationSendName,
+        renewed_send_tel AS relationSendTel,
+        province_number AS provinceNumber,
+        city_number AS cityNumber,
+        area_number AS areaNumber,
+        renewed_send_merge_address AS relationSendMergeAddress,
+        renewed_send_address AS relationSendAddress,
+        renewed_send_logistics_company AS relationSendLogisticsCompany,
+        renewed_send_logistics_no AS relationSendLogisticsNo,
+        renewed_desc AS relationDesc,
+        renewed_state AS relationState,
+        renewed_alipay AS relationAlipay,
+        renewed_is_transfer AS relationIsTransfer,
+        renewed_alipay_name AS relationAlipayName,
+        NULL	AS relationFactoryCosts,
+        NULL AS relationCustomerCosts
+        FROM tb_rst_renewed
+        UNION ALL
+        SELECT
+        '4' AS customerIsSolve,
+        repair_id AS relationId,
+        customer_id AS customerId,
+        order_id AS  orderId,
+        signclosed_id AS signclosedId,
+        repair_back_efast_order_id AS  relationBackEfastOrderId,
+        repair_back_name AS  relationBackName,
+        repair_back_tel AS  relationBackTel,
+        repair_back_status  AS relationBackStatus,
+        repair_back_receipt_date  AS relationBackReceiptDate,
+        repair_back_logistics_company AS relationBackLogisticsCompany,
+        repair_back_logistics_no AS relationBackLogisticsNo,
+        repair_back_postage AS relationBackPostage,
+        repair_back_machine_no AS  relationBackMachineNo,
+        repair_send_status AS relationSendStatus,
+        repair_send_name AS  relationSendName,
+        repair_send_tel AS relationSendTel,
+        province_number AS provinceNumber,
+        city_number AS cityNumber,
+        area_number AS areaNumber,
+        repair_send_merge_address AS relationSendMergeAddress,
+        repair_send_address AS relationSendAddress,
+        repair_send_logistics_company AS relationSendLogisticsCompany,
+        repair_send_logistics_no AS relationSendLogisticsNo,
+        repair_desc AS relationDesc,
+        repair_state AS relationState,
+        repair_alipay AS relationAlipay,
+        repair_is_transfer AS relationIsTransfer,
+        repair_alipay_name AS relationAlipayName,
+        repair_factory_costs AS relationFactoryCosts,
+        repair_customer_costs AS relationCustomerCosts
+        FROM tb_rst_repair
+        UNION ALL
+        SELECT
+        '5' AS customerIsSolve,
+        reissue_id AS relationId,
+        customer_id AS customerId,
+        order_id AS  orderId,
+        NULL AS signclosedId,
+        reissue_back_efast_order_id AS  relationBackEfastOrderId,
+        NULL AS  relationBackName,
+        NULL AS  relationBackTel,
+        NULL  AS relationBackStatus,
+        NULL  AS relationBackReceiptDate,
+        NULL AS relationBackLogisticsCompany,
+        NULL AS relationBackLogisticsNo,
+        NULL AS relationBackPostage,
+        NULL AS  relationBackMachineNo,
+        reissue_send_status AS relationSendStatus,
+        reissue_send_name AS  relationSendName,
+        reissue_send_tel AS relationSendTel,
+        province_number AS provinceNumber,
+        city_number AS cityNumber,
+        area_number AS areaNumber,
+        reissue_send_merge_address AS relationSendMergeAddress,
+        reissue_send_address AS relationSendAddress,
+        reissue_send_logistics_company AS relationSendLogisticsCompany,
+        reissue_send_logistics_no AS relationSendLogisticsNo,
+        reissue_desc AS relationDesc,
+        reissue_state AS relationState,
+        NULL AS relationAlipay,
+        NULL AS relationIsTransfer,
+        NULL AS relationAlipayName,
+        NUll	AS relationFactoryCosts,
+        NUll AS relationCustomerCosts
+        FROM tb_rst_reissue
+        UNION ALL
+        SELECT
+        '6' AS customerIsSolve,
+        back_goods_id AS relationId,
+        customer_id AS customerId,
+        order_id AS  orderId,
+        signclosed_id AS signclosedId,
+        NULL AS  relationBackEfastOrderId,
+        back_goods_back_name AS  relationBackName,
+        back_goods_back_tel AS  relationBackTel,
+        back_goods_back_status  AS relationBackStatus,
+        back_goods_back_receipt_date  AS relationBackReceiptDate,
+        back_goods_back_logistics_company AS relationBackLogisticsCompany,
+        back_goods_back_logistics_no AS relationBackLogisticsNo,
+        back_goods_back_postage AS relationBackPostage,
+        back_goods_back_machine_no AS  relationBackMachineNo,
+        NULL AS relationSendStatus,
+        NULL AS  relationSendName,
+        NULL AS relationSendTel,
+        NULL AS provinceNumber,
+        NULL AS cityNumber,
+        NULL AS areaNumber,
+        NULL AS relationSendMergeAddress,
+        NULL AS relationSendAddress,
+        NULL AS relationSendLogisticsCompany,
+        NULL AS relationSendLogisticsNo,
+        back_goods_desc AS relationDesc,
+        back_goods_state AS relationState,
+        back_goods_alipay AS relationAlipay,
+        back_goods_is_transfer AS relationIsTransfer,
+        back_goods_alipay_name AS relationAlipayName,
+        NULL	AS relationFactoryCosts,
+        NULL AS relationCustomerCosts
+        FROM tb_rst_back_goods
+        UNION ALL
+        SELECT
+        '7' AS customerIsSolve,
+        noreason_back_id AS relationId,
+        customer_id AS customerId,
+        order_id AS  orderId,
+        signclosed_id AS signclosedId,
+        NULL AS  relationBackEfastOrderId,
+        noreason_back_back_name AS  relationBackName,
+        noreason_back_back_tel AS  relationBackTel,
+        noreason_back_back_status  AS relationBackStatus,
+        noreason_back_receipt_date  AS relationBackReceiptDate,
+        noreason_back_back_logistics_company AS relationBackLogisticsCompany,
+        noreason_back_back_logistics_no AS relationBackLogisticsNo,
+        noreason_back_back_postage AS relationBackPostage,
+        noreason_back_back_machine_no AS  relationBackMachineNo,
+        NULL AS relationSendStatus,
+        NULL AS  relationSendName,
+        NULL AS relationSendTel,
+        NULL AS provinceNumber,
+        NULL AS cityNumber,
+        NULL AS areaNumber,
+        NULL AS relationSendMergeAddress,
+        NULL AS relationSendAddress,
+        NULL AS relationSendLogisticsCompany,
+        NULL AS relationSendLogisticsNo,
+        noreason_back_desc AS relationDesc,
+        noreason_back_state AS relationState,
+        noreason_back_alipay AS relationAlipay,
+        noreason_back_is_transfer AS relationIsTransfer,
+        noreason_back_alipay_name AS relationAlipayName,
+        NULL AS relationFactoryCosts,
+        NULL AS relationCustomerCosts
+        FROM tb_rst_noreason_back
         )cc
         LEFT JOIN tb_rst_customer_info c on cc.customerId = c.customer_id
         <where>

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

@@ -812,7 +812,6 @@ LEFT JOIN tb_rst_complaint_type ct ON ct.complaint_id = csc.complaint_id
 LEFT JOIN tb_rst_sales_company sc ON c.company_id = sc.company_id
 LEFT JOIN tb_rst_store_info si ON c.store_id = si.store_id
 LEFT JOIN tb_rst_sys_admin sa ON c.admin_id = sa.admin_id
-
   </select>
   <!-- 退换货统计sql start -->
   <!-- 总销量 -->

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

@@ -2075,7 +2075,7 @@ public class AdminCustomerController {
                 "问题类别", "小类名称", "客诉问题", "处理过程", "购买日期",
                 "处理结果", "销售公司", "销售渠道", "产品型号", "产品颜色",
                 "产品数量", "寄回快递", "寄回单号", "签收日期",
-                "状态", "寄出快递", "寄出快递", "开箱损", "二次客诉", "跟进客服"
+                "状态", "寄出快递", "寄出快递", "开箱损", "二次客诉", "跟进客服", "工厂报价", "客户报价"
         };
         List<CustomerStatisticalInfo> customerStatisticalInfoList = new ArrayList<>();
         SimpleDateFormat format = new SimpleDateFormat("yyyy-MM-dd");
@@ -2106,6 +2106,8 @@ public class AdminCustomerController {
                                     customers.setItemProductName(salesOrderItem.getItemProductName());
                                     customers.setItemProductColor(salesOrderItem.getItemProductColor());
                                     customers.setItemNum(String.valueOf(salesOrderItem.getItemNum()));
+                                    customers.setRelationFactoryCosts(common.getRelationFactoryCosts());
+                                    customers.setRelationCustomerCosts(common.getRelationCustomerCosts());
                                     customerStatisticalInfoList.add(customers);
                                 }
                             } else {
@@ -2221,6 +2223,17 @@ public class AdminCustomerController {
             row.createCell(22).setCellValue(customerStatisticalInfo.getCustomerOutDamaged() == null ? null : customerStatisticalInfo.getCustomerOutDamaged());
             row.createCell(23).setCellValue(customerStatisticalInfo.getCustomerSecondaryCustomer() == null ? null : customerStatisticalInfo.getCustomerSecondaryCustomer());
             row.createCell(24).setCellValue(customerStatisticalInfo.getAdminName() == null ? null : customerStatisticalInfo.getAdminName());
+            if(customerStatisticalInfo.getRelationFactoryCosts() == null){
+                row.createCell(25).setCellValue("");
+            }else{
+                row.createCell(25).setCellValue(customerStatisticalInfo.getRelationFactoryCosts());
+            }
+            if(customerStatisticalInfo.getRelationCustomerCosts() == null){
+                row.createCell(26).setCellValue("");
+            }else{
+                row.createCell(26).setCellValue(customerStatisticalInfo.getRelationCustomerCosts());
+            }
+
         }
         //下载导出订单Excel
         downloadCustomerExcel(res,wb);