Merge branch '长阳分支中职' of http://123.57.209.16:3000/bjquanjiang/DigitalScholl into 长阳分支中职

Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuTransferInfo/QueryMSRMilitaryIndex.cshtml

@@ -0,0 +1,61 @@
+@{
+    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 " style="overflow-y:scroll;-webkit-scrollbar-track-piece{width:1px;background-color:#fff;}">
+            <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>
+                                <div id="DeptNo"></div>
+                            </div>
+                            <div class="col-xs-12 lr-form-item">
+                                <div class="lr-form-item-title">专业</div>
+                                <div id="MajorNo"></div>
+                            </div>
+                            <div class="col-xs-12 lr-form-item">
+                                <div class="lr-form-item-title">年级</div>
+                                <div id="Grade"></div>
+                            </div>
+                            <div class="col-xs-12 lr-form-item">
+                                <div class="lr-form-item-title">班级</div>
+                                <div id="ClassNo"></div>
+                            </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>
+                                <input id="IdentityCardNo" type="text" class="form-control" />
+                            </div>
+                            <div class="col-xs-6 lr-form-item">
+                                <div class="lr-form-item-title">学生编号</div>
+                                <input id="StuNo" type="text" class="form-control" />
+                            </div>
+                            <div class="col-xs-6 lr-form-item">
+                                <div class="lr-form-item-title">学籍号</div>
+                                <input id="StuCode" type="text" class="form-control" />
+                            </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>
+            </div>
+            <div class="lr-layout-body" style="height:40%;border-bottom:1px solid #ccc;" id="gridtable"></div>
+            <div class="lr-layout-body" style="height:40%;border-top: 1px solid #ccc;border-bottom: 1px solid #ccc;margin-top:50px;" id="gridtableTwo"></div>
+            <div class="lr-layout-body" style="height:40%;border-top: 1px solid #ccc;border-bottom: 1px solid #ccc;margin-top:50px;" id="gridtableThree"></div>
+        </div>
+    </div>
+</div>
+@Html.AppendJsFile("/Areas/EducationalAdministration/Views/StuTransferInfo/QueryMSRMilitaryIndex.js")

Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuTransferInfo/QueryMSRMilitaryIndex.js

@@ -0,0 +1,240 @@
+var refreshGirdData;
+var StuId = request('keyValue');
+var StuNo = request('StuNo');
+var tempdatra = new Array();
+var list = [];
+var bootstrap = function ($, learun) {
+    "use strict";
+    var page = {
+        init: function () {
+            page.initGird();
+            page.initGird2();
+            page.initGird3();
+            page.bind();
+        },
+        bind: function () {
+            // 刷新
+            $('#lr_refresh').on('click', function () {
+                location.reload();
+            });
+        },
+        // 初始化列表
+        initGird: function () {
+            $('#gridtable').lrAuthorizeJfGridLei({
+                url: top.$.rootUrl + '/LogisticsManagement/MSRMilitaryServiceRegistrationTran/GetPageList',
+                headData: [
+                    { label: "学年", name: "YearNo", width: 100, align: "left" },
+                    {
+                        label: "系部", name: "DeptNo", width: 100, align: "left",
+                        formatterAsync: function (callback, value, row, op, $cell) {
+                            learun.clientdata.getAsync('custmerData', {
+                                url: '/LR_SystemModule/DataSource/GetDataTable?code=' + 'CdDeptInfo',
+                                key: value,
+                                keyId: 'deptno',
+                                callback: function (_data) {
+                                    callback(_data['deptname']);
+                                }
+                            });
+                        }
+                    },
+                    {
+                        label: "专业", name: "MajorNo", width: 100, align: "left",
+                        formatterAsync: function (callback, value, row, op, $cell) {
+                            learun.clientdata.getAsync('custmerData', {
+                                url: '/LR_SystemModule/DataSource/GetDataTable?code=' + 'CdMajorInfo',
+                                key: value,
+                                keyId: 'majorno',
+                                callback: function (_data) {
+                                    callback(_data['majorname']);
+                                }
+                            });
+                        }
+                    },
+                    {
+                        label: "班级", name: "ClassNo", width: 100, align: "left",
+                        formatterAsync: function (callback, value, row, op, $cell) {
+                            learun.clientdata.getAsync('custmerData', {
+                                url: '/LR_SystemModule/DataSource/GetDataTable?code=' + 'bjsj',
+                                key: value,
+                                keyId: 'classno',
+                                callback: function (_data) {
+                                    callback(_data['classname']);
+                                }
+                            });
+                        }
+                    },
+                    {
+                        label: "学生", name: "StuNo", width: 100, align: "left",
+                        formatterAsync: function (callback, value, row, op, $cell) {
+                            learun.clientdata.getAsync('custmerData', {
+                                url: '/LR_SystemModule/DataSource/GetDataTable?code=' + 'StuInfoBasic',
+                                key: value,
+                                keyId: 'stuno',
+                                callback: function (_data) {
+                                    callback(_data['stuname']);
+                                }
+                            });
+                        }
+                    },
+                    { label: "截图上传", name: "Screenshot", width: 100, align: "left" },
+                    { label: "备注", name: "Remark", width: 100, align: "left" },
+                ],
+                mainId: 'ID',
+                isPage: true
+            });
+            page.search();
+        },
+        initGird2: function () {
+            $('#gridtableTwo').lrAuthorizeJfGridLei({
+                url: top.$.rootUrl + '/LogisticsManagement/MSRIntentionManagementTran/GetPageList',
+                headData: [
+                    {
+                        label: "系", name: "DeptNo", width: 100, align: "left",
+                        formatterAsync: function (callback, value, row, op, $cell) {
+                            learun.clientdata.getAsync('custmerData', {
+                                url: '/LR_SystemModule/DataSource/GetDataTable?code=' + 'CdDeptInfo',
+                                key: value,
+                                keyId: 'deptno',
+                                callback: function (_data) {
+                                    callback(_data['deptname']);
+                                }
+                            });
+                        }
+                    },
+                    {
+                        label: "专业", name: "MajorNo", width: 100, align: "left",
+                        formatterAsync: function (callback, value, row, op, $cell) {
+                            learun.clientdata.getAsync('custmerData', {
+                                url: '/LR_SystemModule/DataSource/GetDataTable?code=' + 'CdMajorInfo',
+                                key: value,
+                                keyId: 'majorno',
+                                callback: function (_data) {
+                                    callback(_data['majorname']);
+                                }
+                            });
+                        }
+                    },
+                    {
+                        label: "班级", name: "ClassNo", width: 100, align: "left",
+                        formatterAsync: function (callback, value, row, op, $cell) {
+                            learun.clientdata.getAsync('custmerData', {
+                                url: '/LR_SystemModule/DataSource/GetDataTable?code=' + 'bjsj',
+                                key: value,
+                                keyId: 'classno',
+                                callback: function (_data) {
+                                    callback(_data['classname']);
+                                }
+                            });
+                        }
+                    },
+                    {
+                        label: "学生", name: "StuNo", width: 100, align: "left",
+                        formatterAsync: function (callback, value, row, op, $cell) {
+                            learun.clientdata.getAsync('custmerData', {
+                                url: '/LR_SystemModule/DataSource/GetDataTable?code=' + 'StuInfoBasic',
+                                key: value,
+                                keyId: 'stuno',
+                                callback: function (_data) {
+                                    callback(_data['stuname']);
+                                }
+                            });
+                        }
+                    },
+                    { label: "联系方式", name: "Mobile", width: 100, align: "left" },
+                    { label: "年龄", name: "Age", width: 100, align: "left" },
+                    { label: "身高", name: "High", width: 100, align: "left" },
+                    { label: "体重", name: "Weight", width: 100, align: "left" },
+                    { label: "视力", name: "Vision", width: 100, align: "left" },
+                ],
+                mainId: 'ID',
+                isPage: true
+            });
+            page.search2();
+        },
+        initGird3: function () {
+            $('#gridtableThree').lrAuthorizeJfGridLei({
+                url: top.$.rootUrl + '/LogisticsManagement/MSRMilitaryRecordTran/GetPageList',
+                headData: [
+                    {
+                        label: "系部", name: "DeptNo", width: 100, align: "left",
+                        formatterAsync: function (callback, value, row, op, $cell) {
+                            learun.clientdata.getAsync('custmerData', {
+                                url: '/LR_SystemModule/DataSource/GetDataTable?code=' + 'CdDeptInfo',
+                                key: value,
+                                keyId: 'deptno',
+                                callback: function (_data) {
+                                    callback(_data['deptname']);
+                                }
+                            });
+                        }
+                    },
+                    {
+                        label: "专业", name: "MajorNo", width: 100, align: "left",
+                        formatterAsync: function (callback, value, row, op, $cell) {
+                            learun.clientdata.getAsync('custmerData', {
+                                url: '/LR_SystemModule/DataSource/GetDataTable?code=' + 'CdMajorInfo',
+                                key: value,
+                                keyId: 'majorno',
+                                callback: function (_data) {
+                                    callback(_data['majorname']);
+                                }
+                            });
+                        }
+                    },
+                    {
+                        label: "班级", name: "ClassNo", width: 100, align: "left",
+                        formatterAsync: function (callback, value, row, op, $cell) {
+                            learun.clientdata.getAsync('custmerData', {
+                                url: '/LR_SystemModule/DataSource/GetDataTable?code=' + 'bjsj',
+                                key: value,
+                                keyId: 'classno',
+                                callback: function (_data) {
+                                    callback(_data['classname']);
+                                }
+                            });
+                        }
+                    },
+                    {
+                        label: "学生", name: "StuNo", width: 100, align: "left",
+                        formatterAsync: function (callback, value, row, op, $cell) {
+                            learun.clientdata.getAsync('custmerData', {
+                                url: '/LR_SystemModule/DataSource/GetDataTable?code=' + 'StuInfoBasic',
+                                key: value,
+                                keyId: 'stuno',
+                                callback: function (_data) {
+                                    callback(_data['stuname']);
+                                }
+                            });
+                        }
+                    },
+                    { label: "参军记录", name: "Record", width: 100, align: "left" },
+                    { label: "备注", name: "Remark", width: 100, align: "left" },
+                ],
+                mainId: 'ID',
+                isPage: true
+            });
+            page.search3();
+        },
+        search: function (param) {
+            param = param || {};
+            param.StuNo = StuNo;
+            $('#gridtable').jfGridSet('reload', { queryJson: JSON.stringify(param) });
+        },
+        search2: function (param) {
+            param = param || {};
+            param.StuNo = StuNo;
+            $('#gridtableTwo').jfGridSet('reload', { queryJson: JSON.stringify(param) });
+        },
+        search3: function (param) {
+            param = param || {};
+            param.StuNo = StuNo;
+            $('#gridtableThree').jfGridSet('reload', { queryJson: JSON.stringify(param) });
+        }
+    };
+    refreshGirdData = function () {
+        page.search();
+        page.search2();
+        page.search3();
+    };
+    page.init();
+}

Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuTransferInfo/QueryScholarshipIndex.js

@@ -1,5 +1,6 @@
 var refreshGirdData;
 var StuId;
+var StuNo = request('StuNo');
 var tempdatra = new Array();
 var list = [];
 var bootstrap = function ($, learun) {
@@ -110,10 +111,12 @@ var bootstrap = function ($, learun) {
         search: function (param) {
             param = param || {};
             param.IsType = 0;
+            param.StuNo = StuNo;
             $('#gridtable').jfGridSet('reload', { queryJson: JSON.stringify(param) });
         },
         search2: function (param) {
             param = param || {};
+            param.StuNo = StuNo;
             param.IsType = 1;
             $('#gridtableTwo').jfGridSet('reload', { queryJson: JSON.stringify(param) });
         }

Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LogisticsManagement/Controllers/MSRIntentionManagementTranController.cs

@@ -0,0 +1,111 @@
+using Learun.Util;
+using System.Data;
+using Learun.Application.TwoDevelopment.LogisticsManagement;
+using System.Web.Mvc;
+using System.Collections.Generic;
+
+namespace Learun.Application.Web.Areas.LogisticsManagement.Controllers
+{
+    /// <summary>
+    /// 版 本 Learun-ADMS-Ultimate V7.0.0 数字化智慧校园 
+    /// Copyright (c) 2013-2018 北京泉江科技有限公司 
+    /// 创 建：超级管理员
+    /// 日 期：2020-05-19 13:38
+    /// 描 述：参军意向管理
+    /// </summary>
+    public class MSRIntentionManagementTranController : MvcControllerBase
+    {
+        private MSRIntentionManagementTranIBLL mSRIntentionManagementTranIBLL = new MSRIntentionManagementTranBLL();
+
+        #region  视图功能
+
+        /// <summary>
+        /// 主页面
+        /// <summary>
+        /// <returns></returns>
+        [HttpGet]
+        public ActionResult Index()
+        {
+             return View();
+        }
+        /// <summary>
+        /// 表单页
+        /// <summary>
+        /// <returns></returns>
+        [HttpGet]
+        public ActionResult Form()
+        {
+             return View();
+        }
+        #endregion
+
+        #region  获取数据
+
+        /// <summary>
+        /// 获取页面显示列表数据
+        /// <summary>
+        /// <param name="queryJson">查询参数</param>
+        /// <returns></returns>
+        [HttpGet]
+        [AjaxOnly]
+        public ActionResult GetPageList(string pagination, string queryJson)
+        {
+            Pagination paginationobj = pagination.ToObject<Pagination>();
+            var data = mSRIntentionManagementTranIBLL.GetPageList(paginationobj, queryJson);
+            var jsonData = new
+            {
+                rows = data,
+                total = paginationobj.total,
+                page = paginationobj.page,
+                records = paginationobj.records
+            };
+            return Success(jsonData);
+        }
+        /// <summary>
+        /// 获取表单数据
+        /// <summary>
+        /// <returns></returns>
+        [HttpGet]
+        [AjaxOnly]
+        public ActionResult GetFormData(string keyValue)
+        {
+            var MSRIntentionManagementData = mSRIntentionManagementTranIBLL.GetMSRIntentionManagementEntity( keyValue );
+            var jsonData = new {
+                MSRIntentionManagementTran = MSRIntentionManagementData,
+            };
+            return Success(jsonData);
+        }
+        #endregion
+
+        #region  提交数据
+
+        /// <summary>
+        /// 删除实体数据
+        /// <param name="keyValue">主键</param>
+        /// <summary>
+        /// <returns></returns>
+        [HttpPost]
+        [AjaxOnly]
+        public ActionResult DeleteForm(string keyValue)
+        {
+            mSRIntentionManagementTranIBLL.DeleteEntity(keyValue);
+            return Success("删除成功！");
+        }
+        /// <summary>
+        /// 保存实体数据（新增、修改）
+        /// <param name="keyValue">主键</param>
+        /// <summary>
+        /// <returns></returns>
+        [HttpPost]
+        [ValidateAntiForgeryToken]
+        [AjaxOnly]
+        public ActionResult SaveForm(string keyValue, string strEntity)
+        {
+            MSRIntentionManagementTranEntity entity = strEntity.ToObject<MSRIntentionManagementTranEntity>();
+            mSRIntentionManagementTranIBLL.SaveEntity(keyValue,entity);
+            return Success("保存成功！");
+        }
+        #endregion
+
+    }
+}

Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LogisticsManagement/Controllers/MSRMilitaryRecordTranController.cs

@@ -0,0 +1,111 @@
+using Learun.Util;
+using System.Data;
+using Learun.Application.TwoDevelopment.LogisticsManagement;
+using System.Web.Mvc;
+using System.Collections.Generic;
+
+namespace Learun.Application.Web.Areas.LogisticsManagement.Controllers
+{
+    /// <summary>
+    /// 版 本 Learun-ADMS-Ultimate V7.0.0 数字化智慧校园 
+    /// Copyright (c) 2013-2018 北京泉江科技有限公司 
+    /// 创 建：超级管理员
+    /// 日 期：2020-05-19 13:49
+    /// 描 述：参军记录
+    /// </summary>
+    public class MSRMilitaryRecordTranController : MvcControllerBase
+    {
+        private MSRMilitaryRecordTranIBLL mSRMilitaryRecordIBLL = new MSRMilitaryRecordTranBLL();
+
+        #region  视图功能
+
+        /// <summary>
+        /// 主页面
+        /// <summary>
+        /// <returns></returns>
+        [HttpGet]
+        public ActionResult Index()
+        {
+             return View();
+        }
+        /// <summary>
+        /// 表单页
+        /// <summary>
+        /// <returns></returns>
+        [HttpGet]
+        public ActionResult Form()
+        {
+             return View();
+        }
+        #endregion
+
+        #region  获取数据
+
+        /// <summary>
+        /// 获取页面显示列表数据
+        /// <summary>
+        /// <param name="queryJson">查询参数</param>
+        /// <returns></returns>
+        [HttpGet]
+        [AjaxOnly]
+        public ActionResult GetPageList(string pagination, string queryJson)
+        {
+            Pagination paginationobj = pagination.ToObject<Pagination>();
+            var data = mSRMilitaryRecordIBLL.GetPageList(paginationobj, queryJson);
+            var jsonData = new
+            {
+                rows = data,
+                total = paginationobj.total,
+                page = paginationobj.page,
+                records = paginationobj.records
+            };
+            return Success(jsonData);
+        }
+        /// <summary>
+        /// 获取表单数据
+        /// <summary>
+        /// <returns></returns>
+        [HttpGet]
+        [AjaxOnly]
+        public ActionResult GetFormData(string keyValue)
+        {
+            var MSRMilitaryRecordData = mSRMilitaryRecordIBLL.GetMSRMilitaryRecordEntity( keyValue );
+            var jsonData = new {
+                MSRMilitaryRecord = MSRMilitaryRecordData,
+            };
+            return Success(jsonData);
+        }
+        #endregion
+
+        #region  提交数据
+
+        /// <summary>
+        /// 删除实体数据
+        /// <param name="keyValue">主键</param>
+        /// <summary>
+        /// <returns></returns>
+        [HttpPost]
+        [AjaxOnly]
+        public ActionResult DeleteForm(string keyValue)
+        {
+            mSRMilitaryRecordIBLL.DeleteEntity(keyValue);
+            return Success("删除成功！");
+        }
+        /// <summary>
+        /// 保存实体数据（新增、修改）
+        /// <param name="keyValue">主键</param>
+        /// <summary>
+        /// <returns></returns>
+        [HttpPost]
+        [ValidateAntiForgeryToken]
+        [AjaxOnly]
+        public ActionResult SaveForm(string keyValue, string strEntity)
+        {
+            MSRMilitaryRecordTranEntity entity = strEntity.ToObject<MSRMilitaryRecordTranEntity>();
+            mSRMilitaryRecordIBLL.SaveEntity(keyValue,entity);
+            return Success("保存成功！");
+        }
+        #endregion
+
+    }
+}

Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LogisticsManagement/Controllers/MSRMilitaryServiceRegistrationTranController.cs

@@ -0,0 +1,111 @@
+using Learun.Util;
+using System.Data;
+using Learun.Application.TwoDevelopment.LogisticsManagement;
+using System.Web.Mvc;
+using System.Collections.Generic;
+
+namespace Learun.Application.Web.Areas.LogisticsManagement.Controllers
+{
+    /// <summary>
+    /// 版 本 Learun-ADMS-Ultimate V7.0.0 数字化智慧校园 
+    /// Copyright (c) 2013-2018 北京泉江科技有限公司 
+    /// 创 建：超级管理员
+    /// 日 期：2020-05-19 12:01
+    /// 描 述：兵役登记
+    /// </summary>
+    public class MSRMilitaryServiceRegistrationTranController : MvcControllerBase
+    {
+        private MSRMilitaryServiceRegistrationTranIBLL mSRMilitaryServiceRegistrationTranIBLL = new MSRMilitaryServiceRegistrationTranBLL();
+
+        #region  视图功能
+
+        /// <summary>
+        /// 主页面
+        /// <summary>
+        /// <returns></returns>
+        [HttpGet]
+        public ActionResult Index()
+        {
+             return View();
+        }
+        /// <summary>
+        /// 表单页
+        /// <summary>
+        /// <returns></returns>
+        [HttpGet]
+        public ActionResult Form()
+        {
+             return View();
+        }
+        #endregion
+
+        #region  获取数据
+
+        /// <summary>
+        /// 获取页面显示列表数据
+        /// <summary>
+        /// <param name="queryJson">查询参数</param>
+        /// <returns></returns>
+        [HttpGet]
+        [AjaxOnly]
+        public ActionResult GetPageList(string pagination, string queryJson)
+        {
+            Pagination paginationobj = pagination.ToObject<Pagination>();
+            var data = mSRMilitaryServiceRegistrationTranIBLL.GetPageList(paginationobj, queryJson);
+            var jsonData = new
+            {
+                rows = data,
+                total = paginationobj.total,
+                page = paginationobj.page,
+                records = paginationobj.records
+            };
+            return Success(jsonData);
+        }
+        /// <summary>
+        /// 获取表单数据
+        /// <summary>
+        /// <returns></returns>
+        [HttpGet]
+        [AjaxOnly]
+        public ActionResult GetFormData(string keyValue)
+        {
+            var MSRMilitaryServiceRegistrationData = mSRMilitaryServiceRegistrationTranIBLL.GetMSRMilitaryServiceRegistrationEntity( keyValue );
+            var jsonData = new {
+                MSRMilitaryServiceRegistration = MSRMilitaryServiceRegistrationData,
+            };
+            return Success(jsonData);
+        }
+        #endregion
+
+        #region  提交数据
+
+        /// <summary>
+        /// 删除实体数据
+        /// <param name="keyValue">主键</param>
+        /// <summary>
+        /// <returns></returns>
+        [HttpPost]
+        [AjaxOnly]
+        public ActionResult DeleteForm(string keyValue)
+        {
+            mSRMilitaryServiceRegistrationTranIBLL.DeleteEntity(keyValue);
+            return Success("删除成功！");
+        }
+        /// <summary>
+        /// 保存实体数据（新增、修改）
+        /// <param name="keyValue">主键</param>
+        /// <summary>
+        /// <returns></returns>
+        [HttpPost]
+        [ValidateAntiForgeryToken]
+        [AjaxOnly]
+        public ActionResult SaveForm(string keyValue, string strEntity)
+        {
+            MSRMilitaryServiceRegistrationTranEntity entity = strEntity.ToObject<MSRMilitaryServiceRegistrationTranEntity>();
+            mSRMilitaryServiceRegistrationTranIBLL.SaveEntity(keyValue,entity);
+            return Success("保存成功！");
+        }
+        #endregion
+
+    }
+}

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

@@ -396,6 +396,9 @@
     <Compile Include="Areas\LogisticsManagement\Controllers\Acc_StuDayRoutineController.cs" />
     <Compile Include="Areas\LogisticsManagement\Controllers\APAppointmentPsychologistController.cs" />
     <Compile Include="Areas\LogisticsManagement\Controllers\CompanyNewsController.cs" />
+    <Compile Include="Areas\LogisticsManagement\Controllers\MSRIntentionManagementTranController.cs" />
+    <Compile Include="Areas\LogisticsManagement\Controllers\MSRMilitaryRecordTranController.cs" />
+    <Compile Include="Areas\LogisticsManagement\Controllers\MSRMilitaryServiceRegistrationTranController.cs" />
     <Compile Include="Areas\LogisticsManagement\Controllers\ProjectDataManageController.cs" />
     <Compile Include="Areas\LogisticsManagement\Controllers\ProjectPhaseManageController.cs" />
     <Compile Include="Areas\LogisticsManagement\LogisticsManagementAreaRegistration.cs" />
@@ -1366,6 +1369,7 @@
     <Content Include="Areas\EducationalAdministration\Views\StuScore\ScoreQueryAllIndexTeacher.js" />
     <Content Include="Areas\EducationalAdministration\Views\StuScore\ScoreQueryAllIndex.js" />
     <Content Include="Areas\EducationalAdministration\Views\StuTransferInfo\CheckIndex.js" />
+    <Content Include="Areas\EducationalAdministration\Views\StuTransferInfo\QueryMSRMilitaryIndex.js" />
     <Content Include="Areas\EducationalAdministration\Views\StuTransferInfo\QueryScholarshipIndex.js" />
     <Content Include="Areas\EducationalAdministration\Views\StuTransferInfo\QueryBasicInfo.js" />
     <Content Include="Areas\EducationalAdministration\Views\StuTransferInfo\FormView.js" />
@@ -8081,6 +8085,7 @@
     <Content Include="Areas\EducationalAdministration\Views\StuTransferInfo\IndexQuery.cshtml" />
     <Content Include="Areas\EducationalAdministration\Views\StuTransferInfo\QueryBasicInfo.cshtml" />
     <Content Include="Areas\EducationalAdministration\Views\StuTransferInfo\QueryScholarshipIndex.cshtml" />
+    <Content Include="Areas\EducationalAdministration\Views\StuTransferInfo\QueryMSRMilitaryIndex.cshtml" />
     <None Include="Properties\PublishProfiles\CustomProfile.pubxml" />
     <None Include="Properties\PublishProfiles\FolderProfile.pubxml" />
     <Content Include="Views\Login\Default-beifen.cshtml" />

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

@@ -140,6 +140,9 @@
     <Compile Include="LogisticsManagement\Acc_PublicAreaHealthMap.cs" />
     <Compile Include="LogisticsManagement\Acc_DailyAssessMap.cs" />
     <Compile Include="LogisticsManagement\Acc_StuDayRoutineMap.cs" />
+    <Compile Include="LogisticsManagement\MSRIntentionManagementTranMap.cs" />
+    <Compile Include="LogisticsManagement\MSRMilitaryRecordTranMap.cs" />
+    <Compile Include="LogisticsManagement\MSRMilitaryServiceRegistrationTranMap.cs" />
     <Compile Include="LogisticsManagement\ProjectDataManageMap.cs" />
     <Compile Include="LogisticsManagement\ProjectPhaseManageMap.cs" />
     <Compile Include="LR_App\DTImgMap.cs" />

Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.Mapping/LogisticsManagement/MSRIntentionManagementTranMap.cs

@@ -0,0 +1,29 @@
+using Learun.Application.TwoDevelopment.LogisticsManagement;
+using System.Data.Entity.ModelConfiguration;
+
+namespace  Learun.Application.Mapping
+{
+    /// <summary>
+    /// 版 本 Learun-ADMS-Ultimate V7.0.0 数字化智慧校园 
+    /// Copyright (c) 2013-2018 北京泉江科技有限公司 
+    /// 创 建：超级管理员
+    /// 日 期：2020-05-19 13:38
+    /// 描 述：参军意向管理
+    /// </summary>
+    public class MSRIntentionManagementTranMap : EntityTypeConfiguration<MSRIntentionManagementTranEntity>
+    {
+        public MSRIntentionManagementTranMap()
+        {
+            #region  表、主键
+            //表
+            this.ToTable("MSRINTENTIONMANAGEMENTTRAN");
+            //主键
+            this.HasKey(t => t.ID);
+            #endregion
+
+            #region  配置关系
+            #endregion
+        }
+    }
+}
+

Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.Mapping/LogisticsManagement/MSRMilitaryRecordTranMap.cs

@@ -0,0 +1,29 @@
+using Learun.Application.TwoDevelopment.LogisticsManagement;
+using System.Data.Entity.ModelConfiguration;
+
+namespace  Learun.Application.Mapping
+{
+    /// <summary>
+    /// 版 本 Learun-ADMS-Ultimate V7.0.0 数字化智慧校园 
+    /// Copyright (c) 2013-2018 北京泉江科技有限公司 
+    /// 创 建：超级管理员
+    /// 日 期：2020-05-19 13:49
+    /// 描 述：参军记录
+    /// </summary>
+    public class MSRMilitaryRecordTranMap : EntityTypeConfiguration<MSRMilitaryRecordTranEntity>
+    {
+        public MSRMilitaryRecordTranMap()
+        {
+            #region  表、主键
+            //表
+            this.ToTable("MSRMILITARYRECORD");
+            //主键
+            this.HasKey(t => t.ID);
+            #endregion
+
+            #region  配置关系
+            #endregion
+        }
+    }
+}
+

Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.Mapping/LogisticsManagement/MSRMilitaryServiceRegistrationTranMap.cs

@@ -0,0 +1,29 @@
+using Learun.Application.TwoDevelopment.LogisticsManagement;
+using System.Data.Entity.ModelConfiguration;
+
+namespace  Learun.Application.Mapping
+{
+    /// <summary>
+    /// 版 本 Learun-ADMS-Ultimate V7.0.0 数字化智慧校园 
+    /// Copyright (c) 2013-2018 北京泉江科技有限公司 
+    /// 创 建：超级管理员
+    /// 日 期：2020-05-19 12:01
+    /// 描 述：兵役登记
+    /// </summary>
+    public class MSRMilitaryServiceRegistrationTranMap : EntityTypeConfiguration<MSRMilitaryServiceRegistrationTranEntity>
+    {
+        public MSRMilitaryServiceRegistrationTranMap()
+        {
+            #region  表、主键
+            //表
+            this.ToTable("MSRMILITARYSERVICEREGISTRATIONTRAN");
+            //主键
+            this.HasKey(t => t.ID);
+            #endregion
+
+            #region  配置关系
+            #endregion
+        }
+    }
+}
+

Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/ScholarshipTran/ScholarshipTranService.cs

@@ -64,11 +64,11 @@ namespace Learun.Application.TwoDevelopment.EducationalAdministration
                     dp.Add("IdentityCardNo", "%" + queryParam["IdentityCardNo"].ToString() + "%", DbType.String);
                     strSql.Append(" AND s.IdentityCardNo Like @IdentityCardNo ");
                 }
-                //var userlogin = LoginUserInfo.Get();
-                //if (userlogin.Description == "学生")
-                //{
-                //    strSql.Append(" AND t.stuno = '" + userlogin.account + "' ");
-                //}
+                if (!queryParam["StuNo"].IsEmpty())
+                {
+                    dp.Add("StuNo", queryParam["StuNo"].ToString(), DbType.String);
+                    strSql.Append(" AND t.StuNo = @StuNo ");
+                }
                 return this.BaseRepository("CollegeMIS").FindList<ScholarshipTranEntity>(strSql.ToString(), dp, pagination);
             }
             catch (Exception ex)

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

@@ -424,6 +424,18 @@
     <Compile Include="LogisticsManagement\Acc_StuDayRoutine\Acc_StuDayRoutineService.cs" />
     <Compile Include="LogisticsManagement\APAppointmentPsychologist\APAppointmentPsychologistEntity.cs" />
     <Compile Include="LogisticsManagement\CompanyNews\CompanyNewsEntity.cs" />
+    <Compile Include="LogisticsManagement\MSRIntentionManagementTran\MSRIntentionManagementTranBLL.cs" />
+    <Compile Include="LogisticsManagement\MSRIntentionManagementTran\MSRIntentionManagementTranEntity.cs" />
+    <Compile Include="LogisticsManagement\MSRIntentionManagementTran\MSRIntentionManagementTranIBLL.cs" />
+    <Compile Include="LogisticsManagement\MSRIntentionManagementTran\MSRIntentionManagementTranService.cs" />
+    <Compile Include="LogisticsManagement\MSRMilitaryRecordTran\MSRMilitaryRecordTranBLL.cs" />
+    <Compile Include="LogisticsManagement\MSRMilitaryRecordTran\MSRMilitaryRecordTranEntity.cs" />
+    <Compile Include="LogisticsManagement\MSRMilitaryRecordTran\MSRMilitaryRecordTranIBLL.cs" />
+    <Compile Include="LogisticsManagement\MSRMilitaryRecordTran\MSRMilitaryRecordTranService.cs" />
+    <Compile Include="LogisticsManagement\MSRMilitaryServiceRegistrationTran\MSRMilitaryServiceRegistrationTranBLL.cs" />
+    <Compile Include="LogisticsManagement\MSRMilitaryServiceRegistrationTran\MSRMilitaryServiceRegistrationTranEntity.cs" />
+    <Compile Include="LogisticsManagement\MSRMilitaryServiceRegistrationTran\MSRMilitaryServiceRegistrationTranIBLL.cs" />
+    <Compile Include="LogisticsManagement\MSRMilitaryServiceRegistrationTran\MSRMilitaryServiceRegistrationTranService.cs" />
     <Compile Include="LogisticsManagement\ProjectDataManage\ProjectDataManageBLL.cs" />
     <Compile Include="LogisticsManagement\ProjectDataManage\ProjectDataManageEntity.cs" />
     <Compile Include="LogisticsManagement\ProjectDataManage\ProjectDataManageIBLL.cs" />

Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/LogisticsManagement/MSRIntentionManagementTran/MSRIntentionManagementTranBLL.cs

@@ -0,0 +1,124 @@
+using Learun.Util;
+using System;
+using System.Data;
+using System.Collections.Generic;
+
+namespace Learun.Application.TwoDevelopment.LogisticsManagement
+{
+    /// <summary>
+    /// 版 本 Learun-ADMS-Ultimate V7.0.0 数字化智慧校园 
+    /// Copyright (c) 2013-2018 北京泉江科技有限公司 
+    /// 创 建：超级管理员
+    /// 日 期：2020-05-19 13:38
+    /// 描 述：参军意向管理
+    /// </summary>
+    public class MSRIntentionManagementTranBLL : MSRIntentionManagementTranIBLL
+    {
+        private MSRIntentionManagementTranService mSRIntentionManagementService = new MSRIntentionManagementTranService();
+
+        #region  获取数据
+
+        /// <summary>
+        /// 获取页面显示列表数据
+        /// <summary>
+        /// <param name="queryJson">查询参数</param>
+        /// <returns></returns>
+        public IEnumerable<MSRIntentionManagementTranEntity> GetPageList(Pagination pagination, string queryJson)
+        {
+            try
+            {
+                return mSRIntentionManagementService.GetPageList(pagination, queryJson);
+            }
+            catch (Exception ex)
+            {
+                if (ex is ExceptionEx)
+                {
+                    throw;
+                }
+                else
+                {
+                    throw ExceptionEx.ThrowBusinessException(ex);
+                }
+            }
+        }
+
+        /// <summary>
+        /// 获取MSRIntentionManagementTran表实体数据
+        /// <param name="keyValue">主键</param>
+        /// <summary>
+        /// <returns></returns>
+        public MSRIntentionManagementTranEntity GetMSRIntentionManagementEntity(string keyValue)
+        {
+            try
+            {
+                return mSRIntentionManagementService.GetMSRIntentionManagementEntity(keyValue);
+            }
+            catch (Exception ex)
+            {
+                if (ex is ExceptionEx)
+                {
+                    throw;
+                }
+                else
+                {
+                    throw ExceptionEx.ThrowBusinessException(ex);
+                }
+            }
+        }
+
+        #endregion
+
+        #region  提交数据
+
+        /// <summary>
+        /// 删除实体数据
+        /// <param name="keyValue">主键</param>
+        /// <summary>
+        /// <returns></returns>
+        public void DeleteEntity(string keyValue)
+        {
+            try
+            {
+                mSRIntentionManagementService.DeleteEntity(keyValue);
+            }
+            catch (Exception ex)
+            {
+                if (ex is ExceptionEx)
+                {
+                    throw;
+                }
+                else
+                {
+                    throw ExceptionEx.ThrowBusinessException(ex);
+                }
+            }
+        }
+
+        /// <summary>
+        /// 保存实体数据（新增、修改）
+        /// <param name="keyValue">主键</param>
+        /// <summary>
+        /// <returns></returns>
+        public void SaveEntity(string keyValue, MSRIntentionManagementTranEntity entity)
+        {
+            try
+            {
+                mSRIntentionManagementService.SaveEntity(keyValue, entity);
+            }
+            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/LogisticsManagement/MSRIntentionManagementTran/MSRIntentionManagementTranEntity.cs

@@ -0,0 +1,103 @@
+using Learun.Util;
+using System;
+using System.ComponentModel.DataAnnotations.Schema;
+
+namespace Learun.Application.TwoDevelopment.LogisticsManagement
+{
+    /// <summary>
+    /// 版 本 Learun-ADMS-Ultimate V7.0.0 数字化智慧校园 
+    /// Copyright (c) 2013-2018 北京泉江科技有限公司 
+    /// 创 建：超级管理员
+    /// 日 期：2020-05-19 13:38
+    /// 描 述：参军意向管理
+    /// </summary>
+    public class MSRIntentionManagementTranEntity 
+    {
+        #region  实体成员
+        /// <summary>
+        /// 编号
+        /// </summary>
+        [Column("ID")]
+        public string ID { get; set; }
+        /// <summary>
+        /// 系
+        /// </summary>
+        [Column("DEPTNO")]
+        public string DeptNo { get; set; }
+        /// <summary>
+        /// 专业
+        /// </summary>
+        [Column("MAJORNO")]
+        public string MajorNo { get; set; }
+        /// <summary>
+        /// 班级
+        /// </summary>
+        [Column("CLASSNO")]
+        public string ClassNo { get; set; }
+        /// <summary>
+        /// 学生
+        /// </summary>
+        [Column("STUNO")]
+        public string StuNo { get; set; }
+        /// <summary>
+        /// 联系方式
+        /// </summary>
+        [Column("MOBILE")]
+        public string Mobile { get; set; }
+        /// <summary>
+        /// 年龄
+        /// </summary>
+        [Column("AGE")]
+        public string Age { get; set; }
+        /// <summary>
+        /// 身高
+        /// </summary>
+        [Column("HIGH")]
+        public string High { get; set; }
+        /// <summary>
+        /// 体重
+        /// </summary>
+        [Column("WEIGHT")]
+        public string Weight { get; set; }
+        /// <summary>
+        /// 视力
+        /// </summary>
+        [Column("VISION")]
+        public string Vision { get; set; }
+        /// <summary>
+        /// 添加时间
+        /// </summary>
+        [Column("F_CREATEDATE")]
+        public DateTime? F_CreateDate { get; set; }
+        /// <summary>
+        /// 添加人
+        /// </summary>
+        [Column("F_CREATEUSERID")]
+        public string F_CreateUserId { get; set; }
+        #endregion
+
+        #region  扩展操作
+        /// <summary>
+        /// 新增调用
+        /// </summary>
+        public void Create()
+        {
+            this.ID = Guid.NewGuid().ToString();
+            this.F_CreateDate = DateTime.Now;
+            UserInfo userInfo = LoginUserInfo.Get();
+            this.F_CreateUserId = userInfo.userId;
+        }
+        /// <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/LogisticsManagement/MSRIntentionManagementTran/MSRIntentionManagementTranIBLL.cs

@@ -0,0 +1,49 @@
+using Learun.Util;
+using System.Data;
+using System.Collections.Generic;
+
+namespace Learun.Application.TwoDevelopment.LogisticsManagement
+{
+    /// <summary>
+    /// 版 本 Learun-ADMS-Ultimate V7.0.0 数字化智慧校园 
+    /// Copyright (c) 2013-2018 北京泉江科技有限公司 
+    /// 创 建：超级管理员
+    /// 日 期：2020-05-19 13:38
+    /// 描 述：参军意向管理
+    /// </summary>
+    public interface MSRIntentionManagementTranIBLL
+    {
+        #region  获取数据
+
+        /// <summary>
+        /// 获取页面显示列表数据
+        /// <summary>
+        /// <param name="queryJson">查询参数</param>
+        /// <returns></returns>
+        IEnumerable<MSRIntentionManagementTranEntity> GetPageList(Pagination pagination, string queryJson);
+        /// <summary>
+        /// 获取MSRIntentionManagementTran表实体数据
+        /// <param name="keyValue">主键</param>
+        /// <summary>
+        /// <returns></returns>
+        MSRIntentionManagementTranEntity GetMSRIntentionManagementEntity(string keyValue);
+        #endregion
+
+        #region  提交数据
+
+        /// <summary>
+        /// 删除实体数据
+        /// <param name="keyValue">主键</param>
+        /// <summary>
+        /// <returns></returns>
+        void DeleteEntity(string keyValue);
+        /// <summary>
+        /// 保存实体数据（新增、修改）
+        /// <param name="keyValue">主键</param>
+        /// <summary>
+        /// <returns></returns>
+        void SaveEntity(string keyValue, MSRIntentionManagementTranEntity entity);
+        #endregion
+
+    }
+}

Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/LogisticsManagement/MSRIntentionManagementTran/MSRIntentionManagementTranService.cs

@@ -0,0 +1,172 @@
+using Dapper;
+using Learun.DataBase.Repository;
+using Learun.Util;
+using System;
+using System.Collections.Generic;
+using System.Data;
+using System.Text;
+using Learun.Application.TwoDevelopment.EducationalAdministration;
+
+namespace Learun.Application.TwoDevelopment.LogisticsManagement
+{
+    /// <summary>
+    /// 版 本 Learun-ADMS-Ultimate V7.0.0 数字化智慧校园 
+    /// Copyright (c) 2013-2018 北京泉江科技有限公司 
+    /// 创 建：超级管理员
+    /// 日 期：2020-05-19 13:38
+    /// 描 述：参军意向管理
+    /// </summary>
+    public class MSRIntentionManagementTranService : RepositoryFactory
+    {
+        #region  获取数据
+
+        /// <summary>
+        /// 获取页面显示列表数据
+        /// <summary>
+        /// <param name="queryJson">查询参数</param>
+        /// <returns></returns>
+        public IEnumerable<MSRIntentionManagementTranEntity> GetPageList(Pagination pagination, string queryJson)
+        {
+            try
+            {
+                var strSql = new StringBuilder();
+                strSql.Append("SELECT ");
+                strSql.Append(@" t.*    ");
+                strSql.Append("  FROM MSRIntentionManagementTran t ");
+                strSql.Append("  WHERE 1=1 ");
+                var queryParam = queryJson.ToJObject();
+                // 虚拟参数
+                var dp = new DynamicParameters(new { });
+                if (!queryParam["DeptNo"].IsEmpty())
+                {
+                    dp.Add("DeptNo",queryParam["DeptNo"].ToString(), DbType.String);
+                    strSql.Append(" AND t.DeptNo = @DeptNo ");
+                }
+                if (!queryParam["MajorNo"].IsEmpty())
+                {
+                    dp.Add("MajorNo",queryParam["MajorNo"].ToString(), DbType.String);
+                    strSql.Append(" AND t.MajorNo = @MajorNo ");
+                }
+                if (!queryParam["ClassNo"].IsEmpty())
+                {
+                    dp.Add("ClassNo",queryParam["ClassNo"].ToString(), DbType.String);
+                    strSql.Append(" AND t.ClassNo = @ClassNo ");
+                }
+                if (!queryParam["StuNo"].IsEmpty())
+                {
+                    dp.Add("StuNo",queryParam["StuNo"].ToString(), DbType.String);
+                    strSql.Append(" AND t.StuNo = @StuNo ");
+                }
+                return this.BaseRepository("CollegeMIS").FindList<MSRIntentionManagementTranEntity>(strSql.ToString(),dp, pagination);
+            }
+            catch (Exception ex)
+            {
+                if (ex is ExceptionEx)
+                {
+                    throw;
+                }
+                else
+                {
+                    throw ExceptionEx.ThrowServiceException(ex);
+                }
+            }
+        }
+
+        /// <summary>
+        /// 获取MSRIntentionManagementTran表实体数据
+        /// <param name="keyValue">主键</param>
+        /// <summary>
+        /// <returns></returns>
+        public MSRIntentionManagementTranEntity GetMSRIntentionManagementEntity(string keyValue)
+        {
+            try
+            {
+                return this.BaseRepository("CollegeMIS").FindEntity<MSRIntentionManagementTranEntity>(keyValue);
+            }
+            catch (Exception ex)
+            {
+                if (ex is ExceptionEx)
+                {
+                    throw;
+                }
+                else
+                {
+                    throw ExceptionEx.ThrowServiceException(ex);
+                }
+            }
+        }
+
+        #endregion
+
+        #region  提交数据
+
+        /// <summary>
+        /// 删除实体数据
+        /// <param name="keyValue">主键</param>
+        /// <summary>
+        /// <returns></returns>
+        public void DeleteEntity(string keyValue)
+        {
+            try
+            {
+                this.BaseRepository("CollegeMIS").Delete<MSRIntentionManagementTranEntity>(t=>t.ID == keyValue);
+            }
+            catch (Exception ex)
+            {
+                if (ex is ExceptionEx)
+                {
+                    throw;
+                }
+                else
+                {
+                    throw ExceptionEx.ThrowServiceException(ex);
+                }
+            }
+        }
+
+        /// <summary>
+        /// 保存实体数据（新增、修改）
+        /// <param name="keyValue">主键</param>
+        /// <summary>
+        /// <returns></returns>
+        public void SaveEntity(string keyValue, MSRIntentionManagementTranEntity entity)
+        {
+            try
+            {
+                if (!string.IsNullOrEmpty(keyValue))
+                {
+                    entity.Modify(keyValue);
+                    this.BaseRepository("CollegeMIS").Update(entity);
+                }
+                else
+                {
+
+                    //获取当前学生的名字、系、专业、班级 
+                    var loginUser = LoginUserInfo.Get();
+                    var userEntity = this.BaseRepository("CollegeMIS")
+                        .FindEntity<StuInfoBasicEntity>(a => a.StuNo == loginUser.account);
+                    entity.StuNo = userEntity?.StuNo;
+                    entity.DeptNo = userEntity?.DeptNo;
+                    entity.MajorNo = userEntity?.MajorNo;
+                    entity.ClassNo = userEntity?.ClassNo;
+                    entity.Create();
+                    this.BaseRepository("CollegeMIS").Insert(entity);
+                }
+            }
+            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/LogisticsManagement/MSRMilitaryRecordTran/MSRMilitaryRecordTranBLL.cs

@@ -0,0 +1,124 @@
+using Learun.Util;
+using System;
+using System.Data;
+using System.Collections.Generic;
+
+namespace Learun.Application.TwoDevelopment.LogisticsManagement
+{
+    /// <summary>
+    /// 版 本 Learun-ADMS-Ultimate V7.0.0 数字化智慧校园 
+    /// Copyright (c) 2013-2018 北京泉江科技有限公司 
+    /// 创 建：超级管理员
+    /// 日 期：2020-05-19 13:49
+    /// 描 述：参军记录
+    /// </summary>
+    public class MSRMilitaryRecordTranBLL : MSRMilitaryRecordTranIBLL
+    {
+        private MSRMilitaryRecordTranService mSRMilitaryRecordService = new MSRMilitaryRecordTranService();
+
+        #region  获取数据
+
+        /// <summary>
+        /// 获取页面显示列表数据
+        /// <summary>
+        /// <param name="queryJson">查询参数</param>
+        /// <returns></returns>
+        public IEnumerable<MSRMilitaryRecordTranEntity> GetPageList(Pagination pagination, string queryJson)
+        {
+            try
+            {
+                return mSRMilitaryRecordService.GetPageList(pagination, queryJson);
+            }
+            catch (Exception ex)
+            {
+                if (ex is ExceptionEx)
+                {
+                    throw;
+                }
+                else
+                {
+                    throw ExceptionEx.ThrowBusinessException(ex);
+                }
+            }
+        }
+
+        /// <summary>
+        /// 获取MSRMilitaryRecord表实体数据
+        /// <param name="keyValue">主键</param>
+        /// <summary>
+        /// <returns></returns>
+        public MSRMilitaryRecordTranEntity GetMSRMilitaryRecordEntity(string keyValue)
+        {
+            try
+            {
+                return mSRMilitaryRecordService.GetMSRMilitaryRecordEntity(keyValue);
+            }
+            catch (Exception ex)
+            {
+                if (ex is ExceptionEx)
+                {
+                    throw;
+                }
+                else
+                {
+                    throw ExceptionEx.ThrowBusinessException(ex);
+                }
+            }
+        }
+
+        #endregion
+
+        #region  提交数据
+
+        /// <summary>
+        /// 删除实体数据
+        /// <param name="keyValue">主键</param>
+        /// <summary>
+        /// <returns></returns>
+        public void DeleteEntity(string keyValue)
+        {
+            try
+            {
+                mSRMilitaryRecordService.DeleteEntity(keyValue);
+            }
+            catch (Exception ex)
+            {
+                if (ex is ExceptionEx)
+                {
+                    throw;
+                }
+                else
+                {
+                    throw ExceptionEx.ThrowBusinessException(ex);
+                }
+            }
+        }
+
+        /// <summary>
+        /// 保存实体数据（新增、修改）
+        /// <param name="keyValue">主键</param>
+        /// <summary>
+        /// <returns></returns>
+        public void SaveEntity(string keyValue, MSRMilitaryRecordTranEntity entity)
+        {
+            try
+            {
+                mSRMilitaryRecordService.SaveEntity(keyValue, entity);
+            }
+            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/LogisticsManagement/MSRMilitaryRecordTran/MSRMilitaryRecordTranEntity.cs

@@ -0,0 +1,87 @@
+using Learun.Util;
+using System;
+using System.ComponentModel.DataAnnotations.Schema;
+
+namespace Learun.Application.TwoDevelopment.LogisticsManagement
+{
+    /// <summary>
+    /// 版 本 Learun-ADMS-Ultimate V7.0.0 数字化智慧校园 
+    /// Copyright (c) 2013-2018 北京泉江科技有限公司 
+    /// 创 建：超级管理员
+    /// 日 期：2020-05-19 13:49
+    /// 描 述：参军记录
+    /// </summary>
+    public class MSRMilitaryRecordTranEntity 
+    {
+        #region  实体成员
+        /// <summary>
+        /// 编号
+        /// </summary>
+        [Column("ID")]
+        public string ID { get; set; }
+        /// <summary>
+        /// 系
+        /// </summary>
+        [Column("DEPTNO")]
+        public string DeptNo { get; set; }
+        /// <summary>
+        /// 专业
+        /// </summary>
+        [Column("MAJORNO")]
+        public string MajorNo { get; set; }
+        /// <summary>
+        /// 班级
+        /// </summary>
+        [Column("CLASSNO")]
+        public string ClassNo { get; set; }
+        /// <summary>
+        /// 学生
+        /// </summary>
+        [Column("STUNO")]
+        public string StuNo { get; set; }
+        /// <summary>
+        /// 备注
+        /// </summary>
+        [Column("REMARK")]
+        public string Remark { get; set; }
+        /// <summary>
+        /// 参军记录
+        /// </summary>
+        [Column("RECORD")]
+        public string Record { get; set; }
+        /// <summary>
+        /// 添加时间
+        /// </summary>
+        [Column("F_CREATETIME")]
+        public DateTime? F_CreateTime { get; set; }
+        /// <summary>
+        /// 添加人
+        /// </summary>
+        [Column("F_CREATEUSERID")]
+        public string F_CreateUserId { get; set; }
+        #endregion
+
+        #region  扩展操作
+        /// <summary>
+        /// 新增调用
+        /// </summary>
+        public void Create()
+        {
+            this.ID = Guid.NewGuid().ToString();
+            UserInfo userInfo = LoginUserInfo.Get();
+            this.F_CreateUserId = userInfo.userId;
+        }
+        /// <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/LogisticsManagement/MSRMilitaryRecordTran/MSRMilitaryRecordTranIBLL.cs

@@ -0,0 +1,49 @@
+using Learun.Util;
+using System.Data;
+using System.Collections.Generic;
+
+namespace Learun.Application.TwoDevelopment.LogisticsManagement
+{
+    /// <summary>
+    /// 版 本 Learun-ADMS-Ultimate V7.0.0 数字化智慧校园 
+    /// Copyright (c) 2013-2018 北京泉江科技有限公司 
+    /// 创 建：超级管理员
+    /// 日 期：2020-05-19 13:49
+    /// 描 述：参军记录
+    /// </summary>
+    public interface MSRMilitaryRecordTranIBLL
+    {
+        #region  获取数据
+
+        /// <summary>
+        /// 获取页面显示列表数据
+        /// <summary>
+        /// <param name="queryJson">查询参数</param>
+        /// <returns></returns>
+        IEnumerable<MSRMilitaryRecordTranEntity> GetPageList(Pagination pagination, string queryJson);
+        /// <summary>
+        /// 获取MSRMilitaryRecord表实体数据
+        /// <param name="keyValue">主键</param>
+        /// <summary>
+        /// <returns></returns>
+        MSRMilitaryRecordTranEntity GetMSRMilitaryRecordEntity(string keyValue);
+        #endregion
+
+        #region  提交数据
+
+        /// <summary>
+        /// 删除实体数据
+        /// <param name="keyValue">主键</param>
+        /// <summary>
+        /// <returns></returns>
+        void DeleteEntity(string keyValue);
+        /// <summary>
+        /// 保存实体数据（新增、修改）
+        /// <param name="keyValue">主键</param>
+        /// <summary>
+        /// <returns></returns>
+        void SaveEntity(string keyValue, MSRMilitaryRecordTranEntity entity);
+        #endregion
+
+    }
+}

Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/LogisticsManagement/MSRMilitaryRecordTran/MSRMilitaryRecordTranService.cs

@@ -0,0 +1,179 @@
+using Dapper;
+using Learun.DataBase.Repository;
+using Learun.Util;
+using System;
+using System.Collections.Generic;
+using System.Data;
+using System.Text;
+using Learun.Application.TwoDevelopment.EducationalAdministration;
+
+namespace Learun.Application.TwoDevelopment.LogisticsManagement
+{
+    /// <summary>
+    /// 版 本 Learun-ADMS-Ultimate V7.0.0 数字化智慧校园 
+    /// Copyright (c) 2013-2018 北京泉江科技有限公司 
+    /// 创 建：超级管理员
+    /// 日 期：2020-05-19 13:49
+    /// 描 述：参军记录
+    /// </summary>
+    public class MSRMilitaryRecordTranService : RepositoryFactory
+    {
+        #region  获取数据
+
+        /// <summary>
+        /// 获取页面显示列表数据
+        /// <summary>
+        /// <param name="queryJson">查询参数</param>
+        /// <returns></returns>
+        public IEnumerable<MSRMilitaryRecordTranEntity> GetPageList(Pagination pagination, string queryJson)
+        {
+            try
+            {
+                var strSql = new StringBuilder();
+                strSql.Append("SELECT ");
+                strSql.Append(@"
+                t.ID,
+                t.DeptNo,
+                t.MajorNo,
+                t.ClassNo,
+                t.StuNo,
+                t.Record,
+                t.Remark
+                ");
+                strSql.Append("  FROM MSRMilitaryRecord t ");
+                strSql.Append("  WHERE 1=1 ");
+                var queryParam = queryJson.ToJObject();
+                // 虚拟参数
+                var dp = new DynamicParameters(new { });
+                if (!queryParam["DeptNo"].IsEmpty())
+                {
+                    dp.Add("DeptNo",queryParam["DeptNo"].ToString(), DbType.String);
+                    strSql.Append(" AND t.DeptNo = @DeptNo ");
+                }
+                if (!queryParam["MajorNo"].IsEmpty())
+                {
+                    dp.Add("MajorNo",queryParam["MajorNo"].ToString(), DbType.String);
+                    strSql.Append(" AND t.MajorNo = @MajorNo ");
+                }
+                if (!queryParam["ClassNo"].IsEmpty())
+                {
+                    dp.Add("ClassNo",queryParam["ClassNo"].ToString(), DbType.String);
+                    strSql.Append(" AND t.ClassNo = @ClassNo ");
+                }
+                if (!queryParam["StuNo"].IsEmpty())
+                {
+                    dp.Add("StuNo",queryParam["StuNo"].ToString(), DbType.String);
+                    strSql.Append(" AND t.StuNo = @StuNo ");
+                }
+                return this.BaseRepository("CollegeMIS").FindList<MSRMilitaryRecordTranEntity>(strSql.ToString(),dp, pagination);
+            }
+            catch (Exception ex)
+            {
+                if (ex is ExceptionEx)
+                {
+                    throw;
+                }
+                else
+                {
+                    throw ExceptionEx.ThrowServiceException(ex);
+                }
+            }
+        }
+
+        /// <summary>
+        /// 获取MSRMilitaryRecord表实体数据
+        /// <param name="keyValue">主键</param>
+        /// <summary>
+        /// <returns></returns>
+        public MSRMilitaryRecordTranEntity GetMSRMilitaryRecordEntity(string keyValue)
+        {
+            try
+            {
+                return this.BaseRepository("CollegeMIS").FindEntity<MSRMilitaryRecordTranEntity>(keyValue);
+            }
+            catch (Exception ex)
+            {
+                if (ex is ExceptionEx)
+                {
+                    throw;
+                }
+                else
+                {
+                    throw ExceptionEx.ThrowServiceException(ex);
+                }
+            }
+        }
+
+        #endregion
+
+        #region  提交数据
+
+        /// <summary>
+        /// 删除实体数据
+        /// <param name="keyValue">主键</param>
+        /// <summary>
+        /// <returns></returns>
+        public void DeleteEntity(string keyValue)
+        {
+            try
+            {
+                this.BaseRepository("CollegeMIS").Delete<MSRMilitaryRecordTranEntity>(t=>t.ID == keyValue);
+            }
+            catch (Exception ex)
+            {
+                if (ex is ExceptionEx)
+                {
+                    throw;
+                }
+                else
+                {
+                    throw ExceptionEx.ThrowServiceException(ex);
+                }
+            }
+        }
+
+        /// <summary>
+        /// 保存实体数据（新增、修改）
+        /// <param name="keyValue">主键</param>
+        /// <summary>
+        /// <returns></returns>
+        public void SaveEntity(string keyValue, MSRMilitaryRecordTranEntity entity)
+        {
+            try
+            {
+                if (!string.IsNullOrEmpty(keyValue))
+                {
+                    entity.Modify(keyValue);
+                    this.BaseRepository("CollegeMIS").Update(entity);
+                }
+                else
+                {
+                    //获取当前学生的名字、系、专业、班级 
+                    var loginUser = LoginUserInfo.Get();
+                    var userEntity = this.BaseRepository("CollegeMIS")
+                        .FindEntity<StuInfoBasicEntity>(a => a.StuNo == loginUser.account);
+                    entity.StuNo = userEntity?.StuNo;
+                    entity.DeptNo = userEntity?.DeptNo;
+                    entity.MajorNo = userEntity?.MajorNo;
+                    entity.ClassNo = userEntity?.ClassNo;
+                    entity.Create();
+                    this.BaseRepository("CollegeMIS").Insert(entity);
+                }
+            }
+            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/LogisticsManagement/MSRMilitaryServiceRegistrationTran/MSRMilitaryServiceRegistrationTranBLL.cs

@@ -0,0 +1,124 @@
+using Learun.Util;
+using System;
+using System.Data;
+using System.Collections.Generic;
+
+namespace Learun.Application.TwoDevelopment.LogisticsManagement
+{
+    /// <summary>
+    /// 版 本 Learun-ADMS-Ultimate V7.0.0 数字化智慧校园 
+    /// Copyright (c) 2013-2018 北京泉江科技有限公司 
+    /// 创 建：超级管理员
+    /// 日 期：2020-05-19 12:01
+    /// 描 述：兵役登记
+    /// </summary>
+    public class MSRMilitaryServiceRegistrationTranBLL : MSRMilitaryServiceRegistrationTranIBLL
+    {
+        private MSRMilitaryServiceRegistrationTranService mSRMilitaryServiceRegistrationTranService = new MSRMilitaryServiceRegistrationTranService();
+
+        #region  获取数据
+
+        /// <summary>
+        /// 获取页面显示列表数据
+        /// <summary>
+        /// <param name="queryJson">查询参数</param>
+        /// <returns></returns>
+        public IEnumerable<MSRMilitaryServiceRegistrationTranEntity> GetPageList(Pagination pagination, string queryJson)
+        {
+            try
+            {
+                return mSRMilitaryServiceRegistrationTranService.GetPageList(pagination, queryJson);
+            }
+            catch (Exception ex)
+            {
+                if (ex is ExceptionEx)
+                {
+                    throw;
+                }
+                else
+                {
+                    throw ExceptionEx.ThrowBusinessException(ex);
+                }
+            }
+        }
+
+        /// <summary>
+        /// 获取MSRMilitaryServiceRegistrationTran表实体数据
+        /// <param name="keyValue">主键</param>
+        /// <summary>
+        /// <returns></returns>
+        public MSRMilitaryServiceRegistrationTranEntity GetMSRMilitaryServiceRegistrationEntity(string keyValue)
+        {
+            try
+            {
+                return mSRMilitaryServiceRegistrationTranService.GetMSRMilitaryServiceRegistrationEntity(keyValue);
+            }
+            catch (Exception ex)
+            {
+                if (ex is ExceptionEx)
+                {
+                    throw;
+                }
+                else
+                {
+                    throw ExceptionEx.ThrowBusinessException(ex);
+                }
+            }
+        }
+
+        #endregion
+
+        #region  提交数据
+
+        /// <summary>
+        /// 删除实体数据
+        /// <param name="keyValue">主键</param>
+        /// <summary>
+        /// <returns></returns>
+        public void DeleteEntity(string keyValue)
+        {
+            try
+            {
+                mSRMilitaryServiceRegistrationTranService.DeleteEntity(keyValue);
+            }
+            catch (Exception ex)
+            {
+                if (ex is ExceptionEx)
+                {
+                    throw;
+                }
+                else
+                {
+                    throw ExceptionEx.ThrowBusinessException(ex);
+                }
+            }
+        }
+
+        /// <summary>
+        /// 保存实体数据（新增、修改）
+        /// <param name="keyValue">主键</param>
+        /// <summary>
+        /// <returns></returns>
+        public void SaveEntity(string keyValue, MSRMilitaryServiceRegistrationTranEntity entity)
+        {
+            try
+            {
+                mSRMilitaryServiceRegistrationTranService.SaveEntity(keyValue, entity);
+            }
+            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/LogisticsManagement/MSRMilitaryServiceRegistrationTran/MSRMilitaryServiceRegistrationTranEntity.cs

@@ -0,0 +1,85 @@
+using Learun.Util;
+using System;
+using System.ComponentModel.DataAnnotations.Schema;
+
+namespace Learun.Application.TwoDevelopment.LogisticsManagement
+{
+    /// <summary>
+    /// 版 本 Learun-ADMS-Ultimate V7.0.0 数字化智慧校园 
+    /// Copyright (c) 2013-2018 北京泉江科技有限公司 
+    /// 创 建：超级管理员
+    /// 日 期：2020-05-19 12:01
+    /// 描 述：兵役登记
+    /// </summary>
+    public class MSRMilitaryServiceRegistrationTranEntity 
+    {
+        #region  实体成员
+        /// <summary>
+        /// 编号
+        /// </summary>
+        [Column("ID")]
+        public string ID { get; set; }
+        /// <summary>
+        /// 系
+        /// </summary>
+        [Column("DEPTNO")]
+        public string DeptNo { get; set; }
+        /// <summary>
+        /// 专业
+        /// </summary>
+        [Column("MAJORNO")]
+        public string MajorNo { get; set; }
+        /// <summary>
+        /// 班级
+        /// </summary>
+        [Column("CLASSNO")]
+        public string ClassNo { get; set; }
+        /// <summary>
+        /// 学生
+        /// </summary>
+        [Column("STUNO")]
+        public string StuNo { get; set; }
+        /// <summary>
+        /// 备注
+        /// </summary>
+        [Column("REMARK")]
+        public string Remark { get; set; }
+        /// <summary>
+        /// 截图上传
+        /// </summary>
+        [Column("SCREENSHOT")]
+        public string Screenshot { get; set; }
+        /// <summary>
+        /// 添加时间
+        /// </summary>
+        [Column("F_CREATETIME")]
+        public DateTime? F_CreateTime { get; set; }
+        /// <summary>
+        /// 学年
+        /// </summary>
+        [Column("YEARNO")]
+        public string YearNo { 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/LogisticsManagement/MSRMilitaryServiceRegistrationTran/MSRMilitaryServiceRegistrationTranIBLL.cs

@@ -0,0 +1,49 @@
+using Learun.Util;
+using System.Data;
+using System.Collections.Generic;
+
+namespace Learun.Application.TwoDevelopment.LogisticsManagement
+{
+    /// <summary>
+    /// 版 本 Learun-ADMS-Ultimate V7.0.0 数字化智慧校园 
+    /// Copyright (c) 2013-2018 北京泉江科技有限公司 
+    /// 创 建：超级管理员
+    /// 日 期：2020-05-19 12:01
+    /// 描 述：兵役登记
+    /// </summary>
+    public interface MSRMilitaryServiceRegistrationTranIBLL
+    {
+        #region  获取数据
+
+        /// <summary>
+        /// 获取页面显示列表数据
+        /// <summary>
+        /// <param name="queryJson">查询参数</param>
+        /// <returns></returns>
+        IEnumerable<MSRMilitaryServiceRegistrationTranEntity> GetPageList(Pagination pagination, string queryJson);
+        /// <summary>
+        /// 获取MSRMilitaryServiceRegistrationTran表实体数据
+        /// <param name="keyValue">主键</param>
+        /// <summary>
+        /// <returns></returns>
+        MSRMilitaryServiceRegistrationTranEntity GetMSRMilitaryServiceRegistrationEntity(string keyValue);
+        #endregion
+
+        #region  提交数据
+
+        /// <summary>
+        /// 删除实体数据
+        /// <param name="keyValue">主键</param>
+        /// <summary>
+        /// <returns></returns>
+        void DeleteEntity(string keyValue);
+        /// <summary>
+        /// 保存实体数据（新增、修改）
+        /// <param name="keyValue">主键</param>
+        /// <summary>
+        /// <returns></returns>
+        void SaveEntity(string keyValue, MSRMilitaryServiceRegistrationTranEntity entity);
+        #endregion
+
+    }
+}

Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/LogisticsManagement/MSRMilitaryServiceRegistrationTran/MSRMilitaryServiceRegistrationTranService.cs

@@ -0,0 +1,178 @@
+using Dapper;
+using Learun.DataBase.Repository;
+using Learun.Util;
+using System;
+using System.Collections.Generic;
+using System.Data;
+using System.Text;
+using Learun.Application.TwoDevelopment.EducationalAdministration;
+
+namespace Learun.Application.TwoDevelopment.LogisticsManagement
+{
+    /// <summary>
+    /// 版 本 Learun-ADMS-Ultimate V7.0.0 数字化智慧校园 
+    /// Copyright (c) 2013-2018 北京泉江科技有限公司 
+    /// 创 建：超级管理员
+    /// 日 期：2020-05-19 12:01
+    /// 描 述：兵役登记
+    /// </summary>
+    public class MSRMilitaryServiceRegistrationTranService : RepositoryFactory
+    {
+        #region  获取数据
+
+        /// <summary>
+        /// 获取页面显示列表数据
+        /// <summary>
+        /// <param name="queryJson">查询参数</param>
+        /// <returns></returns>
+        public IEnumerable<MSRMilitaryServiceRegistrationTranEntity> GetPageList(Pagination pagination, string queryJson)
+        {
+            try
+            {
+                var strSql = new StringBuilder();
+                strSql.Append("SELECT ");
+                strSql.Append(@" t.* ");
+                strSql.Append("  FROM MSRMilitaryServiceRegistrationTran t ");
+                strSql.Append("  WHERE 1=1 ");
+                var queryParam = queryJson.ToJObject();
+                // 虚拟参数
+                var dp = new DynamicParameters(new { });
+                if (!queryParam["YearNo"].IsEmpty())
+                {
+                    dp.Add("YearNo", "%" + queryParam["YearNo"].ToString() + "%", DbType.String);
+                    strSql.Append(" AND t.YearNo Like @YearNo ");
+                }
+                if (!queryParam["DeptNo"].IsEmpty())
+                {
+                    dp.Add("DeptNo",queryParam["DeptNo"].ToString(), DbType.String);
+                    strSql.Append(" AND t.DeptNo = @DeptNo ");
+                }
+                if (!queryParam["MajorNo"].IsEmpty())
+                {
+                    dp.Add("MajorNo",queryParam["MajorNo"].ToString(), DbType.String);
+                    strSql.Append(" AND t.MajorNo = @MajorNo ");
+                }
+                if (!queryParam["ClassNo"].IsEmpty())
+                {
+                    dp.Add("ClassNo",queryParam["ClassNo"].ToString(), DbType.String);
+                    strSql.Append(" AND t.ClassNo = @ClassNo ");
+                }
+                if (!queryParam["StuNo"].IsEmpty())
+                {
+                    dp.Add("StuNo",queryParam["StuNo"].ToString(), DbType.String);
+                    strSql.Append(" AND t.StuNo = @StuNo ");
+                }
+                return this.BaseRepository("CollegeMIS").FindList<MSRMilitaryServiceRegistrationTranEntity>(strSql.ToString(),dp, pagination);
+            }
+            catch (Exception ex)
+            {
+                if (ex is ExceptionEx)
+                {
+                    throw;
+                }
+                else
+                {
+                    throw ExceptionEx.ThrowServiceException(ex);
+                }
+            }
+        }
+
+        /// <summary>
+        /// 获取MSRMilitaryServiceRegistrationTran表实体数据
+        /// <param name="keyValue">主键</param>
+        /// <summary>
+        /// <returns></returns>
+        public MSRMilitaryServiceRegistrationTranEntity GetMSRMilitaryServiceRegistrationEntity(string keyValue)
+        {
+            try
+            {
+                return this.BaseRepository("CollegeMIS").FindEntity<MSRMilitaryServiceRegistrationTranEntity>(keyValue);
+            }
+            catch (Exception ex)
+            {
+                if (ex is ExceptionEx)
+                {
+                    throw;
+                }
+                else
+                {
+                    throw ExceptionEx.ThrowServiceException(ex);
+                }
+            }
+        }
+
+        #endregion
+
+        #region  提交数据
+
+        /// <summary>
+        /// 删除实体数据
+        /// <param name="keyValue">主键</param>
+        /// <summary>
+        /// <returns></returns>
+        public void DeleteEntity(string keyValue)
+        {
+            try
+            {
+                this.BaseRepository("CollegeMIS").Delete<MSRMilitaryServiceRegistrationTranEntity>(t=>t.ID == keyValue);
+            }
+            catch (Exception ex)
+            {
+                if (ex is ExceptionEx)
+                {
+                    throw;
+                }
+                else
+                {
+                    throw ExceptionEx.ThrowServiceException(ex);
+                }
+            }
+        }
+
+        /// <summary>
+        /// 保存实体数据（新增、修改）
+        /// <param name="keyValue">主键</param>
+        /// <summary>
+        /// <returns></returns>
+        public void SaveEntity(string keyValue, MSRMilitaryServiceRegistrationTranEntity entity)
+        {
+            try
+            {
+                if (!string.IsNullOrEmpty(keyValue))
+                {
+                    entity.Modify(keyValue);
+                    this.BaseRepository("CollegeMIS").Update(entity);
+                }
+                else
+                {
+                    //获取当前学生的名字、系、专业、班级 
+                    var loginUser = LoginUserInfo.Get();
+                    var userEntity = this.BaseRepository("CollegeMIS")
+                        .FindEntity<StuInfoBasicEntity>(a => a.StuNo == loginUser.account);
+                    var aa = Common.GetSemesterAndYear();
+                    entity.StuNo = userEntity?.StuNo;
+                    entity.DeptNo = userEntity?.DeptNo;
+                    entity.MajorNo = userEntity?.MajorNo;
+                    entity.ClassNo = userEntity?.ClassNo;
+                    entity.YearNo = aa.AcademicYearShort;
+                    entity.Create();
+                    this.BaseRepository("CollegeMIS").Insert(entity);
+                }
+            }
+            catch (Exception ex)
+            {
+                if (ex is ExceptionEx)
+                {
+                    throw;
+                }
+                else
+                {
+                    throw ExceptionEx.ThrowServiceException(ex);
+                }
+            }
+        }
+
+        #endregion
+
+    }
+}