Commit 2e7315fc authored by cq990612's avatar cq990612

优化代码结构

parent 1d89cc25
......@@ -264,13 +264,13 @@ public class WorkTimeOrderServiceImpl implements WorkTimeOrderService {
dto.setStatus(RE_SUBMIT);
Date rejectTime = DateUtil.convertStrToDate(DateUtil.convertDateToStr(rejectTime1, "yyyy-MM-dd"), "yyyy-MM-dd");
if (date.getTime() - rejectTime.getTime() > submitTime * 24 * 60 * 60 * 1000) {
throw new BaseCustomException("627","超过"+submitTime+"天的工单不能补报");
throw new BaseCustomException("627","超过"+submitTime+"天的不能填报");
}
}
// 4、默认设置超过系统默认3天(包括驳回3天)未填报的工时将不能填报
if (!REJECTED.equals(dto.getStatus()) && !RE_SUBMIT.equals(dto.getStatus())) {
if (date.getTime() - dto.getWorkDay().getTime() > submitTime * 24 * 60 * 60 * 1000) {
throw new BaseCustomException("627","超过"+submitTime+"天的工单不能补报");
throw new BaseCustomException("627","超过"+submitTime+"天的不能填报");
}
}
......@@ -360,6 +360,7 @@ public class WorkTimeOrderServiceImpl implements WorkTimeOrderService {
if (null == projectId && null == type) {
return null;
}
if (0 != user.getLevel()) {
QueryWrapper<WorkTimeOrder> wrapper = new QueryWrapper<>();
wrapper.in("status", COMPLETED, RE_SUBMIT);
......
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