|
@@ -86,7 +86,7 @@ public class VisitPlanServiceImpl extends ServiceImpl<VisitPlanMapper, VisitPlan
|
|
|
}
|
|
|
Date oldVisitTime = oldPlan.getVisitTime();
|
|
|
long milliCosts = oldVisitTime.getTime() - now.getTime();
|
|
|
- if(milliCosts <= 30 * 60 * 1000){
|
|
|
+ if(milliCosts <= 30 * 60 * 1000 && milliCosts > 0){
|
|
|
httpRespMsg.setError("原拜访时间为近半小时内的数据无法修改");
|
|
|
return httpRespMsg;
|
|
|
}
|
|
@@ -129,7 +129,7 @@ public class VisitPlanServiceImpl extends ServiceImpl<VisitPlanMapper, VisitPlan
|
|
|
visitPlan.setFinalRemindTime(DateTimeUtil.cusLocalDateTimeToDate(newRemindTime));
|
|
|
|
|
|
}
|
|
|
-
|
|
|
+ visitPlan.setFinishState(0);
|
|
|
visitPlanMapper.updateById(visitPlan);
|
|
|
// VisitPlan newPlan = visitPlanMapper.selectById(visitPlan.getId());//前端某些字段不传,以防万一
|
|
|
//
|
|
@@ -248,7 +248,7 @@ public class VisitPlanServiceImpl extends ServiceImpl<VisitPlanMapper, VisitPlan
|
|
|
}
|
|
|
Date oldVisitTime = taskPlan.getVisitTime();
|
|
|
long milliCosts = oldVisitTime.getTime() - now.getTime();
|
|
|
- if(milliCosts <= 30 * 60 * 1000){
|
|
|
+ if(milliCosts <= 30 * 60 * 1000 && milliCosts > 0){
|
|
|
httpRespMsg.setError("原拜访时间为近半小时内的数据无法修改");
|
|
|
return httpRespMsg;
|
|
|
}
|
|
@@ -286,6 +286,7 @@ public class VisitPlanServiceImpl extends ServiceImpl<VisitPlanMapper, VisitPlan
|
|
|
visitPlanMapper.update(null,new LambdaUpdateWrapper<VisitPlan>()
|
|
|
.set(VisitPlan::getVisitTime,newVisitTime)
|
|
|
.set(VisitPlan::getFinalRemindTime,taskPlan.getFinalRemindTime())
|
|
|
+ .set(VisitPlan::getFinishState,0)
|
|
|
.eq(VisitPlan::getId,planId)
|
|
|
);
|
|
|
|