From 9df23d32703d6e7e6bf4d64113487aed3db58328 Mon Sep 17 00:00:00 2001 From: zhangjinli Date: Wed, 22 Feb 2023 16:39:29 +0800 Subject: [PATCH] =?UTF-8?q?fixed=20=E9=A6=96=E9=A1=B5=E4=BB=BB=E5=8A=A1?= =?UTF-8?q?=E6=95=B0=E6=8D=AE=E5=AF=BC=E5=87=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../manage/StatisticsController.java | 105 +++++++----------- .../zh/project0512/service/IAdminService.java | 5 +- .../serviceImpl/AdminServiceImpl.java | 83 +++++++++++++- 3 files changed, 126 insertions(+), 67 deletions(-) diff --git a/src/main/java/com/zh/project0512/controller/manage/StatisticsController.java b/src/main/java/com/zh/project0512/controller/manage/StatisticsController.java index 9b4dce6..8baff51 100644 --- a/src/main/java/com/zh/project0512/controller/manage/StatisticsController.java +++ b/src/main/java/com/zh/project0512/controller/manage/StatisticsController.java @@ -8,16 +8,20 @@ import com.fasterxml.jackson.annotation.JsonFormat; import com.zh.project0512.annotation.AdminTokenValid; import com.zh.project0512.mapper.AdminMapper; import com.zh.project0512.mapper.UserEffectRecordsMapper; +import com.zh.project0512.model.Task; import com.zh.project0512.model.UserEffectRecords; import com.zh.project0512.model.Video; import com.zh.project0512.model.dto.RankListDTO; +import com.zh.project0512.service.IAdminService; import com.zh.project0512.service.IRankService; +import com.zh.project0512.utils.ExcelUtil; import com.zh.project0512.utils.MybatisPlusUtil; import com.zh.project0512.utils.result.Result; import io.swagger.v3.oas.annotations.Operation; import io.swagger.v3.oas.annotations.media.Schema; import io.swagger.v3.oas.annotations.tags.Tag; import lombok.Data; +import org.apache.poi.ss.usermodel.Workbook; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.validation.annotation.Validated; import org.springframework.web.bind.annotation.PostMapping; @@ -26,6 +30,11 @@ import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RestController; import javax.annotation.Resource; +import javax.servlet.http.HttpServletResponse; +import java.io.IOException; +import java.io.OutputStream; +import java.io.UnsupportedEncodingException; +import java.net.URLEncoder; import java.time.DayOfWeek; import java.time.LocalDate; import java.time.LocalDateTime; @@ -35,6 +44,7 @@ import java.time.temporal.ChronoUnit; import java.time.temporal.TemporalAdjusters; import java.util.ArrayList; import java.util.List; +import java.util.Map; import java.util.stream.Stream; /** @@ -44,6 +54,8 @@ import java.util.stream.Stream; @RestController @RequestMapping("/manage/statistics") public class StatisticsController { + @Autowired + private IAdminService adminService; @Autowired private AdminMapper adminMapper; @Autowired @@ -57,7 +69,7 @@ public class StatisticsController { } @Data - static class SSParam { + public static class SSParam { @Schema(title = "任务Id") private int taskId; @Schema(title = "员工Id") @@ -76,70 +88,7 @@ public class StatisticsController { @PostMapping("/data2") @AdminTokenValid public Result data2(@Validated @RequestBody SSParam param) { - int condition = param.getDateCondition(); - QueryWrapper