Merge branch 'order_received_statistics' into dev

# Conflicts:
#	xx-order/xx-order-server/src/main/java/com/xxfc/platform/order/rest/background/OrderReceivedStatisticsAdminController.java

ace-modules/ace-admin/src/main/java/com/github/wxiaoqi/security/admin/rest/admin/StaffStatisticsAdminController.java

@@ -5,10 +5,8 @@ import com.github.wxiaoqi.security.admin.dto.StaffStatisticsFindDTO;
 import com.github.wxiaoqi.security.common.msg.ObjectRestResponse;
 import lombok.RequiredArgsConstructor;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
+import org.springframework.stereotype.Controller;
+import org.springframework.web.bind.annotation.*;
 import com.github.wxiaoqi.security.common.exception.BaseException;
 import javax.servlet.ServletOutputStream;
 import javax.servlet.http.HttpServletResponse;
@@ -22,7 +20,7 @@ import java.util.Map;
  * @description
  * @data 2019/11/26 16:59
  */
-@RestController
+@Controller
 @RequestMapping("/staff_statistics")
 @RequiredArgsConstructor(onConstructor = @__(@Autowired))
 public class StaffStatisticsAdminController {
@@ -30,6 +28,7 @@ public class StaffStatisticsAdminController {
        private final StaffStatisticsBiz staffStatisticsBiz;
 
        @PostMapping("/page")
+       @ResponseBody
        public ObjectRestResponse<Map<String,Object>> lisetStaffStatisticsWithPage(@RequestBody StaffStatisticsFindDTO staffStatisticsFindDTO){
            Map<String,Object> result =  staffStatisticsBiz.listStaffStatisticsWithPage(staffStatisticsFindDTO);
            return ObjectRestResponse.succ(result);

xx-order/xx-order-server/src/main/java/com/xxfc/platform/order/biz/OrderReceivedStatisticsBiz.java

@@ -27,8 +27,6 @@ import org.springframework.transaction.annotation.Transactional;
 import javax.servlet.ServletOutputStream;
 import java.io.IOException;
 import java.math.BigDecimal;
-import java.time.LocalDate;
-import java.time.format.DateTimeFormatter;
 import java.util.*;
 import java.util.concurrent.CountDownLatch;
 import java.util.stream.Collectors;
@@ -54,7 +52,6 @@ public class OrderReceivedStatisticsBiz extends BaseBiz<OrderReceivedStatisticsM
     private List<String> orderRentVehicleSigns;
     private List<String> orderTourSigns;
     private Map<String, String> signAndDescMap;
-    private DateTimeFormatter dateTimeFormatter = DateTimeFormatter.ofPattern("yyyy-MM-dd");
     private final ThreadPoolTaskExecutor executor;
 
 
@@ -181,15 +178,15 @@ public class OrderReceivedStatisticsBiz extends BaseBiz<OrderReceivedStatisticsM
                         firstCell.setCellValue(DateUtil.format(orderReceivedStatisticsVo.getDate(), "yyyy.MM.dd"));
                     }
                     if (ReceivedStatisticsEnum.WEEK.getWayCode() == statisticalWay) {
-                        LocalDate localDate = LocalDate.of(Integer.valueOf(orderReceivedStatisticsVo.getYear()), Integer.valueOf(orderReceivedStatisticsVo.getMonth().replace(orderReceivedStatisticsVo.getYear(), "")), 1);
-                        int dayOfYear = localDate.getDayOfYear();
-                        int days = Integer.valueOf(orderReceivedStatisticsVo.getWeekOfYear().replace(orderReceivedStatisticsVo.getYear(), "")) * 7;
-                        int betweenDays = days - dayOfYear;
-                        LocalDate endLocalDate = localDate.withDayOfMonth(betweenDays);
-                        LocalDate startLocalDate = endLocalDate.minusDays(6);
-                        String startDateStr = startLocalDate.format(dateTimeFormatter);
-                        String endDateStr = endLocalDate.format(dateTimeFormatter);
-                        firstCell.setCellValue(String.format("%s~%s", startDateStr, endDateStr));
+                        Calendar cal = Calendar.getInstance();
+                        cal.setFirstDayOfWeek(Calendar.MONDAY);
+                        cal.set(Calendar.YEAR, Integer.valueOf(orderReceivedStatisticsVo.getYear()));
+                        cal.set(Calendar.WEEK_OF_YEAR, Integer.valueOf(orderReceivedStatisticsVo.getWeekOfYear().replace("" + orderReceivedStatisticsVo.getYear(), "")));
+                        cal.set(Calendar.DAY_OF_WEEK, cal.getFirstDayOfWeek());
+                        Date startDate = cal.getTime();
+                        cal.add(Calendar.DAY_OF_WEEK, 6);
+                        Date endDate = cal.getTime();
+                        firstCell.setCellValue(String.format("%s~%s", DateUtil.format(startDate,"yyyy-MM-dd"), DateUtil.format(endDate,"yyyy-MM-dd")));
                     }
                     if (ReceivedStatisticsEnum.MONTH.getWayCode() == statisticalWay) {
                         StringBuilder sb = new StringBuilder(orderReceivedStatisticsVo.getMonth());

xx-order/xx-order-server/src/main/java/com/xxfc/platform/order/rest/OrderMemberController.java

@@ -76,7 +76,6 @@ public class OrderMemberController extends BaseController<OrderMemberDetailBiz,
     }
 
     @PostMapping("/export")
-    @ResponseBody
     public void exportMemberOrders(@RequestBody MemberOrderFindDTO memberOrderFindDTO, HttpServletResponse response){
         try {
             String name = DateTimeFormatter.ofPattern("YYYYMMddHHmmss").format(LocalDateTime.now());

xx-order/xx-order-server/src/main/java/com/xxfc/platform/order/rest/background/CompanyOrderReceivedStatiscsAdminController.java

@@ -11,10 +11,8 @@ import io.swagger.annotations.ApiOperation;
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
+import org.springframework.stereotype.Controller;
+import org.springframework.web.bind.annotation.*;
 
 import javax.servlet.ServletOutputStream;
 import javax.servlet.http.HttpServletResponse;
@@ -29,7 +27,7 @@ import java.util.Date;
  * @data 2019/11/23 14:32
  */
 @Slf4j
-@RestController
+@Controller
 @RequestMapping("/statistics")
 @RequiredArgsConstructor(onConstructor = @__(@Autowired))
 public class CompanyOrderReceivedStatiscsAdminController {
@@ -37,6 +35,7 @@ public class CompanyOrderReceivedStatiscsAdminController {
       private final CompanyPerformanceBiz companyPerformanceBiz;
 
       @PostMapping("/company_performance")
+      @ResponseBody
       public ObjectRestResponse<PageDataVO<CompanyPerformanceBo>> companyPerformance(@RequestBody CompanyPerformanceFindDTO companyPerformanceFindDTO){
            if(companyPerformanceFindDTO.getStartDate() == null && companyPerformanceFindDTO.getEndDate()==null){
                Date date = new Date();

xx-order/xx-order-server/src/main/java/com/xxfc/platform/order/rest/background/OrderReceivedStatisticsAdminController.java

@@ -14,10 +14,9 @@ import io.swagger.annotations.ApiOperation;
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
+import org.springframework.http.MediaType;
+import org.springframework.stereotype.Controller;
+import org.springframework.web.bind.annotation.*;
 
 import javax.servlet.ServletOutputStream;
 import javax.servlet.http.HttpServletResponse;
@@ -36,7 +35,7 @@ import java.util.Map;
  */
 @Slf4j
 @Api(tags = "订单统计")
-@RestController
+@Controller
 @RequestMapping("admin/order/received_statistics")
 @RequiredArgsConstructor(onConstructor = @__(@Autowired))
 public class OrderReceivedStatisticsAdminController {
@@ -44,6 +43,7 @@ public class OrderReceivedStatisticsAdminController {
 
      @ApiOperation("订单统计")
      @PostMapping("")
+     @ResponseBody
      public ObjectRestResponse<Map<String, List<OrderReceivedStatisticsVo>>> orderReceivedStatistics(@RequestBody @SimpleValid OrderReceivedStatisticsFindDTO orderReceivedStatisticsFindDTO, UserDTO userDTO){
          orderReceivedStatisticsFindDTO.setCompanyId(Arrays.asList(userDTO.getCompanyId()));
          if (orderReceivedStatisticsFindDTO.getStartDate()==null && orderReceivedStatisticsFindDTO.getEndDate()==null){
@@ -58,7 +58,7 @@ public class OrderReceivedStatisticsAdminController {
      }
 
     @ApiOperation("订单统计excel导出下载")
-    @PostMapping(value = "/export", produces = "application/vnd.ms-excel;charset=utf-8")
+    @PostMapping(value = "/export",produces = MediaType.APPLICATION_OCTET_STREAM_VALUE)
     public ObjectRestResponse<Void> exportOrderReceivedStatistics(@RequestBody @BeanValid OrderReceivedStatisticsFindDTO orderReceivedStatisticsFindDTO,UserDTO userDTO, HttpServletResponse response){
         try {
             orderReceivedStatisticsFindDTO.setCompanyId(Arrays.asList(userDTO.getCompanyId()));

xx-order/xx-order-server/src/main/java/com/xxfc/platform/order/rest/background/StaffStatisticsAdminController.java

@@ -8,6 +8,7 @@ import com.xxfc.platform.order.pojo.bo.StaffStatisticsTotalBo;
 import com.xxfc.platform.order.pojo.vo.StaffStatisticsVo;
 import lombok.RequiredArgsConstructor;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Controller;
 import org.springframework.web.bind.annotation.*;
 
 /**
@@ -16,7 +17,7 @@ import org.springframework.web.bind.annotation.*;
  * @description
  * @data 2019/11/25 12:39
  */
-@RestController
+@Controller
 @RequestMapping("/admin/staff_statistics")
 @RequiredArgsConstructor(onConstructor = @__(@Autowired))
 public class StaffStatisticsAdminController {
@@ -24,6 +25,7 @@ public class StaffStatisticsAdminController {
     private final StaffStatisticsBiz staffStatisticsBiz;
 
     @PostMapping("/total_statistics")
+    @ResponseBody
     public ObjectRestResponse<StaffStatisticsTotalBo> staffStatisticsWithTotal(@RequestBody StaffStatisticsFindDTO staffStatisticsFindDTO) {
         StaffStatisticsTotalBo staffStatisticsTotalVo = staffStatisticsBiz.staffStatisticsWithTotal(staffStatisticsFindDTO);
         return ObjectRestResponse.succ(staffStatisticsTotalVo);