Commit d3567596 by lal Committed by chenzg

提交

parent 6eb0f507
...@@ -241,7 +241,17 @@ public class ClockInController { ...@@ -241,7 +241,17 @@ public class ClockInController {
} }
//具体打卡时间入汇总表(打卡成功才会录入汇总表) //具体打卡时间入汇总表(打卡成功才会录入汇总表)
KqglAssoMonthPunchSummary summary = KqglAssoMonthPunchSummary.builder().build(); KqglAssoMonthPunchSummary isyessum = KqglAssoMonthPunchSummary.builder().build().selectOne(new QueryWrapper<KqglAssoMonthPunchSummary>().lambda()
.eq(KqglAssoMonthPunchSummary::getNum, asUserId).eq(KqglAssoMonthPunchSummary::getOrgCode, user.getOrgCode()));
// KqglAssoMonthPunchSummary summary = KqglAssoMonthPunchSummary.builder().name().build();
if(isyessum == null) {//无汇总记录
}else {
}
}else { }else {
System.out.println("当前打卡时间不在范围内"); System.out.println("当前打卡时间不在范围内");
......
...@@ -870,7 +870,7 @@ public class TimeCardController { ...@@ -870,7 +870,7 @@ public class TimeCardController {
* 查询列表-考勤组-分页 * 查询列表-考勤组-分页
*/ */
@PostMapping(value = "/attendance_group") @PostMapping(value = "/attendance_group")
@ApiOperation(value = "34:查询列表-我审批的/抄送我的-分页", httpMethod = "POST", notes = "查询列表-我审批的-关键字、审批状态、发起时间-分页") @ApiOperation(value = "34:查询列表-考勤组-分页", httpMethod = "POST", notes = "查询列表-考勤组-分页")
@ApiOperationSupport(order = 34) @ApiOperationSupport(order = 34)
public Result<Object> AttendanceGroup(@CurrentUser UserBean userBean, @Validated @RequestBody AttqueryCriteriaDto attquerycriteriadto){ public Result<Object> AttendanceGroup(@CurrentUser UserBean userBean, @Validated @RequestBody AttqueryCriteriaDto attquerycriteriadto){
IPage<KqglMainKqzDto> page = new Page<KqglMainKqzDto>( IPage<KqglMainKqzDto> page = new Page<KqglMainKqzDto>(
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment