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
new file mode 100644
index 000000000..70415d825
--- /dev/null
+++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Controllers/StuVolunteerController.cs
@@ -0,0 +1,223 @@
+using System;
+using Learun.Util;
+using System.Data;
+using Learun.Application.TwoDevelopment.EducationalAdministration;
+using System.Web.Mvc;
+using System.Collections.Generic;
+using System.Linq;
+
+namespace Learun.Application.Web.Areas.EducationalAdministration.Controllers
+{
+ ///
+ /// 版 本 Learun-ADMS V7.0.6 力软敏捷开发框架
+ /// Copyright (c) 2013-2020 力软信息技术(苏州)有限公司
+ /// 创 建:超级管理员
+ /// 日 期:2021-12-16 10:14
+ /// 描 述:长阳迎新
+ ///
+ public class StuVolunteerController : MvcControllerBase
+ {
+ private StuVolunteerIBLL stuVolunteerIBLL = new StuVolunteerBLL();
+
+ #region 视图功能
+
+ ///
+ /// 主页面
+ ///
+ ///
+ [HttpGet]
+ public ActionResult Index()
+ {
+ return View();
+ }
+ ///
+ /// 表单页
+ ///
+ ///
+ [HttpGet]
+ public ActionResult Form()
+ {
+ return View();
+ }
+
+ ///
+ /// 标注页面
+ ///
+ ///
+ [HttpGet]
+ public ActionResult IndexLabel()
+ {
+ return View();
+ }
+
+ ///
+ /// 志愿表单页
+ ///
+ ///
+ [HttpGet]
+ public ActionResult FormSchool()
+ {
+ return View();
+ }
+
+ ///
+ /// 志愿表单页
+ ///
+ ///
+ [HttpGet]
+ public ActionResult IndexAccount()
+ {
+ return View();
+ }
+
+ #endregion
+
+ #region 获取数据
+
+ ///
+ /// 获取页面显示列表数据
+ ///
+ /// 分页参数
+ /// 查询参数
+ ///
+ [HttpGet]
+ [AjaxOnly]
+ public ActionResult GetPageList(string pagination, string queryJson)
+ {
+ Pagination paginationobj = pagination.ToObject();
+ var data = stuVolunteerIBLL.GetPageList(paginationobj, queryJson);
+ var jsonData = new
+ {
+ rows = data,
+ total = paginationobj.total,
+ page = paginationobj.page,
+ records = paginationobj.records
+ };
+ return Success(jsonData);
+ }
+ ///
+ /// 获取表单数据
+ ///
+ /// 主键
+ ///
+ [HttpGet]
+ [AjaxOnly]
+ public ActionResult GetFormData(string keyValue)
+ {
+ var StuVolunteerData = stuVolunteerIBLL.GetStuVolunteerEntity(keyValue);
+ var jsonData = new
+ {
+ StuVolunteer = StuVolunteerData,
+ };
+ return Success(jsonData);
+ }
+ #endregion
+
+ #region 提交数据
+
+ ///
+ /// 删除实体数据
+ ///
+ /// 主键
+ ///
+ [HttpPost]
+ [AjaxOnly]
+ public ActionResult DeleteForm(string keyValue)
+ {
+ stuVolunteerIBLL.DeleteEntity(keyValue);
+ return Success("删除成功!");
+ }
+ ///
+ /// 保存实体数据(新增、修改)
+ ///
+ /// 主键
+ /// 实体
+ ///
+ [HttpPost]
+ [ValidateAntiForgeryToken]
+ [AjaxOnly]
+ public ActionResult SaveForm(string keyValue, string strEntity)
+ {
+ StuVolunteerEntity entity = strEntity.ToObject();
+ var userInfo = LoginUserInfo.Get();
+ if (string.IsNullOrEmpty(keyValue))
+ {
+ entity.CreateUser = userInfo.realName;
+ entity.CreateTime = DateTime.Now;
+ }
+ entity.UpdateUser = userInfo.realName;
+ entity.UpdateTime = DateTime.Now;
+ var dWList =
+ stuVolunteerIBLL.GetRepetitions(entity.H_SchoolNo, entity.ApplyNo, entity.CardNo).Where(x => x.ID != keyValue);
+ if (dWList.Count() > 0)
+ {
+ return Fail("保存失败,请检查数据有重复项");
+ }
+ stuVolunteerIBLL.SaveEntity(keyValue, entity);
+ return Success("保存成功!");
+ }
+ #endregion
+
+
+ #region 扩展数据
+
+ ///
+ /// 标注数据
+ ///
+ ///
+ ///
+ public ActionResult LabelForm(string keyValue)
+ {
+ stuVolunteerIBLL.LabelEntity(keyValue);
+ return Success("标注成功!");
+ }
+
+ ///
+ /// 取消数据
+ ///
+ ///
+ ///
+ public ActionResult CancelLabel(string keyValue)
+ {
+ stuVolunteerIBLL.CancelLabel(keyValue);
+ return Success("取消成功!");
+ }
+
+ ///
+ /// 填报志愿
+ ///
+ ///
+ ///
+ public ActionResult IsOurSchool(string keyValue, string strEntity)
+ {
+ StuVolunteerEntity entity = strEntity.ToObject();
+ stuVolunteerIBLL.IsOurSchool(keyValue,entity);
+ return Success("填报成功!");
+ }
+
+
+ ///
+ /// 录取学生
+ ///
+ ///
+ ///
+ public ActionResult EnrollForm(string keyValue)
+ {
+ stuVolunteerIBLL.EnrollEntity(keyValue);
+ return Success("录取成功!");
+ }
+
+ ///
+ /// 取消录取学生
+ ///
+ ///
+ ///
+ public ActionResult CancelForm(string keyValue)
+ {
+ stuVolunteerIBLL.CancelEntity(keyValue);
+ return Success("取消成功!");
+ }
+
+ #endregion
+ }
+}
diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuVolunteer/Form.cshtml b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuVolunteer/Form.cshtml
new file mode 100644
index 000000000..f87074ef2
--- /dev/null
+++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuVolunteer/Form.cshtml
@@ -0,0 +1,83 @@
+@{
+ ViewBag.Title = "长阳迎新";
+ Layout = "~/Views/Shared/_Form.cshtml";
+}
+
+@Html.AppendJsFile("/Areas/EducationalAdministration/Views/StuVolunteer/Form.js")
diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuVolunteer/Form.js b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuVolunteer/Form.js
new file mode 100644
index 000000000..74d49c484
--- /dev/null
+++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuVolunteer/Form.js
@@ -0,0 +1,52 @@
+/* * 版 本 Learun-ADMS V7.0.6 力软敏捷开发框架(http://www.learun.cn)
+ * Copyright (c) 2013-2020 力软信息技术(苏州)有限公司
+ * 创建人:超级管理员
+ * 日 期:2021-12-16 10:14
+ * 描 述:长阳迎新
+ */
+var acceptClick;
+var keyValue = request('keyValue');
+var bootstrap = function ($, learun) {
+ "use strict";
+ var page = {
+ init: function () {
+ $('.lr-form-wrap').lrscroll();
+ page.bind();
+ page.initData();
+ },
+ bind: function () {
+ $('#IsCYSchool').lrDataItemSelect({ code: 'YesOrNoBit' });
+ $('#Sex').lrDataItemSelect({ code: 'usersex' });
+ },
+ initData: function () {
+ if (!!keyValue) {
+ $.lrSetForm(top.$.rootUrl + '/EducationalAdministration/StuVolunteer/GetFormData?keyValue=' + keyValue, function (data) {
+ for (var id in data) {
+ if (!!data[id].length && data[id].length > 0) {
+ $('#' + id ).jfGridSet('refreshdata', data[id]);
+ }
+ else {
+ $('[data-table="' + id + '"]').lrSetFormData(data[id]);
+ }
+ }
+ });
+ }
+ }
+ };
+ // 保存数据
+ acceptClick = function (callBack) {
+ if (!$('body').lrValidform()) {
+ return false;
+ }
+ var postData = {
+ strEntity: JSON.stringify($('body').lrGetFormData())
+ };
+ $.lrSaveForm(top.$.rootUrl + '/EducationalAdministration/StuVolunteer/SaveForm?keyValue=' + keyValue, postData, function (res) {
+ // 保存成功后才回调
+ if (!!callBack) {
+ callBack();
+ }
+ });
+ };
+ page.init();
+}
diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuVolunteer/FormSchool.cshtml b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuVolunteer/FormSchool.cshtml
new file mode 100644
index 000000000..9faced9c4
--- /dev/null
+++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuVolunteer/FormSchool.cshtml
@@ -0,0 +1,47 @@
+@{
+ ViewBag.Title = "长阳迎新";
+ Layout = "~/Views/Shared/_Form.cshtml";
+}
+
+@Html.AppendJsFile("/Areas/EducationalAdministration/Views/StuVolunteer/FormSchool.js")
diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuVolunteer/FormSchool.js b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuVolunteer/FormSchool.js
new file mode 100644
index 000000000..74d49c484
--- /dev/null
+++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuVolunteer/FormSchool.js
@@ -0,0 +1,52 @@
+/* * 版 本 Learun-ADMS V7.0.6 力软敏捷开发框架(http://www.learun.cn)
+ * Copyright (c) 2013-2020 力软信息技术(苏州)有限公司
+ * 创建人:超级管理员
+ * 日 期:2021-12-16 10:14
+ * 描 述:长阳迎新
+ */
+var acceptClick;
+var keyValue = request('keyValue');
+var bootstrap = function ($, learun) {
+ "use strict";
+ var page = {
+ init: function () {
+ $('.lr-form-wrap').lrscroll();
+ page.bind();
+ page.initData();
+ },
+ bind: function () {
+ $('#IsCYSchool').lrDataItemSelect({ code: 'YesOrNoBit' });
+ $('#Sex').lrDataItemSelect({ code: 'usersex' });
+ },
+ initData: function () {
+ if (!!keyValue) {
+ $.lrSetForm(top.$.rootUrl + '/EducationalAdministration/StuVolunteer/GetFormData?keyValue=' + keyValue, function (data) {
+ for (var id in data) {
+ if (!!data[id].length && data[id].length > 0) {
+ $('#' + id ).jfGridSet('refreshdata', data[id]);
+ }
+ else {
+ $('[data-table="' + id + '"]').lrSetFormData(data[id]);
+ }
+ }
+ });
+ }
+ }
+ };
+ // 保存数据
+ acceptClick = function (callBack) {
+ if (!$('body').lrValidform()) {
+ return false;
+ }
+ var postData = {
+ strEntity: JSON.stringify($('body').lrGetFormData())
+ };
+ $.lrSaveForm(top.$.rootUrl + '/EducationalAdministration/StuVolunteer/SaveForm?keyValue=' + keyValue, postData, function (res) {
+ // 保存成功后才回调
+ if (!!callBack) {
+ callBack();
+ }
+ });
+ };
+ page.init();
+}
diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuVolunteer/Index.cshtml b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuVolunteer/Index.cshtml
new file mode 100644
index 000000000..dfd309618
--- /dev/null
+++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuVolunteer/Index.cshtml
@@ -0,0 +1,48 @@
+@{
+ ViewBag.Title = "长阳迎新";
+ Layout = "~/Views/Shared/_Index.cshtml";
+}
+
+@Html.AppendJsFile("/Areas/EducationalAdministration/Views/StuVolunteer/Index.js")
diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuVolunteer/Index.js b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuVolunteer/Index.js
new file mode 100644
index 000000000..49e3b7533
--- /dev/null
+++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuVolunteer/Index.js
@@ -0,0 +1,133 @@
+/* * 版 本 Learun-ADMS V7.0.6 力软敏捷开发框架(http://www.learun.cn)
+ * Copyright (c) 2013-2020 力软信息技术(苏州)有限公司
+ * 创建人:超级管理员
+ * 日 期:2021-12-16 10:14
+ * 描 述:长阳迎新
+ */
+var refreshGirdData;
+var bootstrap = function ($, learun) {
+ "use strict";
+ var page = {
+ init: function () {
+ page.initGird();
+ page.bind();
+ },
+ bind: function () {
+ $('#multiple_condition_query').lrMultipleQuery(function (queryJson) {
+ page.search(queryJson);
+ }, 220, 400);
+ $('#Sex').lrDataItemSelect({ code: 'usersex' });
+ // 刷新
+ $('#lr_refresh').on('click', function () {
+ location.reload();
+ });
+ // 新增
+ $('#lr_add').on('click', function () {
+ learun.layerForm({
+ id: 'form',
+ title: '新增',
+ url: top.$.rootUrl + '/EducationalAdministration/StuVolunteer/Form',
+ width: 600,
+ height: 400,
+ callBack: function (id) {
+ return top[id].acceptClick(refreshGirdData);
+ }
+ });
+ });
+ // 编辑
+ $('#lr_edit').on('click', function () {
+ var keyValue = $('#gridtable').jfGridValue('ID');
+ if (learun.checkrow(keyValue)) {
+ if (keyValue.indexOf(',') != -1) {
+ learun.alert.warning("只能选择一条记录进行编辑!");
+ return;
+ }
+ learun.layerForm({
+ id: 'form',
+ title: '编辑',
+ url: top.$.rootUrl + '/EducationalAdministration/StuVolunteer/Form?keyValue=' + keyValue,
+ width: 600,
+ height: 400,
+ callBack: function (id) {
+ return top[id].acceptClick(refreshGirdData);
+ }
+ });
+ }
+ });
+ // 删除
+ $('#lr_delete').on('click', function () {
+ var keyValue = $('#gridtable').jfGridValue('ID');
+ if (learun.checkrow(keyValue)) {
+ learun.layerConfirm('是否确认删除该项!', function (res) {
+ if (res) {
+ learun.deleteForm(top.$.rootUrl + '/EducationalAdministration/StuVolunteer/DeleteForm', { keyValue: keyValue }, function () {
+ refreshGirdData();
+ });
+ }
+ });
+ }
+ });
+ // 打印
+ $('#lr_print').on('click', function () {
+ $('#gridtable').jqprintTable();
+ });
+ },
+ // 初始化列表
+ initGird: function () {
+ $('#gridtable').lrAuthorizeJfGrid({
+ url: top.$.rootUrl + '/EducationalAdministration/StuVolunteer/GetPageList',
+ headData: [
+ { label: "县区名称", name: "Address", width: 150, align: "left" },
+ { label: "毕业学校", name: "BySchool", width: 150, align: "left" },
+ { label: "初中学号", name: "H_SchoolNo", width: 150, align: "left" },
+ { label: "报名号", name: "ApplyNo", width: 150, align: "left" },
+ { label: "学生姓名", name: "StuName", width: 100, align: "left" },
+ {
+ label: "性别", name: "Sex", width: 100, align: "left",
+ formatterAsync: function (callback, value, row, op, $cell) {
+ learun.clientdata.getAsync('dataItem', {
+ key: value,
+ code: 'usersex',
+ callback: function (_data) {
+ callback(_data.text);
+ }
+ });
+ }
+ },
+ {
+ label: "录取意向(本校)", name: "IsCYSchool", width: 100, align: "left",
+ formatter: function (cellvalue) {
+ return cellvalue == true ? "是" :
+ "否";
+ }
+ },
+ { label: "身份证号", name: "CardNo", width: 150, align: "left" },
+ { label: "中考总分", name: "StuScore", width: 100, align: "left" },
+ { label: "第一志愿", name: "FirstVolunteer", width: 120, align: "left" },
+ { label: "第二志愿", name: "SecondVolunteer", width: 120, align: "left" },
+ { label: "第三志愿", name: "ThirdVolunteer", width: 120, align: "left" },
+ { label: "第四志愿", name: "FouthVolunteer", width: 120, align: "left" },
+ { label: "第五志愿", name: "FifthVolunteer", width: 120, align: "left" },
+ { label: "第六志愿", name: "SixthVolunteer", width: 120, align: "left" },
+ { label: "第七志愿", name: "SeventhVolunteer", width: 120, align: "left" },
+ { label: "第八志愿", name: "EighthVolunteer", width: 120, align: "left" },
+ { label: "第九志愿", name: "NinthVolunteer", width: 120, align: "left" },
+ { label: "备注", name: "Demo", width: 100, align: "left" },
+ ],
+ mainId: 'ID',
+ isPage: true,
+ isMultiselect: true
+
+ });
+ page.search();
+ },
+ search: function (param) {
+ param = param || {};
+ $('#gridtable').jfGridSet('reload', { queryJson: JSON.stringify(param) });
+ }
+ };
+ refreshGirdData = function () {
+ $('#gridtable').jfGridSet('reload');
+ };
+ page.init();
+}
diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuVolunteer/IndexAccount.cshtml b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuVolunteer/IndexAccount.cshtml
new file mode 100644
index 000000000..0b169b1b9
--- /dev/null
+++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuVolunteer/IndexAccount.cshtml
@@ -0,0 +1,48 @@
+@{
+ ViewBag.Title = "长阳迎新";
+ Layout = "~/Views/Shared/_Index.cshtml";
+}
+
+@Html.AppendJsFile("/Areas/EducationalAdministration/Views/StuVolunteer/IndexAccount.js")
diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuVolunteer/IndexAccount.js b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuVolunteer/IndexAccount.js
new file mode 100644
index 000000000..3a091430c
--- /dev/null
+++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuVolunteer/IndexAccount.js
@@ -0,0 +1,116 @@
+/* * 版 本 Learun-ADMS V7.0.6 力软敏捷开发框架(http://www.learun.cn)
+ * Copyright (c) 2013-2020 力软信息技术(苏州)有限公司
+ * 创建人:超级管理员
+ * 日 期:2021-12-16 10:14
+ * 描 述:长阳迎新
+ */
+var refreshGirdData;
+var bootstrap = function ($, learun) {
+ "use strict";
+ var page = {
+ init: function () {
+ page.initGird();
+ page.bind();
+ },
+ bind: function () {
+ $('#multiple_condition_query').lrMultipleQuery(function (queryJson) {
+ page.search(queryJson);
+ }, 220, 400);
+ $('#Sex').lrDataItemSelect({ code: 'usersex' });
+ // 刷新
+ $('#lr_refresh').on('click', function () {
+ location.reload();
+ });
+ // 录取
+ $('#lr_enroll').on('click', function () {
+ var keyValue = $('#gridtable').jfGridValue('ID');
+ if (learun.checkrow(keyValue)) {
+ learun.layerConfirm('是否确认录取选中项!', function (res) {
+ if (res) {
+ learun.postForm(top.$.rootUrl + '/EducationalAdministration/StuVolunteer/EnrollForm', { keyValue: keyValue }, function () {
+ refreshGirdData();
+ });
+ }
+ });
+ }
+ });
+ // 取消录取
+ $('#lr_cancel').on('click', function () {
+ var keyValue = $('#gridtable').jfGridValue('ID');
+ if (learun.checkrow(keyValue)) {
+ learun.layerConfirm('是否确认取消录取选中项!', function (res) {
+ if (res) {
+ learun.postForm(top.$.rootUrl + '/EducationalAdministration/StuVolunteer/CancelForm', { keyValue: keyValue }, function () {
+ refreshGirdData();
+ });
+ }
+ });
+ }
+ });
+ },
+ // 初始化列表
+ initGird: function () {
+ $('#gridtable').lrAuthorizeJfGrid({
+ url: top.$.rootUrl + '/EducationalAdministration/StuVolunteer/GetPageList',
+ headData: [
+ {
+ label: "是否录取", name: "IsEnroll", width: 80, align: "left",
+ formatter: function (cellvalue) {
+ return cellvalue == true ? "是" :
+ "否";
+ }
+ },
+ {
+ label: "录取意向(本校)", name: "IsCYSchool", width: 100, align: "left",
+ formatter: function (cellvalue) {
+ return cellvalue == true ? "是" :
+ "否";
+ }
+ },
+ { label: "中考总分", name: "StuScore", width: 100, align: "left" },
+ { label: "学生姓名", name: "StuName", width: 100, align: "left" },
+ {
+ label: "性别", name: "Sex", width: 80, align: "left",
+ formatterAsync: function (callback, value, row, op, $cell) {
+ learun.clientdata.getAsync('dataItem', {
+ key: value,
+ code: 'usersex',
+ callback: function (_data) {
+ callback(_data.text);
+ }
+ });
+ }
+ },
+ { label: "身份证号", name: "CardNo", width: 150, align: "left" },
+ { label: "县区名称", name: "Address", width: 150, align: "left" },
+ { label: "毕业学校", name: "BySchool", width: 150, align: "left" },
+ { label: "初中学号", name: "H_SchoolNo", width: 150, align: "left" },
+ { label: "报名号", name: "ApplyNo", width: 150, align: "left" },
+ { label: "第一志愿", name: "FirstVolunteer", width: 120, align: "left" },
+ { label: "第二志愿", name: "SecondVolunteer", width: 120, align: "left" },
+ { label: "第三志愿", name: "ThirdVolunteer", width: 120, align: "left" },
+ { label: "第四志愿", name: "FouthVolunteer", width: 120, align: "left" },
+ { label: "第五志愿", name: "FifthVolunteer", width: 120, align: "left" },
+ { label: "第六志愿", name: "SixthVolunteer", width: 120, align: "left" },
+ { label: "第七志愿", name: "SeventhVolunteer", width: 120, align: "left" },
+ { label: "第八志愿", name: "EighthVolunteer", width: 120, align: "left" },
+ { label: "第九志愿", name: "NinthVolunteer", width: 120, align: "left" },
+ { label: "备注", name: "Demo", width: 100, align: "left" },
+ ],
+ mainId: 'ID',
+ isPage: true,
+ isMultiselect: true
+
+ });
+ page.search();
+ },
+ search: function (param) {
+ param = param || {};
+ $('#gridtable').jfGridSet('reload', { queryJson: JSON.stringify(param) });
+ }
+ };
+ refreshGirdData = function () {
+ $('#gridtable').jfGridSet('reload');
+ };
+ page.init();
+}
diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuVolunteer/IndexLabel.cshtml b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuVolunteer/IndexLabel.cshtml
new file mode 100644
index 000000000..7d0551e4b
--- /dev/null
+++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuVolunteer/IndexLabel.cshtml
@@ -0,0 +1,48 @@
+@{
+ ViewBag.Title = "长阳迎新";
+ Layout = "~/Views/Shared/_Index.cshtml";
+}
+
+@Html.AppendJsFile("/Areas/EducationalAdministration/Views/StuVolunteer/Indexlabel.js")
diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuVolunteer/IndexLabel.js b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuVolunteer/IndexLabel.js
new file mode 100644
index 000000000..a26708df0
--- /dev/null
+++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuVolunteer/IndexLabel.js
@@ -0,0 +1,149 @@
+/* * 版 本 Learun-ADMS V7.0.6 力软敏捷开发框架(http://www.learun.cn)
+ * Copyright (c) 2013-2020 力软信息技术(苏州)有限公司
+ * 创建人:超级管理员
+ * 日 期:2021-12-16 10:14
+ * 描 述:长阳迎新
+ */
+var refreshGirdData;
+var bootstrap = function ($, learun) {
+ "use strict";
+ var page = {
+ init: function () {
+ page.initGird();
+ page.bind();
+ },
+ bind: function () {
+ $('#multiple_condition_query').lrMultipleQuery(function (queryJson) {
+ page.search(queryJson);
+ }, 220, 400);
+ $('#Sex').lrDataItemSelect({ code: 'usersex' });
+ // 刷新
+ $('#lr_refresh').on('click', function () {
+ location.reload();
+ });
+ // 标注
+ $('#lr_label').on('click', function () {
+ var keyValue = $('#gridtable').jfGridValue('ID');
+ if (learun.checkrow(keyValue)) {
+ learun.layerConfirm('是否确认标注选中该项!', function (res) {
+ if (res) {
+ learun.postForm(top.$.rootUrl + '/EducationalAdministration/StuVolunteer/LabelForm', { keyValue: keyValue }, function () {
+ refreshGirdData();
+ });
+ }
+ });
+ }
+ });
+ // 取消标注
+ $('#lr_cancel').on('click', function () {
+ var keyValue = $('#gridtable').jfGridValue('ID');
+ if (learun.checkrow(keyValue)) {
+ learun.layerConfirm('是否取消标注选中该项!', function (res) {
+ if (res) {
+ learun.postForm(top.$.rootUrl + '/EducationalAdministration/StuVolunteer/CancelLabel', { keyValue: keyValue }, function () {
+ refreshGirdData();
+ });
+ }
+ });
+ }
+ });
+ // 填报志愿
+ $('#lr_school').on('click', function () {
+ var keyValue = $('#gridtable').jfGridValue('ID');
+ if (learun.checkrow(keyValue)) {
+ if (keyValue.indexOf(',') != -1) {
+ learun.alert.warning("只能选择一条记录进行编辑!");
+ return;
+ }
+ var IsOurSchool = $('#gridtable').jfGridValue('IsOurSchool');
+ if (IsOurSchool == false) {
+ learun.layerForm({
+ id: 'form',
+ title: '填报学校',
+ url: top.$.rootUrl + '/EducationalAdministration/StuVolunteer/Formschool?keyValue=' + keyValue,
+ width: 600,
+ height: 400,
+ callBack: function (id) {
+ return top[id].acceptClick(refreshGirdData);
+ }
+ });
+ } else {
+ learun.alert.warning("当前项无需填报!");
+ return;
+ }
+ }
+ });
+ },
+ // 初始化列表
+ initGird: function () {
+ $('#gridtable').lrAuthorizeJfGrid({
+ url: top.$.rootUrl + '/EducationalAdministration/StuVolunteer/GetPageList',
+ headData: [
+ {
+ label: "是否有意(本校)", name: "IsIntention", width: 100, align: "IsIntention",
+ formatter: function (cellvalue) {
+ return cellvalue == true ? "是" :
+ "否";
+ }
+ },
+ {
+ label: "填报志愿(本校)", name: "IsOurSchool", width: 100, align: "IsIntention",
+ formatter: function (cellvalue) {
+ return cellvalue == true ? "是" :
+ "否";
+ }
+ },
+ { label: "县区名称", name: "Address", width: 200, align: "left" },
+ { label: "毕业学校", name: "BySchool", width: 200, align: "left" },
+ { label: "初中学号", name: "H_SchoolNo", width: 200, align: "left" },
+ { label: "报名号", name: "ApplyNo", width: 200, align: "left" },
+ { label: "学生姓名", name: "StuName", width: 100, align: "left" },
+ {
+ label: "性别", name: "Sex", width: 100, align: "left",
+ formatterAsync: function (callback, value, row, op, $cell) {
+ learun.clientdata.getAsync('dataItem', {
+ key: value,
+ code: 'usersex',
+ callback: function (_data) {
+ callback(_data.text);
+ }
+ });
+ }
+ },
+ {
+ label: "录取意向", name: "IsCYSchool", width: 200, align: "left",
+ formatter: function (cellvalue) {
+ return cellvalue == true ? "是" :
+ "否";
+ }
+ },
+ { label: "身份证号", name: "CardNo", width: 150, align: "left" },
+ { label: "中考总分", name: "StuScore", width: 100, align: "left" },
+ { label: "第一志愿", name: "FirstVolunteer", width: 120, align: "left" },
+ { label: "第二志愿", name: "SecondVolunteer", width: 120, align: "left" },
+ { label: "第三志愿", name: "ThirdVolunteer", width: 120, align: "left" },
+ { label: "第四志愿", name: "FouthVolunteer", width: 120, align: "left" },
+ { label: "第五志愿", name: "FifthVolunteer", width: 120, align: "left" },
+ { label: "第六志愿", name: "SixthVolunteer", width: 120, align: "left" },
+ { label: "第七志愿", name: "SeventhVolunteer", width: 120, align: "left" },
+ { label: "第八志愿", name: "EighthVolunteer", width: 120, align: "left" },
+ { label: "第九志愿", name: "NinthVolunteer", width: 120, align: "left" },
+ { label: "备注", name: "Demo", width: 100, align: "left" },
+ ],
+ mainId: 'ID',
+ isPage: true,
+ isMultiselect: true
+
+ });
+ page.search();
+ },
+ search: function (param) {
+ param = param || {};
+ $('#gridtable').jfGridSet('reload', { queryJson: JSON.stringify(param) });
+ }
+ };
+ refreshGirdData = function () {
+ $('#gridtable').jfGridSet('reload');
+ };
+ page.init();
+}
diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Learun.Application.Web.csproj b/Learun.Framework.Ultimate V7/Learun.Application.Web/Learun.Application.Web.csproj
index 3cd647c19..02e66e8bf 100644
--- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Learun.Application.Web.csproj
+++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Learun.Application.Web.csproj
@@ -821,6 +821,7 @@
+
@@ -1053,6 +1054,9 @@
+
+
+
@@ -6278,6 +6282,10 @@
+
+
+
+
@@ -7485,6 +7493,9 @@
+
+
+
@@ -7609,10 +7620,10 @@
False
- True
- 20472
- /
- http://localhost:20873/
+ True
+ 20472
+ /
+ http://localhost:20873/
False
False
diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Views/Login/Default/Index.js b/Learun.Framework.Ultimate V7/Learun.Application.Web/Views/Login/Default/Index.js
index 189493836..ece31d495 100644
--- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Views/Login/Default/Index.js
+++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Views/Login/Default/Index.js
@@ -154,7 +154,7 @@
$.ajax({
url: $.rootUrl + "/Login/CheckLogin",
headers: { __RequestVerificationToken: $.lrToken },
- data: { username: username, password: password, verifycode: verifycode, up: up }, AdminDesktop
+ data: { username: username, password: password, verifycode: verifycode, up: up },
type: "post",
dataType: "json",
success: function (res) {
diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/XmlConfig/database.config b/Learun.Framework.Ultimate V7/Learun.Application.Web/XmlConfig/database.config
index 2429bf817..c9b587ac5 100644
--- a/Learun.Framework.Ultimate V7/Learun.Application.Web/XmlConfig/database.config
+++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/XmlConfig/database.config
@@ -35,8 +35,11 @@
-->
-
+
+
+
-
+
\ No newline at end of file
diff --git a/Learun.Framework.Ultimate V7/Learun.Application.WebApi/XmlConfig/database.config b/Learun.Framework.Ultimate V7/Learun.Application.WebApi/XmlConfig/database.config
index 2e55202a0..dcdf1b76c 100644
--- a/Learun.Framework.Ultimate V7/Learun.Application.WebApi/XmlConfig/database.config
+++ b/Learun.Framework.Ultimate V7/Learun.Application.WebApi/XmlConfig/database.config
@@ -19,8 +19,13 @@
-->
-
+
+
+
+
+
+
\ No newline at end of file
diff --git a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.Mapping/EducationalAdministration/StuVolunteerMap.cs b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.Mapping/EducationalAdministration/StuVolunteerMap.cs
new file mode 100644
index 000000000..95e9e5b36
--- /dev/null
+++ b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.Mapping/EducationalAdministration/StuVolunteerMap.cs
@@ -0,0 +1,29 @@
+using Learun.Application.TwoDevelopment.EducationalAdministration;
+using System.Data.Entity.ModelConfiguration;
+
+namespace Learun.Application.Mapping
+{
+ ///
+ /// 版 本 Learun-ADMS V7.0.6 力软敏捷开发框架
+ /// Copyright (c) 2013-2020 力软信息技术(苏州)有限公司
+ /// 创 建:超级管理员
+ /// 日 期:2021-12-16 10:14
+ /// 描 述:长阳迎新
+ ///
+ public class StuVolunteerMap : EntityTypeConfiguration
+ {
+ public StuVolunteerMap()
+ {
+ #region 表、主键
+ //表
+ this.ToTable("STUVOLUNTEER");
+ //主键
+ this.HasKey(t => t.ID);
+ #endregion
+
+ #region 配置关系
+ #endregion
+ }
+ }
+}
+
diff --git a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.Mapping/Learun.Application.Mapping.csproj b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.Mapping/Learun.Application.Mapping.csproj
index e366181a5..9fd5e35fa 100644
--- a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.Mapping/Learun.Application.Mapping.csproj
+++ b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.Mapping/Learun.Application.Mapping.csproj
@@ -567,6 +567,7 @@
+
diff --git a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/StuVolunteer/StuVolunteerBLL.cs b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/StuVolunteer/StuVolunteerBLL.cs
new file mode 100644
index 000000000..197c2d625
--- /dev/null
+++ b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/StuVolunteer/StuVolunteerBLL.cs
@@ -0,0 +1,269 @@
+using Learun.Util;
+using System;
+using System.Data;
+using System.Collections.Generic;
+
+namespace Learun.Application.TwoDevelopment.EducationalAdministration
+{
+ ///
+ /// 版 本 Learun-ADMS V7.0.6 力软敏捷开发框架
+ /// Copyright (c) 2013-2020 力软信息技术(苏州)有限公司
+ /// 创 建:超级管理员
+ /// 日 期:2021-12-16 10:14
+ /// 描 述:长阳迎新
+ ///
+ public class StuVolunteerBLL : StuVolunteerIBLL
+ {
+ private StuVolunteerService stuVolunteerService = new StuVolunteerService();
+
+ #region 获取数据
+
+ ///
+ /// 获取页面显示列表数据
+ ///
+ /// 分页参数
+ /// 查询参数
+ ///
+ public IEnumerable GetPageList(Pagination pagination, string queryJson)
+ {
+ try
+ {
+ return stuVolunteerService.GetPageList(pagination, queryJson);
+ }
+ catch (Exception ex)
+ {
+ if (ex is ExceptionEx)
+ {
+ throw;
+ }
+ else
+ {
+ throw ExceptionEx.ThrowBusinessException(ex);
+ }
+ }
+ }
+
+ ///
+ /// 获取StuVolunteer表实体数据
+ ///
+ /// 主键
+ ///
+ public StuVolunteerEntity GetStuVolunteerEntity(string keyValue)
+ {
+ try
+ {
+ return stuVolunteerService.GetStuVolunteerEntity(keyValue);
+ }
+ catch (Exception ex)
+ {
+ if (ex is ExceptionEx)
+ {
+ throw;
+ }
+ else
+ {
+ throw ExceptionEx.ThrowBusinessException(ex);
+ }
+ }
+ }
+
+ #endregion
+
+ #region 提交数据
+
+ ///
+ /// 删除实体数据
+ ///
+ /// 主键
+ public void DeleteEntity(string keyValue)
+ {
+ try
+ {
+ stuVolunteerService.DeleteEntity(keyValue);
+ }
+ catch (Exception ex)
+ {
+ if (ex is ExceptionEx)
+ {
+ throw;
+ }
+ else
+ {
+ throw ExceptionEx.ThrowBusinessException(ex);
+ }
+ }
+ }
+
+ ///
+ /// 保存实体数据(新增、修改)
+ ///
+ /// 主键
+ /// 实体
+ ///
+ public void SaveEntity(string keyValue, StuVolunteerEntity entity)
+ {
+ try
+ {
+ stuVolunteerService.SaveEntity(keyValue, entity);
+ }
+ catch (Exception ex)
+ {
+ if (ex is ExceptionEx)
+ {
+ throw;
+ }
+ else
+ {
+ throw ExceptionEx.ThrowBusinessException(ex);
+ }
+ }
+ }
+
+ #endregion
+
+ #region 扩展数据
+
+ ///
+ /// 去重
+ ///
+ /// 学号
+ /// 报名号
+ /// 身份证
+ ///
+ public List GetRepetitions(string H_SchoolNo, string ApplyNo, string CardNo)
+ {
+ try
+ {
+ return stuVolunteerService.GetRepetitions(H_SchoolNo, ApplyNo, CardNo);
+ }
+ catch (Exception ex)
+ {
+ if (ex is ExceptionEx)
+ {
+ throw;
+ }
+ else
+ {
+ throw ExceptionEx.ThrowBusinessException(ex);
+ }
+ }
+ }
+ ///
+ /// 标注数据
+ ///
+ /// 主键
+ public void LabelEntity(string keyValue)
+ {
+ try
+ {
+ stuVolunteerService.LabelEntity(keyValue);
+ }
+ catch (Exception ex)
+ {
+ if (ex is ExceptionEx)
+ {
+ throw;
+ }
+ else
+ {
+ throw ExceptionEx.ThrowBusinessException(ex);
+ }
+ }
+ }
+
+ ///
+ /// 取消标注数据
+ ///
+ /// 主键
+ public void CancelLabel(string keyValue)
+ {
+ try
+ {
+ stuVolunteerService.CancelLabel(keyValue);
+ }
+ catch (Exception ex)
+ {
+ if (ex is ExceptionEx)
+ {
+ throw;
+ }
+ else
+ {
+ throw ExceptionEx.ThrowBusinessException(ex);
+ }
+ }
+ }
+
+ ///
+ /// 志愿填报
+ ///
+ ///
+ ///
+ public void IsOurSchool(string keyValue, StuVolunteerEntity entity)
+ {
+ try
+ {
+ stuVolunteerService.SaveEntity(keyValue, entity);
+ }
+ catch (Exception ex)
+ {
+ if (ex is ExceptionEx)
+ {
+ throw;
+ }
+ else
+ {
+ throw ExceptionEx.ThrowBusinessException(ex);
+ }
+ }
+ }
+
+ ///
+ /// 录取学生
+ ///
+ /// 主键
+ public void EnrollEntity(string keyValue)
+ {
+ try
+ {
+ stuVolunteerService.EnrollEntity(keyValue);
+ }
+ catch (Exception ex)
+ {
+ if (ex is ExceptionEx)
+ {
+ throw;
+ }
+ else
+ {
+ throw ExceptionEx.ThrowBusinessException(ex);
+ }
+ }
+ }
+
+ ///
+ /// 取消录取学生
+ ///
+ /// 主键
+ public void CancelEntity(string keyValue)
+ {
+ try
+ {
+ stuVolunteerService.CancelEntity(keyValue);
+ }
+ catch (Exception ex)
+ {
+ if (ex is ExceptionEx)
+ {
+ throw;
+ }
+ else
+ {
+ throw ExceptionEx.ThrowBusinessException(ex);
+ }
+ }
+ }
+
+ #endregion
+ }
+}
diff --git a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/StuVolunteer/StuVolunteerEntity.cs b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/StuVolunteer/StuVolunteerEntity.cs
new file mode 100644
index 000000000..10007f11b
--- /dev/null
+++ b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/StuVolunteer/StuVolunteerEntity.cs
@@ -0,0 +1,210 @@
+using Learun.Util;
+using System;
+using System.ComponentModel.DataAnnotations.Schema;
+
+namespace Learun.Application.TwoDevelopment.EducationalAdministration
+{
+ ///
+ /// 版 本 Learun-ADMS V7.0.6 力软敏捷开发框架
+ /// Copyright (c) 2013-2020 力软信息技术(苏州)有限公司
+ /// 创 建:超级管理员
+ /// 日 期:2021-12-16 10:14
+ /// 描 述:长阳迎新
+ ///
+ public class StuVolunteerEntity
+ {
+ #region 实体成员
+ ///
+ /// ID
+ ///
+ [Column("ID")]
+ public string ID { get; set; }
+ ///
+ /// 区县
+ ///
+ [Column("ADDRESS")]
+ public string Address { get; set; }
+ ///
+ /// 学籍号
+ ///
+ [Column("STUCODE")]
+ public string StuCode { get; set; }
+ ///
+ /// 毕业学校
+ ///
+ [Column("BYSCHOOL")]
+ public string BySchool { get; set; }
+ ///
+ /// 学生编码(初中学号)
+ ///
+ [Column("H_SCHOOLNO")]
+ public string H_SchoolNo { get; set; }
+ ///
+ /// 中考时报名号
+ ///
+ [Column("APPLYNO")]
+ public string ApplyNo { get; set; }
+ ///
+ /// 学生姓名
+ ///
+ [Column("STUNAME")]
+ public string StuName { get; set; }
+ ///
+ /// 性别
+ ///
+ [Column("SEX")]
+ public string Sex { get; set; }
+ ///
+ /// 身份号
+ ///
+ [Column("CARDNO")]
+ public string CardNo { get; set; }
+ ///
+ /// 系所号
+ ///
+ [Column("DEPTNO")]
+ public string DeptNo { get; set; }
+ ///
+ /// 专业
+ ///
+ [Column("MAJORNO")]
+ public string MajorNo { get; set; }
+ ///
+ /// 中考总分
+ ///
+ [Column("STUSCORE")]
+ public decimal? StuScore { get; set; }
+ ///
+ /// IsCYSchool
+ ///
+ [Column("ISCYSCHOOL")]
+ public bool? IsCYSchool { get; set; }
+ ///
+ /// 根据平时成绩 标注是否有意向报名本校
+ ///
+ [Column("ISINTENTION")]
+ public bool? IsIntention { get; set; }
+ ///
+ /// 一志愿
+ ///
+ [Column("FIRSTVOLUNTEER")]
+ public string FirstVolunteer { get; set; }
+ ///
+ /// 二志愿
+ ///
+ [Column("SECONDVOLUNTEER")]
+ public string SecondVolunteer { get; set; }
+ ///
+ /// 三志愿
+ ///
+ [Column("THIRDVOLUNTEER")]
+ public string ThirdVolunteer { get; set; }
+ ///
+ /// 四志愿
+ ///
+ [Column("FOUTHVOLUNTEER")]
+ public string FouthVolunteer { get; set; }
+ ///
+ /// 五
+ ///
+ [Column("FIFTHVOLUNTEER")]
+ public string FifthVolunteer { get; set; }
+ ///
+ /// 六
+ ///
+ [Column("SIXTHVOLUNTEER")]
+ public string SixthVolunteer { get; set; }
+ ///
+ /// 七
+ ///
+ [Column("SEVENTHVOLUNTEER")]
+ public string SeventhVolunteer { get; set; }
+ ///
+ /// 八
+ ///
+ [Column("EIGHTHVOLUNTEER")]
+ public string EighthVolunteer { get; set; }
+ ///
+ /// 九
+ ///
+ [Column("NINTHVOLUNTEER")]
+ public string NinthVolunteer { get; set; }
+ ///
+ /// 备注
+ ///
+ [Column("DEMO")]
+ public string Demo { get; set; }
+ ///
+ /// CreateTime
+ ///
+ [Column("CREATETIME")]
+ public DateTime? CreateTime { get; set; }
+ ///
+ /// CreateUser
+ ///
+ [Column("CREATEUSER")]
+ public string CreateUser { get; set; }
+ ///
+ /// UpdateTime
+ ///
+ [Column("UPDATETIME")]
+ public DateTime? UpdateTime { get; set; }
+ ///
+ /// UpdateUser
+ ///
+ [Column("UPDATEUSER")]
+ public string UpdateUser { get; set; }
+ ///
+ /// 是否是本校
+ ///
+ [Column("ISOURSCHOOL")]
+ public bool? IsOurSchool { get; set; }
+ ///
+ /// 其他学校名称
+ ///
+ [Column("OTHERSCHOOL")]
+ public string OtherSchool { get; set; }
+ ///
+ /// 是否录取
+ ///
+ [Column("ISENROLL")]
+ public bool? IsEnroll { get; set; }
+ ///
+ /// 是否生成账号
+ ///
+ [Column("ISACCOUNT")]
+ public bool? IsAccount { get; set; }
+ ///
+ /// 所属学校
+ ///
+ [Column("F_SCHOOLID")]
+ public string F_SchoolId { get; set; }
+ ///
+ /// 学号
+ ///
+ [Column("STUNO")]
+ public string StuNo { get; set; }
+ #endregion
+
+ #region 扩展操作
+ ///
+ /// 新增调用
+ ///
+ public void Create()
+ {
+ this.ID = Guid.NewGuid().ToString();
+ }
+ ///
+ /// 编辑调用
+ ///
+ ///
+ public void Modify(string keyValue)
+ {
+ this.ID = keyValue;
+ }
+ #endregion
+ #region 扩展字段
+ #endregion
+ }
+}
+
diff --git a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/StuVolunteer/StuVolunteerIBLL.cs b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/StuVolunteer/StuVolunteerIBLL.cs
new file mode 100644
index 000000000..ba646b0ec
--- /dev/null
+++ b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/StuVolunteer/StuVolunteerIBLL.cs
@@ -0,0 +1,91 @@
+using Learun.Util;
+using System.Data;
+using System.Collections.Generic;
+
+namespace Learun.Application.TwoDevelopment.EducationalAdministration
+{
+ ///
+ /// 版 本 Learun-ADMS V7.0.6 力软敏捷开发框架
+ /// Copyright (c) 2013-2020 力软信息技术(苏州)有限公司
+ /// 创 建:超级管理员
+ /// 日 期:2021-12-16 10:14
+ /// 描 述:长阳迎新
+ ///
+ public interface StuVolunteerIBLL
+ {
+ #region 获取数据
+
+ ///
+ /// 获取页面显示列表数据
+ ///
+ /// 查询参数
+ ///
+ IEnumerable GetPageList(Pagination pagination, string queryJson);
+ ///
+ /// 获取StuVolunteer表实体数据
+ ///
+ /// 主键
+ ///
+ StuVolunteerEntity GetStuVolunteerEntity(string keyValue);
+ #endregion
+
+ #region 提交数据
+
+ ///
+ /// 删除实体数据
+ ///
+ /// 主键
+ void DeleteEntity(string keyValue);
+ ///
+ /// 保存实体数据(新增、修改)
+ ///
+ /// 主键
+ /// 实体
+ void SaveEntity(string keyValue, StuVolunteerEntity entity);
+ #endregion
+
+ #region 扩展数据
+
+ ///
+ /// 去重
+ ///
+ /// 学号
+ /// 报名号
+ /// 身份证
+ ///
+ List GetRepetitions(string H_SchoolNo, string ApplyNo, string CardNo);
+
+ ///
+ /// 标注数据
+ ///
+ /// 主键
+ void LabelEntity(string keyValue);
+
+ ///
+ /// 取消标注数据
+ ///
+ /// 主键
+ void CancelLabel(string keyValue);
+
+ ///
+ /// 志愿填报
+ ///
+ ///
+ ///
+ void IsOurSchool(string keyValue, StuVolunteerEntity entity);
+
+ ///
+ /// 录取学生
+ ///
+ /// 主键
+ void EnrollEntity(string keyValue);
+
+ ///
+ /// 取消录入学生
+ ///
+ /// 主键
+ void CancelEntity(string keyValue);
+
+ #endregion
+ }
+}
diff --git a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/StuVolunteer/StuVolunteerService.cs b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/StuVolunteer/StuVolunteerService.cs
new file mode 100644
index 000000000..52c05570f
--- /dev/null
+++ b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/StuVolunteer/StuVolunteerService.cs
@@ -0,0 +1,350 @@
+using Dapper;
+using Learun.DataBase.Repository;
+using Learun.Util;
+using System;
+using System.Collections.Generic;
+using System.Data;
+using System.Linq;
+using System.Text;
+
+namespace Learun.Application.TwoDevelopment.EducationalAdministration
+{
+ ///
+ /// 版 本 Learun-ADMS V7.0.6 力软敏捷开发框架
+ /// Copyright (c) 2013-2020 力软信息技术(苏州)有限公司
+ /// 创 建:超级管理员
+ /// 日 期:2021-12-16 10:14
+ /// 描 述:长阳迎新
+ ///
+ public class StuVolunteerService : RepositoryFactory
+ {
+ #region 获取数据
+
+ ///
+ /// 获取页面显示列表数据
+ ///
+ /// 查询参数
+ /// 查询参数
+ ///
+ public IEnumerable GetPageList(Pagination pagination, string queryJson)
+ {
+ try
+ {
+ var strSql = new StringBuilder();
+ strSql.Append("SELECT ");
+ strSql.Append(@" * ");
+ strSql.Append(" FROM StuVolunteer t ");
+ strSql.Append(" WHERE 1=1 ");
+ var queryParam = queryJson.ToJObject();
+ // 虚拟参数
+ var dp = new DynamicParameters(new { });
+ if (!queryParam["Address"].IsEmpty())
+ {
+ dp.Add("Address", "%" + queryParam["Address"].ToString() + "%", DbType.String);
+ strSql.Append(" AND t.Address Like @Address ");
+ }
+ if (!queryParam["BySchool"].IsEmpty())
+ {
+ dp.Add("BySchool", "%" + queryParam["BySchool"].ToString() + "%", DbType.String);
+ strSql.Append(" AND t.BySchool Like @BySchool ");
+ }
+ if (!queryParam["StuName"].IsEmpty())
+ {
+ dp.Add("StuName", "%" + queryParam["StuName"].ToString() + "%", DbType.String);
+ strSql.Append(" AND t.StuName Like @StuName ");
+ }
+ if (!queryParam["Sex"].IsEmpty())
+ {
+ dp.Add("Sex", queryParam["Sex"].ToString(), DbType.String);
+ strSql.Append(" AND t.Sex = @Sex ");
+ }
+ return this.BaseRepository("CollegeMIS").FindList(strSql.ToString(), dp, pagination);
+ }
+ catch (Exception ex)
+ {
+ if (ex is ExceptionEx)
+ {
+ throw;
+ }
+ else
+ {
+ throw ExceptionEx.ThrowServiceException(ex);
+ }
+ }
+ }
+
+ ///
+ /// 获取StuVolunteer表实体数据
+ ///
+ /// 主键
+ ///
+ public StuVolunteerEntity GetStuVolunteerEntity(string keyValue)
+ {
+ try
+ {
+ return this.BaseRepository("CollegeMIS").FindEntity(keyValue);
+ }
+ catch (Exception ex)
+ {
+ if (ex is ExceptionEx)
+ {
+ throw;
+ }
+ else
+ {
+ throw ExceptionEx.ThrowServiceException(ex);
+ }
+ }
+ }
+
+ #endregion
+
+ #region 提交数据
+
+ ///
+ /// 删除实体数据
+ ///
+ /// 主键
+ public void DeleteEntity(string keyValue)
+ {
+ var db = this.BaseRepository("CollegeMIS").BeginTrans();
+ try
+ {
+ //单个删除
+ //this.BaseRepository("CollegeMIS").Delete(t => t.ID == keyValue);
+ //多个删除
+ var keyValueArr = keyValue.Split(',');
+ foreach (var item in keyValueArr)
+ {
+ db.Delete(t => t.ID == item);
+ }
+ db.Commit();
+ }
+ catch (Exception ex)
+ {
+ if (ex is ExceptionEx)
+ {
+ throw;
+ }
+ else
+ {
+ throw ExceptionEx.ThrowServiceException(ex);
+ }
+ }
+ }
+
+ ///
+ /// 保存实体数据(新增、修改)
+ ///
+ /// 主键
+ /// 实体
+ public void SaveEntity(string keyValue, StuVolunteerEntity entity)
+ {
+ try
+ {
+ if (!string.IsNullOrEmpty(keyValue))
+ {
+ entity.Modify(keyValue);
+ this.BaseRepository("CollegeMIS").Update(entity);
+ }
+ else
+ {
+ entity.Create();
+ this.BaseRepository("CollegeMIS").Insert(entity);
+ }
+ }
+ catch (Exception ex)
+ {
+ if (ex is ExceptionEx)
+ {
+ throw;
+ }
+ else
+ {
+ throw ExceptionEx.ThrowServiceException(ex);
+ }
+ }
+ }
+
+ #endregion
+
+
+ #region
+
+ ///
+ /// 去重
+ ///
+ /// 初中学号
+ /// 报名号
+ /// 身份证号
+ ///
+ public List GetRepetitions(string H_SchoolNo, string ApplyNo, string CardNo)
+ {
+ try
+ {
+ return this.BaseRepository("CollegeMIS").FindList(x =>
+ x.H_SchoolNo == H_SchoolNo || x.ApplyNo == ApplyNo || x.CardNo == CardNo).ToList();
+ }
+ catch (Exception e)
+ {
+ Console.WriteLine(e);
+ throw;
+ }
+ }
+
+ ///
+ /// 标注数据
+ ///
+ /// 主键
+ public void LabelEntity(string keyValue)
+ {
+ var db = this.BaseRepository("CollegeMIS").BeginTrans();
+ try
+ {
+ var keyValueArr = keyValue.Split(',');
+ foreach (var item in keyValueArr)
+ {
+ var entity = db.FindEntity(x => x.ID == item);
+ entity.IsIntention = true;
+ db.Update(entity);
+ }
+
+ db.Commit();
+ }
+ catch (Exception ex)
+ {
+ if (ex is ExceptionEx)
+ {
+ throw;
+ }
+ else
+ {
+ throw ExceptionEx.ThrowServiceException(ex);
+ }
+ }
+ }
+
+ ///
+ /// 取消标注数据
+ ///
+ /// 主键
+ public void CancelLabel(string keyValue)
+ {
+ var db = this.BaseRepository("CollegeMIS").BeginTrans();
+ try
+ {
+ var keyValueArr = keyValue.Split(',');
+ foreach (var item in keyValueArr)
+ {
+ var entity = db.FindEntity(x => x.ID == item);
+ entity.IsIntention = false;
+ db.Update(entity);
+ }
+
+ db.Commit();
+ }
+ catch (Exception ex)
+ {
+ if (ex is ExceptionEx)
+ {
+ throw;
+ }
+ else
+ {
+ throw ExceptionEx.ThrowServiceException(ex);
+ }
+ }
+ }
+
+ ///
+ /// 志愿填报
+ ///
+ ///
+ ///
+ public void IsOurSchool(string keyValue, StuVolunteerEntity entity)
+ {
+ try
+ {
+ entity.Modify(keyValue);
+ this.BaseRepository("CollegeMIS").Update(entity);
+ }
+ catch (Exception ex)
+ {
+ if (ex is ExceptionEx)
+ {
+ throw;
+ }
+ else
+ {
+ throw ExceptionEx.ThrowServiceException(ex);
+ }
+ }
+ }
+
+ ///
+ /// 录取学生
+ ///
+ /// 主键
+ public void EnrollEntity(string keyValue)
+ {
+ var db = this.BaseRepository("CollegeMIS").BeginTrans();
+ try
+ {
+ var keyValueArr = keyValue.Split(',');
+ foreach (var item in keyValueArr)
+ {
+ var entity = db.FindEntity(x => x.ID == item);
+ entity.IsEnroll = true;
+ db.Update(entity);
+ }
+
+ db.Commit();
+ }
+ catch (Exception ex)
+ {
+ if (ex is ExceptionEx)
+ {
+ throw;
+ }
+ else
+ {
+ throw ExceptionEx.ThrowServiceException(ex);
+ }
+ }
+ }
+
+ ///
+ /// 取消录取学生
+ ///
+ /// 主键
+ public void CancelEntity(string keyValue)
+ {
+ var db = this.BaseRepository("CollegeMIS").BeginTrans();
+ try
+ {
+ var keyValueArr = keyValue.Split(',');
+ foreach (var item in keyValueArr)
+ {
+ var entity = db.FindEntity(x => x.ID == item);
+ entity.IsEnroll = false;
+ db.Update(entity);
+ }
+
+ db.Commit();
+ }
+ catch (Exception ex)
+ {
+ if (ex is ExceptionEx)
+ {
+ throw;
+ }
+ else
+ {
+ throw ExceptionEx.ThrowServiceException(ex);
+ }
+ }
+ }
+
+ #endregion
+ }
+}
diff --git a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/Learun.Application.TwoDevelopment.csproj b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/Learun.Application.TwoDevelopment.csproj
index 18945acac..e5e494106 100644
--- a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/Learun.Application.TwoDevelopment.csproj
+++ b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/Learun.Application.TwoDevelopment.csproj
@@ -1719,6 +1719,10 @@
+
+
+
+