fix: 修改签到报表接口

guzijian
1 parent c7d6a2a7
Showing 4 changed files with 69 additions and 2 deletions
ruoyi-admin/src/main/java/com/ruoyi/controller/ReportController.java
ruoyi-admin/src/main/java/com/ruoyi/pojo/response/ReportSignInResponseVo.java
ruoyi-admin/src/main/java/com/ruoyi/pojo/response/ReportViewResponseVo.java
ruoyi-admin/src/main/java/com/ruoyi/service/ReportService.java
@@ -33,6 +33,12 @@ public class ReportController {
     @ApiOperation("签到报表集合查询")
     @GetMapping("/list")
     public AjaxResult getList(@ApiParam @ModelAttribute ReportViewRequestVo requestVo) {
+        return AjaxResult.success(reportService.handlerList(reportService.getReportScrollViewTable(requestVo)));
+    }
+
+    @ApiOperation("签到报表集合查询")
+    @GetMapping("/bigView")
+    public AjaxResult bigView(@ApiParam @ModelAttribute ReportViewRequestVo requestVo) {
         return AjaxResult.success(reportService.getReportScrollViewTable(requestVo));
     }
  
+package com.ruoyi.pojo.response;
+
+import lombok.Data;
+
+import java.util.ArrayList;
+import java.util.List;
+
+/**
+ * @author 20412
+ */
+@Data
+public class ReportSignInResponseVo extends ReportViewResponseVo{
+    /**
+     * 签到次数
+     */
+    Integer count;
+    /**
+     * 子集
+     */
+    List<ReportSignInResponseVo> children;
+    public ReportSignInResponseVo(ReportViewResponseVo vo){
+        this.count = 1;
+        this.children = new ArrayList<>();
+        this.setCreateTime(vo.getCreateTime());
+        this.setId(vo.getId());
+        this.setImage(vo.getImage());
+        this.setAlcoholFlag(vo.getAlcoholFlag());
+        this.setType(vo.getType());
+        this.setJobCode(vo.getJobCode());
+        this.setAlcoholIntake(vo.getAlcoholIntake());
+        this.setName(vo.getName());
+        this.setRemark(vo.getRemark());
+        this.setStatus(vo.getStatus());
+        this.setSingnIn(vo.getSingnIn());
+    }
+    public ReportSignInResponseVo(){
+
+    }
+}
@@ -46,8 +46,8 @@ public class ReportViewResponseVo {
  
     @ExcelProperty(value = "签到时间")
     @ApiModelProperty("签到时间")
-    @DateTimeFormat(pattern = "yyyy-MM-dd hh:mm:ss")
-    @JsonFormat(pattern = "yyyy-MM-dd hh:mm:ss")
+    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
     private Date createTime;
  
     @ExcelProperty(value = "签到状态", converter = SignInStatusConverter.class)
@@ -9,10 +9,12 @@ import com.ruoyi.in.mapper.SignInMapper;
 import com.ruoyi.pojo.request.ReportViewRequestVo;
 import com.ruoyi.pojo.request.ReportErrorRequestVo;
 import com.ruoyi.pojo.response.ReportErrorResponseVo;
+import com.ruoyi.pojo.response.ReportSignInResponseVo;
 import com.ruoyi.pojo.response.ReportViewResponseVo;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
  
+import java.text.SimpleDateFormat;
 import java.util.*;
 import java.util.stream.Collectors;
  
@@ -105,4 +107,24 @@ public class ReportService {
             responses.add(vo);
         });
     }
+
+    public List<ReportSignInResponseVo> handlerList(List<ReportViewResponseVo> reportScrollViewTable) {
+        Map<String, ReportSignInResponseVo> responseMapVo = new HashMap<>(30);
+        for (ReportViewResponseVo originVo : reportScrollViewTable) {
+            String dayKey = getDateDay(originVo.getCreateTime()) + originVo.getJobCode();
+            if (Objects.isNull(responseMapVo.get(dayKey))) {
+                responseMapVo.put(dayKey, new ReportSignInResponseVo(originVo));
+            } else {
+                ReportSignInResponseVo responseVo = responseMapVo.get(dayKey);
+                responseVo.getChildren().add(new ReportSignInResponseVo(originVo));
+                responseVo.setCount(responseVo.getCount() + 1);
+            }
+        }
+        return new ArrayList<>(responseMapVo.values());
+    }
+
+    public String getDateDay(Date createTime) {
+        SimpleDateFormat simple = new SimpleDateFormat("yyyy-MM-dd");
+        return simple.format(createTime);
+    }
 }