长阳迎新

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
+{
+    /// <summary>
+    /// 版 本 Learun-ADMS V7.0.6 力软敏捷开发框架
+    /// Copyright (c) 2013-2020 力软信息技术（苏州）有限公司
+    /// 创 建：超级管理员
+    /// 日 期：2021-12-16 10:14
+    /// 描 述：长阳迎新
+    /// </summary>
+    public class StuVolunteerController : MvcControllerBase
+    {
+        private StuVolunteerIBLL stuVolunteerIBLL = new StuVolunteerBLL();
+
+        #region 视图功能
+
+        /// <summary>
+        /// 主页面
+        /// <summary>
+        /// <returns></returns>
+        [HttpGet]
+        public ActionResult Index()
+        {
+            return View();
+        }
+        /// <summary>
+        /// 表单页
+        /// <summary>
+        /// <returns></returns>
+        [HttpGet]
+        public ActionResult Form()
+        {
+            return View();
+        }
+
+        /// <summary>
+        /// 标注页面
+        /// <summary>
+        /// <returns></returns>
+        [HttpGet]
+        public ActionResult IndexLabel()
+        {
+            return View();
+        }
+
+        /// <summary>
+        /// 志愿表单页
+        /// <summary>
+        /// <returns></returns>
+        [HttpGet]
+        public ActionResult FormSchool()
+        {
+            return View();
+        }
+
+        /// <summary>
+        /// 志愿表单页
+        /// <summary>
+        /// <returns></returns>
+        [HttpGet]
+        public ActionResult IndexAccount()
+        {
+            return View();
+        }
+        
+        #endregion
+
+        #region 获取数据
+
+        /// <summary>
+        /// 获取页面显示列表数据
+        /// </summary>
+        /// <param name="pagination">分页参数</param>
+        /// <param name="queryJson">查询参数</param>
+        /// <returns></returns>
+        [HttpGet]
+        [AjaxOnly]
+        public ActionResult GetPageList(string pagination, string queryJson)
+        {
+            Pagination paginationobj = pagination.ToObject<Pagination>();
+            var data = stuVolunteerIBLL.GetPageList(paginationobj, queryJson);
+            var jsonData = new
+            {
+                rows = data,
+                total = paginationobj.total,
+                page = paginationobj.page,
+                records = paginationobj.records
+            };
+            return Success(jsonData);
+        }
+        /// <summary>
+        /// 获取表单数据
+        /// </summary>
+        /// <param name="keyValue">主键</param>
+        /// <returns></returns>
+        [HttpGet]
+        [AjaxOnly]
+        public ActionResult GetFormData(string keyValue)
+        {
+            var StuVolunteerData = stuVolunteerIBLL.GetStuVolunteerEntity(keyValue);
+            var jsonData = new
+            {
+                StuVolunteer = StuVolunteerData,
+            };
+            return Success(jsonData);
+        }
+        #endregion
+
+        #region 提交数据
+
+        /// <summary>
+        /// 删除实体数据
+        /// </summary>
+        /// <param name="keyValue">主键</param>
+        /// <returns></returns>
+        [HttpPost]
+        [AjaxOnly]
+        public ActionResult DeleteForm(string keyValue)
+        {
+            stuVolunteerIBLL.DeleteEntity(keyValue);
+            return Success("删除成功！");
+        }
+        /// <summary>
+        /// 保存实体数据（新增、修改）
+        /// </summary>
+        /// <param name="keyValue">主键</param>
+        /// <param name="strEntity">实体</param>
+        /// <returns></returns>
+        [HttpPost]
+        [ValidateAntiForgeryToken]
+        [AjaxOnly]
+        public ActionResult SaveForm(string keyValue, string strEntity)
+        {
+            StuVolunteerEntity entity = strEntity.ToObject<StuVolunteerEntity>();
+            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 扩展数据
+
+        /// <summary>
+        /// 标注数据
+        /// </summary>
+        /// <param name="keyValue"></param>
+        /// <returns></returns>
+        public ActionResult LabelForm(string keyValue)
+        {
+            stuVolunteerIBLL.LabelEntity(keyValue);
+            return Success("标注成功！");
+        }
+
+        /// <summary>
+        /// 取消数据
+        /// </summary>
+        /// <param name="keyValue"></param>
+        /// <returns></returns>
+        public ActionResult CancelLabel(string keyValue)
+        {
+            stuVolunteerIBLL.CancelLabel(keyValue);
+            return Success("取消成功！");
+        }
+
+        /// <summary>
+        /// 填报志愿
+        /// </summary>
+        /// <param name="keyValue"></param>
+        /// <returns></returns>
+        public ActionResult IsOurSchool(string keyValue, string strEntity)
+        {
+            StuVolunteerEntity entity = strEntity.ToObject<StuVolunteerEntity>();
+            stuVolunteerIBLL.IsOurSchool(keyValue,entity);
+            return Success("填报成功！");
+        }
+
+
+        /// <summary>
+        /// 录取学生
+        /// </summary>
+        /// <param name="keyValue"></param>
+        /// <returns></returns>
+        public ActionResult EnrollForm(string keyValue)
+        {
+            stuVolunteerIBLL.EnrollEntity(keyValue);
+            return Success("录取成功！");
+        }
+
+        /// <summary>
+        /// 取消录取学生
+        /// </summary>
+        /// <param name="keyValue"></param>
+        /// <returns></returns>
+        public ActionResult CancelForm(string keyValue)
+        {
+            stuVolunteerIBLL.CancelEntity(keyValue);
+            return Success("取消成功！");
+        }
+
+        #endregion
+    }
+}

Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuVolunteer/Form.cshtml

@@ -0,0 +1,83 @@
+@{
+    ViewBag.Title = "长阳迎新";
+    Layout = "~/Views/Shared/_Form.cshtml";
+}
+<div class="lr-form-wrap" id="form">
+    <div class="col-xs-6 lr-form-item" data-table="StuVolunteer">
+        <div class="lr-form-item-title">县区名称<font face="宋体">*</font></div>
+        <input id="Address" type="text" class="form-control" isvalid="yes" checkexpession="NotNull" />
+    </div>
+    <div class="col-xs-6 lr-form-item" data-table="StuVolunteer">
+        <div class="lr-form-item-title">毕业学校<font face="宋体">*</font></div>
+        <input id="BySchool" type="text" class="form-control" isvalid="yes" checkexpession="NotNull" />
+    </div>
+    <div class="col-xs-6 lr-form-item" data-table="StuVolunteer">
+        <div class="lr-form-item-title">初中学号<font face="宋体">*</font></div>
+        <input id="H_SchoolNo" type="text" class="form-control" isvalid="yes" checkexpession="NotNull" />
+    </div>
+    <div class="col-xs-6 lr-form-item" data-table="StuVolunteer">
+        <div class="lr-form-item-title">报名号<font face="宋体">*</font></div>
+        <input id="ApplyNo" type="text" class="form-control" isvalid="yes" checkexpession="NotNull" />
+    </div>
+    <div class="col-xs-4 lr-form-item" data-table="StuVolunteer">
+        <div class="lr-form-item-title">学生姓名<font face="宋体">*</font></div>
+        <input id="StuName" type="text" class="form-control" isvalid="yes" checkexpession="NotNull" />
+    </div>
+    <div class="col-xs-4 lr-form-item" data-table="StuVolunteer">
+        <div class="lr-form-item-title">性别<font face="宋体">*</font></div>
+        <div id="Sex" isvalid="yes" checkexpession="NotNull"></div>
+    </div>
+    <div class="col-xs-4 lr-form-item" data-table="StuVolunteer">
+        <div class="lr-form-item-title">中考总分<font face="宋体">*</font></div>
+        <input id="StuScore" type="text" class="form-control" isvalid="yes" checkexpession="Num" />
+    </div>
+    <div class="col-xs-6 lr-form-item" data-table="StuVolunteer">
+        <div class="lr-form-item-title">身份证号<font face="宋体">*</font></div>
+        <input id="CardNo" type="text" class="form-control" isvalid="yes" checkexpession="IDCard" />
+    </div>
+    <div class="col-xs-6 lr-form-item" data-table="StuVolunteer">
+        <div class="lr-form-item-title">录取意向(本校)<font face="宋体">*</font></div>
+        <div id="IsCYSchool" isvalid="yes" checkexpession="NotNull"></div>
+    </div>
+    <div class="col-xs-6 lr-form-item" data-table="StuVolunteer">
+        <div class="lr-form-item-title">第一志愿</div>
+        <input id="FirstVolunteer" type="text" class="form-control" />
+    </div>
+    <div class="col-xs-6 lr-form-item" data-table="StuVolunteer">
+        <div class="lr-form-item-title">第二志愿</div>
+        <input id="SecondVolunteer" type="text" class="form-control" />
+    </div>
+    <div class="col-xs-6 lr-form-item" data-table="StuVolunteer">
+        <div class="lr-form-item-title">第三志愿</div>
+        <input id="ThirdVolunteer" type="text" class="form-control" />
+    </div>
+    <div class="col-xs-6 lr-form-item" data-table="StuVolunteer">
+        <div class="lr-form-item-title">第四志愿</div>
+        <input id="FouthVolunteer" type="text" class="form-control" />
+    </div>
+    <div class="col-xs-6 lr-form-item" data-table="StuVolunteer">
+        <div class="lr-form-item-title">第五志愿</div>
+        <input id="FifthVolunteer" type="text" class="form-control" />
+    </div>
+    <div class="col-xs-6 lr-form-item" data-table="StuVolunteer">
+        <div class="lr-form-item-title">第六志愿</div>
+        <input id="SixthVolunteer" type="text" class="form-control" />
+    </div>
+    <div class="col-xs-6 lr-form-item" data-table="StuVolunteer">
+        <div class="lr-form-item-title">第七志愿</div>
+        <input id="SeventhVolunteer" type="text" class="form-control" />
+    </div>
+    <div class="col-xs-6 lr-form-item" data-table="StuVolunteer">
+        <div class="lr-form-item-title">第八志愿</div>
+        <input id="EighthVolunteer" type="text" class="form-control" />
+    </div>
+    <div class="col-xs-6 lr-form-item" data-table="StuVolunteer">
+        <div class="lr-form-item-title">第九志愿</div>
+        <input id="NinthVolunteer" type="text" class="form-control" />
+    </div>
+    <div class="col-xs-12 lr-form-item" data-table="StuVolunteer">
+        <div class="lr-form-item-title">备注</div>
+        <textarea id="Demo" class="form-control" style="height:100px;"></textarea>
+    </div>
+</div>
+@Html.AppendJsFile("/Areas/EducationalAdministration/Views/StuVolunteer/Form.js")

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();
+}

Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuVolunteer/FormSchool.cshtml

