From f2a989e851df4d60ab02073772db928896ec683a Mon Sep 17 00:00:00 2001 From: tanghucheng Date: Mon, 6 Dec 2021 14:21:23 +0800 Subject: [PATCH] * adjust for date format for programplan. --- module/programplan/lang/zh-cn.php | 2 ++ module/programplan/model.php | 10 ++++++++++ 2 files changed, 12 insertions(+) diff --git a/module/programplan/lang/zh-cn.php b/module/programplan/lang/zh-cn.php index a97076829d..4d456fd181 100644 --- a/module/programplan/lang/zh-cn.php +++ b/module/programplan/lang/zh-cn.php @@ -53,6 +53,8 @@ $lang->programplan->hideCriticalPath = '隐藏关键路径'; $lang->programplan->showCriticalPath = '显示关键路径'; $lang->programplan->errorBegin = '阶段的开始时间不能小于所属项目的开始时间%s'; $lang->programplan->errorEnd = '阶段的结束时间不能大于所属项目的结束时间%s'; +$lang->programplan->emptyBegin = '『计划开始』应当为合法的日期'; +$lang->programplan->emptyEnd = '『计划完成』应当为合法的日期'; $lang->programplan->milestoneList[1] = '是'; $lang->programplan->milestoneList[0] = '否'; diff --git a/module/programplan/model.php b/module/programplan/model.php index 9d46210a8b..1b767fadfb 100644 --- a/module/programplan/model.php +++ b/module/programplan/model.php @@ -447,6 +447,16 @@ class programplanModel extends model dao::$errors['message'][] = $this->lang->programplan->error->percentNumber; return false; } + if($plan->begin == '0000-00-00' or !validater::checkDate($plan->begin)) + { + dao::$errors['message'][] = $this->lang->programplan->emptyBegin; + return false; + } + if($plan->end == '0000-00-00' or !validater::checkDate($plan->end)) + { + dao::$errors['message'][] = $this->lang->programplan->emptyEnd; + return false; + } if($plan->end != '0000-00-00' and $plan->end < $plan->begin) { dao::$errors['message'][] = $this->lang->programplan->error->planFinishSmall;