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

Merge remote-tracking branch 'origin/test' into test

Browse Source
This commit is contained in:
wangw
2025-12-01 11:49:35 +08:00
parent d7a8d6edc5 fe76b4133a
commit cd12c48caa
3 changed files with 14 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
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()
));
}
/**
@@ -41,22 +46,22 @@ public class AttendanceController {
*/
@PutMapping("/config")
public CzgResult<Boolean> editConfig(@Validated @RequestBody AttendanceConfigDTO dto) {
return CzgResult.success(shopConfigService.editConfig(StpKit.USER.getShopId(), BeanUtil.copyProperties(dto, ShopConfig.class)));
ShopConfig shopConfig = BeanUtil.copyProperties(dto, ShopConfig.class);
shopConfig.setId(StpKit.USER.getShopId());
return CzgResult.success(shopConfigService.editConfig(StpKit.USER.getShopId(), shopConfig));
}
/**
* 列表
* @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));
}
}