@@ -0,0 +1,47 @@
+@{
+    ViewBag.Title = "长阳迎新";
+    Layout = "~/Views/Shared/_Form.cshtml";
+}
+<div class="lr-form-wrap" id="form">
+    <div class="col-xs-6 lr-form-item" data-table="StuVolunteer">
+        <div class="lr-form-item-title">第一志愿</div>
+        <input id="FirstVolunteer" type="text" class="form-control" />
+    </div>
+    <div class="col-xs-6 lr-form-item" data-table="StuVolunteer">
+        <div class="lr-form-item-title">第二志愿</div>
+        <input id="SecondVolunteer" type="text" class="form-control" />
+    </div>
+    <div class="col-xs-6 lr-form-item" data-table="StuVolunteer">
+        <div class="lr-form-item-title">第三志愿</div>
+        <input id="ThirdVolunteer" type="text" class="form-control" />
+    </div>
+    <div class="col-xs-6 lr-form-item" data-table="StuVolunteer">
+        <div class="lr-form-item-title">第四志愿</div>
+        <input id="FouthVolunteer" type="text" class="form-control" />
+    </div>
+    <div class="col-xs-6 lr-form-item" data-table="StuVolunteer">
+        <div class="lr-form-item-title">第五志愿</div>
+        <input id="FifthVolunteer" type="text" class="form-control" />
+    </div>
+    <div class="col-xs-6 lr-form-item" data-table="StuVolunteer">
+        <div class="lr-form-item-title">第六志愿</div>
+        <input id="SixthVolunteer" type="text" class="form-control" />
+    </div>
+    <div class="col-xs-6 lr-form-item" data-table="StuVolunteer">
+        <div class="lr-form-item-title">第七志愿</div>
+        <input id="SeventhVolunteer" type="text" class="form-control" />
+    </div>
+    <div class="col-xs-6 lr-form-item" data-table="StuVolunteer">
+        <div class="lr-form-item-title">第八志愿</div>
+        <input id="EighthVolunteer" type="text" class="form-control" />
+    </div>
+    <div class="col-xs-6 lr-form-item" data-table="StuVolunteer">
+        <div class="lr-form-item-title">第九志愿</div>
+        <input id="NinthVolunteer" type="text" class="form-control" />
+    </div>
+    <div class="col-xs-12 lr-form-item" data-table="StuVolunteer">
+        <div class="lr-form-item-title">备注</div>
+        <textarea id="Demo" class="form-control" style="height:100px;"></textarea>
+    </div>
+</div>
+@Html.AppendJsFile("/Areas/EducationalAdministration/Views/StuVolunteer/FormSchool.js")

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();
+}

Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuVolunteer/Index.cshtml

