From 43c092d6d00858053d63a4bd165bd0a83d66efa9 Mon Sep 17 00:00:00 2001
From: "382696293@qq.com" <382696293@qq.com>
Date: Mon, 5 Feb 2024 10:18:23 +0800
Subject: [PATCH] =?UTF-8?q?=E6=A0=B9=E6=8D=AE=E5=B9=B4=E6=9C=88=E8=8E=B7?=
 =?UTF-8?q?=E5=8F=96=E6=89=93=E5=8D=A1=E8=AE=B0=E5=BD=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../controller/WxClockLogController.java       | 18 ++++++++++++++----
 .../service/IWxClockLogService.java            |  2 +-
 .../service/impl/WxClockLogServiceImpl.java    |  4 +---
 3 files changed, 16 insertions(+), 8 deletions(-)

diff --git a/flossom-modules/flossom-mini-program/src/main/java/com/flossom/miniProgram/controller/WxClockLogController.java b/flossom-modules/flossom-mini-program/src/main/java/com/flossom/miniProgram/controller/WxClockLogController.java
index c234f4d..4dd8ccc 100644
--- a/flossom-modules/flossom-mini-program/src/main/java/com/flossom/miniProgram/controller/WxClockLogController.java
+++ b/flossom-modules/flossom-mini-program/src/main/java/com/flossom/miniProgram/controller/WxClockLogController.java
@@ -3,12 +3,14 @@ package com.flossom.miniProgram.controller;
 import com.flossom.common.core.constant.Constants;
 import com.flossom.common.core.domain.R;
 import com.flossom.common.core.domain.SysFile;
+import com.flossom.common.core.domain.entity.WxClockLog;
 import com.flossom.common.core.domain.entity.WxClockStatistics;
 import com.flossom.common.core.domain.req.WxClockLogReq;
 import com.flossom.common.core.domain.ret.WxClockLogRet;
 import com.flossom.common.core.exception.ServiceException;
 import com.flossom.common.core.web.controller.BaseController;
 import com.flossom.common.core.web.page.TableDataInfo;
+import com.flossom.common.security.utils.SecurityUtils;
 import com.flossom.miniProgram.service.IWxClockLogService;
 import com.flossom.system.api.RemoteFileService;
 import org.apache.commons.lang3.StringUtils;
@@ -18,8 +20,13 @@ import org.springframework.web.bind.annotation.*;
 import org.springframework.web.multipart.MultipartFile;
 
 import javax.validation.constraints.NotNull;
+import java.time.LocalDate;
+import java.time.LocalDateTime;
+import java.time.LocalTime;
+import java.time.YearMonth;
 import java.util.ArrayList;
 import java.util.List;
+import java.util.Map;
 
 /**
  * 用户打卡Controller
@@ -58,10 +65,13 @@ public class WxClockLogController extends BaseController {
      * 分页查询用户的打卡记录
      */
     @GetMapping("/list")
-    public TableDataInfo list() {
-        startPage();
-        List<WxClockLogRet> list = wxClockLogService.selectWxClockLogList();
-        return getDataTable(list);
+    public R list(@RequestParam(value = "year") Integer year, @RequestParam(value = "month") Integer month) {
+        WxClockLog queryClockLog = new WxClockLog();
+        queryClockLog.setUserId(SecurityUtils.getLoginUser().getWxUserMember().getId());
+        YearMonth targetYearMonth = YearMonth.of(year, month);
+        queryClockLog.getParams().put("beginTime", targetYearMonth.atDay(1).atStartOfDay());
+        queryClockLog.getParams().put("endTime", targetYearMonth.atEndOfMonth().atTime(LocalTime.MAX));
+        return R.ok(wxClockLogService.selectWxClockLogList(queryClockLog));
     }
 
     /**
diff --git a/flossom-modules/flossom-mini-program/src/main/java/com/flossom/miniProgram/service/IWxClockLogService.java b/flossom-modules/flossom-mini-program/src/main/java/com/flossom/miniProgram/service/IWxClockLogService.java
index 3caa599..ba8ce2b 100644
--- a/flossom-modules/flossom-mini-program/src/main/java/com/flossom/miniProgram/service/IWxClockLogService.java
+++ b/flossom-modules/flossom-mini-program/src/main/java/com/flossom/miniProgram/service/IWxClockLogService.java
@@ -15,7 +15,7 @@ public interface IWxClockLogService {
 
     WxClockLogRet latestClockRecord();
 
-    List<WxClockLogRet> selectWxClockLogList();
+    List<WxClockLogRet> selectWxClockLogList(WxClockLog queryClockLog);
 
     List<WxClockStatistics> clockStatistics(Integer year);
 
diff --git a/flossom-modules/flossom-mini-program/src/main/java/com/flossom/miniProgram/service/impl/WxClockLogServiceImpl.java b/flossom-modules/flossom-mini-program/src/main/java/com/flossom/miniProgram/service/impl/WxClockLogServiceImpl.java
index bfdfed6..36449cd 100644
--- a/flossom-modules/flossom-mini-program/src/main/java/com/flossom/miniProgram/service/impl/WxClockLogServiceImpl.java
+++ b/flossom-modules/flossom-mini-program/src/main/java/com/flossom/miniProgram/service/impl/WxClockLogServiceImpl.java
@@ -226,9 +226,7 @@ public class WxClockLogServiceImpl implements IWxClockLogService {
     }
 
     @Override
-    public List<WxClockLogRet> selectWxClockLogList() {
-        WxClockLog queryClockLog = new WxClockLog();
-        queryClockLog.setUserId(SecurityUtils.getLoginUser().getWxUserMember().getId());
+    public List<WxClockLogRet> selectWxClockLogList(WxClockLog queryClockLog) {
         List<WxClockLogRet> list = wxClockLogMapper.selectWxClockImgRetList(queryClockLog);
         if (list != null && list.size() > 0) {
             for (WxClockLogRet wxClockLogRet : list) {