|
@@ -1239,6 +1239,9 @@ public class ProjectCostBudgetServiceImpl extends BaseServiceImpl<ProjectCostBud
|
|
if (planLog.getRealPlanStartTime().until(practicalFinishTime, ChronoUnit.DAYS) > 35) {
|
|
if (planLog.getRealPlanStartTime().until(practicalFinishTime, ChronoUnit.DAYS) > 35) {
|
|
throw new ServiceException("固定计划完成周期超过一个月,请联系管理员");
|
|
throw new ServiceException("固定计划完成周期超过一个月,请联系管理员");
|
|
}else {
|
|
}else {
|
|
|
|
+ if (planLog.getRealPlanStartTime().compareTo(practicalFinishTime) >= 1){
|
|
|
|
+ throw new ServiceException("数据错误,计划开始时间大于结束时间");
|
|
|
|
+ }
|
|
realWorkDays = CommonUtil.getWorkDays(planLog.getRealPlanStartTime(), practicalFinishTime);
|
|
realWorkDays = CommonUtil.getWorkDays(planLog.getRealPlanStartTime(), practicalFinishTime);
|
|
}
|
|
}
|
|
}else {
|
|
}else {
|
|
@@ -1249,6 +1252,9 @@ public class ProjectCostBudgetServiceImpl extends BaseServiceImpl<ProjectCostBud
|
|
if (planLog.getOpenPlanStartTime().until(practicalFinishTime, ChronoUnit.DAYS) > 35) {
|
|
if (planLog.getOpenPlanStartTime().until(practicalFinishTime, ChronoUnit.DAYS) > 35) {
|
|
throw new ServiceException("固定计划完成周期超过一个月,请联系管理员");
|
|
throw new ServiceException("固定计划完成周期超过一个月,请联系管理员");
|
|
}else {
|
|
}else {
|
|
|
|
+ if (planLog.getOpenPlanStartTime().compareTo(practicalFinishTime) >= 1){
|
|
|
|
+ throw new ServiceException("数据错误,计划开始时间大于结束时间");
|
|
|
|
+ }
|
|
int day = CommonUtil.getWorkDays(planLog.getOpenPlanStartTime(), practicalFinishTime);
|
|
int day = CommonUtil.getWorkDays(planLog.getOpenPlanStartTime(), practicalFinishTime);
|
|
realWorkDays = days + day;
|
|
realWorkDays = days + day;
|
|
}
|
|
}
|