@@ -0,0 +1,48 @@
+@{
+    ViewBag.Title = "长阳迎新";
+    Layout = "~/Views/Shared/_Index.cshtml";
+}
+<div class="lr-layout "  >
+    <div class="lr-layout-center">
+        <div class="lr-layout-wrap lr-layout-wrap-notitle ">
+            <div class="lr-layout-tool">
+                <div class="lr-layout-tool-left">
+                    <div class="lr-layout-tool-item">
+                        <div id="multiple_condition_query">
+                            <div class="lr-query-formcontent">
+                                <div class="col-xs-12 lr-form-item">
+                                    <div class="lr-form-item-title">县区名称</div>
+                                    <input id="Address" type="text" class="form-control" />
+                                </div>
+                                <div class="col-xs-12 lr-form-item">
+                                    <div class="lr-form-item-title">毕业学校</div>
+                                    <input id="BySchool" type="text" class="form-control" />
+                                </div>
+                                <div class="col-xs-6 lr-form-item">
+                                    <div class="lr-form-item-title">学生姓名</div>
+                                    <input id="StuName" type="text" class="form-control" />
+                                </div>
+                                <div class="col-xs-6 lr-form-item">
+                                    <div class="lr-form-item-title">性别</div>
+                                    <div id="Sex"></div>
+                                </div>
+                            </div>
+                        </div>
+                    </div>
+                </div>
+                <div class="lr-layout-tool-right">
+                    <div class=" btn-group btn-group-sm">
+                        <a id="lr_refresh" class="btn btn-default"><i class="fa fa-refresh"></i></a>
+                    </div>
+                    <div class=" btn-group btn-group-sm" learun-authorize="yes">
+                        <a id="lr_add" class="btn btn-default"><i class="fa fa-plus"></i>&nbsp;新增</a>
+                        <a id="lr_edit" class="btn btn-default"><i class="fa fa-pencil-square-o"></i>&nbsp;编辑</a>
+                        <a id="lr_delete" class="btn btn-default"><i class="fa fa-trash-o"></i>&nbsp;删除</a>
+                    </div>
+                </div>
+            </div>
+            <div class="lr-layout-body" id="gridtable"></div>
+        </div>
+    </div>
+</div>
+@Html.AppendJsFile("/Areas/EducationalAdministration/Views/StuVolunteer/Index.js")

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 ? "<span class=\"label label-success\">是</span>" :
+                                "<span class=\"label label-danger\">否</span>";
+                        }
+                    },
+                    { 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();
+}

Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuVolunteer/IndexAccount.cshtml

@@ -0,0 +1,48 @@
+@{
+    ViewBag.Title = "长阳迎新";
+    Layout = "~/Views/Shared/_Index.cshtml";
+}
+<div class="lr-layout "  >
+    <div class="lr-layout-center">
+        <div class="lr-layout-wrap lr-layout-wrap-notitle ">
+            <div class="lr-layout-tool">
+                <div class="lr-layout-tool-left">
+                    <div class="lr-layout-tool-item">
+                        <div id="multiple_condition_query">
+                            <div class="lr-query-formcontent">
+                                <div class="col-xs-12 lr-form-item">
+                                    <div class="lr-form-item-title">县区名称</div>
+                                    <input id="Address" type="text" class="form-control" />
+                                </div>
+                                <div class="col-xs-12 lr-form-item">
+                                    <div class="lr-form-item-title">毕业学校</div>
+                                    <input id="BySchool" type="text" class="form-control" />
+                                </div>
+                                <div class="col-xs-6 lr-form-item">
+                                    <div class="lr-form-item-title">学生姓名</div>
+                                    <input id="StuName" type="text" class="form-control" />
+                                </div>
+                                <div class="col-xs-6 lr-form-item">
+                                    <div class="lr-form-item-title">性别</div>
+                                    <div id="Sex"></div>
+                                </div>
+                            </div>
+                        </div>
+                    </div>
+                </div>
+                <div class="lr-layout-tool-right">
+                    <div class=" btn-group btn-group-sm">
+                        <a id="lr_refresh" class="btn btn-default"><i class="fa fa-refresh"></i></a>
+                    </div>
+                    <div class=" btn-group btn-group-sm" learun-authorize="yes">
+                        <a id="lr_enroll" class="btn btn-default"><i class="fa fa-plus"></i>&nbsp;录取</a>
+                        <a id="lr_cancel" class="btn btn-default"><i class="fa fa-pencil-square-o"></i>&nbsp;取消录取</a>
+                        <a id="lr_cancel" class="btn btn-default"><i class="fa fa-plus"></i>&nbsp;生成学籍</a>
+                    </div>
+                </div>
+            </div>
+            <div class="lr-layout-body" id="gridtable"></div>
+        </div>
+    </div>
+</div>
+@Html.AppendJsFile("/Areas/EducationalAdministration/Views/StuVolunteer/IndexAccount.js")

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 ? "<span class=\"label label-success\">是</span>" :
+                                "<span class=\"label label-danger\">否</span>";
+                        }
+                    },
+                    {
+                        label: "录取意向(本校)", name: "IsCYSchool", width: 100, align: "left",
+                        formatter: function (cellvalue) {
+                            return cellvalue == true ? "<span class=\"label label-success\">是</span>" :
+                                "<span class=\"label label-danger\">否</span>";
+                        }
+                    },
+                    { 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();
+}

Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuVolunteer/IndexLabel.cshtml

