Browse Source

下载客诉时,增加产品类型。

xian 3 years ago
parent
commit
bdbe8419d8

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

@@ -924,9 +924,11 @@ cr.relation_send_logistics_no AS relationSendLogisticsNo,
 cr.relation_factory_costs AS relationFactoryCosts,
 cr.relation_customer_costs AS relationCustomerCosts,
 cr.relation_id AS relationId,
-cpm.proc_method_name AS procMethodName
+cpm.proc_method_name AS procMethodName,
+type.type_name as typeName
 FROM
 	tb_rst_cm_customer_info c
+left join tb_rst_product_type type on c.type_id = type.type_id
 LEFT JOIN tb_rst_cm_question_describe qd ON c.customer_id = qd.customer_id
 LEFT JOIN tb_rst_cm_complaint_question cq ON c.question_id = cq.question_id
 LEFT JOIN tb_rst_cm_complaint_small_class csc ON csc.small_class_id = cq.small_class_id

+ 1 - 1
watero-rst-web/pom.xml

@@ -173,7 +173,7 @@
                     <target>1.8</target>
                     <compilerArguments>
                         <verbose />
-                        <bootclasspath>${java.home}/lib/rt.jar</bootclasspath>
+                        <bootclasspath>${java.home}/lib/rt.jar;${java.home}/lib/jce.jar</bootclasspath>
                     </compilerArguments>
                 </configuration>
             </plugin>

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

@@ -1869,7 +1869,7 @@ public class AdminCustomerController {
                     "问题类别", "小类名称", "客诉问题", "处理过程", "购买日期",
                     "处理方式", "处理结果", "销售公司", "销售渠道", "产品型号", "产品颜色", "产品类型",
                     "产品数量", "寄回快递", "寄回单号", "签收日期",
-                    "状态", "寄出快递", "寄出单号", "开箱损", "二次客诉", "跟进客服", "工厂报价", "客户报价", "邮费信息"
+                    "状态", "寄出快递", "寄出单号", "开箱损", "二次客诉", "跟进客服", "工厂报价", "客户报价", "邮费信息", "产品类型"
             };
             List<CustomerStatisticalInfo> customerStatisticalInfoList = new ArrayList<>();
             SimpleDateFormat sdf4 = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
@@ -2153,6 +2153,7 @@ public class AdminCustomerController {
                 row.createCell(28).setCellValue(customerStatisticalInfo.getRelationCustomerCosts());
             }
             row.createCell(29).setCellValue(customerStatisticalInfo.getPostageString());
+            row.createCell(30).setCellValue(customerStatisticalInfo.getTypeName());
 
         }