下载订单功能优化

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

@@ -854,9 +854,6 @@ public class AdminOrderController {
             // 释放锁
             lock.unlock();
         }
-
-        System.out.println("组装数据共花费：" + (System.currentTimeMillis()-ctrStart));
-
         model.put("varList", countexts);
         ObjectExcelView erv = new ObjectExcelView();
         return new ModelAndView(erv,model);

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

@@ -36,7 +36,6 @@ public class DownOrderRunnable implements Runnable {
 
     @Override
     public void run() {
-        System.out.println("执行代码....");
         try {
             for (;start <= stop; start++) {
                 SalesOrder salesOrder = salesOrders.get(start);
@@ -45,7 +44,7 @@ public class DownOrderRunnable implements Runnable {
                 // 时间
                 if (salesOrder.getSalesCreateTime() != null) {
                     cal.setTime(salesOrder.getSalesCreateTime());
-                    row.add("年" + (cal.get(Calendar.MONTH) + 1) + "月" + cal.get(Calendar.DAY_OF_MONTH) + "日");
+                    row.add(cal.get(Calendar.YEAR) + "年" + (cal.get(Calendar.MONTH) + 1) + "月" + cal.get(Calendar.DAY_OF_MONTH) + "日");
                 } else {
                     row.add(null);
                 }
@@ -82,20 +81,20 @@ public class DownOrderRunnable implements Runnable {
                 row.add(salesOrder.getStoreName());
                 if (salesOrder.getSalesDeliverTime() != null) {
                     cal.setTime(salesOrder.getSalesDeliverTime());
-                    row.add("年" + (cal.get(Calendar.MONTH) + 1) + "月" + cal.get(Calendar.DAY_OF_MONTH) + "日");
+                    row.add(cal.get(Calendar.YEAR) + "年" + (cal.get(Calendar.MONTH) + 1) + "月" + cal.get(Calendar.DAY_OF_MONTH) + "日");
                 } else {
                     row.add(null);
                 }
                 if(salesOrder.getSalesDistributionTime() == null){
                     if(salesOrder.getSalesSendTime() != null){
                         cal.setTime(salesOrder.getSalesSendTime());
-                        row.add("年" + (cal.get(Calendar.MONTH) + 1) + "月" + cal.get(Calendar.DAY_OF_MONTH) + "日");
+                        row.add(cal.get(Calendar.YEAR) + "年" + (cal.get(Calendar.MONTH) + 1) + "月" + cal.get(Calendar.DAY_OF_MONTH) + "日");
                     }else{
                         row.add(null);
                     }
                 }else{
                     cal.setTime(salesOrder.getSalesDistributionTime());
-                    row.add("年" + (cal.get(Calendar.MONTH) + 1) + "月" + cal.get(Calendar.DAY_OF_MONTH) + "日");
+                    row.add(cal.get(Calendar.YEAR) + "年" + (cal.get(Calendar.MONTH) + 1) + "月" + cal.get(Calendar.DAY_OF_MONTH) + "日");
                 }
                 row.add(salesOrder.getProcMethodName());
                 row.add(salesOrder.getSalesPostageCost() == null ? null : salesOrder.getSalesPostageCost()/100);