配件订单

src/main/java/com/fdkankan/manage/entity/ScenePlusExt.java

@@ -155,4 +155,7 @@ public class ScenePlusExt implements Serializable {
     @TableField("is_obj")
     private Integer isObj;
 
+    @TableField("algorithm_time")
+    private String algorithmTime;
+
 }

src/main/java/com/fdkankan/manage/service/impl/DataService.java

@@ -133,16 +133,19 @@ public class DataService implements IDataService {
             case 0 :
                 incrementOrderList = dataMapper.userDataGroupBy("t_increment_order",dayFormat,startTime,endTime);
                 downOrderList = dataMapper.userDataGroupBy("t_download_order",dayFormat,startTime,endTime);
+                partOrderList = dataMapper.userDataGroupBy("t_order",dayFormat,startTime,endTime);
                 break;
             case 1 :
                 rule = Dateutils.WEEK;
                 incrementOrderList = dataMapper.userDataGroupByWeek("t_increment_order",startTime,endTime);
                 downOrderList = dataMapper.userDataGroupByWeek("t_download_order",startTime,endTime);
+                partOrderList = dataMapper.userDataGroupByWeek("t_order",startTime,endTime);
                 break;
             case 2 :
                 rule = Dateutils.MONTH;
                 incrementOrderList = dataMapper.userDataGroupBy("t_increment_order",mouthFormat,startTime,endTime);
                 downOrderList = dataMapper.userDataGroupBy("t_download_order",mouthFormat,startTime,endTime);
+                partOrderList = dataMapper.userDataGroupBy("t_order",mouthFormat,startTime,endTime);
                 break;
         }
         //查询从开始时间到结束时间为止所有天数，月份，不存在结果补零
@@ -151,6 +154,7 @@ public class DataService implements IDataService {
         HashMap<String,Long> partMap = new HashMap<>();
         incrementOrderList.forEach(entity -> incrementMap.put(entity.getGroupKey(),entity.getCount()));
         downOrderList.forEach(entity -> downOrderMap.put(entity.getGroupKey(),entity.getCount()));
+        partOrderList.forEach(entity -> partMap.put(entity.getGroupKey(),entity.getCount()));
 
         List<String> dates = Dateutils.findDatesStr(Dateutils.getDate(startTime), Dateutils.getDate(endTime),rule );
         for (String date : dates) {
@@ -163,10 +167,15 @@ public class DataService implements IDataService {
             groupByCount2.setGroupKey(date);
             groupByCount2.setCount(downOrderMap.get(date)== null ?0 :downOrderMap.get(date));
             downOrderResultList.add(groupByCount2);
+
+            DataGroupByCount groupByCount3 = new DataGroupByCount();
+            groupByCount3.setGroupKey(date);
+            groupByCount3.setCount(partMap.get(date)== null ?0 :partMap.get(date));
+            partOrderResultList.add(groupByCount3);
         }
         map.put("incrementOrder",incrementOrderResultList);
         map.put("downOrder",downOrderResultList);
-        //map.put("partOrder",partOrderList);
+        map.put("partOrder",partOrderResultList);
         return map;
     }
 
@@ -182,24 +191,28 @@ public class DataService implements IDataService {
             case 0 :
                 incrementOrderList = dataMapper.userDataSumGroupBy("t_increment_order",dayFormat,startTime,endTime);
                 downOrderList = dataMapper.userDataSumGroupBy("t_download_order",dayFormat,startTime,endTime);
+                partOrderList = dataMapper.userDataSumGroupBy("t_order",dayFormat,startTime,endTime);
                 break;
             case 1 :
                 rule = Dateutils.WEEK;
                 incrementOrderList = dataMapper.userDataSumGroupByWeek("t_increment_order",startTime,endTime);
                 downOrderList = dataMapper.userDataSumGroupByWeek("t_download_order",startTime,endTime);
+                partOrderList = dataMapper.userDataSumGroupByWeek("t_order",startTime,endTime);
                 break;
             case 2 :
                 rule = Dateutils.MONTH;
                 incrementOrderList = dataMapper.userDataSumGroupBy("t_increment_order",mouthFormat,startTime,endTime);
                 downOrderList = dataMapper.userDataSumGroupBy("t_download_order",mouthFormat,startTime,endTime);
+                partOrderList = dataMapper.userDataSumGroupBy("t_order",mouthFormat,startTime,endTime);
                 break;
         }
         //查询从开始时间到结束时间为止所有天数，月份，不存在结果补零
         HashMap<String,String> incrementMap = new HashMap<>();
         HashMap<String,String> downOrderMap = new HashMap<>();
-        HashMap<String,Long> partMap = new HashMap<>();
+        HashMap<String,String> partMap = new HashMap<>();
         incrementOrderList.forEach(entity -> incrementMap.put(entity.getGroupKey(),entity.getCount()));
         downOrderList.forEach(entity -> downOrderMap.put(entity.getGroupKey(),entity.getCount()));
+        partOrderList.forEach(entity -> partMap.put(entity.getGroupKey(),entity.getCount()));
 
         List<String> dates = Dateutils.findDatesStr(Dateutils.getDate(startTime), Dateutils.getDate(endTime),rule );
         for (String date : dates) {
@@ -212,10 +225,15 @@ public class DataService implements IDataService {
             groupByCount2.setGroupKey(date);
             groupByCount2.setCount(downOrderMap.get(date)== null ?"0" :downOrderMap.get(date));
             downOrderResultList.add(groupByCount2);
+
+            DataGroupBySum groupByCount3 = new DataGroupBySum();
+            groupByCount3.setGroupKey(date);
+            groupByCount3.setCount(partMap.get(date)== null ?"0" :partMap.get(date));
+            partOrderResultList.add(groupByCount3);
         }
         map.put("incrementOrder",incrementOrderResultList);
         map.put("downOrder",downOrderResultList);
-        //map.put("partOrder",partOrderList);
+        map.put("partOrder",partOrderResultList);
         return map;
     }