yudao-team/oa-master
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

getWorkDay前端传递小时数
Some checks are pending
Java CI with Maven / build (11) (push) Waiting to run
Details
Java CI with Maven / build (17) (push) Waiting to run
Details
Java CI with Maven / build (8) (push) Waiting to run
Details
yudao-ui-admin CI / build (14.x) (push) Waiting to run
Details
yudao-ui-admin CI / build (16.x) (push) Waiting to run
Details

Browse Source
This commit is contained in:
XaoLi717 2024-12-18 10:11:10 +08:00
parent e4afc61982
commit c03d29323d
2 changed files with 9 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
yudao-module-home/yudao-module-home-biz/src/main/java/cn/iocoder/yudao/module/home/controller/admin/calendar/vo/CalendarPageReqVO.java
View File

@ -34,6 +34,12 @@ public class CalendarPageReqVO extends PageParam {
@Schema(description = "日期内容") @Schema(description = "日期内容")
private Long endTime; private Long endTime;
@Schema(description = "开始小时")
private Integer sHour;
@Schema(description = "结束小时")
private Integer eHour;
@Schema(description = "创建时间") @Schema(description = "创建时间")
@DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND) @DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND)
private LocalDateTime[] createTime; private LocalDateTime[] createTime;

14
yudao-module-home/yudao-module-home-biz/src/main/java/cn/iocoder/yudao/module/home/service/calendar/CalendarServiceImpl.java
View File

@ -158,22 +158,14 @@ public class CalendarServiceImpl implements CalendarService {
BigDecimal result = null; BigDecimal result = null;
// 获取开始结束时间 // 获取开始结束时间
Long startTime = workDayVO.getStartTime(); Integer sHour = workDayVO.getSHour();
Long endTime = workDayVO.getEndTime(); Integer eHour = workDayVO.getEHour();
// 判断开始结束时间 // 判断开始结束时间
if (startTime == null || endTime == null) { if (sHour == null || eHour == null) {
return null; return null;
} }
// 获取开始结束时间小时数
int sHour = Instant.ofEpochMilli(startTime)
.atZone(ZoneId.systemDefault())
.getHour();
int eHour = Instant.ofEpochMilli(endTime)
.atZone(ZoneId.systemDefault())
.getHour();
// 获取开始日期结束日期传递的isWorkDay参数 // 获取开始日期结束日期传递的isWorkDay参数
String sDay = workDayVO.getDate()[0]; String sDay = workDayVO.getDate()[0];
String eDay = workDayVO.getDate()[1]; String eDay = workDayVO.getDate()[1];