|
@@ -609,6 +609,11 @@ public class ProjectCostBudgetServiceImpl extends BaseServiceImpl<ProjectCostBud
|
|
|
//创建时间小于查询开始时间,则开始时间变成查询开始时间
|
|
|
start = startDate;
|
|
|
}
|
|
|
+ //如果创建时间是今天,则直接返回0
|
|
|
+ if (start.compareTo(LocalDate.now()) == 0){
|
|
|
+ vo3.setNotFilledLog(0);
|
|
|
+ return vo3;
|
|
|
+ }
|
|
|
//如果查询结束时间大于今天,则今天为查询结束时间
|
|
|
if (endDate.isAfter(LocalDate.now())){
|
|
|
end = LocalDate.now();
|
|
@@ -619,7 +624,7 @@ public class ProjectCostBudgetServiceImpl extends BaseServiceImpl<ProjectCostBud
|
|
|
//获取用户当月填写的日志
|
|
|
Integer logTotal = baseMapper.getUserMonthLog(userId,start,end);
|
|
|
//根据开始时间,结束时间获取工作日应该填写
|
|
|
- days = CommonUtil.getWorkDays(start, end);
|
|
|
+ days = CommonUtil.getWorkDays(start, end.plusDays(-1));
|
|
|
//计算 应该填写-实际填写
|
|
|
vo3.setNotFilledLog(days - logTotal);
|
|
|
}
|