feat: 修改获取考勤接口

guzijian
1 parent 577a53a8
Showing 3 changed files with 51 additions and 9 deletions
Bsth-admin/src/main/java/com/ruoyi/controller/ReportController.java
Bsth-admin/src/main/java/com/ruoyi/pojo/vo/PersonSignDataResponseVo.java
Bsth-admin/src/main/java/com/ruoyi/service/ReportService.java
@@ -7,6 +7,7 @@ import com.ruoyi.pojo.request.ReportViewRequestVo;
 import com.ruoyi.pojo.request.ReportErrorRequestVo;
 import com.ruoyi.pojo.response.ExportReportViewResponseVo;
 import com.ruoyi.pojo.response.ReportErrorResponseVo;
+import com.ruoyi.pojo.vo.PersonSignDataResponseVo;
 import com.ruoyi.service.ReportService;
 import com.ruoyi.system.domain.SysNotice;
 import io.swagger.annotations.Api;
@@ -88,7 +89,7 @@ public class ReportController {
  
     @ApiOperation("提供给人事用接口(获取当月所有签到记录)")
     @GetMapping("/list/{month}")
-    public Result<?> listReportMonth(@PathVariable("month") String month, HttpServletRequest request) {
+    public Result<PersonSignDataResponseVo> listReportMonth(@PathVariable("month") String month, HttpServletRequest request) {
         return reportService.listReportMonth(month, request);
     }
 }
+package com.ruoyi.pojo.vo;
+
+import com.ruoyi.pojo.response.ExportReportViewResponseVo;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.util.ArrayList;
+import java.util.List;
+
+/**
+ * 人员签到响应数据
+ * @author 20412
+ */
+@Data
+@ApiModel("签到数据对象")
+public class PersonSignDataResponseVo {
+    @ApiModelProperty("打卡集合")
+    private List<SignData> list;
+    public PersonSignDataResponseVo(){
+        this.list = new ArrayList<>();
+    }
+    @Data
+    @ApiModel("签到数据")
+    public static class SignData{
+        @ApiModelProperty("数据日期")
+        private String date;
+        @ApiModelProperty("打卡集合")
+        private List<ExportReportViewResponseVo> responseVoList;
+    }
+}
@@ -12,6 +12,7 @@ import com.ruoyi.domain.DriverScheduling;
 import com.ruoyi.pojo.request.ReportViewRequestVo;
 import com.ruoyi.pojo.request.ReportErrorRequestVo;
 import com.ruoyi.pojo.response.*;
+import com.ruoyi.pojo.vo.PersonSignDataResponseVo;
 import com.ruoyi.system.domain.SysNotice;
 import com.ruoyi.system.service.ISysNoticeService;
 import com.ruoyi.utils.ConstDateUtil;
@@ -215,7 +216,7 @@ public class ReportService {
         return null;
     }
  
-    public Result listReportMonth(String month, HttpServletRequest request) {
+    public Result<PersonSignDataResponseVo> listReportMonth(String month, HttpServletRequest request) {
         boolean validateDate = validateDate(month);
         String header = request.getHeader("X-TOKEN-AUTHORIZATION");
         if (!PERSONNEL_API_KEY.equals(header)) {
@@ -227,21 +228,30 @@ public class ReportService {
         ReportViewRequestVo vo = new ReportViewRequestVo();
         vo.setDate(month + "-01");
         List<ExportReportViewResponseVo> responseVoList = getMonthReportTableResponseVo(vo);
-        Map<String, List<ExportReportViewResponseVo>> map = new HashMap<>(responseVoList.size() / 30);
-        handleResponseByDay(responseVoList, map, vo.getDate());
-        return Result.OK(map);
+        PersonSignDataResponseVo responseVo = new PersonSignDataResponseVo();
+        handleResponseByDay(responseVoList, responseVo, vo.getDate());
+        return Result.OK(responseVo);
     }
  
-    private void handleResponseByDay(List<ExportReportViewResponseVo> responseVoList, Map<String, List<ExportReportViewResponseVo>> map, @NotBlank String date) {
+    private void handleResponseByDay(List<ExportReportViewResponseVo> responseVoList, PersonSignDataResponseVo voList, @NotBlank String date) {
+        List<PersonSignDataResponseVo.SignData> list = voList.getList();
+        Map<String, List<ExportReportViewResponseVo>> map = new HashMap<>(30);
         for (ExportReportViewResponseVo vo : responseVoList) {
             String key = ConstDateUtil.formatDate("yyyy-MM-dd", vo.getScheduleDate());
             List<ExportReportViewResponseVo> vos = map.get(key);
-            if (CollectionUtil.isEmpty(vos)){
-                map.put(key,new ArrayList<>(Arrays.asList(vo)));
-            }else {
+            if (CollectionUtil.isEmpty(vos)) {
+                map.put(key, new ArrayList<>(Arrays.asList(vo)));
+            } else {
                 map.get(key).add(vo);
             }
         }
+        // 转换对象
+        for (Map.Entry<String, List<ExportReportViewResponseVo>> entry : map.entrySet()) {
+            PersonSignDataResponseVo.SignData signData = new PersonSignDataResponseVo.SignData();
+            signData.setDate(entry.getKey());
+            signData.setResponseVoList(entry.getValue());
+            list.add(signData);
+        }
     }
  
     /**