diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Controllers/StuVolunteerController.cs b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Controllers/StuVolunteerController.cs
index a8e3f48ba..7d6157b71 100644
--- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Controllers/StuVolunteerController.cs
+++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Controllers/StuVolunteerController.cs
@@ -261,19 +261,6 @@ namespace Learun.Application.Web.Areas.EducationalAdministration.Controllers
return Success("取消成功！");
}
- ///
- /// 保存草稿
- ///
- ///
- ///
- ///
- public ActionResult DraftForm(string keyValue, string strEntity)
- {
- StuVolunteerEntity entity = strEntity.ToObject();
- entity.IsSubmit = false;
- stuVolunteerIBLL.SaveEntity(keyValue, entity);
- return Success("保存成功！");
- }
///
/// 提交选择专业
///
@@ -283,28 +270,28 @@ namespace Learun.Application.Web.Areas.EducationalAdministration.Controllers
public ActionResult SubmitForm(string keyValue, string strEntity)
{
StuVolunteerEntity entity = strEntity.ToObject();
- entity.IsSubmit = true;
+
stuVolunteerIBLL.SaveEntity(keyValue, entity);
return Success("提交成功！");
}
- public ActionResult Search(string CardNo, string txtPass)
- {
- var StuVolunteerData = stuVolunteerIBLL.IsEnrollByCard(CardNo);
- if (StuVolunteerData != null)
- {
- var jsonData = new
- {
- StuVolunteer = StuVolunteerData,
- };
- return Success(jsonData);
- }
- else
- {
- return Success(null);
- }
- }
+ //public ActionResult Search(string CardNo, string txtPass)
+ //{
+ // var StuVolunteerData = stuVolunteerIBLL.IsEnrollByCard(CardNo);
+ // if (StuVolunteerData != null)
+ // {
+ // var jsonData = new
+ // {
+ // StuVolunteer = StuVolunteerData,
+ // };
+ // return Success(jsonData);
+ // }
+ // else
+ // {
+ // return Success(null);
+ // }
+ //}
#endregion
}
diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Controllers/StuVolunteerPhoneController.cs b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Controllers/StuVolunteerPhoneController.cs
index 2ba72ff8f..5d2f11f71 100644
--- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Controllers/StuVolunteerPhoneController.cs
+++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Controllers/StuVolunteerPhoneController.cs
@@ -123,71 +123,70 @@ namespace Learun.Application.Web.Areas.EducationalAdministration.Controllers
#region 扩展数据
///
- /// 报名草稿
+ /// 登录查询
///
- ///
- ///
///
- public ActionResult DraftForm(string keyValue, string strEntity)
+ [HttpPost]
+ [AjaxOnly]
+ public ActionResult IsExist(string CardNo, string Password)
{
- StuVolunteerEntity entity = strEntity.ToObject();
- entity.IsSubmit = false;
- stuVolunteerIBLL.DraftForm(keyValue, entity);
- return Success("保存成功！");
+ var entity = stuVolunteerIBLL.GetEntityByCardNo(CardNo);
+ if (entity == null)
+ {
+ return Fail("身份证号不存在！");
+ }
+ if (Password != CardNo.Substring(CardNo.Length - 6))
+ {
+ return Fail("密码错误！");
+ }
+ return Success("查询成功！");
}
///
- /// 提交选择专业
+ /// 报名提交
///
///
///
///
+ [HttpPost]
+ [AjaxOnly]
public ActionResult SubmitForm(string keyValue, string strEntity)
{
StuVolunteerEntity entity = strEntity.ToObject();
- entity.IsSubmit = true;
- stuVolunteerIBLL.SubmitForm(entity.CardNo, entity);
+ entity.EnrollTime = DateTime.Now;
+ stuVolunteerIBLL.SubmitForm(keyValue, entity);
return Success("提交成功！");
}
- public ActionResult Search(string CardNo, string txtPass)
- {
- var StuVolunteerData = stuVolunteerIBLL.IsEnrollByCard(CardNo);
- if (StuVolunteerData != null)
- {
- var jsonData = new
- {
- StuVolunteer = StuVolunteerData,
- };
- return Success(jsonData);
- }
- else
- {
- return Success(null);
- }
- }
-
- public ActionResult SearchForm(string CardNo, string txtPass)
+ //public ActionResult Search(string CardNo, string txtPass)
+ //{
+ // var StuVolunteerData = new StuVolunteerEntity();// stuVolunteerIBLL.IsEnrollByCard(CardNo);
+ // if (StuVolunteerData != null)
+ // {
+ // var jsonData = new
+ // {
+ // StuVolunteer = StuVolunteerData,
+ // };
+ // return Success(jsonData);
+ // }
+ // else
+ // {
+ // return Success(null);
+ // }
+ //}
+ [HttpGet]
+ [AjaxOnly]
+ public ActionResult SearchForm(string CardNo)
{
- var StuVolunteerData = stuVolunteerIBLL.IsEnrollByCard(CardNo);
- if (StuVolunteerData != null)
- {
- var jsonData = new
- {
- StuVolunteer = StuVolunteerData,
- };
- return Success(jsonData);
- }
- else
- {
- return Success(null);
- }
+ var StuVolunteerData = stuVolunteerIBLL.GetEntityByCardNo(CardNo);
+
+ return Success(StuVolunteerData);
}
public ActionResult SearchCard(string CardNo)
{
- var StuVolunteerData = stuVolunteerIBLL.GetCardId(CardNo);
+ var StuVolunteerData = stuVolunteerIBLL.GetEntityByCardNo(CardNo);
var jsonData = new
{
StuVolunteer = StuVolunteerData,
diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuVolunteerPhone/FormApply.cshtml b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuVolunteerPhone/FormApply.cshtml
index 6f725fd9a..feee83e25 100644
--- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuVolunteerPhone/FormApply.cshtml
+++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuVolunteerPhone/FormApply.cshtml
@@ -19,93 +19,13 @@
-
- @**@
@@ -277,30 +87,173 @@
-
-
+ function formatDateTimesM() {
+ var date = new Date(1960, 0, 0);
+ var y = date.getFullYear();
+ var m = date.getMonth() + 1 < 10 ? '0' + (date.getMonth() + 1) : date.getMonth() + 1;
+ var d = date.getDate() < 10 ? '0' + date.getDate() : date.getDate();
+ var h = date.getHours() < 10 ? '0' + date.getHours() : date.getHours();
+ var min = date.getMinutes() < 10 ? '0' + date.getMinutes() : date.getMinutes();
+
+ return {
+ y: y,
+ m: m,
+ d: d,
+ h: h,
+ min: min
+ }
+ };
+