diff --git a/cash-api/market-server/src/main/java/com/czg/controller/admin/AttendanceController.java b/cash-api/market-server/src/main/java/com/czg/controller/admin/AttendanceController.java index 2517bfbc2..312d9e1e6 100644 --- a/cash-api/market-server/src/main/java/com/czg/controller/admin/AttendanceController.java +++ b/cash-api/market-server/src/main/java/com/czg/controller/admin/AttendanceController.java @@ -14,6 +14,7 @@ import org.springframework.validation.annotation.Validated; import org.springframework.web.bind.annotation.*; import java.util.ArrayList; +import java.util.Map; /** * 考勤打卡数据 @@ -32,8 +33,12 @@ public class AttendanceController { * @return 配置信息 */ @GetMapping("/config") - public CzgResult getConfig() { - return CzgResult.success(shopConfigService.getById(StpKit.USER.getShopId())); + public CzgResult> getConfig() { + ShopConfig config = shopConfigService.getById(StpKit.USER.getShopId()); + return CzgResult.success(Map.of( + "dingAppKey", config.getDingAppKey(), + "dingAppSecret", config.getDingAppSecret() + )); } /** @@ -49,16 +54,14 @@ public class AttendanceController { /** * 列表 - * @param page 开始页码 - * @param size 数量 * @param name 姓名 * @param startTime 开始时间 * @param endTime 结束时间 */ @GetMapping - public CzgResult> getList(@RequestParam Integer page, @RequestParam Integer size, + public CzgResult> getList( @RequestParam(required = false) String name, @RequestParam(required = false) String startTime, @RequestParam(required = false) String endTime) { - return CzgResult.success(attendanceService.list(StpKit.USER.getShopId(), page, size, name, startTime, endTime)); + return CzgResult.success(attendanceService.list(StpKit.USER.getShopId(), name, startTime, endTime)); } } diff --git a/cash-common/cash-common-service/src/main/java/com/czg/market/service/AttendanceService.java b/cash-common/cash-common-service/src/main/java/com/czg/market/service/AttendanceService.java index b4ddd39e2..eae89aeb0 100644 --- a/cash-common/cash-common-service/src/main/java/com/czg/market/service/AttendanceService.java +++ b/cash-common/cash-common-service/src/main/java/com/czg/market/service/AttendanceService.java @@ -5,5 +5,5 @@ import com.czg.market.vo.DingAttendanceStatsVO; import java.util.ArrayList; public interface AttendanceService { - ArrayList list(Long shopId, Integer page, Integer size, String name, String startTime, String endTime); + ArrayList list(Long shopId, String name, String startTime, String endTime); } diff --git a/cash-service/market-service/src/main/java/com/czg/service/market/service/impl/AttendanceServiceImpl.java b/cash-service/market-service/src/main/java/com/czg/service/market/service/impl/AttendanceServiceImpl.java index dd66d263b..1e188d2b9 100644 --- a/cash-service/market-service/src/main/java/com/czg/service/market/service/impl/AttendanceServiceImpl.java +++ b/cash-service/market-service/src/main/java/com/czg/service/market/service/impl/AttendanceServiceImpl.java @@ -21,7 +21,7 @@ public class AttendanceServiceImpl implements AttendanceService { private ShopConfigService shopConfigService; @Override - public ArrayList list(Long shopId, Integer page, Integer size, String name, String startTime, String endTime) { + public ArrayList list(Long shopId, String name, String startTime, String endTime) { DateTime start; DateTime end; if (StrUtil.isBlank(startTime)) {