下载订单功能增加订单类型

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

@@ -43,6 +43,7 @@ public class CustomerStatisticalInfo implements Serializable {
     private Integer relationFactoryCosts;//工厂维修报价
     private Integer relationCustomerCosts;//客户报价
     private Integer relationId;//处理主键
+    private String procMethodName;//处理详细方式
 
     public Integer getCustomerId() {
         return customerId;
@@ -283,4 +284,12 @@ public class CustomerStatisticalInfo implements Serializable {
     public void setRelationId(Integer relationId) {
         this.relationId = relationId;
     }
+
+    public String getProcMethodName() {
+        return procMethodName;
+    }
+
+    public void setProcMethodName(String procMethodName) {
+        this.procMethodName = procMethodName;
+    }
 }

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

@@ -725,7 +725,8 @@ cr.relation_send_logistics_company AS relationSendLogisticsCompany,
 cr.relation_send_logistics_no AS relationSendLogisticsNo,
 cr.relation_factory_costs AS relationFactoryCosts,
 cr.relation_customer_costs AS relationCustomerCosts,
-cr.relation_id AS relationId
+cr.relation_id AS relationId,
+cpm.proc_method_name AS procMethodName
 FROM
 	tb_rst_cm_customer_info c
 LEFT JOIN tb_rst_cm_question_describe qd ON c.customer_id = qd.customer_id

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

@@ -1582,7 +1582,7 @@ public class AdminCustomerController {
         String[] cells = {
                 "日期", "姓名", "联系电话", "类别", "来源入口",
                 "问题类别", "小类名称", "客诉问题", "处理过程", "购买日期",
-                "处理结果", "销售公司", "销售渠道", "产品型号", "产品颜色",
+                "处理方式","处理结果", "销售公司", "销售渠道", "产品型号", "产品颜色",
                 "产品数量", "寄回快递", "寄回单号", "签收日期",
                 "状态", "寄出快递", "寄出快递", "开箱损", "二次客诉", "跟进客服", "工厂报价", "客户报价"
         };
@@ -1722,21 +1722,22 @@ public class AdminCustomerController {
             row.createCell(7).setCellValue(customerStatisticalInfo.getDescribeTitle() == null ? null : customerStatisticalInfo.getDescribeTitle());
             row.createCell(8).setCellValue(customerStatisticalInfo.getDescribeHandleDesc() == null ? null : customerStatisticalInfo.getDescribeHandleDesc());
             row.createCell(9).setCellValue(salesPayTime);
-            row.createCell(10).setCellValue(customerStatisticalInfo.getCustomerIsSolve() == null ? null : customerStatisticalInfo.getCustomerIsSolve());
-            row.createCell(11).setCellValue(customerStatisticalInfo.getCompanyName() == null ? null : customerStatisticalInfo.getCompanyName());
-            row.createCell(12).setCellValue(customerStatisticalInfo.getStoreName() == null ? null : customerStatisticalInfo.getStoreName());
-            row.createCell(13).setCellValue(customerStatisticalInfo.getItemProductName() == null ? null : customerStatisticalInfo.getItemProductName());
-            row.createCell(14).setCellValue(customerStatisticalInfo.getItemProductColor() == null ? null : customerStatisticalInfo.getItemProductColor());
-            row.createCell(15).setCellValue(customerStatisticalInfo.getItemNum() == null ? null : customerStatisticalInfo.getItemNum());
-            row.createCell(16).setCellValue(backLogisticsCompany);
-            row.createCell(17).setCellValue(customerStatisticalInfo.getRelationBackLogisticsNo() == null ? null : customerStatisticalInfo.getRelationBackLogisticsNo());
-            row.createCell(18).setCellValue(customerStatisticalInfo.getRelationBackReceiptDate() == null ? null : customerStatisticalInfo.getRelationBackReceiptDate());
-            row.createCell(19).setCellValue(backStatus);
-            row.createCell(20).setCellValue(sendLogisticsCompany);
-            row.createCell(21).setCellValue(customerStatisticalInfo.getRelationSendLogisticsNo() == null ? null : customerStatisticalInfo.getRelationSendLogisticsNo());
-            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());
+            row.createCell(10).setCellValue(customerStatisticalInfo.getProcMethodName() == null ? null : customerStatisticalInfo.getProcMethodName());
+            row.createCell(11).setCellValue(customerStatisticalInfo.getCustomerIsSolve() == null ? null : customerStatisticalInfo.getCustomerIsSolve());
+            row.createCell(12).setCellValue(customerStatisticalInfo.getCompanyName() == null ? null : customerStatisticalInfo.getCompanyName());
+            row.createCell(13).setCellValue(customerStatisticalInfo.getStoreName() == null ? null : customerStatisticalInfo.getStoreName());
+            row.createCell(14).setCellValue(customerStatisticalInfo.getItemProductName() == null ? null : customerStatisticalInfo.getItemProductName());
+            row.createCell(15).setCellValue(customerStatisticalInfo.getItemProductColor() == null ? null : customerStatisticalInfo.getItemProductColor());
+            row.createCell(16).setCellValue(customerStatisticalInfo.getItemNum() == null ? null : customerStatisticalInfo.getItemNum());
+            row.createCell(17).setCellValue(backLogisticsCompany);
+            row.createCell(18).setCellValue(customerStatisticalInfo.getRelationBackLogisticsNo() == null ? null : customerStatisticalInfo.getRelationBackLogisticsNo());
+            row.createCell(19).setCellValue(customerStatisticalInfo.getRelationBackReceiptDate() == null ? null : customerStatisticalInfo.getRelationBackReceiptDate());
+            row.createCell(20).setCellValue(backStatus);
+            row.createCell(21).setCellValue(sendLogisticsCompany);
+            row.createCell(22).setCellValue(customerStatisticalInfo.getRelationSendLogisticsNo() == null ? null : customerStatisticalInfo.getRelationSendLogisticsNo());
+            row.createCell(23).setCellValue(customerStatisticalInfo.getCustomerOutDamaged() == null ? null : customerStatisticalInfo.getCustomerOutDamaged());
+            row.createCell(24).setCellValue(customerStatisticalInfo.getCustomerSecondaryCustomer() == null ? null : customerStatisticalInfo.getCustomerSecondaryCustomer());
+            row.createCell(25).setCellValue(customerStatisticalInfo.getAdminName() == null ? null : customerStatisticalInfo.getAdminName());
             if(customerStatisticalInfo.getRelationFactoryCosts() == null){
                 row.createCell(25).setCellValue("");
             }else{

watero-rst-web/src/main/java/com/iamberry/rst/controllers/order/AdminOrderController.java

@@ -783,6 +783,7 @@ public class AdminOrderController {
         titles.add("店铺名称");
         titles.add("出库日期");
         titles.add("通知配货日期");
+        titles.add("处理类型");
         model.put("titles", titles);
         PtsBatch ptsBatch = new PtsBatch();
         List<List<Object>> countexts = new ArrayList<List<Object>>();
@@ -831,6 +832,7 @@ public class AdminOrderController {
                 row.add(salesOrder.getStoreName() == null ? null:salesOrder.getStoreName());
                 row.add(salesOrder.getSalesDeliverTime() == null ? null:formatter.format(salesOrder.getSalesDeliverTime()));
                 row.add(salesOrder.getSalesDistributionTime() == null ? null:formatter.format(salesOrder.getSalesDistributionTime()));
+                row.add(salesOrder.getProcMethodName() == null ? null:salesOrder.getProcMethodName());
                 countexts.add(row);
             }
         }