@@ -0,0 +1,48 @@
+@{
+    ViewBag.Title = "长阳迎新";
+    Layout = "~/Views/Shared/_Index.cshtml";
+}
+<div class="lr-layout "  >
+    <div class="lr-layout-center">
+        <div class="lr-layout-wrap lr-layout-wrap-notitle ">
+            <div class="lr-layout-tool">
+                <div class="lr-layout-tool-left">
+                    <div class="lr-layout-tool-item">
+                        <div id="multiple_condition_query">
+                            <div class="lr-query-formcontent">
+                                <div class="col-xs-12 lr-form-item">
+                                    <div class="lr-form-item-title">县区名称</div>
+                                    <input id="Address" type="text" class="form-control" />
+                                </div>
+                                <div class="col-xs-12 lr-form-item">
+                                    <div class="lr-form-item-title">毕业学校</div>
+                                    <input id="BySchool" type="text" class="form-control" />
+                                </div>
+                                <div class="col-xs-6 lr-form-item">
+                                    <div class="lr-form-item-title">学生姓名</div>
+                                    <input id="StuName" type="text" class="form-control" />
+                                </div>
+                                <div class="col-xs-6 lr-form-item">
+                                    <div class="lr-form-item-title">性别</div>
+                                    <div id="Sex"></div>
+                                </div>
+                            </div>
+                        </div>
+                    </div>
+                </div>
+                <div class="lr-layout-tool-right">
+                    <div class=" btn-group btn-group-sm">
+                        <a id="lr_refresh" class="btn btn-default"><i class="fa fa-refresh"></i></a>
+                    </div>
+                    <div class=" btn-group btn-group-sm" learun-authorize="yes">
+                        <a id="lr_label" class="btn btn-default"><i class="fa fa-plus"></i>&nbsp;标注</a>
+                        <a id="lr_cancel" class="btn btn-default"><i class="fa fa-square-o"></i>&nbsp;取消标注</a>
+                        <a id="lr_school" class="btn btn-default"><i class="fa fa-square-o"></i>&nbsp;填报志愿</a>
+                    </div>
+                </div>
+            </div>
+            <div class="lr-layout-body" id="gridtable"></div>
+        </div>
+    </div>
+</div>
+@Html.AppendJsFile("/Areas/EducationalAdministration/Views/StuVolunteer/Indexlabel.js")

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 ? "<span class=\"label label-success\">是</span>" :
+                                "<span class=\"label label-danger\">否</span>";
+                        }
+                    },
+                    {
+                        label: "填报志愿(本校)", name: "IsOurSchool", width: 100, align: "IsIntention",
+                        formatter: function (cellvalue) {
+                            return cellvalue == true ? "<span class=\"label label-success\">是</span>" :
+                                "<span class=\"label label-danger\">否</span>";
+                        }
+                    },
+                    { 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 ? "<span class=\"label label-success\">是</span>" :
+                                "<span class=\"label label-danger\">否</span>";
+                        }
+                    },
+                    { 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();
+}

Learun.Framework.Ultimate V7/Learun.Application.Web/Learun.Application.Web.csproj

@@ -821,6 +821,7 @@
     <Compile Include="Areas\EducationalAdministration\Controllers\StuDisciplineManagementController.cs" />
     <Compile Include="Areas\EducationalAdministration\Controllers\StuCancelDisciplineManagementController.cs" />
     <Compile Include="Areas\EducationalAdministration\Controllers\ArrangeExamTermNewController.cs" />
+    <Compile Include="Areas\EducationalAdministration\Controllers\StuVolunteerController.cs" />
   </ItemGroup>
   <ItemGroup>
     <Content Include="Areas\AdmissionsPlatform\Views\AP_OnlineUserInfo\DropOutIndex.js" />
@@ -1053,6 +1054,9 @@
     <Content Include="Areas\EducationalAdministration\Views\StuScore\GraduateScoreQueryAllIndex.js" />
     <Content Include="Areas\EducationalAdministration\Views\StuScore\ScoreQueryAllIndexTeacher.js" />
     <Content Include="Areas\EducationalAdministration\Views\StuScore\ScoreQueryAllIndex.js" />
+    <Content Include="Areas\EducationalAdministration\Views\StuVolunteer\FormSchool.js" />
+    <Content Include="Areas\EducationalAdministration\Views\StuVolunteer\IndexAccount.js" />
+    <Content Include="Areas\EducationalAdministration\Views\StuVolunteer\IndexLabel.js" />
     <Content Include="Areas\EducationalAdministration\Views\Sys_DefaultPwdConfig\Form.js" />
     <Content Include="Areas\EducationalAdministration\Views\Sys_DefaultPwdConfig\Index.js" />
     <Content Include="Areas\EducationalAdministration\Views\Sys_ReceiveDocument\FormView.js" />
@@ -6278,6 +6282,10 @@
     <Content Include="Areas\EducationalAdministration\Views\ArrangeExamTermNew\Index.js" />
     <Content Include="Areas\EducationalAdministration\Views\ArrangeExamTermNew\Form.cshtml" />
     <Content Include="Areas\EducationalAdministration\Views\ArrangeExamTermNew\Form.js" />
+    <Content Include="Areas\EducationalAdministration\Views\StuVolunteer\Index.cshtml" />
+    <Content Include="Areas\EducationalAdministration\Views\StuVolunteer\Index.js" />
+    <Content Include="Areas\EducationalAdministration\Views\StuVolunteer\Form.cshtml" />
+    <Content Include="Areas\EducationalAdministration\Views\StuVolunteer\Form.js" />
   </ItemGroup>
   <ItemGroup>
     <Folder Include="Areas\EducationalAdministration\Views\HomeStatistics\" />
@@ -7485,6 +7493,9 @@
     <Content Include="Areas\EducationalAdministration\Views\ArrangeExamTermNew\IndexForLesson.cshtml" />
     <Content Include="Areas\EducationalAdministration\Views\ArrangeExamTermNew\IndexTeach.cshtml" />
     <Content Include="Areas\EducationalAdministration\Views\ArrangeExamTermNew\IndexStudent.cshtml" />
+    <Content Include="Areas\EducationalAdministration\Views\StuVolunteer\IndexLabel.cshtml" />
+    <Content Include="Areas\EducationalAdministration\Views\StuVolunteer\FormSchool.cshtml" />
+    <Content Include="Areas\EducationalAdministration\Views\StuVolunteer\IndexAccount.cshtml" />
     <None Include="Properties\PublishProfiles\CustomProfile.pubxml" />
     <None Include="Properties\PublishProfiles\FolderProfile.pubxml" />
     <Content Include="Views\Login\Default-beifen.cshtml" />
@@ -7609,10 +7620,10 @@
       <FlavorProperties GUID="{349c5851-65df-11da-9384-00065b846f21}">
         <WebProjectProperties>
           <UseIIS>False</UseIIS>
