czg_team/cashier_server
7
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

钉钉考勤

Browse Source
This commit is contained in:
张松
2025-12-01 11:39:39 +08:00
parent 9f9edec0f6
commit fe76b4133a
3 changed files with 11 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
cash-api/market-server/src/main/java/com/czg/controller/admin/AttendanceController.java
View File

@@ -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<ShopConfig> getConfig() {
return CzgResult.success(shopConfigService.getById(StpKit.USER.getShopId()));
public CzgResult<Map<String, String>> 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<ArrayList<DingAttendanceStatsVO>> getList(@RequestParam Integer page, @RequestParam Integer size,
public CzgResult<ArrayList<DingAttendanceStatsVO>> 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));
}
}

2
cash-common/cash-common-service/src/main/java/com/czg/market/service/AttendanceService.java
View File

@@ -5,5 +5,5 @@ import com.czg.market.vo.DingAttendanceStatsVO;
import java.util.ArrayList;
public interface AttendanceService {
ArrayList<DingAttendanceStatsVO> list(Long shopId, Integer page, Integer size, String name, String startTime, String endTime);
ArrayList<DingAttendanceStatsVO> list(Long shopId, String name, String startTime, String endTime);
}

2
cash-service/market-service/src/main/java/com/czg/service/market/service/impl/AttendanceServiceImpl.java
View File

@@ -21,7 +21,7 @@ public class AttendanceServiceImpl implements AttendanceService {
private ShopConfigService shopConfigService;
@Override
public ArrayList<DingAttendanceStatsVO> list(Long shopId, Integer page, Integer size, String name, String startTime, String endTime) {
public ArrayList<DingAttendanceStatsVO> list(Long shopId, String name, String startTime, String endTime) {
DateTime start;
DateTime end;
if (StrUtil.isBlank(startTime)) {