一人一码发展统计表bug

service-manager/src/main/java/com/winsun/controller/OrderController.java

@@ -50,7 +50,7 @@ import lombok.extern.slf4j.Slf4j;
 @Slf4j
 @Slf4j
 @RestController
 @RestController
 @RequestMapping("/order")
 @RequestMapping("/order")
-public class OrderController extends BaseController {
+public class OrderController {
 
 
     private static OrderMapper orderMapper;
     private static OrderMapper orderMapper;
 
 
@@ -83,7 +83,7 @@ public class OrderController extends BaseController {
      * @param pageSize
      * @param pageSize
      * @return
      * @return
      */
      */
-    @Permission(menuname = "查询订单信息", value = "list", method = RequestMethod.POST)
+    /*@Permission(menuname = "查询订单信息", value = "list", method = RequestMethod.POST)
     //@RequestMapping(value="list", method = RequestMethod.POST)
     //@RequestMapping(value="list", method = RequestMethod.POST)
     public ResponseData<Page<Order>> listOrder(@RequestParam(name = "createTimeStart", required = false) String createTimeStart,
     public ResponseData<Page<Order>> listOrder(@RequestParam(name = "createTimeStart", required = false) String createTimeStart,
                                                @RequestParam(name = "createTimeEnd", required = false) String createTimeEnd, @RequestParam(name = "successTimeStart", required = false) String successTimeStart,
                                                @RequestParam(name = "createTimeEnd", required = false) String createTimeEnd, @RequestParam(name = "successTimeStart", required = false) String successTimeStart,
@@ -231,7 +231,7 @@ public class OrderController extends BaseController {
         } finally {
         } finally {
             IOUtils.closeQuite(workbook, os);
             IOUtils.closeQuite(workbook, os);
         }
         }
-    }
+    }*/
 
 
     @Permission(menuname = "一人一码统计数据", value = "getHhrOrderInfo", method = RequestMethod.POST)
     @Permission(menuname = "一人一码统计数据", value = "getHhrOrderInfo", method = RequestMethod.POST)
     public ResponseData<List<YrymReport>> getHhrOrderInfo(String startTime, String endTime) {
     public ResponseData<List<YrymReport>> getHhrOrderInfo(String startTime, String endTime) {
@@ -239,7 +239,9 @@ public class OrderController extends BaseController {
         return ResponseData.success(subNameList, "查询完毕！");
         return ResponseData.success(subNameList, "查询完毕！");
     }
     }
 
 
-    @Permission(menuname = "导出一人一码统计报表", value = "outputHhrOrder", method = RequestMethod.POST)
+//    @Permission(menuname = "导出一人一码统计报表", value = "outputHhrOrder", method = RequestMethod.POST)
+    @ResponseBody
+    @RequestMapping("outputHhrOrder")
     public void downloadHhrOrder(HttpServletResponse response, String startTime, String endTime) throws IOException {
     public void downloadHhrOrder(HttpServletResponse response, String startTime, String endTime) throws IOException {
 
 
         //获取数据
         //获取数据
@@ -339,10 +341,20 @@ public class OrderController extends BaseController {
         commonWrapper.groupBy("hehuoren_area");
         commonWrapper.groupBy("hehuoren_area");
 
 
         //周
         //周
-        Wrapper<Order> weekWrapper = commonWrapper.clone().ge("DATE(success_time)", "DATE_SUB(CURDATE(), INTERVAL 7 DAY)");
+        Wrapper<Order> weekWrapper = commonWrapper.clone();
+        if (StringUtils.isNotBlank(endTime)) {
+            weekWrapper.addFilter("DATE(success_time) >= DATE_SUB(DATE('"+endTime+"'), INTERVAL 7 DAY)");
+        } else {
+            weekWrapper.addFilter("DATE(success_time) >= DATE_SUB(CURDATE(), INTERVAL 7 DAY)");
+        }
         List<Map<String, Object>> weekNumList = orderMapper.selectMaps(weekWrapper);
         List<Map<String, Object>> weekNumList = orderMapper.selectMaps(weekWrapper);
         //月
         //月
-        Wrapper<Order> monthWrapper = commonWrapper.clone().ge("DATE(success_time)", "DATE_SUB(CURDATE(), INTERVAL 30 DAY)");
+        Wrapper<Order> monthWrapper = commonWrapper.clone();
+        if (StringUtils.isNotBlank(endTime)) {
+            monthWrapper.addFilter("DATE(success_time) >= DATE_SUB(DATE('"+endTime+"'), INTERVAL 30 DAY)");
+        } else {
+            monthWrapper.addFilter("DATE(success_time) >= DATE_SUB(CURDATE(), INTERVAL 30 DAY)");
+        }
         List<Map<String, Object>> monthNumList = orderMapper.selectMaps(monthWrapper);
         List<Map<String, Object>> monthNumList = orderMapper.selectMaps(monthWrapper);
         //累计
         //累计
         Wrapper<Order> allWrapper = commonWrapper.clone();
         Wrapper<Order> allWrapper = commonWrapper.clone();