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

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

Browse Source
This commit is contained in:
furongxin 2024-04-15 21:42:00 +08:00
commit de97bc1b50
2 changed files with 19 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
yudao-framework/yudao-common/src/main/java/cn/iocoder/yudao/framework/common/util/date/DateUtils.java
View File

@ -265,4 +265,17 @@ public class DateUtils {
}
return list;
}
public static Date buildTimeYYYYMMddHHmm(String yyyy_MM_dd, String HH_mm) {
String[] yyyy_MM_dds = yyyy_MM_dd.split("-");
String[] time = HH_mm.split(":");
return buildTime(Integer.parseInt(yyyy_MM_dds[0]), Integer.parseInt(yyyy_MM_dds[1]), Integer.parseInt(yyyy_MM_dds[2]),
Integer.parseInt(time[0]), Integer.parseInt(time[1]), 0);
}
public static Date buildTimeYYYYMMdd(String yyyy_MM_dd) {
String[] yyyy_MM_dds = yyyy_MM_dd.split("-");
return buildTime(Integer.parseInt(yyyy_MM_dds[0]), Integer.parseInt(yyyy_MM_dds[1]), Integer.parseInt(yyyy_MM_dds[2]),
0, 0, 0);
}
}

10
yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/service/worklog/LogInstanceServiceImpl.java
View File

@ -1,5 +1,6 @@
package cn.iocoder.yudao.module.system.service.worklog;
import cn.hutool.core.date.DateUtil;
import cn.hutool.json.JSONObject;
import cn.iocoder.yudao.framework.common.util.date.DateUtils;
import cn.iocoder.yudao.framework.common.util.object.BeanUtils;
@ -108,14 +109,15 @@ public class LogInstanceServiceImpl implements LogInstanceService {
logInstance.setName(adminUserDO.getNickname() + "的" + logFormDo.getName());
// 插入提交状态
Date endTime = null;
Date thisDate = new Date();
if (logRuleDO.getType() == 1) {
endTime = DateUtils.buildHHmmTime(logRuleDO.getEndTime());
Date endTime = DateUtils.buildTimeYYYYMMddHHmm(createReqVO.getTime(), logRuleDO.getEndTime());
logInstance.setStatus(thisDate.getTime() < endTime.getTime() ? 1 : 2);
} else {
endTime = DateUtils.buildWeekHHmmTime(logRuleDO.getEndTime());
Date beginTime = DateUtil.beginOfWeek(thisDate);
Date endTime = DateUtils.buildWeekHHmmTime(logRuleDO.getEndTime());
logInstance.setStatus(DateUtil.isIn(thisDate, beginTime, endTime) ? 1 : 2);
}
logInstance.setStatus(thisDate.getTime() < endTime.getTime() ? 1 : 2);
// 插入
logInstanceMapper.insert(logInstance);