ak/zn-cloud
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

考勤子表调整/

Browse Source
This commit is contained in:
aikai 2024-05-23 11:10:25 +08:00
parent 4759c15f79
commit 59a6517bb2
4 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/groupshiftitem/AttendanceGroupShiftItemController.java
View File

@ -29,7 +29,7 @@ import static cn.iocoder.yudao.framework.operatelog.core.enums.OperateTypeEnum.E
@Tag(name = "管理后台 - 考勤组班次子表") @Tag(name = "管理后台 - 考勤组班次子表")
@RestController @RestController
@RequestMapping("/system.attendance/attendance-group-shift-item") @RequestMapping("/system/attendance/attendance-group-shift-item")
@Validated @Validated
public class AttendanceGroupShiftItemController { public class AttendanceGroupShiftItemController {

2
yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/app/attendance/AttendanceController.java
View File

@ -29,7 +29,7 @@ public class AttendanceController {
@GetMapping("/getPunchPage") @GetMapping("/getPunchPage")
@Operation(summary = "获取考勤页面") @Operation(summary = "获取考勤页面")
public CommonResult<AttendancePunchPageVO> getPunchPage(@ModelAttribute AttendancePunchPageDTO dto) { public CommonResult<AttendancePunchPageVO> getPunchPage(@ModelAttribute AttendancePunchPageDTO dto) {
AttendancePunchPageVO vo = attendanceService.getPunchPage(dto.setUserId(getLoginUserId())); AttendancePunchPageVO vo = attendanceService.getPunchPage(dto);
return success(vo); return success(vo);
} }

5
yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/service/attendance/AttendanceServiceImpl.java
View File

@ -136,8 +136,9 @@ public class AttendanceServiceImpl implements AttendanceService {
.setDayTime(pageVO.getTargetDayStr()) .setDayTime(pageVO.getTargetDayStr())
.setShouldPunchTime(pageVO.getShouldPunchTime()) .setShouldPunchTime(pageVO.getShouldPunchTime())
.setPunchTime(dto.getLocalDateTime()) .setPunchTime(dto.getLocalDateTime())
.setLateTime(Constants.ONE.equals(status) ? LocalDateTimeUtil.between(dto.getLocalDateTime(), pageVO.getShouldPunchTime(), ChronoUnit.MILLIS) : 0L) //取绝对值 如果status是负数则变为正数
.setLeaveEarlyTime(Constants.TWO.equals(status) ? LocalDateTimeUtil.between(dto.getLocalDateTime(), pageVO.getShouldPunchTime(), ChronoUnit.MILLIS) : 0L) .setLateTime(Constants.ONE.equals(status) ? Math.abs(LocalDateTimeUtil.between(dto.getLocalDateTime(), pageVO.getShouldPunchTime(), ChronoUnit.MILLIS)) : 0L)
.setLeaveEarlyTime(Constants.TWO.equals(status) ? Math.abs(LocalDateTimeUtil.between(dto.getLocalDateTime(), pageVO.getShouldPunchTime(), ChronoUnit.MILLIS)) : 0L)
.setRemark(dto.getRemark()) .setRemark(dto.getRemark())
.setImage(dto.getImage()) .setImage(dto.getImage())
.setPunchAddress(dto.getPunchAddress()); .setPunchAddress(dto.getPunchAddress());

2
yudao-module-system/yudao-module-system-biz/src/main/resources/logback-spring.xml
View File

@ -66,7 +66,7 @@
</springProfile> </springProfile>
<!-- 其它环境 --> <!-- 其它环境 -->
<springProfile name="dev,test,stage,prod,default"> <springProfile name="dev,test,stage,prod,default">
<root level="DEBUG"> <root level="INFO">
<appender-ref ref="STDOUT"/> <appender-ref ref="STDOUT"/>
<appender-ref ref="ASYNC"/> <appender-ref ref="ASYNC"/>
<appender-ref ref="GRPC"/> <appender-ref ref="GRPC"/>