Browse Source

签单统计表数据库BUG修复

anderx 3 years ago
parent
commit
e664700e03

+ 10 - 1
src/main/java/com/goafanti/order/controller/AdminNewOrderApiController.java

@@ -3,6 +3,7 @@ package com.goafanti.order.controller;
 
 
 import java.io.IOException;
+import java.util.Comparator;
 import java.util.List;
 
 import javax.servlet.http.HttpServletRequest;
@@ -640,7 +641,15 @@ public class AdminNewOrderApiController extends CertifyApiController {
 	 */
 	@RequestMapping(value = "/statisticsList", method = RequestMethod.GET)
 	public Result statisticsList(InputStatistics in){
-		return res().data(orderNewService.statisticsList(in));
+		List<OutStatisticsList> result = orderNewService.statisticsList(in);
+		if (in.getSort()==null||in.getSort()==0){
+			result.sort(Comparator.comparing(OutStatisticsList::getTotal).reversed());
+		}else if (in.getSort()==1){
+			result.sort(Comparator.comparing(OutStatisticsList::getQuantity).reversed());
+		} else {
+			result.sort(Comparator.comparing(OutStatisticsList::getCounts).reversed());
+		}
+		return res().data(result);
 	}
 
 	/**

+ 1 - 11
src/main/java/com/goafanti/order/service/impl/OrderNewServiceImpl.java

@@ -1811,11 +1811,8 @@ public class OrderNewServiceImpl extends BaseMybatisDao<TOrderNewMapper> impleme
 
 	@Override
 	@Cacheable(cacheNames = "statisticsList#500",key = "'statisticsList:depId:'+#in.depId+'province:'+#in.province+" +
-			"'startCreate:'+#in.startCreate+'endCreate:'+#in.endCreate+'startSign:'+#in.startSign+'endSign:'+#in.endSign+'sort:'+#in.sort")
+			"'startCreate:'+#in.startCreate+'endCreate:'+#in.endCreate+'startSign:'+#in.startSign+'endSign:'+#in.endSign")
 	public List<OutStatisticsList> statisticsList(InputStatistics in) {
-		if(in.getSort()==null) {
-			in.setSort(0);
-		}
 		if(in.getEndCreate()!=null) {
 			in.setEndCreate(in.getEndCreate()+" 23:59:59");
 		}
@@ -1849,13 +1846,6 @@ public class OrderNewServiceImpl extends BaseMybatisDao<TOrderNewMapper> impleme
 			out.setCounts(counts);
 			result.add(out);
 		}
-		if (in.getSort()==0){
-			result.sort(Comparator.comparing(OutStatisticsList::getTotal).reversed());
-		}else if (in.getSort()==1){
-			result.sort(Comparator.comparing(OutStatisticsList::getQuantity).reversed());
-		} else {
-			result.sort(Comparator.comparing(OutStatisticsList::getCounts).reversed());
-		}
 		return result;
 	}