-          <AutoAssignPort>True</AutoAssignPort>
-          <DevelopmentServerPort>20472</DevelopmentServerPort>
-          <DevelopmentServerVPath>/</DevelopmentServerVPath>
-          <IISUrl>http://localhost:20873/</IISUrl>
+		  <AutoAssignPort>True</AutoAssignPort>
+		  <DevelopmentServerPort>20472</DevelopmentServerPort>
+		  <DevelopmentServerVPath>/</DevelopmentServerVPath>
+		  <IISUrl>http://localhost:20873/</IISUrl>
           <NTLMAuthentication>False</NTLMAuthentication>
           <UseCustomServer>False</UseCustomServer>
           <CustomServerUrl>

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) {

Learun.Framework.Ultimate V7/Learun.Application.Web/XmlConfig/database.config

@@ -35,8 +35,11 @@
   <add name="hangfireString" connectionString="Server=192.168.2.126;Initial Catalog=Hangfire;User ID=sa;Password=bjqj@2015!" providerName="System.Data.SqlClient" />-->
 	<!--测试公共提交-->
 	<!--塔里木测试-->
-	<add name="BaseDb" connectionString="Server=123.57.209.16;Initial Catalog=adms7ultimate2_塔里木;User ID=sa;Password=bjqjkj@2014~2015!" providerName="System.Data.SqlClient" />
+	<!--<add name="BaseDb" connectionString="Server=123.57.209.16;Initial Catalog=adms7ultimate2_塔里木;User ID=sa;Password=bjqjkj@2014~2015!" providerName="System.Data.SqlClient" />
   <add name="CollegeMIS" connectionString="Server=123.57.209.16;Initial Catalog=CollegeMIS_塔里木;User ID=sa;Password=bjqjkj@2014~2015!" providerName="System.Data.SqlClient" />
+  <add name="hangfireString" connectionString="Server=123.57.209.16;Initial Catalog=Hangfire;User ID=sa;Password=bjqjkj@2014~2015!" providerName="System.Data.SqlClient" />-->
+  <add name="BaseDb" connectionString="Server=123.57.209.16;Initial Catalog=adms7ultimate2_西昌;User ID=sa;Password=bjqjkj@2014~2015!" providerName="System.Data.SqlClient" />
+  <add name="CollegeMIS" connectionString="Server=123.57.209.16;Initial Catalog=CollegeMIS_西昌;User ID=sa;Password=bjqjkj@2014~2015!" providerName="System.Data.SqlClient" />
   <add name="hangfireString" connectionString="Server=123.57.209.16;Initial Catalog=Hangfire;User ID=sa;Password=bjqjkj@2014~2015!" providerName="System.Data.SqlClient" />
-	<add name="paikeDbString" connectionString="Data Source=10.30.0.11;Database=paike;User ID=root;Password=12345678;" providerName="MySql.Data.MySqlClient" />
+  <add name="paikeDbString" connectionString="Data Source=10.30.0.11;Database=paike;User ID=root;Password=12345678;" providerName="MySql.Data.MySqlClient" />
 </connectionStrings>

Learun.Framework.Ultimate V7/Learun.Application.WebApi/XmlConfig/database.config

@@ -19,8 +19,13 @@
   <add name="CollegeMIS" connectionString="Server=112.45.152.8;Initial Catalog=NewCollegeMIS;User ID=sa;Password=qj@2018" providerName="System.Data.SqlClient" />
   <add name="hangfireString" connectionString="Server=112.45.152.8;Initial Catalog=HangFire;User ID=sa;Password=qj@2018" providerName="System.Data.SqlClient" />-->
 	<!--塔里木测试-->
-	<add name="BaseDb" connectionString="Server=123.57.209.16;Initial Catalog=adms7ultimate2_塔里木;User ID=sa;Password=bjqjkj@2014~2015!" providerName="System.Data.SqlClient" />
+	<!--<add name="BaseDb" connectionString="Server=123.57.209.16;Initial Catalog=adms7ultimate2_塔里木;User ID=sa;Password=bjqjkj@2014~2015!" providerName="System.Data.SqlClient" />
 	<add name="CollegeMIS" connectionString="Server=123.57.209.16;Initial Catalog=CollegeMIS_塔里木;User ID=sa;Password=bjqjkj@2014~2015!" providerName="System.Data.SqlClient" />
 	<add name="hangfireString" connectionString="Server=123.57.209.16;Initial Catalog=Hangfire;User ID=sa;Password=bjqjkj@2014~2015!" providerName="System.Data.SqlClient" />
-	<add name="paikeDbString" connectionString="Data Source=10.30.0.11;Database=paike;User ID=root;Password=12345678;" providerName="MySql.Data.MySqlClient" />
+	<add name="paikeDbString" connectionString="Data Source=10.30.0.11;Database=paike;User ID=root;Password=12345678;" providerName="MySql.Data.MySqlClient" />-->
+
+  <!--西昌-->
+  <add name="BaseDb" connectionString="Server=123.57.209.16;Initial Catalog=adms7ultimate2_西昌;User ID=sa;Password=bjqjkj@2014~2015!" providerName="System.Data.SqlClient" />
+  <add name="CollegeMIS" connectionString="Server=123.57.209.16;Initial Catalog=CollegeMIS_西昌;User ID=sa;Password=bjqjkj@2014~2015!" providerName="System.Data.SqlClient" />
+  <add name="hangfireString" connectionString="Server=123.57.209.16;Initial Catalog=Hangfire;User ID=sa;Password=bjqjkj@2014~2015!" providerName="System.Data.SqlClient" />
 </connectionStrings>

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
+{
+    /// <summary>
+    /// 版 本 Learun-ADMS V7.0.6 力软敏捷开发框架
+    /// Copyright (c) 2013-2020 力软信息技术（苏州）有限公司
+    /// 创 建：超级管理员
+    /// 日 期：2021-12-16 10:14
+    /// 描 述：长阳迎新
+    /// </summary>
+    public class StuVolunteerMap : EntityTypeConfiguration<StuVolunteerEntity>
+    {
+        public StuVolunteerMap()
+        {
+            #region 表、主键
+            //表
+            this.ToTable("STUVOLUNTEER");
+            //主键
+            this.HasKey(t => t.ID);
+            #endregion
+
+            #region 配置关系
+            #endregion
+        }
+    }
+}
+

Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.Mapping/Learun.Application.Mapping.csproj

@@ -567,6 +567,7 @@
     <Compile Include="EducationalAdministration\StuDisciplineManagementMap.cs" />
     <Compile Include="EducationalAdministration\StuCancelDisciplineManagementMap.cs" />
     <Compile Include="EducationalAdministration\ArrangeExamTermNewMap.cs" />
+    <Compile Include="EducationalAdministration\StuVolunteerMap.cs" />
   </ItemGroup>
   <ItemGroup>
     <ProjectReference Include="..\..\..\Learun.Application.Organization\Learun.Application.Organization.csproj">

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
+{
+    /// <summary>
+    /// 版 本 Learun-ADMS V7.0.6 力软敏捷开发框架
+    /// Copyright (c) 2013-2020 力软信息技术（苏州）有限公司
+    /// 创 建：超级管理员
+    /// 日 期：2021-12-16 10:14
+    /// 描 述：长阳迎新
+    /// </summary>
+    public class StuVolunteerBLL : StuVolunteerIBLL
+    {
+        private StuVolunteerService stuVolunteerService = new StuVolunteerService();
+
+        #region 获取数据
+
+        /// <summary>
+        /// 获取页面显示列表数据
+        /// </summary>
+        /// <param name="pagination">分页参数</param>
+        /// <param name="queryJson">查询参数</param>
+        /// <returns></returns>
+        public IEnumerable<StuVolunteerEntity> GetPageList(Pagination pagination, string queryJson)
+        {
+            try
+            {
+                return stuVolunteerService.GetPageList(pagination, queryJson);
+            }
+            catch (Exception ex)
+            {
+                if (ex is ExceptionEx)
+                {
+                    throw;
+                }
+                else
+                {
+                    throw ExceptionEx.ThrowBusinessException(ex);
+                }
+            }
+        }
+
+        /// <summary>
+        /// 获取StuVolunteer表实体数据
+        /// </summary>
+        /// <param name="keyValue">主键</param>
+        /// <returns></returns>
+        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 提交数据
+
+        /// <summary>
+        /// 删除实体数据
+        /// </summary>
+        /// <param name="keyValue">主键</param>
+        public void DeleteEntity(string keyValue)
+        {
+            try
+            {
+                stuVolunteerService.DeleteEntity(keyValue);
+            }
+            catch (Exception ex)
+            {
+                if (ex is ExceptionEx)
+                {
+                    throw;
+                }
+                else
+                {
+                    throw ExceptionEx.ThrowBusinessException(ex);
+                }
+            }
+        }
+
+        /// <summary>
+        /// 保存实体数据（新增、修改）
+        /// </summary>
+        /// <param name="keyValue">主键</param>
+        /// <param name="entity">实体</param>
+        /// <returns></returns>
+        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 扩展数据
+
+        /// <summary>
+        /// 去重
+        /// </summary>
+        /// <param name="H_SchoolNo">学号</param>
+        /// <param name="ApplyNo">报名号</param>
+        /// <param name="CardNo">身份证</param>
+        /// <returns></returns>
+        public List<StuVolunteerEntity> 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);
+                }
+            }
+        }
+        /// <summary>
+        /// 标注数据
+        /// </summary>
+        /// <param name="keyValue">主键</param>
+        public void LabelEntity(string keyValue)
+        {
+            try
+            {
+                stuVolunteerService.LabelEntity(keyValue);
+            }
+            catch (Exception ex)
+            {
+                if (ex is ExceptionEx)
+                {
+                    throw;
+                }
+                else
+                {
+                    throw ExceptionEx.ThrowBusinessException(ex);
+                }
+            }
+        }
+
+        /// <summary>
+        /// 取消标注数据
+        /// </summary>
+        /// <param name="keyValue">主键</param>
+        public void CancelLabel(string keyValue)
+        {
+            try
+            {
+                stuVolunteerService.CancelLabel(keyValue);
+            }
+            catch (Exception ex)
+            {
+                if (ex is ExceptionEx)
+                {
+                    throw;
+                }
+                else
+                {
+                    throw ExceptionEx.ThrowBusinessException(ex);
+                }
+            }
+        }
+
+        /// <summary>
+        /// 志愿填报
+        /// </summary>
+        /// <param name="keyValue"></param>
+        /// <param name="entity"></param>
+        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);
+                }
+            }
+        }
+
+        /// <summary>
+        /// 录取学生
+        /// </summary>
+        /// <param name="keyValue">主键</param>
+        public void EnrollEntity(string keyValue)
+        {
+            try
+            {
+                stuVolunteerService.EnrollEntity(keyValue);
+            }
+            catch (Exception ex)
+            {
+                if (ex is ExceptionEx)
+                {
+                    throw;
+                }
+                else
+                {
+                    throw ExceptionEx.ThrowBusinessException(ex);
+                }
+            }
+        }
+
+        /// <summary>
+        /// 取消录取学生
+        /// </summary>
+        /// <param name="keyValue">主键</param>
+        public void CancelEntity(string keyValue)
+        {
+            try
+            {
+                stuVolunteerService.CancelEntity(keyValue);
+            }
+            catch (Exception ex)
+            {
+                if (ex is ExceptionEx)
+                {
+                    throw;
+                }
+                else
+                {
+                    throw ExceptionEx.ThrowBusinessException(ex);
+                }
+            }
+        }
+
+        #endregion
+    }
+}

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
+{
+    /// <summary>
+    /// 版 本 Learun-ADMS V7.0.6 力软敏捷开发框架
+    /// Copyright (c) 2013-2020 力软信息技术（苏州）有限公司
+    /// 创 建：超级管理员
+    /// 日 期：2021-12-16 10:14
+    /// 描 述：长阳迎新
+    /// </summary>
+    public class StuVolunteerEntity
+    {
+        #region 实体成员
+        /// <summary>
+        /// ID
+        /// </summary>
+        [Column("ID")]
+        public string ID { get; set; }
+        /// <summary>
+        /// 区县
+        /// </summary>
+        [Column("ADDRESS")]
+        public string Address { get; set; }
+        /// <summary>
+        /// 学籍号
+        /// </summary>
+        [Column("STUCODE")]
+        public string StuCode { get; set; }
+        /// <summary>
+        /// 毕业学校
+        /// </summary>
+        [Column("BYSCHOOL")]
+        public string BySchool { get; set; }
+        /// <summary>
+        /// 学生编码(初中学号)
+        /// </summary>
+        [Column("H_SCHOOLNO")]
+        public string H_SchoolNo { get; set; }
+        /// <summary>
+        /// 中考时报名号
+        /// </summary>
+        [Column("APPLYNO")]
+        public string ApplyNo { get; set; }
+        /// <summary>
+        /// 学生姓名
+        /// </summary>
+        [Column("STUNAME")]
+        public string StuName { get; set; }
+        /// <summary>
+        /// 性别
+        /// </summary>
+        [Column("SEX")]
+        public string Sex { get; set; }
+        /// <summary>
+        /// 身份号
+        /// </summary>
+        [Column("CARDNO")]
+        public string CardNo { get; set; }
+        /// <summary>
+        /// 系所号
+        /// </summary>
+        [Column("DEPTNO")]
+        public string DeptNo { get; set; }
+        /// <summary>
+        /// 专业
+        /// </summary>
+        [Column("MAJORNO")]
+        public string MajorNo { get; set; }
+        /// <summary>
+        /// 中考总分
+        /// </summary>
+        [Column("STUSCORE")]
+        public decimal? StuScore { get; set; }
+        /// <summary>
+        /// IsCYSchool
+        /// </summary>
+        [Column("ISCYSCHOOL")]
+        public bool? IsCYSchool { get; set; }
+        /// <summary>
+        /// 根据平时成绩 标注是否有意向报名本校
+        /// </summary>
+        [Column("ISINTENTION")]
+        public bool? IsIntention { get; set; }
+        /// <summary>
+        /// 一志愿
+        /// </summary>
+        [Column("FIRSTVOLUNTEER")]
+        public string FirstVolunteer { get; set; }
+        /// <summary>
+        /// 二志愿
+        /// </summary>
+        [Column("SECONDVOLUNTEER")]
+        public string SecondVolunteer { get; set; }
+        /// <summary>
+        /// 三志愿
+        /// </summary>
+        [Column("THIRDVOLUNTEER")]
+        public string ThirdVolunteer { get; set; }
+        /// <summary>
+        /// 四志愿
+        /// </summary>
+        [Column("FOUTHVOLUNTEER")]
+        public string FouthVolunteer { get; set; }
+        /// <summary>
+        /// 五
+        /// </summary>
+        [Column("FIFTHVOLUNTEER")]
+        public string FifthVolunteer { get; set; }
+        /// <summary>
+        /// 六
+        /// </summary>
+        [Column("SIXTHVOLUNTEER")]
+        public string SixthVolunteer { get; set; }
+        /// <summary>
+        /// 七
+        /// </summary>
+        [Column("SEVENTHVOLUNTEER")]
+        public string SeventhVolunteer { get; set; }
+        /// <summary>
+        /// 八
+        /// </summary>
+        [Column("EIGHTHVOLUNTEER")]
+        public string EighthVolunteer { get; set; }
+        /// <summary>
+        /// 九
+        /// </summary>
+        [Column("NINTHVOLUNTEER")]
+        public string NinthVolunteer { get; set; }
+        /// <summary>
+        /// 备注
+        /// </summary>
+        [Column("DEMO")]
+        public string Demo { get; set; }
+        /// <summary>
+        /// CreateTime
+        /// </summary>
+        [Column("CREATETIME")]
+        public DateTime? CreateTime { get; set; }
+        /// <summary>
+        /// CreateUser
+        /// </summary>
+        [Column("CREATEUSER")]
+        public string CreateUser { get; set; }
+        /// <summary>
+        /// UpdateTime
+        /// </summary>
+        [Column("UPDATETIME")]
+        public DateTime? UpdateTime { get; set; }
+        /// <summary>
+        /// UpdateUser
+        /// </summary>
+        [Column("UPDATEUSER")]
+        public string UpdateUser { get; set; }
+        /// <summary>
+        /// 是否是本校
+        /// </summary>
+        [Column("ISOURSCHOOL")]
+        public bool? IsOurSchool { get; set; }
+        /// <summary>
+        /// 其他学校名称
+        /// </summary>
+        [Column("OTHERSCHOOL")]
+        public string OtherSchool { get; set; }
+        /// <summary>
+        /// 是否录取
+        /// </summary>
+        [Column("ISENROLL")]
+        public bool? IsEnroll { get; set; }
+        /// <summary>
+        /// 是否生成账号
+        /// </summary>
+        [Column("ISACCOUNT")]
+        public bool? IsAccount { get; set; }
+        /// <summary>
+        /// 所属学校
+        /// </summary>
+        [Column("F_SCHOOLID")]
+        public string F_SchoolId { get; set; }
+        /// <summary>
+        /// 学号
+        /// </summary>
+        [Column("STUNO")]
+        public string StuNo { get; set; }
+        #endregion
+
+        #region 扩展操作
+        /// <summary>
+        /// 新增调用
+        /// </summary>
+        public void Create()
+        {
+            this.ID = Guid.NewGuid().ToString();
+        }
+        /// <summary>
+        /// 编辑调用
+        /// </summary>
+        /// <param name="keyValue"></param>
+        public void Modify(string keyValue)
+        {
+            this.ID = keyValue;
+        }
+        #endregion
+        #region 扩展字段
+        #endregion
+    }
+}
+

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
+{
+    /// <summary>
+    /// 版 本 Learun-ADMS V7.0.6 力软敏捷开发框架
+    /// Copyright (c) 2013-2020 力软信息技术（苏州）有限公司
+    /// 创 建：超级管理员
+    /// 日 期：2021-12-16 10:14
+    /// 描 述：长阳迎新
+    /// </summary>
+    public interface StuVolunteerIBLL
+    {
+        #region 获取数据
+
+        /// <summary>
+        /// 获取页面显示列表数据
+        /// </summary>
+        /// <param name="queryJson">查询参数</param>
+        /// <returns></returns>
+        IEnumerable<StuVolunteerEntity> GetPageList(Pagination pagination, string queryJson);
+        /// <summary>
+        /// 获取StuVolunteer表实体数据
+        /// </summary>
+        /// <param name="keyValue">主键</param>
+        /// <returns></returns>
+        StuVolunteerEntity GetStuVolunteerEntity(string keyValue);
+        #endregion
+
+        #region 提交数据
+
+        /// <summary>
+        /// 删除实体数据
+        /// </summary>
+        /// <param name="keyValue">主键</param>
+        void DeleteEntity(string keyValue);
+        /// <summary>
+        /// 保存实体数据（新增、修改）
+        /// </summary>
+        /// <param name="keyValue">主键</param>
+        /// <param name="entity">实体</param>
+        void SaveEntity(string keyValue, StuVolunteerEntity entity);
+        #endregion
+
+        #region 扩展数据
+
+        /// <summary>
+        /// 去重
+        /// </summary>
+        /// <param name="H_SchoolNo">学号</param>
+        /// <param name="ApplyNo">报名号</param>
+        /// <param name="CardNo">身份证</param>
+        /// <returns></returns>
+        List<StuVolunteerEntity> GetRepetitions(string H_SchoolNo, string ApplyNo, string CardNo);
+
+        /// <summary>
+        /// 标注数据
+        /// </summary>
+        /// <param name="keyValue">主键</param>
+        void LabelEntity(string keyValue);
+
+        /// <summary>
+        /// 取消标注数据
+        /// </summary>
+        /// <param name="keyValue">主键</param>
+        void CancelLabel(string keyValue);
+
+        /// <summary>
+        /// 志愿填报
+        /// </summary>
+        /// <param name="keyValue"></param>
+        /// <param name="entity"></param>
+        void IsOurSchool(string keyValue, StuVolunteerEntity entity);
+
+        /// <summary>
+        /// 录取学生
+        /// </summary>
+        /// <param name="keyValue">主键</param>
+        void EnrollEntity(string keyValue);
+
+        /// <summary>
+        /// 取消录入学生
+        /// </summary>
+        /// <param name="keyValue">主键</param>
+        void CancelEntity(string keyValue);
+
+        #endregion
+    }
+}

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
+{
+    /// <summary>
+    /// 版 本 Learun-ADMS V7.0.6 力软敏捷开发框架
+    /// Copyright (c) 2013-2020 力软信息技术（苏州）有限公司
+    /// 创 建：超级管理员
+    /// 日 期：2021-12-16 10:14
+    /// 描 述：长阳迎新
+    /// </summary>
+    public class StuVolunteerService : RepositoryFactory
+    {
+        #region 获取数据
+
+        /// <summary>
+        /// 获取页面显示列表数据
+        /// </summary>
+        /// <param name="pagination">查询参数</param>
+        /// <param name="queryJson">查询参数</param>
+        /// <returns></returns>
+        public IEnumerable<StuVolunteerEntity> 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<StuVolunteerEntity>(strSql.ToString(), dp, pagination);
+            }
+            catch (Exception ex)
+            {
+                if (ex is ExceptionEx)
+                {
+                    throw;
+                }
+                else
+                {
+                    throw ExceptionEx.ThrowServiceException(ex);
+                }
+            }
+        }
+
+        /// <summary>
+        /// 获取StuVolunteer表实体数据
+        /// </summary>
+        /// <param name="keyValue">主键</param>
+        /// <returns></returns>
+        public StuVolunteerEntity GetStuVolunteerEntity(string keyValue)
+        {
+            try
+            {
+                return this.BaseRepository("CollegeMIS").FindEntity<StuVolunteerEntity>(keyValue);
+            }
+            catch (Exception ex)
+            {
+                if (ex is ExceptionEx)
+                {
+                    throw;
+                }
+                else
+                {
+                    throw ExceptionEx.ThrowServiceException(ex);
+                }
+            }
+        }
+
+        #endregion
+
+        #region 提交数据
+
+        /// <summary>
+        /// 删除实体数据
+        /// </summary>
+        /// <param name="keyValue">主键</param>
+        public void DeleteEntity(string keyValue)
+        {
+            var db = this.BaseRepository("CollegeMIS").BeginTrans();
+            try
+            {
+                //单个删除
+                //this.BaseRepository("CollegeMIS").Delete<CdMajorEntity>(t => t.ID == keyValue);
+                //多个删除
+                var keyValueArr = keyValue.Split(',');
+                foreach (var item in keyValueArr)
+                {
+                    db.Delete<StuVolunteerEntity>(t => t.ID == item);
+                }
+                db.Commit();
+            }
+            catch (Exception ex)
+            {
+                if (ex is ExceptionEx)
+                {
+                    throw;
+                }
+                else
+                {
+                    throw ExceptionEx.ThrowServiceException(ex);
+                }
+            }
+        }
+
+        /// <summary>
+        /// 保存实体数据（新增、修改）
+        /// </summary>
+        /// <param name="keyValue">主键</param>
+        /// <param name="entity">实体</param>
+        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
+
+        /// <summary>
+        /// 去重
+        /// </summary>
+        /// <param name="H_SchoolNo">初中学号</param>
+        /// <param name="ApplyNo">报名号</param>
+        /// <param name="CardNo">身份证号</param>
+        /// <returns></returns>
+        public List<StuVolunteerEntity> GetRepetitions(string H_SchoolNo, string ApplyNo, string CardNo)
+        {
+            try
+            {
+                return this.BaseRepository("CollegeMIS").FindList<StuVolunteerEntity>(x =>
+                    x.H_SchoolNo == H_SchoolNo || x.ApplyNo == ApplyNo || x.CardNo == CardNo).ToList();
+            }
+            catch (Exception e)
+            {
+                Console.WriteLine(e);
+                throw;
+            }
+        }
+
+        /// <summary>
+        /// 标注数据
+        /// </summary>
+        /// <param name="keyValue">主键</param>
+        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<StuVolunteerEntity>(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);
+                }
+            }
+        }
+
+        /// <summary>
+        /// 取消标注数据
+        /// </summary>
+        /// <param name="keyValue">主键</param>
+        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<StuVolunteerEntity>(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);
+                }
+            }
+        }
+
+        /// <summary>
+        /// 志愿填报
+        /// </summary>
+        /// <param name="keyValue"></param>
+        /// <param name="entity"></param>
+        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);
+                }
+            }
+        }
+
+        /// <summary>
+        /// 录取学生
+        /// </summary>
+        /// <param name="keyValue">主键</param>
+        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<StuVolunteerEntity>(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);
+                }
+            }
+        }
+
+        /// <summary>
+        /// 取消录取学生
+        /// </summary>
+        /// <param name="keyValue">主键</param>
+        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<StuVolunteerEntity>(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
+    }
+}

Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/Learun.Application.TwoDevelopment.csproj

@@ -1719,6 +1719,10 @@
     <Compile Include="EducationalAdministration\ArrangeExamTermNew\ArrangeExamTermNewService.cs" />
     <Compile Include="EducationalAdministration\ArrangeExamTermNew\ArrangeExamTermNewIBLL.cs" />
     <Compile Include="EducationalAdministration\ArrangeExamTermNew\ArrangeExamTermNewBLL.cs" />
+    <Compile Include="EducationalAdministration\StuVolunteer\StuVolunteerEntity.cs" />
+    <Compile Include="EducationalAdministration\StuVolunteer\StuVolunteerService.cs" />
+    <Compile Include="EducationalAdministration\StuVolunteer\StuVolunteerIBLL.cs" />
+    <Compile Include="EducationalAdministration\StuVolunteer\StuVolunteerBLL.cs" />
   </ItemGroup>
   <ItemGroup>
     <ProjectReference Include="..\..\..\Learun.Application.Organization\Learun.Application.Organization.csproj">