Merge branch '塔里木分支' of http://123.57.209.16:3000/bjquanjiang/DigitalScholl into 塔里木分支

Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/YKTStateMent/Index.js

@@ -18,10 +18,10 @@ var bootstrap = function ($, learun) {
             // 时间搜索框
             $('#datesearch').lrdate({
                 dfdata: [
-                    { name: '今天', begin: function () { return learun.getDate('yyyy-MM-dd') }, end: function () { return learun.getDate('yyyy-MM-dd') } },
-                    { name: '近7天', begin: function () { return learun.getDate('yyyy-MM-dd', 'd', -6) }, end: function () { return learun.getDate('yyyy-MM-dd') } },
-                    { name: '近1个月', begin: function () { return learun.getDate('yyyy-MM-dd', 'm', -1) }, end: function () { return learun.getDate('yyyy-MM-dd') } },
-                    { name: '近3个月', begin: function () { return learun.getDate('yyyy-MM-dd', 'm', -3) }, end: function () { return learun.getDate('yyyy-MM-dd') } }
+                    { name: '今天', begin: function () { return learun.getDate('yyyy-MM-dd') }, end: function () { return learun.getDate('yyyy-MM-dd 23:59:59') } },
+                    { name: '近7天', begin: function () { return learun.getDate('yyyy-MM-dd', 'd', -6) }, end: function () { return learun.getDate('yyyy-MM-dd 23:59:59') } },
+                    { name: '近1个月', begin: function () { return learun.getDate('yyyy-MM-dd', 'm', -1) }, end: function () { return learun.getDate('yyyy-MM-dd 23:59:59') } },
+                    { name: '近3个月', begin: function () { return learun.getDate('yyyy-MM-dd', 'm', -3) }, end: function () { return learun.getDate('yyyy-MM-dd 23:59:59') } }
                 ],
                 // 月
                 mShow: false,
@@ -117,10 +117,11 @@ var bootstrap = function ($, learun) {
                     { label: "学号", name: "StuNo", width: 100, align: "left" },
                     { label: "姓名", name: "StuName", width: 100, align: "left" },
                     { label: "系部", name: "DeptName", width: 100, align: "left" },
+                    { label: "专业", name: "MajorName", width: 100, align: "left" },
                     { label: "班级", name: "ClassName", width: 100, align: "left" },
                     { label: "身份证号", name: "IdentityCardNo", width: 150, align: "left" },
                     { label: "消费金额", name: "MONEY", width: 100, align: "left" },
-                    { label: "余额", name: "BALANCE", width: 100, align: "left" },
+                    //{ label: "余额", name: "BALANCE", width: 100, align: "left" },
                     { label: "发生时间", name: "HAPPENTIME", width: 120, align: "left" },
                     { label: "科目", name: "SUBJECT", width: 100, align: "left" },
                     { label: "终端名称", name: "TERMNAME", width: 150, align: "left" },

Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/YKTStateMent/IndexForStudent.js

@@ -18,10 +18,10 @@ var bootstrap = function ($, learun) {
             // 时间搜索框
             $('#datesearch').lrdate({
                 dfdata: [
-                    { name: '今天', begin: function () { return learun.getDate('yyyy-MM-dd') }, end: function () { return learun.getDate('yyyy-MM-dd') } },
-                    { name: '近7天', begin: function () { return learun.getDate('yyyy-MM-dd', 'd', -6) }, end: function () { return learun.getDate('yyyy-MM-dd') } },
-                    { name: '近1个月', begin: function () { return learun.getDate('yyyy-MM-dd', 'm', -1) }, end: function () { return learun.getDate('yyyy-MM-dd') } },
-                    { name: '近3个月', begin: function () { return learun.getDate('yyyy-MM-dd', 'm', -3) }, end: function () { return learun.getDate('yyyy-MM-dd') } }
+                    { name: '今天', begin: function () { return learun.getDate('yyyy-MM-dd') }, end: function () { return learun.getDate('yyyy-MM-dd 23:59:59') } },
+                    { name: '近7天', begin: function () { return learun.getDate('yyyy-MM-dd', 'd', -6) }, end: function () { return learun.getDate('yyyy-MM-dd 23:59:59') } },
+                    { name: '近1个月', begin: function () { return learun.getDate('yyyy-MM-dd', 'm', -1) }, end: function () { return learun.getDate('yyyy-MM-dd 23:59:59') } },
+                    { name: '近3个月', begin: function () { return learun.getDate('yyyy-MM-dd', 'm', -3) }, end: function () { return learun.getDate('yyyy-MM-dd 23:59:59') } }
                 ],
                 // 月
                 mShow: false,
@@ -57,10 +57,11 @@ var bootstrap = function ($, learun) {
                     { label: "学号", name: "StuNo", width: 100, align: "left" },
                     { label: "姓名", name: "StuName", width: 100, align: "left" },
                     { label: "系部", name: "DeptName", width: 100, align: "left" },
+                    { label: "专业", name: "MajorName", width: 100, align: "left" },
                     { label: "班级", name: "ClassName", width: 100, align: "left" },
                     { label: "身份证号", name: "IdentityCardNo", width: 150, align: "left" },
                     { label: "消费金额", name: "MONEY", width: 100, align: "left" },
-                    { label: "余额", name: "BALANCE", width: 100, align: "left" },
+                    //{ label: "余额", name: "BALANCE", width: 100, align: "left" },
                     { label: "发生时间", name: "HAPPENTIME", width: 120, align: "left" },
                     { label: "科目", name: "SUBJECT", width: 100, align: "left" },
                     { label: "终端名称", name: "TERMNAME", width: 150, align: "left" },

Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EvaluationTeach/Controllers/Eval_MainController.cs

@@ -125,6 +125,18 @@ namespace Learun.Application.Web.Areas.EvaluationTeach.Controllers
             ViewBag.VSerial = "EvaluationTeach_" + CommonHelper.CreateNo();
             return View();
         }
+
+        /// <summary>
+        /// 快速复制
+        /// <summary>
+        /// <returns></returns>
+        [HttpGet]
+        public ActionResult CopyForm()
+        {
+            ViewBag.VSerial = "EvaluationTeach_" + CommonHelper.CreateNo();
+            return View();
+        }
+
         #endregion
 
         #region  获取数据

Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EvaluationTeach/Views/Eval_Main/CopyForm.cshtml

@@ -0,0 +1,42 @@
+@{
+    ViewBag.Title = "问卷管理";
+    Layout = "~/Views/Shared/_Form.cshtml";
+}
+<script type="text/javascript">
+    var NewVSerial = "@ViewBag.VSerial";
+</script>
+<div class="lr-form-wrap">
+    <div class="col-xs-12 lr-form-item"  data-table="Eval_Main" >
+        <div class="lr-form-item-title">评教编号</div>
+        <input id="VSerial" type="text" class="form-control"  readonly="readonly" />
+    </div>
+    <div class="col-xs-12 lr-form-item"  data-table="Eval_Main" >
+        <div class="lr-form-item-title">标题<font face="宋体">*</font></div>
+        <input id="VTitle" type="text" class="form-control" isvalid="yes" checkexpession="NotNull" />
+    </div>
+    <div class="col-xs-6 lr-form-item"  data-table="Eval_Main" >
+        <div class="lr-form-item-title">开始时间<font face="宋体">*</font></div>
+        <input id="VStartTime" type="text" class="form-control lr-input-wdatepicker" onfocus="WdatePicker({ maxDate:'#F{$dp.$D(\'VStopTime\')}',dateFmt:'yyyy-MM-dd',onpicked: function () { $('#VStartTime').trigger('change'); } })"  isvalid="yes" checkexpession="NotNull" />
+    </div>
+    <div class="col-xs-6 lr-form-item"  data-table="Eval_Main" >
+        <div class="lr-form-item-title">结束时间<font face="宋体">*</font></div>
+        <input id="VStopTime" type="text" class="form-control lr-input-wdatepicker" onfocus="WdatePicker({ minDate:'#F{$dp.$D(\'VStartTime\')}',dateFmt:'yyyy-MM-dd',onpicked: function () { $('#VStopTime').trigger('change'); } })"  isvalid="yes" checkexpession="NotNull" />
+    </div>
+    <div class="col-xs-6 lr-form-item"  data-table="Eval_Main" >
+        <div class="lr-form-item-title">评教学年<font face="宋体">*</font></div>
+        <div id="AcademicYearNo" isvalid="yes" checkexpession="NotNull"></div>
+    </div>
+    <div class="col-xs-6 lr-form-item"  data-table="Eval_Main" >
+        <div class="lr-form-item-title">评教学期<font face="宋体">*</font></div>
+        <div id="Semester" isvalid="yes" checkexpession="NotNull"></div>
+    </div>
+    <div class="col-xs-12 lr-form-item"  data-table="Eval_Main" >
+        <div class="lr-form-item-title">排序<font face="宋体">*</font></div>
+        <input id="VOrder" type="text" class="form-control" isvalid="yes" checkexpession="Num" />
+    </div>
+    <div class="col-xs-12 lr-form-item"  data-table="Eval_Main" >
+        <div class="lr-form-item-title">备注说明</div>
+        <textarea id="VContent" class="form-control" style="height:150px;"  ></textarea>
+    </div>
+</div>
+@Html.AppendJsFile("/Areas/EvaluationTeach/Views/Eval_Main/CopyForm.js")

Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EvaluationTeach/Views/Eval_Main/CopyForm.js

@@ -0,0 +1,59 @@
+/* * 版 本 Learun-ADMS-Ultimate V7.0.0 数字化智慧校园(http://www.learun.cn) 
+ * Copyright (c) 2013-2018 北京泉江科技有限公司 
+ * 创建人：超级管理员
+ * 日  期：2019-04-23 15:50
+ * 描  述：问卷管理
+ */
+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 () {
+            $("#AcademicYearNo").lrselect({
+                url: "/EvaluationTeach/Eval_Main/GenerateNearByAcademic",
+                value: "value",
+                text: "text"
+            });
+            $("#Semester").lrDataItemSelect({ code: 'Semester' });
+        },
+        initData: function () {
+            if (!!keyValue) {
+                $.lrSetForm(top.$.rootUrl + '/EvaluationTeach/Eval_Main/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]);
+                            }
+                        }
+                        $("#VSerial").val(NewVSerial);
+                    });
+            //} else {
+            //    $("#VSerial").val(NewVSerial);
+            }
+        }
+    };
+    // 保存数据
+    acceptClick = function (callBack) {
+        if (!$('body').lrValidform()) {
+            return false;
+        }
+        var postData = {
+            strEntity: JSON.stringify($('body').lrGetFormData())
+        };
+        $.lrSaveForm(top.$.rootUrl + '/EvaluationTeach/Eval_Main/SaveForm?keyValue=' + '', postData, function (res) {
+            // 保存成功后才回调
+            if (!!callBack) {
+                callBack();
+            }
+        });
+    };
+    page.init();
+}

Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EvaluationTeach/Views/Eval_Main/Index.cshtml

@@ -30,6 +30,7 @@
                         <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>
+                        <a id="lr_copy" class="btn btn-default"><i class="fa fa-plus"></i>&nbsp;快速复制</a>
                         <a id="lr_question" class="btn btn-default"><i class="fa fa-navicon"></i>&nbsp;管理问题</a>
                         <a id="lr_answer" class="btn btn-default"><i class="fa fa-building-o"></i>&nbsp;学生评教情况</a>
                         <a id="lr_teacher" class="btn btn-default"><i class="fa fa-envelope-open"></i>&nbsp;教师被评情况</a>

Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EvaluationTeach/Views/Eval_Main/Index.js

@@ -5,6 +5,7 @@
  * 描  述：问卷管理
  */
 var refreshGirdData;
+var selectedRow;
 var bootstrap = function ($, learun) {
     "use strict";
     var page = {
@@ -33,6 +34,23 @@ var bootstrap = function ($, learun) {
                     }
                 });
             });
+            // 快速复制
+            $('#lr_copy').on('click', function () {
+                var keyValue = $('#gridtable').jfGridValue('VID');
+                if (learun.checkrow(keyValue)) {
+                    selectedRow = $('#gridtable').jfGridGet('rowdata');
+                    learun.layerForm({
+                        id: 'form',
+                        title: '快速新增',
+                        url: top.$.rootUrl + '/EvaluationTeach/Eval_Main/CopyForm?keyValue=' + keyValue,
+                        width: 780,
+                        height: 560,
+                        callBack: function (id) {
+                            return top[id].acceptClick(refreshGirdData);
+                        }
+                    });
+                }
+            });
             // 编辑
             $('#lr_edit').on('click', function () {
                 var keyValue = $('#gridtable').jfGridValue('VID');
@@ -87,7 +105,7 @@ var bootstrap = function ($, learun) {
                         url: top.$.rootUrl + '/EvaluationTeach/Eval_Question/Index?VID=' + keyValue,
                         width: 980,
                         height: 760,
-                        btn:null
+                        btn: null
                     });
                 }
             });
@@ -101,7 +119,7 @@ var bootstrap = function ($, learun) {
                         url: top.$.rootUrl + '/EvaluationTeach/Eval_Main/AnswerIndex?VID=' + keyValue,
                         width: 980,
                         height: 760,
-                        btn:null
+                        btn: null
                     });
                 }
             });
@@ -115,7 +133,7 @@ var bootstrap = function ($, learun) {
                         url: top.$.rootUrl + '/EvaluationTeach/Eval_Main/TeacherIndex?VID=' + keyValue,
                         width: 980,
                         height: 760,
-                        btn:null
+                        btn: null
                     });
                 }
             });
@@ -181,7 +199,7 @@ var bootstrap = function ($, learun) {
             $('#gridtable').lrAuthorizeJfGrid({
                 url: top.$.rootUrl + '/EvaluationTeach/Eval_Main/GetPageList',
                 headData: [
-                    { label: "评教编号", name: "VSerial", width: 180, align: "left" },
+                    { label: "评教编号", name: "VSerial", width: 250, align: "left" },
                     { label: "标题", name: "VTitle", width: 200, align: "left" },
                     { label: "开始时间", name: "VStartTime", width: 100, align: "left" },
                     { label: "结束时间", name: "VStopTime", width: 100, align: "left" },
@@ -196,7 +214,7 @@ var bootstrap = function ($, learun) {
                 ],
                 mainId: 'VID',
                 isPage: true,
-                sidx:'VOrder'
+                sidx: 'VOrder'
             });
             page.search();
         },

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

@@ -26,7 +26,7 @@ namespace Learun.Application.Web.Areas.LogisticsManagement.Controllers
         [HttpGet]
         public ActionResult Index()
         {
-             return View();
+            return View();
         }
         /// <summary>
         /// 表单页
@@ -35,7 +35,17 @@ namespace Learun.Application.Web.Areas.LogisticsManagement.Controllers
         [HttpGet]
         public ActionResult Form()
         {
-             return View();
+            return View();
+        }
+
+        /// <summary>
+        /// 统计
+        /// <summary>
+        /// <returns></returns>
+        [HttpGet]
+        public ActionResult IndexStatistics()
+        {
+            return View();
         }
         #endregion
 
@@ -61,6 +71,27 @@ namespace Learun.Application.Web.Areas.LogisticsManagement.Controllers
             };
             return Success(jsonData);
         }
+        
+        /// <summary>
+        /// 获取页面显示列表数据
+        /// <summary>
+        /// <param name="queryJson">查询参数</param>
+        /// <returns></returns>
+        [HttpGet]
+        [AjaxOnly]
+        public ActionResult GetPageListForStatistics(string pagination, string queryJson)
+        {
+            Pagination paginationobj = pagination.ToObject<Pagination>();
+            var data = acc_PunishmentIBLL.GetPageListForStatistics(paginationobj, queryJson);
+            var jsonData = new
+            {
+                rows = data,
+                total = paginationobj.total,
+                page = paginationobj.page,
+                records = paginationobj.records
+            };
+            return Success(jsonData);
+        }
         /// <summary>
         /// 获取表单数据
         /// <summary>
@@ -69,8 +100,9 @@ namespace Learun.Application.Web.Areas.LogisticsManagement.Controllers
         [AjaxOnly]
         public ActionResult GetFormData(string keyValue)
         {
-            var Acc_PunishmentData = acc_PunishmentIBLL.GetAcc_PunishmentEntity( keyValue );
-            var jsonData = new {
+            var Acc_PunishmentData = acc_PunishmentIBLL.GetAcc_PunishmentEntity(keyValue);
+            var jsonData = new
+            {
                 Acc_Punishment = Acc_PunishmentData,
             };
             return Success(jsonData);
@@ -102,7 +134,7 @@ namespace Learun.Application.Web.Areas.LogisticsManagement.Controllers
         public ActionResult SaveForm(string keyValue, string strEntity)
         {
             Acc_PunishmentEntity entity = strEntity.ToObject<Acc_PunishmentEntity>();
-            acc_PunishmentIBLL.SaveEntity(keyValue,entity);
+            acc_PunishmentIBLL.SaveEntity(keyValue, entity);
             return Success("保存成功！");
         }
         #endregion

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

@@ -37,6 +37,16 @@ namespace Learun.Application.Web.Areas.LogisticsManagement.Controllers
         {
              return View();
         }
+        /// <summary>
+        /// 奖励统计
+        /// <summary>
+        /// <returns></returns>
+        [HttpGet]
+        public ActionResult IndexStatistics()
+        {
+            return View();
+        }
+        
         #endregion
 
         #region  获取数据
@@ -62,6 +72,26 @@ namespace Learun.Application.Web.Areas.LogisticsManagement.Controllers
             return Success(jsonData);
         }
         /// <summary>
+        /// 获取页面显示列表数据
+        /// <summary>
+        /// <param name="queryJson">查询参数</param>
+        /// <returns></returns>
+        [HttpGet]
+        [AjaxOnly]
+        public ActionResult GetPageListForStatistics(string pagination, string queryJson)
+        {
+            Pagination paginationobj = pagination.ToObject<Pagination>();
+            var data = acc_RewardIBLL.GetPageListForStatistics(paginationobj, queryJson);
+            var jsonData = new
+            {
+                rows = data,
+                total = paginationobj.total,
+                page = paginationobj.page,
+                records = paginationobj.records
+            };
+            return Success(jsonData);
+        }
+        /// <summary>
         /// 获取表单数据
         /// <summary>
         /// <returns></returns>

Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LogisticsManagement/Views/Acc_Punishment/Form.cshtml

@@ -4,28 +4,28 @@
 }
 <div class="lr-form-wrap">
     <div class="col-xs-6 lr-form-item" data-table="Acc_Punishment">
-        <div class="lr-form-item-title">学年</div>
-        <div id="SYear"></div>
+        <div class="lr-form-item-title">学年<font face="宋体">*</font></div>
+        <div id="SYear" isvalid="yes" checkexpession="NotNull"></div>
     </div>
     <div class="col-xs-6 lr-form-item" data-table="Acc_Punishment">
-        <div class="lr-form-item-title">学期</div>
-        <div id="Semester"></div>
+        <div class="lr-form-item-title">学期<font face="宋体">*</font></div>
+        <div id="Semester" isvalid="yes" checkexpession="NotNull"></div>
     </div>
     <div class="col-xs-6 lr-form-item" data-table="Acc_Punishment">
-        <div class="lr-form-item-title">宿舍楼</div>
-        <div id="Dormitory"></div>
+        <div class="lr-form-item-title">宿舍楼<font face="宋体">*</font></div>
+        <div id="Dormitory" isvalid="yes" checkexpession="NotNull"></div>
     </div>
     <div class="col-xs-6 lr-form-item" data-table="Acc_Punishment">
-        <div class="lr-form-item-title">单元</div>
-        <div id="Unit"></div>
+        <div class="lr-form-item-title">单元<font face="宋体">*</font></div>
+        <div id="Unit" isvalid="yes" checkexpession="NotNull"></div>
     </div>
     <div class="col-xs-6 lr-form-item" data-table="Acc_Punishment">
-        <div class="lr-form-item-title">楼层</div>
-        <div id="Floor"></div>
+        <div class="lr-form-item-title">楼层<font face="宋体">*</font></div>
+        <div id="Floor" isvalid="yes" checkexpession="NotNull"></div>
     </div>
     <div class="col-xs-6 lr-form-item" data-table="Acc_Punishment">
-        <div class="lr-form-item-title">宿舍</div>
-        <div id="RId"></div>
+        <div class="lr-form-item-title">宿舍<font face="宋体">*</font></div>
+        <div id="RId" isvalid="yes" checkexpession="NotNull"></div>
     </div>
     <div class="col-xs-12 lr-form-item" data-table="Acc_Punishment">
         <div class="lr-form-item-title">惩罚</div>

Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LogisticsManagement/Views/Acc_Punishment/IndexStatistics.cshtml

@@ -0,0 +1,71 @@
+@{
+    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 class="lr-form-item">
+                            <div class="lr-form-item-title">统计条件</div>
+                        </div>
+                    </div>*@
+                    <div class="lr-layout-tool-item">
+                        <div class="lr-form-item">
+                            <div class="lr-form-item-title">学年</div>
+                            <div id="SYear"></div>
+                        </div>
+                    </div>
+                    <div class="lr-layout-tool-item">
+                        <div class="lr-form-item">
+                            <div class="lr-form-item-title">学期</div>
+                            <div id="Semester"></div>
+                        </div>
+                    </div>
+                    <div class="lr-layout-tool-item">
+                        <div class="lr-form-item">
+                            <div class="lr-form-item-title">宿舍楼</div>
+                            <div id="Dormitory"></div>
+                        </div>
+                    </div>
+                    <div class="lr-layout-tool-item">
+                        <div class="lr-form-item">
+                            <div class="lr-form-item-title">单元</div>
+                            <div id="Unit"></div>
+                        </div>
+                    </div>
+                    <div class="lr-layout-tool-item">
+                        <div class="lr-form-item">
+                            <div class="lr-form-item-title">楼层</div>
+                            <div id="Floor"></div>
+                        </div>
+                    </div>
+                    <div class="lr-layout-tool-item">
+                        <div class="lr-form-item">
+                            <div class="lr-form-item-title">宿舍</div>
+                            <div id="RId"></div>
+                        </div>
+                    </div>
+                    <div class="lr-layout-tool-item">
+                        <a id="btn_Search" class="btn btn-primary btn-sm"><i class="fa fa-search"></i>&nbsp;统计</a>
+                    </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/LogisticsManagement/Views/Acc_Punishment/IndexStatistics.js")

Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LogisticsManagement/Views/Acc_Punishment/IndexStatistics.js

@@ -0,0 +1,158 @@
+/* * 版 本 Learun-ADMS-Ultimate V7.0.0 数字化智慧校园(http://www.learun.cn) 
+ * Copyright (c) 2013-2018 北京泉江科技有限公司 
+ * 创建人：超级管理员
+ * 日  期：2020-08-11 16:46
+ * 描  述：宿舍奖励
+ */
+var refreshGirdData;
+var bootstrap = function ($, learun) {
+    "use strict";
+    var startTime;
+    var endTime;
+    var page = {
+        init: function () {
+           page.initGird();
+            page.bind();
+        },
+        bind: function () {
+            $('#multiple_condition_query').lrMultipleQuery(function (queryJson) {
+                page.search(queryJson);
+            }, 420, 400);
+            $('#SYear').lrRadioCheckbox({
+                type: 'radio',
+                code: 'YesOrNoInt',
+            });
+            $('#SYear').lrselectSet('1');
+            $('#Semester').lrRadioCheckbox({
+                type: 'radio',
+                code: 'YesOrNoInt',
+            });
+            $('#Dormitory').lrRadioCheckbox({
+                type: 'radio',
+                code: 'YesOrNoInt',
+            });
+            $('#Unit').lrRadioCheckbox({
+                type: 'radio',
+                code: 'YesOrNoInt',
+            });
+            $('#Floor').lrRadioCheckbox({
+                type: 'radio',
+                code: 'YesOrNoInt',
+            });
+            $('#RId').lrRadioCheckbox({
+                type: 'radio',
+                code: 'YesOrNoInt',
+            });
+            // 时间搜索框
+            $('#datesearch').lrdate({
+                dfdata: [
+                    { name: '今天', begin: function () { return learun.getDate('yyyy-MM-dd 00:00:00') }, end: function () { return learun.getDate('yyyy-MM-dd 23:59:59') } },
+                    { name: '近7天', begin: function () { return learun.getDate('yyyy-MM-dd 00:00:00', 'd', -6) }, end: function () { return learun.getDate('yyyy-MM-dd 23:59:59') } },
+                    { name: '近1个月', begin: function () { return learun.getDate('yyyy-MM-dd 00:00:00', 'm', -1) }, end: function () { return learun.getDate('yyyy-MM-dd 23:59:59') } },
+                    { name: '近3个月', begin: function () { return learun.getDate('yyyy-MM-dd 00:00:00', 'm', -3) }, end: function () { return learun.getDate('yyyy-MM-dd 23:59:59') } }
+                ],
+                // 月
+                mShow: false,
+                premShow: false,
+                // 季度
+                jShow: false,
+                prejShow: false,
+                // 年
+                ysShow: false,
+                yxShow: false,
+                preyShow: false,
+                yShow: false,
+                // 默认
+                dfvalue: '1',
+                selectfn: function (begin, end) {
+                    startTime = begin;
+                    endTime = end;
+                    page.search();
+                }
+            });
+            // 刷新
+            $('#lr_refresh').on('click', function () {
+                location.reload();
+            });
+            //查询
+            $('#btn_Search').on('click', function () {
+                refreshGirdData();
+            });
+        },
+        // 初始化列表
+        initGird: function () {
+            $('#gridtable').jfGrid({
+                url: top.$.rootUrl + '/LogisticsManagement/Acc_Punishment/GetPageListForStatistics',
+                headData: [
+                    { label: "学年", name: "SYear", width: 100, align: "left" },
+                    { label: "学期", name: "Semester", width: 100, align: "left" },
+                    {
+                        label: "宿舍楼", name: "Dormitory", width: 100, align: "left",
+                        formatterAsync: function (callback, value, row, op, $cell) {
+                            learun.clientdata.getAsync('custmerData', {
+                                url: '/LR_SystemModule/DataSource/GetDataTable?code=' + 'Acc_DormitoryData',
+                                key: value,
+                                keyId: 'id',
+                                callback: function (_data) {
+                                    callback(_data['name']);
+                                }
+                            });
+                        }
+                    },
+                    {
+                        label: "单元", name: "Unit", width: 100, align: "left",
+                        formatterAsync: function (callback, value, row, op, $cell) {
+                            learun.clientdata.getAsync('custmerData', {
+                                url: '/LR_SystemModule/DataSource/GetDataTable?code=' + 'Acc_UnitData',
+                                key: value,
+                                keyId: 'id',
+                                callback: function (_data) {
+                                    callback(_data['name']);
+                                }
+                            });
+                        }
+                    },
+                    {
+                        label: "楼层", name: "Floor", width: 100, align: "left",
+                        formatterAsync: function (callback, value, row, op, $cell) {
+                            learun.clientdata.getAsync('custmerData', {
+                                url: '/LR_SystemModule/DataSource/GetDataTable?code=' + 'Acc_FloorData',
+                                key: value,
+                                keyId: 'id',
+                                callback: function (_data) {
+                                    callback(_data['name']);
+                                }
+                            });
+                        }
+                    },
+                    {
+                        label: "宿舍", name: "RId", width: 100, align: "left",
+                        formatterAsync: function (callback, value, row, op, $cell) {
+                            learun.clientdata.getAsync('custmerData', {
+                                url: '/LR_SystemModule/DataSource/GetDataTable?code=' + 'Acc_RoomData',
+                                key: value,
+                                keyId: 'id',
+                                callback: function (_data) {
+                                    callback(_data['name']);
+                                }
+                            });
+                        }
+                    },
+                    { label: "数量", name: "num", width: 100, align: "left" },
+                 ],
+                mainId: 'ID',
+                isPage: true
+            });
+        },
+        search: function (param) {
+            param = param || {};
+            var $content = $('body').find('.lr-layout-tool-left');
+            param = $content.lrGetFormData();
+            $('#gridtable').jfGridSet('reload', { queryJson: JSON.stringify(param) });
+        }
+    };
+    refreshGirdData = function () {
+        page.search();
+    };
+    page.init();
+}

Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LogisticsManagement/Views/Acc_Reward/Form.cshtml

@@ -4,28 +4,28 @@
 }
 <div class="lr-form-wrap">
     <div class="col-xs-6 lr-form-item" data-table="Acc_Reward">
-        <div class="lr-form-item-title">学年</div>
-        <div id="SYear"></div>
+        <div class="lr-form-item-title">学年<font face="宋体">*</font></div>
+        <div id="SYear" isvalid="yes" checkexpession="NotNull"></div>
     </div>
     <div class="col-xs-6 lr-form-item" data-table="Acc_Reward">
-        <div class="lr-form-item-title">学期</div>
-        <div id="Semester"></div>
+        <div class="lr-form-item-title">学期<font face="宋体">*</font></div>
+        <div id="Semester" isvalid="yes" checkexpession="NotNull"></div>
     </div>
     <div class="col-xs-6 lr-form-item" data-table="Acc_Reward">
-        <div class="lr-form-item-title">宿舍楼</div>
-        <div id="Dormitory"></div>
+        <div class="lr-form-item-title">宿舍楼<font face="宋体">*</font></div>
+        <div id="Dormitory" isvalid="yes" checkexpession="NotNull"></div>
     </div>
     <div class="col-xs-6 lr-form-item" data-table="Acc_Reward">
-        <div class="lr-form-item-title">单元</div>
-        <div id="Unit"></div>
+        <div class="lr-form-item-title">单元<font face="宋体">*</font></div>
+        <div id="Unit" isvalid="yes" checkexpession="NotNull"></div>
     </div>
     <div class="col-xs-6 lr-form-item" data-table="Acc_Reward">
-        <div class="lr-form-item-title">楼层</div>
-        <div id="Floor"></div>
+        <div class="lr-form-item-title">楼层<font face="宋体">*</font></div>
+        <div id="Floor" isvalid="yes" checkexpession="NotNull"></div>
     </div>
     <div class="col-xs-6 lr-form-item" data-table="Acc_Reward">
-        <div class="lr-form-item-title">宿舍</div>
-        <div id="RId"></div>
+        <div class="lr-form-item-title">宿舍<font face="宋体">*</font></div>
+        <div id="RId" isvalid="yes" checkexpession="NotNull"></div>
     </div>
     <div class="col-xs-12 lr-form-item" data-table="Acc_Reward">
         <div class="lr-form-item-title">奖励</div>

Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LogisticsManagement/Views/Acc_Reward/IndexStatistics.cshtml

@@ -0,0 +1,71 @@
+@{
+    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 class="lr-form-item">
+                            <div class="lr-form-item-title">统计条件</div>
+                        </div>
+                    </div>*@
+                    <div class="lr-layout-tool-item">
+                        <div class="lr-form-item">
+                            <div class="lr-form-item-title">学年</div>
+                            <div id="SYear"></div>
+                        </div>
+                    </div>
+                    <div class="lr-layout-tool-item">
+                        <div class="lr-form-item">
+                            <div class="lr-form-item-title">学期</div>
+                            <div id="Semester"></div>
+                        </div>
+                    </div>
+                    <div class="lr-layout-tool-item">
+                        <div class="lr-form-item">
+                            <div class="lr-form-item-title">宿舍楼</div>
+                            <div id="Dormitory"></div>
+                        </div>
+                    </div>
+                    <div class="lr-layout-tool-item">
+                        <div class="lr-form-item">
+                            <div class="lr-form-item-title">单元</div>
+                            <div id="Unit"></div>
+                        </div>
+                    </div>
+                    <div class="lr-layout-tool-item">
+                        <div class="lr-form-item">
+                            <div class="lr-form-item-title">楼层</div>
+                            <div id="Floor"></div>
+                        </div>
+                    </div>
+                    <div class="lr-layout-tool-item">
+                        <div class="lr-form-item">
+                            <div class="lr-form-item-title">宿舍</div>
+                            <div id="RId"></div>
+                        </div>
+                    </div>
+                    <div class="lr-layout-tool-item">
+                        <a id="btn_Search" class="btn btn-primary btn-sm"><i class="fa fa-search"></i>&nbsp;统计</a>
+                    </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/LogisticsManagement/Views/Acc_Reward/IndexStatistics.js")

Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LogisticsManagement/Views/Acc_Reward/IndexStatistics.js

@@ -0,0 +1,158 @@
+/* * 版 本 Learun-ADMS-Ultimate V7.0.0 数字化智慧校园(http://www.learun.cn) 
+ * Copyright (c) 2013-2018 北京泉江科技有限公司 
+ * 创建人：超级管理员
+ * 日  期：2020-08-11 16:46
+ * 描  述：宿舍奖励
+ */
+var refreshGirdData;
+var bootstrap = function ($, learun) {
+    "use strict";
+    var startTime;
+    var endTime;
+    var page = {
+        init: function () {
+           page.initGird();
+            page.bind();
+        },
+        bind: function () {
+            $('#multiple_condition_query').lrMultipleQuery(function (queryJson) {
+                page.search(queryJson);
+            }, 420, 400);
+            $('#SYear').lrRadioCheckbox({
+                type: 'radio',
+                code: 'YesOrNoInt',
+            });
+            $('#SYear').lrselectSet('1');
+            $('#Semester').lrRadioCheckbox({
+                type: 'radio',
+                code: 'YesOrNoInt',
+            });
+            $('#Dormitory').lrRadioCheckbox({
+                type: 'radio',
+                code: 'YesOrNoInt',
+            });
+            $('#Unit').lrRadioCheckbox({
+                type: 'radio',
+                code: 'YesOrNoInt',
+            });
+            $('#Floor').lrRadioCheckbox({
+                type: 'radio',
+                code: 'YesOrNoInt',
+            });
+            $('#RId').lrRadioCheckbox({
+                type: 'radio',
+                code: 'YesOrNoInt',
+            });
+            // 时间搜索框
+            $('#datesearch').lrdate({
+                dfdata: [
+                    { name: '今天', begin: function () { return learun.getDate('yyyy-MM-dd 00:00:00') }, end: function () { return learun.getDate('yyyy-MM-dd 23:59:59') } },
+                    { name: '近7天', begin: function () { return learun.getDate('yyyy-MM-dd 00:00:00', 'd', -6) }, end: function () { return learun.getDate('yyyy-MM-dd 23:59:59') } },
+                    { name: '近1个月', begin: function () { return learun.getDate('yyyy-MM-dd 00:00:00', 'm', -1) }, end: function () { return learun.getDate('yyyy-MM-dd 23:59:59') } },
+                    { name: '近3个月', begin: function () { return learun.getDate('yyyy-MM-dd 00:00:00', 'm', -3) }, end: function () { return learun.getDate('yyyy-MM-dd 23:59:59') } }
+                ],
+                // 月
+                mShow: false,
+                premShow: false,
+                // 季度
+                jShow: false,
+                prejShow: false,
+                // 年
+                ysShow: false,
+                yxShow: false,
+                preyShow: false,
+                yShow: false,
+                // 默认
+                dfvalue: '1',
+                selectfn: function (begin, end) {
+                    startTime = begin;
+                    endTime = end;
+                    page.search();
+                }
+            });
+            // 刷新
+            $('#lr_refresh').on('click', function () {
+                location.reload();
+            });
+            //查询
+            $('#btn_Search').on('click', function () {
+                refreshGirdData();
+            });
+        },
+        // 初始化列表
+        initGird: function () {
+            $('#gridtable').jfGrid({
+                url: top.$.rootUrl + '/LogisticsManagement/Acc_Reward/GetPageListForStatistics',
+                headData: [
+                    { label: "学年", name: "SYear", width: 100, align: "left" },
+                    { label: "学期", name: "Semester", width: 100, align: "left" },
+                    {
+                        label: "宿舍楼", name: "Dormitory", width: 100, align: "left",
+                        formatterAsync: function (callback, value, row, op, $cell) {
+                            learun.clientdata.getAsync('custmerData', {
+                                url: '/LR_SystemModule/DataSource/GetDataTable?code=' + 'Acc_DormitoryData',
+                                key: value,
+                                keyId: 'id',
+                                callback: function (_data) {
+                                    callback(_data['name']);
+                                }
+                            });
+                        }
+                    },
+                    {
+                        label: "单元", name: "Unit", width: 100, align: "left",
+                        formatterAsync: function (callback, value, row, op, $cell) {
+                            learun.clientdata.getAsync('custmerData', {
+                                url: '/LR_SystemModule/DataSource/GetDataTable?code=' + 'Acc_UnitData',
+                                key: value,
+                                keyId: 'id',
+                                callback: function (_data) {
+                                    callback(_data['name']);
+                                }
+                            });
+                        }
+                    },
+                    {
+                        label: "楼层", name: "Floor", width: 100, align: "left",
+                        formatterAsync: function (callback, value, row, op, $cell) {
+                            learun.clientdata.getAsync('custmerData', {
+                                url: '/LR_SystemModule/DataSource/GetDataTable?code=' + 'Acc_FloorData',
+                                key: value,
+                                keyId: 'id',
+                                callback: function (_data) {
+                                    callback(_data['name']);
+                                }
+                            });
+                        }
+                    },
+                    {
+                        label: "宿舍", name: "RId", width: 100, align: "left",
+                        formatterAsync: function (callback, value, row, op, $cell) {
+                            learun.clientdata.getAsync('custmerData', {
+                                url: '/LR_SystemModule/DataSource/GetDataTable?code=' + 'Acc_RoomData',
+                                key: value,
+                                keyId: 'id',
+                                callback: function (_data) {
+                                    callback(_data['name']);
+                                }
+                            });
+                        }
+                    },
+                    { label: "数量", name: "num", width: 100, align: "left" },
+                 ],
+                mainId: 'ID',
+                isPage: true
+            });
+        },
+        search: function (param) {
+            param = param || {};
+            var $content = $('body').find('.lr-layout-tool-left');
+            param = $content.lrGetFormData();
+            $('#gridtable').jfGridSet('reload', { queryJson: JSON.stringify(param) });
+        }
+    };
+    refreshGirdData = function () {
+        page.search();
+    };
+    page.init();
+}

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

@@ -1251,6 +1251,7 @@
     <Content Include="Areas\EducationalAdministration\Views\VaccinationInfo\TeachForm.js" />
     <Content Include="Areas\EducationalAdministration\Views\VaccinationInfo\TeachIndex.js" />
     <Content Include="Areas\EvaluationTeach\Views\Eval_Main\AnswerIndex.js" />
+    <Content Include="Areas\EvaluationTeach\Views\Eval_Main\CopyForm.js" />
     <Content Include="Areas\EvaluationTeach\Views\Eval_Main\TeacherIndex2.js" />
     <Content Include="Areas\EvaluationTeach\Views\Eval_Main\TeacherIndex.js" />
     <Content Include="Areas\EvaluationTeach\Views\Eval_Main\Form.js" />
@@ -1390,6 +1391,8 @@
     <Content Include="Areas\LogisticsManagement\Views\Accommodation\IndexImport.js" />
     <Content Include="Areas\LogisticsManagement\Views\Acc_DormitoryRule\Form.js" />
     <Content Include="Areas\LogisticsManagement\Views\Acc_DormitoryRule\Index.js" />
+    <Content Include="Areas\LogisticsManagement\Views\Acc_Punishment\IndexStatistics.js" />
+    <Content Include="Areas\LogisticsManagement\Views\Acc_Reward\IndexStatistics.js" />
     <Content Include="Areas\LogisticsManagement\Views\ADR_Record\AttendanceReportByWeek.js" />
     <Content Include="Areas\LogisticsManagement\Views\ADR_Record\StatisticDetailIndex.js" />
     <Content Include="Areas\LogisticsManagement\Views\ADR_Record\StatisticIndex.js" />
@@ -8044,6 +8047,9 @@
     <Content Include="Areas\EducationalAdministration\Views\YKTStateMent\IndexForStudent.cshtml" />
     <Content Include="Areas\ReceiveSendFeeManagement\Views\SalaryInfo\IndexPersonal.cshtml" />
     <Content Include="Areas\EducationalAdministration\Views\Acc_DormitoryChange\FormView.cshtml" />
+    <Content Include="Areas\EvaluationTeach\Views\Eval_Main\CopyForm.cshtml" />
+    <Content Include="Areas\LogisticsManagement\Views\Acc_Reward\IndexStatistics.cshtml" />
+    <Content Include="Areas\LogisticsManagement\Views\Acc_Punishment\IndexStatistics.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.Application.WebApi/Bootstraper.cs

@@ -38,6 +38,7 @@ namespace Learun.Application.WebApi
         protected override void ApplicationStartup(TinyIoCContainer container, IPipelines pipelines)
         {
             base.ApplicationStartup(container, pipelines);
+            StaticConfiguration.DisableErrorTraces = false;
             Nancy.Json.JsonSettings.MaxJsonLength = int.MaxValue;
         }
 

Learun.Framework.Ultimate V7/Learun.Application.WebApi/Modules/AnnexesNoLoginApi.cs

@@ -32,7 +32,6 @@ namespace Learun.Application.WebApi.Modules
 
             return Success(list);
         }
-
         /// <summary>
         /// 上传附件图片文件
         /// <summary>
@@ -40,14 +39,14 @@ namespace Learun.Application.WebApi.Modules
         public Response Upload(dynamic _)
         {
             var files = (List<HttpFile>)this.Context.Request.Files;
-            var folderId = this.GetReqData();
-
+            string folderId = Guid.NewGuid().ToString();
             string filePath = Config.GetValue("AnnexesFile");
             string uploadDate = DateTime.Now.ToString("yyyyMMdd");
-            string FileEextension = Path.GetExtension(files[0].Name);
+            string fileEextension = Path.GetExtension(files[0].Name);
+            string fileType = fileEextension.Replace(".", "");
             string fileGuid = Guid.NewGuid().ToString();
 
-            string virtualPath = string.Format("{0}/{1}/{2}/{3}{4}", filePath, userInfo.userId, uploadDate, fileGuid, FileEextension);
+            string virtualPath = string.Format("{0}/{1}/{2}/{3}{4}", filePath, "system", uploadDate, fileGuid, fileEextension);
 
             //创建文件夹
             string path = Path.GetDirectoryName(virtualPath);
@@ -67,17 +66,16 @@ namespace Learun.Application.WebApi.Modules
                 fileAnnexesEntity.F_FileName = files[0].Name;
                 fileAnnexesEntity.F_FilePath = virtualPath;
                 fileAnnexesEntity.F_FileSize = files[0].Value.Length.ToString();
-                fileAnnexesEntity.F_FileExtensions = FileEextension;
-                fileAnnexesEntity.F_FileType = FileEextension.Replace(".", "");
-                fileAnnexesEntity.F_CreateUserId = userInfo.userId;
-                fileAnnexesEntity.F_CreateUserName = userInfo.realName;
+                fileAnnexesEntity.F_FileExtensions = fileEextension;
+                fileAnnexesEntity.F_FileType = fileType;
+                fileAnnexesEntity.F_CreateUserId = "system";
+                fileAnnexesEntity.F_CreateUserName = "system";
 
                 annexesFileIBLL.SaveEntity(folderId, fileAnnexesEntity);
             }
 
-            return SuccessString(fileGuid);
+            return SuccessString(folderId);
         }
-
         /// <summary>
         /// 删除文件
         /// </summary>

Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/DBModel/中间库.PDM

@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<?PowerDesigner AppLocale="UTF16" ID="{88086B01-C9E1-11D4-9552-0090277716A9}" Label="" LastModificationDate="1677490504" Name="Physical Data Model 1" Objects="148" Symbols="24" Target="ORACLE Version 11g" Type="{CDE44E21-9669-11D1-9914-006097355D9B}" signature="PDM_DATA_MODEL_XML" version="16.5.0.3982"?>
+<?PowerDesigner AppLocale="UTF16" ID="{88086B01-C9E1-11D4-9552-0090277716A9}" Label="" LastModificationDate="1677636790" Name="Physical Data Model 1" Objects="191" Symbols="25" Target="ORACLE Version 11g" Type="{CDE44E21-9669-11D1-9914-006097355D9B}" signature="PDM_DATA_MODEL_XML" version="16.5.0.3982"?>
 <!-- do not edit this file -->
 
 <Model xmlns:a="attribute" xmlns:c="collection" xmlns:o="object">
@@ -12,7 +12,7 @@
 <a:Code>PHYSICAL_DATA_MODEL_1</a:Code>
 <a:CreationDate>0</a:CreationDate>
 <a:Creator/>
-<a:ModificationDate>1677489461</a:ModificationDate>
+<a:ModificationDate>1677635508</a:ModificationDate>
 <a:Modifier>l</a:Modifier>
 <a:PackageOptionsText>[FolderOptions]
 
@@ -1207,7 +1207,7 @@ PhysOpts=</a:ModelOptionsText>
 <a:Code>DIAGRAM_1</a:Code>
 <a:CreationDate>0</a:CreationDate>
 <a:Creator/>
-<a:ModificationDate>1657693977</a:ModificationDate>
+<a:ModificationDate>1677635508</a:ModificationDate>
 <a:Modifier>l</a:Modifier>
 <a:DisplayPreferences>[DisplayPreferences]
 
@@ -1655,8 +1655,8 @@ Shadow=0</a:DisplayPreferences>
 <o:TextSymbol Id="o7">
 <a:Text>基础信息，数据无论是否有更新，每天1点都会全量更新一次。</a:Text>
 <a:CreationDate>1657685099</a:CreationDate>
-<a:ModificationDate>1657685193</a:ModificationDate>
-<a:Rect>((-9337,-23701), (4312,-19276))</a:Rect>
+<a:ModificationDate>1677635494</a:ModificationDate>
+<a:Rect>((8663,-28876), (22312,-24451))</a:Rect>
 <a:TextStyle>4130</a:TextStyle>
 <a:AutoAdjustToText>0</a:AutoAdjustToText>
 <a:LineColor>0</a:LineColor>
@@ -1988,6 +1988,33 @@ LABL 0 新宋体,8,N</a:FontList>
 <a:FontName>新宋体,12,B</a:FontName>
 <a:ManuallyResized>1</a:ManuallyResized>
 </o:TextSymbol>
+<o:TableSymbol Id="o32">
+<a:CreationDate>1677635508</a:CreationDate>
+<a:ModificationDate>1677635510</a:ModificationDate>
+<a:IconMode>-1</a:IconMode>
+<a:Rect>((-18550,-28681), (-3175,-15869))</a:Rect>
+<a:AutoAdjustToText>0</a:AutoAdjustToText>
+<a:LineColor>12615680</a:LineColor>
+<a:FillColor>16570034</a:FillColor>
+<a:ShadowColor>12632256</a:ShadowColor>
+<a:FontList>STRN 0 新宋体,8,N
+DISPNAME 0 新宋体,8,N
+OWNRDISPNAME 0 新宋体,8,N
+Columns 0 新宋体,8,N
+TablePkColumns 0 新宋体,8,U
+TableFkColumns 0 新宋体,8,N
+Keys 0 新宋体,8,N
+Indexes 0 新宋体,8,N
+Triggers 0 新宋体,8,N
+LABL 0 新宋体,8,N</a:FontList>
+<a:BrushStyle>6</a:BrushStyle>
+<a:GradientFillMode>65</a:GradientFillMode>
+<a:GradientEndColor>16777215</a:GradientEndColor>
+<a:ManuallyResized>1</a:ManuallyResized>
+<c:Object>
+<o:Table Ref="o33"/>
+</c:Object>
+</o:TableSymbol>
 </c:Symbols>
 </o:PhysicalDiagram>
 </c:PhysicalDiagrams>
@@ -2005,7 +2032,7 @@ LABL 0 新宋体,8,N</a:FontList>
 <a:Modifier>l</a:Modifier>
 <a:TotalSavingCurrency/>
 <c:ExtendedCollections>
-<o:ExtendedCollection Id="o32">
+<o:ExtendedCollection Id="o34">
 <a:ObjectID>558ED300-C20F-42DE-B3A6-A2026F8B8090</a:ObjectID>
 <a:Name>Related Columns</a:Name>
 <a:ExtendedBaseCollection.CollectionName>Related Columns</a:ExtendedBaseCollection.CollectionName>
@@ -2016,7 +2043,7 @@ LABL 0 新宋体,8,N</a:FontList>
 </o:ExtendedCollection>
 </c:ExtendedCollections>
 <c:Columns>
-<o:Column Id="o33">
+<o:Column Id="o35">
 <a:ObjectID>3595DD6F-8483-4B8D-92A5-6F94C77CBB96</a:ObjectID>
 <a:Name>Id</a:Name>
 <a:Code>Id</a:Code>
@@ -2028,7 +2055,7 @@ LABL 0 新宋体,8,N</a:FontList>
 <a:Length>50</a:Length>
 <a:Column.Mandatory>1</a:Column.Mandatory>
 </o:Column>
-<o:Column Id="o34">
+<o:Column Id="o36">
 <a:ObjectID>C35E233D-EE5E-44BD-BC73-481300E32B7B</a:ObjectID>
 <a:Name>父级部门Id</a:Name>
 <a:Code>ParentId</a:Code>
@@ -2039,7 +2066,7 @@ LABL 0 新宋体,8,N</a:FontList>
 <a:DataType>VARCHAR2(50)</a:DataType>
 <a:Length>50</a:Length>
 </o:Column>
-<o:Column Id="o35">
+<o:Column Id="o37">
 <a:ObjectID>CB412D00-DA74-4995-8AE1-5946D4697118</a:ObjectID>
 <a:Name>部门编号</a:Name>
 <a:Code>Code</a:Code>
@@ -2050,7 +2077,7 @@ LABL 0 新宋体,8,N</a:FontList>
 <a:DataType>VARCHAR2(50)</a:DataType>
 <a:Length>50</a:Length>
 </o:Column>
-<o:Column Id="o36">
+<o:Column Id="o38">
 <a:ObjectID>AB391F98-15E9-4545-98DC-94164D6FBE74</a:ObjectID>
 <a:Name>部门名称</a:Name>
 <a:Code>Name</a:Code>
@@ -2061,7 +2088,7 @@ LABL 0 新宋体,8,N</a:FontList>
 <a:DataType>VARCHAR2(50)</a:DataType>
 <a:Length>50</a:Length>
 </o:Column>
-<o:Column Id="o37">
+<o:Column Id="o39">
 <a:ObjectID>0C2EA7B3-C16E-4756-B01E-1037AB6BF076</a:ObjectID>
 <a:Name>部门负责人Id</a:Name>
 <a:Code>ManagerId</a:Code>
@@ -2072,7 +2099,7 @@ LABL 0 新宋体,8,N</a:FontList>
 <a:DataType>VARCHAR2(50)</a:DataType>
 <a:Length>50</a:Length>
 </o:Column>
-<o:Column Id="o38">
+<o:Column Id="o40">
 <a:ObjectID>681C88A1-510A-4CF8-AD68-A369D4C049C7</a:ObjectID>
 <a:Name>分管校长Id</a:Name>
 <a:Code>SMId</a:Code>
@@ -2083,7 +2110,7 @@ LABL 0 新宋体,8,N</a:FontList>
 <a:DataType>VARCHAR2(50)</a:DataType>
 <a:Length>50</a:Length>
 </o:Column>
-<o:Column Id="o39">
+<o:Column Id="o41">
 <a:ObjectID>6BB164A7-9B2A-4C8B-803B-D9FF5A1CDB4B</a:ObjectID>
 <a:Name>排序号</a:Name>
 <a:Code>IOrder</a:Code>
@@ -2095,7 +2122,7 @@ LABL 0 新宋体,8,N</a:FontList>
 </o:Column>
 </c:Columns>
 <c:Keys>
-<o:Key Id="o40">
+<o:Key Id="o42">
 <a:ObjectID>6FD90701-CDC4-4BE2-9094-F3151F356179</a:ObjectID>
 <a:Name>Key_1</a:Name>
 <a:Code>Key_1</a:Code>
@@ -2104,12 +2131,12 @@ LABL 0 新宋体,8,N</a:FontList>
 <a:ModificationDate>1657617405</a:ModificationDate>
 <a:Modifier>l</a:Modifier>
 <c:Key.Columns>
-<o:Column Ref="o33"/>
+<o:Column Ref="o35"/>
 </c:Key.Columns>
 </o:Key>
 </c:Keys>
 <c:PrimaryKey>
-<o:Key Ref="o40"/>
+<o:Key Ref="o42"/>
 </c:PrimaryKey>
 </o:Table>
 <o:Table Id="o14">
@@ -2122,7 +2149,7 @@ LABL 0 新宋体,8,N</a:FontList>
 <a:Modifier>l</a:Modifier>
 <a:TotalSavingCurrency/>
 <c:Columns>
-<o:Column Id="o41">
+<o:Column Id="o43">
 <a:ObjectID>01720DCA-B288-4B05-84BC-63357E9EE0AB</a:ObjectID>
 <a:Name>Id</a:Name>
 <a:Code>Id</a:Code>
@@ -2134,7 +2161,7 @@ LABL 0 新宋体,8,N</a:FontList>
 <a:Length>50</a:Length>
 <a:Column.Mandatory>1</a:Column.Mandatory>
 </o:Column>
-<o:Column Id="o42">
+<o:Column Id="o44">
 <a:ObjectID>3CE5A1FC-C7E1-49C7-9043-35CE439A9628</a:ObjectID>
 <a:Name>系部编号</a:Name>
 <a:Code>DeptNo</a:Code>
@@ -2145,7 +2172,7 @@ LABL 0 新宋体,8,N</a:FontList>
 <a:DataType>VARCHAR2(50)</a:DataType>
 <a:Length>50</a:Length>
 </o:Column>
-<o:Column Id="o43">
+<o:Column Id="o45">
 <a:ObjectID>1E89BF25-4639-43A3-89AE-FF8DBCC8B303</a:ObjectID>
 <a:Name>系部名称</a:Name>
 <a:Code>DeptName</a:Code>
@@ -2156,7 +2183,7 @@ LABL 0 新宋体,8,N</a:FontList>
 <a:DataType>VARCHAR2(50)</a:DataType>
 <a:Length>50</a:Length>
 </o:Column>
-<o:Column Id="o44">
+<o:Column Id="o46">
 <a:ObjectID>7E784D19-A634-43F8-8615-56A470DF8547</a:ObjectID>
 <a:Name>部门负责人Id</a:Name>
 <a:Code>DMId</a:Code>
@@ -2169,7 +2196,7 @@ LABL 0 新宋体,8,N</a:FontList>
 </o:Column>
 </c:Columns>
 <c:Keys>
-<o:Key Id="o45">
+<o:Key Id="o47">
 <a:ObjectID>6194A0FA-1EE9-4311-9FBE-717B7B76FF5A</a:ObjectID>
 <a:Name>Key_1</a:Name>
 <a:Code>Key_1</a:Code>
@@ -2178,12 +2205,12 @@ LABL 0 新宋体,8,N</a:FontList>
 <a:ModificationDate>1657618612</a:ModificationDate>
 <a:Modifier>l</a:Modifier>
 <c:Key.Columns>
-<o:Column Ref="o41"/>
+<o:Column Ref="o43"/>
 </c:Key.Columns>
 </o:Key>
 </c:Keys>
 <c:PrimaryKey>
-<o:Key Ref="o45"/>
+<o:Key Ref="o47"/>
 </c:PrimaryKey>
 </o:Table>
 <o:Table Id="o16">
@@ -2196,7 +2223,7 @@ LABL 0 新宋体,8,N</a:FontList>
 <a:Modifier>l</a:Modifier>
 <a:TotalSavingCurrency/>
 <c:Columns>
-<o:Column Id="o46">
+<o:Column Id="o48">
 <a:ObjectID>03C6A62A-3644-49F3-99C5-92B1F3692903</a:ObjectID>
 <a:Name>Id</a:Name>
 <a:Code>Id</a:Code>
@@ -2208,7 +2235,7 @@ LABL 0 新宋体,8,N</a:FontList>
 <a:Length>50</a:Length>
 <a:Column.Mandatory>1</a:Column.Mandatory>
 </o:Column>
-<o:Column Id="o47">
+<o:Column Id="o49">
 <a:ObjectID>BFBDE752-328A-4401-BF30-37F9294EF4DB</a:ObjectID>
 <a:Name>系部编号</a:Name>
 <a:Code>DeptNo</a:Code>
@@ -2219,7 +2246,7 @@ LABL 0 新宋体,8,N</a:FontList>
 <a:DataType>VARCHAR2(50)</a:DataType>
 <a:Length>50</a:Length>
 </o:Column>
-<o:Column Id="o48">
+<o:Column Id="o50">
 <a:ObjectID>0E1A8FFC-53D3-417E-890E-4BCAD53FF0CE</a:ObjectID>
 <a:Name>专业编号</a:Name>
 <a:Code>MajorNo</a:Code>
@@ -2230,7 +2257,7 @@ LABL 0 新宋体,8,N</a:FontList>
 <a:DataType>VARCHAR2(50)</a:DataType>
 <a:Length>50</a:Length>
 </o:Column>
-<o:Column Id="o49">
+<o:Column Id="o51">
 <a:ObjectID>8F34DFD9-5DB2-43B2-9620-882FC7FB7618</a:ObjectID>
 <a:Name>专业名称</a:Name>
 <a:Code>MajorName</a:Code>
@@ -2241,7 +2268,7 @@ LABL 0 新宋体,8,N</a:FontList>
 <a:DataType>VARCHAR2(50)</a:DataType>
 <a:Length>50</a:Length>
 </o:Column>
-<o:Column Id="o50">
+<o:Column Id="o52">
 <a:ObjectID>925347EA-AC73-41CF-9F48-5D4E11F216F6</a:ObjectID>
 <a:Name>学制</a:Name>
 <a:Code>EduSystem</a:Code>
@@ -2253,7 +2280,7 @@ LABL 0 新宋体,8,N</a:FontList>
 </o:Column>
 </c:Columns>
 <c:Keys>
-<o:Key Id="o51">
+<o:Key Id="o53">
 <a:ObjectID>4AD61D05-C03C-436F-9851-8737CA4A67A0</a:ObjectID>
 <a:Name>Key_1</a:Name>
 <a:Code>Key_1</a:Code>
@@ -2262,12 +2289,12 @@ LABL 0 新宋体,8,N</a:FontList>
 <a:ModificationDate>1657619057</a:ModificationDate>
 <a:Modifier>l</a:Modifier>
 <c:Key.Columns>
-<o:Column Ref="o46"/>
+<o:Column Ref="o48"/>
 </c:Key.Columns>
 </o:Key>
 </c:Keys>
 <c:PrimaryKey>
-<o:Key Ref="o51"/>
+<o:Key Ref="o53"/>
 </c:PrimaryKey>
 </o:Table>
 <o:Table Id="o18">
@@ -2280,7 +2307,7 @@ LABL 0 新宋体,8,N</a:FontList>
 <a:Modifier>l</a:Modifier>
 <a:TotalSavingCurrency/>
 <c:Columns>
-<o:Column Id="o52">
+<o:Column Id="o54">
 <a:ObjectID>722109E4-54F4-4648-AB91-8D54D8085C97</a:ObjectID>
 <a:Name>Id</a:Name>
 <a:Code>Id</a:Code>
@@ -2292,7 +2319,7 @@ LABL 0 新宋体,8,N</a:FontList>
 <a:Length>50</a:Length>
 <a:Column.Mandatory>1</a:Column.Mandatory>
 </o:Column>
-<o:Column Id="o53">
+<o:Column Id="o55">
 <a:ObjectID>5B11B296-ABD4-4E50-85E1-D8D946E8C76B</a:ObjectID>
 <a:Name>系部编号</a:Name>
 <a:Code>DeptNo</a:Code>
@@ -2303,7 +2330,7 @@ LABL 0 新宋体,8,N</a:FontList>
 <a:DataType>VARCHAR2(50)</a:DataType>
 <a:Length>50</a:Length>
 </o:Column>
-<o:Column Id="o54">
+<o:Column Id="o56">
 <a:ObjectID>14B27FA9-B8C0-48F4-A09B-08A0182DE8D3</a:ObjectID>
 <a:Name>专业编号</a:Name>
 <a:Code>MajorNo</a:Code>
@@ -2314,7 +2341,7 @@ LABL 0 新宋体,8,N</a:FontList>
 <a:DataType>VARCHAR2(50)</a:DataType>
 <a:Length>50</a:Length>
 </o:Column>
-<o:Column Id="o55">
+<o:Column Id="o57">
 <a:ObjectID>DF2215BC-3EF9-4C24-A71B-7D810562F2C5</a:ObjectID>
 <a:Name>班级名称</a:Name>
 <a:Code>ClassName</a:Code>
@@ -2325,7 +2352,7 @@ LABL 0 新宋体,8,N</a:FontList>
 <a:DataType>VARCHAR2(50)</a:DataType>
 <a:Length>50</a:Length>
 </o:Column>
-<o:Column Id="o56">
+<o:Column Id="o58">
 <a:ObjectID>C6775154-39D1-4A70-A68F-D6CA180848C3</a:ObjectID>
 <a:Name>班级编号</a:Name>
 <a:Code>ClassNo</a:Code>
@@ -2336,7 +2363,7 @@ LABL 0 新宋体,8,N</a:FontList>
 <a:DataType>VARCHAR2(50)</a:DataType>
 <a:Length>50</a:Length>
 </o:Column>
-<o:Column Id="o57">
+<o:Column Id="o59">
 <a:ObjectID>BC73F282-AEA4-44F0-8D3E-1313343A7989</a:ObjectID>
 <a:Name>年级</a:Name>
 <a:Code>Grade</a:Code>
@@ -2347,7 +2374,7 @@ LABL 0 新宋体,8,N</a:FontList>
 <a:DataType>VARCHAR2(50)</a:DataType>
 <a:Length>50</a:Length>
 </o:Column>
-<o:Column Id="o58">
+<o:Column Id="o60">
 <a:ObjectID>51B12E2D-A1E0-47FD-99B8-778B7E6811E6</a:ObjectID>
 <a:Name>班主任编号</a:Name>
 <a:Code>ClassDiredctorNo</a:Code>
@@ -2358,7 +2385,7 @@ LABL 0 新宋体,8,N</a:FontList>
 <a:DataType>VARCHAR2(50)</a:DataType>
 <a:Length>50</a:Length>
 </o:Column>
-<o:Column Id="o59">
+<o:Column Id="o61">
 <a:ObjectID>1786F396-5EA4-484A-9AE0-1DAA14570E67</a:ObjectID>
 <a:Name>辅导员编号</a:Name>
 <a:Code>ClassTutorNo</a:Code>
@@ -2371,7 +2398,7 @@ LABL 0 新宋体,8,N</a:FontList>
 </o:Column>
 </c:Columns>
 <c:Keys>
-<o:Key Id="o60">
+<o:Key Id="o62">
 <a:ObjectID>7929E237-29B2-48D5-A59A-1F42A8BFE6FB</a:ObjectID>
 <a:Name>Key_1</a:Name>
 <a:Code>Key_1</a:Code>
@@ -2380,12 +2407,12 @@ LABL 0 新宋体,8,N</a:FontList>
 <a:ModificationDate>1657679435</a:ModificationDate>
 <a:Modifier>l</a:Modifier>
 <c:Key.Columns>
-<o:Column Ref="o52"/>
+<o:Column Ref="o54"/>
 </c:Key.Columns>
 </o:Key>
 </c:Keys>
 <c:PrimaryKey>
-<o:Key Ref="o60"/>
+<o:Key Ref="o62"/>
 </c:PrimaryKey>
 </o:Table>
 <o:Table Id="o20">
@@ -2398,7 +2425,7 @@ LABL 0 新宋体,8,N</a:FontList>
 <a:Modifier>l</a:Modifier>
 <a:TotalSavingCurrency/>
 <c:Columns>
-<o:Column Id="o61">
+<o:Column Id="o63">
 <a:ObjectID>FB699D7A-6267-41D1-9C74-DD5D1BF0DBBF</a:ObjectID>
 <a:Name>Id</a:Name>
 <a:Code>Id</a:Code>
@@ -2410,7 +2437,7 @@ LABL 0 新宋体,8,N</a:FontList>
 <a:Length>50</a:Length>
 <a:Column.Mandatory>1</a:Column.Mandatory>
 </o:Column>
-<o:Column Id="o62">
+<o:Column Id="o64">
 <a:ObjectID>36F815DD-14A0-4C21-A0A4-436F01FC0C73</a:ObjectID>
 <a:Name>教室编号</a:Name>
 <a:Code>ClassroomNo</a:Code>
@@ -2421,7 +2448,7 @@ LABL 0 新宋体,8,N</a:FontList>
 <a:DataType>VARCHAR2(50)</a:DataType>
 <a:Length>50</a:Length>
 </o:Column>
-<o:Column Id="o63">
+<o:Column Id="o65">
 <a:ObjectID>4D9928D1-D647-42C9-B2DF-14B177A89D99</a:ObjectID>
 <a:Name>教室名称</a:Name>
 <a:Code>ClassroomName</a:Code>
@@ -2432,7 +2459,7 @@ LABL 0 新宋体,8,N</a:FontList>
 <a:DataType>VARCHAR2(50)</a:DataType>
 <a:Length>50</a:Length>
 </o:Column>
-<o:Column Id="o64">
+<o:Column Id="o66">
 <a:ObjectID>8F7C6CD6-49AB-4945-AFEC-A78D993F0433</a:ObjectID>
 <a:Name>容纳人数</a:Name>
 <a:Code>ContainStuNum</a:Code>
@@ -2444,7 +2471,7 @@ LABL 0 新宋体,8,N</a:FontList>
 </o:Column>
 </c:Columns>
 <c:Keys>
-<o:Key Id="o65">
+<o:Key Id="o67">
 <a:ObjectID>62A53ED8-5B19-49F2-A3E9-71CC109A26F7</a:ObjectID>
 <a:Name>Key_1</a:Name>
 <a:Code>Key_1</a:Code>
@@ -2453,12 +2480,12 @@ LABL 0 新宋体,8,N</a:FontList>
 <a:ModificationDate>1657679722</a:ModificationDate>
 <a:Modifier>l</a:Modifier>
 <c:Key.Columns>
-<o:Column Ref="o61"/>
+<o:Column Ref="o63"/>
 </c:Key.Columns>
 </o:Key>
 </c:Keys>
 <c:PrimaryKey>
-<o:Key Ref="o65"/>
+<o:Key Ref="o67"/>
 </c:PrimaryKey>
 </o:Table>
 <o:Table Id="o22">
@@ -2471,7 +2498,7 @@ LABL 0 新宋体,8,N</a:FontList>
 <a:Modifier>l</a:Modifier>
 <a:TotalSavingCurrency/>
 <c:Columns>
-<o:Column Id="o66">
+<o:Column Id="o68">
 <a:ObjectID>ED58F529-833D-47E7-90C0-D4A87D413C24</a:ObjectID>
 <a:Name>Id</a:Name>
 <a:Code>Id</a:Code>
@@ -2483,7 +2510,7 @@ LABL 0 新宋体,8,N</a:FontList>
 <a:Length>50</a:Length>
 <a:Column.Mandatory>1</a:Column.Mandatory>
 </o:Column>
-<o:Column Id="o67">
+<o:Column Id="o69">
 <a:ObjectID>B1D90F4D-456C-46F6-A7CB-842036844EB8</a:ObjectID>
 <a:Name>学生编号</a:Name>
 <a:Code>StuNo</a:Code>
@@ -2494,7 +2521,7 @@ LABL 0 新宋体,8,N</a:FontList>
 <a:DataType>VARCHAR2(50)</a:DataType>
 <a:Length>50</a:Length>
 </o:Column>
-<o:Column Id="o68">
+<o:Column Id="o70">
 <a:ObjectID>792DB026-752C-4204-8B65-E79C20C31054</a:ObjectID>
 <a:Name>姓名</a:Name>
 <a:Code>StuName</a:Code>
@@ -2505,7 +2532,7 @@ LABL 0 新宋体,8,N</a:FontList>
 <a:DataType>VARCHAR2(100)</a:DataType>
 <a:Length>100</a:Length>
 </o:Column>
-<o:Column Id="o69">
+<o:Column Id="o71">
 <a:ObjectID>7D8241D7-77C2-478B-815D-4E7B3BE2B9E6</a:ObjectID>
 <a:Name>系部编号</a:Name>
 <a:Code>DeptNo</a:Code>
@@ -2516,7 +2543,7 @@ LABL 0 新宋体,8,N</a:FontList>
 <a:DataType>VARCHAR2(50)</a:DataType>
 <a:Length>50</a:Length>
 </o:Column>
-<o:Column Id="o70">
+<o:Column Id="o72">
 <a:ObjectID>1A146A9E-7A18-4E9E-A752-DE13D04AB00D</a:ObjectID>
 <a:Name>专业编号</a:Name>
 <a:Code>MajorNo</a:Code>
@@ -2527,7 +2554,7 @@ LABL 0 新宋体,8,N</a:FontList>
 <a:DataType>VARCHAR2(50)</a:DataType>
 <a:Length>50</a:Length>
 </o:Column>
-<o:Column Id="o71">
+<o:Column Id="o73">
 <a:ObjectID>A57C3BFD-DF44-480D-A716-AAB5AB8BB1AE</a:ObjectID>
 <a:Name>班级编号</a:Name>
 <a:Code>ClassNo</a:Code>
@@ -2538,7 +2565,7 @@ LABL 0 新宋体,8,N</a:FontList>
 <a:DataType>VARCHAR2(50)</a:DataType>
 <a:Length>50</a:Length>
 </o:Column>
-<o:Column Id="o72">
+<o:Column Id="o74">
 <a:ObjectID>2AF4E230-E28B-45D4-B53F-B054BEDD7EBA</a:ObjectID>
 <a:Name>年级</a:Name>
 <a:Code>Grade</a:Code>
@@ -2549,7 +2576,7 @@ LABL 0 新宋体,8,N</a:FontList>
 <a:DataType>VARCHAR2(50)</a:DataType>
 <a:Length>50</a:Length>
 </o:Column>
-<o:Column Id="o73">
+<o:Column Id="o75">
 <a:ObjectID>8C8C3184-3774-477F-9794-41D37FEEA493</a:ObjectID>
 <a:Name>出生日期</a:Name>
 <a:Code>Birth</a:Code>
@@ -2559,7 +2586,7 @@ LABL 0 新宋体,8,N</a:FontList>
 <a:Modifier>l</a:Modifier>
 <a:DataType>DATE</a:DataType>
 </o:Column>
-<o:Column Id="o74">
+<o:Column Id="o76">
 <a:ObjectID>22F8F70C-410B-4A5B-9B89-0C131B199B0B</a:ObjectID>
 <a:Name>性别</a:Name>
 <a:Code>GenderNo</a:Code>
@@ -2570,7 +2597,7 @@ LABL 0 新宋体,8,N</a:FontList>
 <a:DataType>CHAR(1)</a:DataType>
 <a:Length>1</a:Length>
 </o:Column>
-<o:Column Id="o75">
+<o:Column Id="o77">
 <a:ObjectID>44C9FBC1-46A6-44C4-A93D-1721235FB73B</a:ObjectID>
 <a:Name>身份证号</a:Name>
 <a:Code>IdentityNo</a:Code>
@@ -2581,7 +2608,7 @@ LABL 0 新宋体,8,N</a:FontList>
 <a:DataType>VARCHAR2(50)</a:DataType>
 <a:Length>50</a:Length>
 </o:Column>
-<o:Column Id="o76">
+<o:Column Id="o78">
 <a:ObjectID>DB840626-AECF-4EA7-BAA1-C8F16DBC5EB0</a:ObjectID>
 <a:Name>联系电话</a:Name>
 <a:Code>Mobile</a:Code>
@@ -2594,7 +2621,7 @@ LABL 0 新宋体,8,N</a:FontList>
 </o:Column>
 </c:Columns>
 <c:Keys>
-<o:Key Id="o77">
+<o:Key Id="o79">
 <a:ObjectID>AE735D7A-D489-4A3C-BA6B-89680DBC2DDF</a:ObjectID>
 <a:Name>Key_1</a:Name>
 <a:Code>Key_1</a:Code>
@@ -2603,12 +2630,12 @@ LABL 0 新宋体,8,N</a:FontList>
 <a:ModificationDate>1657680259</a:ModificationDate>
 <a:Modifier>l</a:Modifier>
 <c:Key.Columns>
-<o:Column Ref="o66"/>
+<o:Column Ref="o68"/>
 </c:Key.Columns>
 </o:Key>
 </c:Keys>
 <c:PrimaryKey>
-<o:Key Ref="o77"/>
+<o:Key Ref="o79"/>
 </c:PrimaryKey>
 </o:Table>
 <o:Table Id="o24">
@@ -2621,7 +2648,7 @@ LABL 0 新宋体,8,N</a:FontList>
 <a:Modifier>l</a:Modifier>
 <a:TotalSavingCurrency/>
 <c:ExtendedCollections>
-<o:ExtendedCollection Id="o78">
+<o:ExtendedCollection Id="o80">
 <a:ObjectID>746D87CA-6014-4561-BDA3-7A467EA3C6F4</a:ObjectID>
 <a:Name>Related Columns</a:Name>
 <a:ExtendedBaseCollection.CollectionName>Related Columns</a:ExtendedBaseCollection.CollectionName>
@@ -2632,7 +2659,7 @@ LABL 0 新宋体,8,N</a:FontList>
 </o:ExtendedCollection>
 </c:ExtendedCollections>
 <c:Columns>
-<o:Column Id="o79">
+<o:Column Id="o81">
 <a:ObjectID>C0B04110-9C71-408C-A7A4-803DFD125792</a:ObjectID>
 <a:Name>Id</a:Name>
 <a:Code>Id</a:Code>
@@ -2644,7 +2671,7 @@ LABL 0 新宋体,8,N</a:FontList>
 <a:Length>50</a:Length>
 <a:Column.Mandatory>1</a:Column.Mandatory>
 </o:Column>
-<o:Column Id="o80">
+<o:Column Id="o82">
 <a:ObjectID>824877E7-2C98-46A2-BF9A-BA15FDC107CE</a:ObjectID>
 <a:Name>教师编号</a:Name>
 <a:Code>EmpNo</a:Code>
@@ -2655,7 +2682,7 @@ LABL 0 新宋体,8,N</a:FontList>
 <a:DataType>VARCHAR2(50)</a:DataType>
 <a:Length>50</a:Length>
 </o:Column>
-<o:Column Id="o81">
+<o:Column Id="o83">
 <a:ObjectID>ACCD9438-788D-4274-A358-2C201C618257</a:ObjectID>
 <a:Name>姓名</a:Name>
 <a:Code>EmpName</a:Code>
@@ -2666,7 +2693,7 @@ LABL 0 新宋体,8,N</a:FontList>
 <a:DataType>VARCHAR2(100)</a:DataType>
 <a:Length>100</a:Length>
 </o:Column>
-<o:Column Id="o82">
+<o:Column Id="o84">
 <a:ObjectID>42DE8C48-F02E-47D2-90D6-52ADE85C67D9</a:ObjectID>
 <a:Name>部门Id</a:Name>
 <a:Code>DepartmentId</a:Code>
@@ -2677,7 +2704,7 @@ LABL 0 新宋体,8,N</a:FontList>
 <a:DataType>VARCHAR2(50)</a:DataType>
 <a:Length>50</a:Length>
 </o:Column>
-<o:Column Id="o83">
+<o:Column Id="o85">
 <a:ObjectID>DB03B7D5-E5CA-492C-A4AA-8FCD55299CCA</a:ObjectID>
 <a:Name>教学系部编号</a:Name>
 <a:Code>DeptNo</a:Code>
@@ -2688,7 +2715,7 @@ LABL 0 新宋体,8,N</a:FontList>
 <a:DataType>VARCHAR2(50)</a:DataType>
 <a:Length>50</a:Length>
 </o:Column>
-<o:Column Id="o84">
+<o:Column Id="o86">
 <a:ObjectID>6A4CF63B-C673-40D7-B4B1-6E384FD768E8</a:ObjectID>
 <a:Name>出生日期</a:Name>
 <a:Code>Birth</a:Code>
@@ -2698,7 +2725,7 @@ LABL 0 新宋体,8,N</a:FontList>
 <a:Modifier>l</a:Modifier>
 <a:DataType>DATE</a:DataType>
 </o:Column>
-<o:Column Id="o85">
+<o:Column Id="o87">
 <a:ObjectID>C586C289-061B-4A9A-AB10-C03092A53626</a:ObjectID>
 <a:Name>性别</a:Name>
 <a:Code>GenderNo</a:Code>
@@ -2709,7 +2736,7 @@ LABL 0 新宋体,8,N</a:FontList>
 <a:DataType>CHAR(1)</a:DataType>
 <a:Length>1</a:Length>
 </o:Column>
-<o:Column Id="o86">
+<o:Column Id="o88">
 <a:ObjectID>87B1BC29-8CF8-43AD-BEDB-8587BDBD931D</a:ObjectID>
 <a:Name>身份证号</a:Name>
 <a:Code>IdentityNo</a:Code>
@@ -2720,7 +2747,7 @@ LABL 0 新宋体,8,N</a:FontList>
 <a:DataType>VARCHAR2(50)</a:DataType>
 <a:Length>50</a:Length>
 </o:Column>
-<o:Column Id="o87">
+<o:Column Id="o89">
 <a:ObjectID>21A503A9-9F6A-4FB7-8C2D-80205D0F1FC8</a:ObjectID>
 <a:Name>联系电话</a:Name>
 <a:Code>Mobile</a:Code>
@@ -2733,7 +2760,7 @@ LABL 0 新宋体,8,N</a:FontList>
 </o:Column>
 </c:Columns>
 <c:Keys>
-<o:Key Id="o88">
+<o:Key Id="o90">
 <a:ObjectID>95F85F33-69EB-4704-86D0-BBEC72D9AE1A</a:ObjectID>
 <a:Name>Key_1</a:Name>
 <a:Code>Key_1</a:Code>
@@ -2742,12 +2769,12 @@ LABL 0 新宋体,8,N</a:FontList>
 <a:ModificationDate>1657680820</a:ModificationDate>
 <a:Modifier>l</a:Modifier>
 <c:Key.Columns>
-<o:Column Ref="o79"/>
+<o:Column Ref="o81"/>
 </c:Key.Columns>
 </o:Key>
 </c:Keys>
 <c:PrimaryKey>
-<o:Key Ref="o88"/>
+<o:Key Ref="o90"/>
 </c:PrimaryKey>
 </o:Table>
 <o:Table Id="o27">
@@ -2760,7 +2787,7 @@ LABL 0 新宋体,8,N</a:FontList>
 <a:Modifier>l</a:Modifier>
 <a:TotalSavingCurrency/>
 <c:ExtendedCollections>
-<o:ExtendedCollection Id="o89">
+<o:ExtendedCollection Id="o91">
 <a:ObjectID>0913886D-4511-408C-8BB6-7EE9E7EA4008</a:ObjectID>
 <a:Name>Related Columns</a:Name>
 <a:ExtendedBaseCollection.CollectionName>Related Columns</a:ExtendedBaseCollection.CollectionName>
@@ -2771,7 +2798,7 @@ LABL 0 新宋体,8,N</a:FontList>
 </o:ExtendedCollection>
 </c:ExtendedCollections>
 <c:Columns>
-<o:Column Id="o90">
+<o:Column Id="o92">
 <a:ObjectID>0F6F186D-3A1B-4C1E-99CF-D782685B21BA</a:ObjectID>
 <a:Name>Id</a:Name>
 <a:Code>Id</a:Code>
@@ -2782,7 +2809,7 @@ LABL 0 新宋体,8,N</a:FontList>
 <a:DataType>NVARCHAR2(50)</a:DataType>
 <a:Length>50</a:Length>
 </o:Column>
-<o:Column Id="o91">
+<o:Column Id="o93">
 <a:ObjectID>7B6CAE4E-C137-4AA5-888B-A7B9A753DF43</a:ObjectID>
 <a:Name>学生学号</a:Name>
 <a:Code>StuNo</a:Code>
@@ -2793,7 +2820,7 @@ LABL 0 新宋体,8,N</a:FontList>
 <a:DataType>NVARCHAR2(50)</a:DataType>
 <a:Length>50</a:Length>
 </o:Column>
-<o:Column Id="o92">
+<o:Column Id="o94">
 <a:ObjectID>20413846-FE6C-4415-A4C2-7CD7E8B139CF</a:ObjectID>
 <a:Name>身份证号</a:Name>
 <a:Code>IdentityNo</a:Code>
@@ -2804,7 +2831,7 @@ LABL 0 新宋体,8,N</a:FontList>
 <a:DataType>NVARCHAR2(50)</a:DataType>
 <a:Length>50</a:Length>
 </o:Column>
-<o:Column Id="o93">
+<o:Column Id="o95">
 <a:ObjectID>80A83A2D-F20F-45BD-A6B9-1C77D79C055F</a:ObjectID>
 <a:Name>人脸图片Url</a:Name>
 <a:Code>FaceUrl</a:Code>
@@ -2827,7 +2854,7 @@ LABL 0 新宋体,8,N</a:FontList>
 <a:Modifier>l</a:Modifier>
 <a:TotalSavingCurrency/>
 <c:ExtendedCollections>
-<o:ExtendedCollection Id="o94">
+<o:ExtendedCollection Id="o96">
 <a:ObjectID>DEFF5BA6-9BEF-44B5-B4A6-254A59A5A55B</a:ObjectID>
 <a:Name>Related Columns</a:Name>
 <a:ExtendedBaseCollection.CollectionName>Related Columns</a:ExtendedBaseCollection.CollectionName>
@@ -2838,7 +2865,7 @@ LABL 0 新宋体,8,N</a:FontList>
 </o:ExtendedCollection>
 </c:ExtendedCollections>
 <c:Columns>
-<o:Column Id="o95">
+<o:Column Id="o97">
 <a:ObjectID>1DF34B9F-EBDF-4530-9554-8587C84E964F</a:ObjectID>
 <a:Name>Id</a:Name>
 <a:Code>Id</a:Code>
@@ -2849,7 +2876,7 @@ LABL 0 新宋体,8,N</a:FontList>
 <a:DataType>NVARCHAR2(50)</a:DataType>
 <a:Length>50</a:Length>
 </o:Column>
-<o:Column Id="o96">
+<o:Column Id="o98">
 <a:ObjectID>4094E0BC-8242-4DAD-98AF-B1601C95A1DC</a:ObjectID>
 <a:Name>学生学号</a:Name>
 <a:Code>StuNo</a:Code>
@@ -2860,7 +2887,7 @@ LABL 0 新宋体,8,N</a:FontList>
 <a:DataType>NVARCHAR2(50)</a:DataType>
 <a:Length>50</a:Length>
 </o:Column>
-<o:Column Id="o97">
+<o:Column Id="o99">
 <a:ObjectID>07E1BDF0-350A-420A-9409-578D60116CD4</a:ObjectID>
 <a:Name>身份证号</a:Name>
 <a:Code>IdentityNo</a:Code>
@@ -2871,7 +2898,7 @@ LABL 0 新宋体,8,N</a:FontList>
 <a:DataType>NVARCHAR2(50)</a:DataType>
 <a:Length>50</a:Length>
 </o:Column>
-<o:Column Id="o98">
+<o:Column Id="o100">
 <a:ObjectID>7092EFB1-DBDD-40B9-9016-7D2AF961A914</a:ObjectID>
 <a:Name>一卡通号</a:Name>
 <a:Code>CardNo</a:Code>
@@ -2882,7 +2909,7 @@ LABL 0 新宋体,8,N</a:FontList>
 <a:DataType>NVARCHAR2(100)</a:DataType>
 <a:Length>100</a:Length>
 </o:Column>
-<o:Column Id="o99">
+<o:Column Id="o101">
 <a:ObjectID>3F5122A6-4236-4D21-A438-B3FA6160882D</a:ObjectID>
 <a:Name>用户类型(1教师，2学生，3其他)</a:Name>
 <a:Code>UType</a:Code>
@@ -2893,7 +2920,7 @@ LABL 0 新宋体,8,N</a:FontList>
 <a:DataType>CHAR(1)</a:DataType>
 <a:Length>1</a:Length>
 </o:Column>
-<o:Column Id="o100">
+<o:Column Id="o102">
 <a:ObjectID>61DB9EFE-A4E9-4A3D-841E-4E4DEFA14A51</a:ObjectID>
 <a:Name>交易类型（1交易，2充值）</a:Name>
 <a:Code>TransType</a:Code>
@@ -2904,7 +2931,7 @@ LABL 0 新宋体,8,N</a:FontList>
 <a:DataType>CHAR(1)</a:DataType>
 <a:Length>1</a:Length>
 </o:Column>
-<o:Column Id="o101">
+<o:Column Id="o103">
 <a:ObjectID>891DB1A1-5893-466D-AB8C-0A0C4A9AB531</a:ObjectID>
 <a:Name>交易金额（元，精确到1位小数）</a:Name>
 <a:Code>TransAmount</a:Code>
@@ -2916,7 +2943,7 @@ LABL 0 新宋体,8,N</a:FontList>
 <a:Length>10</a:Length>
 <a:Precision>1</a:Precision>
 </o:Column>
-<o:Column Id="o102">
+<o:Column Id="o104">
 <a:ObjectID>64C30399-01FB-4C0E-9ED3-4D83FF039706</a:ObjectID>
 <a:Name>交易时间</a:Name>
 <a:Code>TransTime</a:Code>
@@ -2926,7 +2953,7 @@ LABL 0 新宋体,8,N</a:FontList>
 <a:Modifier>l</a:Modifier>
 <a:DataType>DATE</a:DataType>
 </o:Column>
-<o:Column Id="o103">
+<o:Column Id="o105">
 <a:ObjectID>2DDBE0BC-3C5F-4E43-A100-D4B19DBEF540</a:ObjectID>
 <a:Name>交易地点（文字说明）</a:Name>
 <a:Code>TransAddr</a:Code>
@@ -2939,9 +2966,115 @@ LABL 0 新宋体,8,N</a:FontList>
 </o:Column>
 </c:Columns>
 </o:Table>
+<o:Table Id="o33">
+<a:ObjectID>49DC18D7-AA40-4DDE-B6B6-AB2AEF55B30F</a:ObjectID>
+<a:Name>宿舍信息表</a:Name>
+<a:Code>DS_Dormitory</a:Code>
+<a:CreationDate>1657616336</a:CreationDate>
+<a:Creator>l</a:Creator>
+<a:ModificationDate>1677636783</a:ModificationDate>
+<a:Modifier>l</a:Modifier>
+<a:TotalSavingCurrency/>
+<c:ExtendedCollections>
+<o:ExtendedCollection Id="o106">
+<a:ObjectID>D3952E27-151B-4912-86E5-B4F56618B6E1</a:ObjectID>
+<a:Name>Related Columns</a:Name>
+<a:ExtendedBaseCollection.CollectionName>Related Columns</a:ExtendedBaseCollection.CollectionName>
+<a:CreationDate>1677636790</a:CreationDate>
+<a:Creator>l</a:Creator>
+<a:ModificationDate>1677636790</a:ModificationDate>
+<a:Modifier>l</a:Modifier>
+</o:ExtendedCollection>
+</c:ExtendedCollections>
+<c:Columns>
+<o:Column Id="o107">
+<a:ObjectID>7C97549E-6FF4-4865-971C-AFEA87D8D8D3</a:ObjectID>
+<a:Name>Id</a:Name>
+<a:Code>Id</a:Code>
+<a:CreationDate>1657616446</a:CreationDate>
+<a:Creator>l</a:Creator>
+<a:ModificationDate>1677635508</a:ModificationDate>
+<a:Modifier>l</a:Modifier>
+<a:DataType>VARCHAR2(50)</a:DataType>
+<a:Length>50</a:Length>
+<a:Column.Mandatory>1</a:Column.Mandatory>
+</o:Column>
+<o:Column Id="o108">
+<a:ObjectID>6462C7DF-82A3-4235-B299-35DFE06E710C</a:ObjectID>
+<a:Name>父Id</a:Name>
+<a:Code>DParentId</a:Code>
+<a:CreationDate>1677636643</a:CreationDate>
+<a:Creator>l</a:Creator>
+<a:ModificationDate>1677636679</a:ModificationDate>
+<a:Modifier>l</a:Modifier>
+<a:DataType>VARCHAR2(50)</a:DataType>
+<a:Length>50</a:Length>
+</o:Column>
+<o:Column Id="o109">
+<a:ObjectID>DC94952C-4A3F-487B-8016-16592EA1D044</a:ObjectID>
+<a:Name>学生编号</a:Name>
+<a:Code>StuNo</a:Code>
+<a:CreationDate>1657679511</a:CreationDate>
+<a:Creator>l</a:Creator>
+<a:ModificationDate>1677635508</a:ModificationDate>
+<a:Modifier>l</a:Modifier>
+<a:DataType>VARCHAR2(50)</a:DataType>
+<a:Length>50</a:Length>
+</o:Column>
+<o:Column Id="o110">
+<a:ObjectID>0E87FE81-E407-4E62-99B7-F829EC333151</a:ObjectID>
+<a:Name>编号</a:Name>
+<a:Code>DNo</a:Code>
+<a:CreationDate>1677635565</a:CreationDate>
+<a:Creator>l</a:Creator>
+<a:ModificationDate>1677636559</a:ModificationDate>
+<a:Modifier>l</a:Modifier>
+<a:DataType>VARCHAR(50)</a:DataType>
+<a:Length>50</a:Length>
+</o:Column>
+<o:Column Id="o111">
+<a:ObjectID>C850C88F-3B60-4D43-B201-93B3F59782C1</a:ObjectID>
+<a:Name>名称</a:Name>
+<a:Code>DName</a:Code>
+<a:CreationDate>1677636537</a:CreationDate>
+<a:Creator>l</a:Creator>
+<a:ModificationDate>1677636559</a:ModificationDate>
+<a:Modifier>l</a:Modifier>
+<a:DataType>VARCHAR(50)</a:DataType>
+<a:Length>50</a:Length>
+</o:Column>
+<o:Column Id="o112">
+<a:ObjectID>B388BC3E-2C39-4950-A9DB-3006FCFC5E5B</a:ObjectID>
+<a:Name>类型(1宿舍楼，2单元，3楼层，4寝室，5床位)</a:Name>
+<a:Code>DType</a:Code>
+<a:CreationDate>1677636562</a:CreationDate>
+<a:Creator>l</a:Creator>
+<a:ModificationDate>1677636641</a:ModificationDate>
+<a:Modifier>l</a:Modifier>
+<a:DataType>NUMBER</a:DataType>
+</o:Column>
+</c:Columns>
+<c:Keys>
+<o:Key Id="o113">
+<a:ObjectID>DC095920-290B-4E8C-9631-AEAAC9E73191</a:ObjectID>
+<a:Name>Key_1</a:Name>
+<a:Code>Key_1</a:Code>
+<a:CreationDate>1657617396</a:CreationDate>
+<a:Creator>l</a:Creator>
+<a:ModificationDate>1677635508</a:ModificationDate>
+<a:Modifier>l</a:Modifier>
+<c:Key.Columns>
+<o:Column Ref="o107"/>
+</c:Key.Columns>
+</o:Key>
+</c:Keys>
+<c:PrimaryKey>
+<o:Key Ref="o113"/>
+</c:PrimaryKey>
+</o:Table>
 </c:Tables>
 <c:DefaultGroups>
-<o:Group Id="o104">
+<o:Group Id="o114">
 <a:ObjectID>46EC3E2A-6CBF-421A-9DA8-6BCCEDEC7DF5</a:ObjectID>
 <a:Name>PUBLIC</a:Name>
 <a:Code>PUBLIC</a:Code>
@@ -2952,7 +3085,7 @@ LABL 0 新宋体,8,N</a:FontList>
 </o:Group>
 </c:DefaultGroups>
 <c:TargetModels>
-<o:TargetModel Id="o105">
+<o:TargetModel Id="o115">
 <a:ObjectID>AF25C190-A5BF-4CF4-8137-C7E7446D61A4</a:ObjectID>
 <a:Name>ORACLE Version 11g</a:Name>
 <a:Code>ORA11GR1</a:Code>

Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/YKTStateMent/YKTStateMentEntity.cs

@@ -47,6 +47,7 @@ namespace Learun.Application.TwoDevelopment.EducationalAdministration
         public string StuNo { get; set; }
         public string StuName { get; set; }
         public string DeptName { get; set; }
+        public string MajorName { get; set; }
         public string ClassName { get; set; }
         public string IdentityCardNo { get; set; }
         public string mobile { get; set; }

Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/YKTStateMent/YKTStateMentService.cs

@@ -32,11 +32,12 @@ namespace Learun.Application.TwoDevelopment.EducationalAdministration
             {
                 var queryParam = queryJson.ToJObject();
                 var strSql = new StringBuilder();
-                strSql.Append(@"SELECT  A.OUTID AS STUPHONE,A.CUSTOMERID AS YKTNO,round(A.OPFARE/100,2) AS MONEY,round(A.ODDFARE/100,2) AS BALANCE,A.OPDT AS HAPPENTIME,A.DSCRP AS SUBJECT,B.TERMNAME,C.StuNo,C.StuName,d.DeptName,e.ClassName,c.identityno as IdentityCardNo 
+                strSql.Append(@"SELECT  A.OUTID AS STUPHONE,A.CUSTOMERID AS YKTNO,round(A.OPFARE/100,2) AS MONEY,round(A.ODDFARE/100,2) AS BALANCE,A.OPDT AS HAPPENTIME,A.DSCRP AS SUBJECT,B.TERMNAME,C.StuNo,C.StuName,d.DeptName,e.ClassName,c.identityno as IdentityCardNo, f.MajorName
                 FROM M_REC_CONSUME@ykt A LEFT JOIN M_BASE_TERM@ykt B ON A.TERMID = B.TERMID
                 left join ds_stuinfo C on A.OUTID = C.mobile
                 left join ds_dept d on c.deptno = d.deptno
                 left join ds_classinfo e on c.classno = e.classno
+                left join ds_major f on c.majorno=f.majorno
                 where 1=1 and stuno is not null ");
                 if (!queryParam["StuNo"].IsEmpty())
                 {
@@ -60,7 +61,7 @@ namespace Learun.Application.TwoDevelopment.EducationalAdministration
                 }
                 if (!queryParam["StartDate"].IsEmpty() && !queryParam["EndDate"].IsEmpty())
                 {
-                    strSql.Append(" and (A.OPDT>=to_date('" + queryParam["StartDate"] + "','yyyy-mm-dd') and A.OPDT<=to_date('" + queryParam["EndDate"] + "','yyyy-mm-dd'))");
+                    strSql.Append(" and (A.OPDT>=to_date('" + queryParam["StartDate"] + "','yyyy-mm-dd') and A.OPDT<=to_date('" + queryParam["EndDate"] + "','yyyy-mm-dd hh24:mi:ss'))");
                 }
 
                 return BaseRepository("TLMZYMIDDLEString").FindList<YKTStateMentEntity>(strSql.ToString(), pagination);

Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/LogisticsManagement/Acc_Punishment/Acc_PunishmentBLL.cs

@@ -42,6 +42,25 @@ namespace Learun.Application.TwoDevelopment.LogisticsManagement
             }
         }
 
+        public IEnumerable<Acc_PunishmentEntity> GetPageListForStatistics(Pagination pagination, string queryJson)
+        {
+            try
+            {
+                return acc_PunishmentService.GetPageListForStatistics(pagination, queryJson);
+            }
+            catch (Exception ex)
+            {
+                if (ex is ExceptionEx)
+                {
+                    throw;
+                }
+                else
+                {
+                    throw ExceptionEx.ThrowBusinessException(ex);
+                }
+            }
+        }
+
         /// <summary>
         /// 获取Acc_Punishment表实体数据
         /// <param name="keyValue">主键</param>

Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/LogisticsManagement/Acc_Punishment/Acc_PunishmentEntity.cs

@@ -11,7 +11,7 @@ namespace Learun.Application.TwoDevelopment.LogisticsManagement
     /// 日 期：2020-08-11 16:48
     /// 描 述：惩罚管理
     /// </summary>
-    public class Acc_PunishmentEntity 
+    public class Acc_PunishmentEntity
     {
         #region  实体成员
         /// <summary>
@@ -112,6 +112,8 @@ namespace Learun.Application.TwoDevelopment.LogisticsManagement
         }
         #endregion
         #region  扩展字段
+        [NotMapped]
+        public string num { get; set; }
         #endregion
     }
 }

Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/LogisticsManagement/Acc_Punishment/Acc_PunishmentIBLL.cs

@@ -21,6 +21,7 @@ namespace Learun.Application.TwoDevelopment.LogisticsManagement
         /// <param name="queryJson">查询参数</param>
         /// <returns></returns>
         IEnumerable<Acc_PunishmentEntity> GetPageList(Pagination pagination, string queryJson);
+        IEnumerable<Acc_PunishmentEntity> GetPageListForStatistics(Pagination pagination, string queryJson);
         /// <summary>
         /// 获取Acc_Punishment表实体数据
         /// <param name="keyValue">主键</param>

Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/LogisticsManagement/Acc_Punishment/Acc_PunishmentService.cs

@@ -57,6 +57,74 @@ namespace Learun.Application.TwoDevelopment.LogisticsManagement
             }
         }
 
+
+        /// <summary>
+        /// 奖励统计
+        /// </summary>
+        /// <param name="pagination"></param>
+        /// <param name="queryJson"></param>
+        /// <returns></returns>
+        public IEnumerable<Acc_PunishmentEntity> GetPageListForStatistics(Pagination pagination, string queryJson)
+        {
+            try
+            {
+                var strSql = new StringBuilder();
+                var filedSql = "";
+                var groupSql = "";
+                strSql.Append("SELECT ");
+
+                var queryParam = queryJson.ToJObject();
+                // 虚拟参数
+                var dp = new DynamicParameters(new { });
+                if (!queryParam["SYear"].IsEmpty() && queryParam["SYear"].ToString().Trim() == "1")
+                {
+                    filedSql += " SYear,";
+                }
+                if (!queryParam["Semester"].IsEmpty() && queryParam["Semester"].ToString().Trim() == "1")
+                {
+                    filedSql += " Semester,";
+                }
+                if (!queryParam["Dormitory"].IsEmpty() && queryParam["Dormitory"].ToString().Trim() == "1")
+                {
+                    filedSql += " Dormitory,";
+                }
+                if (!queryParam["Unit"].IsEmpty() && queryParam["Unit"].ToString().Trim() == "1")
+                {
+                    filedSql += " Unit,";
+                }
+                if (!queryParam["Floor"].IsEmpty() && queryParam["Floor"].ToString().Trim() == "1")
+                {
+                    filedSql += " Floor,";
+                }
+                if (!queryParam["RId"].IsEmpty() && queryParam["RId"].ToString().Trim() == "1")
+                {
+                    filedSql += " RId,";
+                }
+                if (!string.IsNullOrEmpty(filedSql))
+                {
+                    strSql.Append(filedSql);
+                    groupSql = " group by " + filedSql.Substring(0, filedSql.Length - 1);
+                }
+
+                strSql.Append(" count(1) as num  FROM Acc_Punishment t ");
+                strSql.Append("  WHERE 1=1 ");
+                strSql.Append(groupSql);
+                return this.BaseRepository("CollegeMIS").FindList<Acc_PunishmentEntity>(strSql.ToString(), dp, pagination);
+            }
+            catch (Exception ex)
+            {
+                if (ex is ExceptionEx)
+                {
+                    throw;
+                }
+                else
+                {
+                    throw ExceptionEx.ThrowServiceException(ex);
+                }
+            }
+        }
+
+
         /// <summary>
         /// 获取Acc_Punishment表实体数据
         /// <param name="keyValue">主键</param>

Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/LogisticsManagement/Acc_Reward/Acc_RewardBLL.cs

@@ -42,6 +42,30 @@ namespace Learun.Application.TwoDevelopment.LogisticsManagement
             }
         }
 
+        /// <summary>
+        /// 获取页面显示列表数据
+        /// <summary>
+        /// <param name="queryJson">查询参数</param>
+        /// <returns></returns>
+        public IEnumerable<Acc_RewardEntity> GetPageListForStatistics(Pagination pagination, string queryJson)
+        {
+            try
+            {
+                return acc_RewardService.GetPageListForStatistics(pagination, queryJson);
+            }
+            catch (Exception ex)
+            {
+                if (ex is ExceptionEx)
+                {
+                    throw;
+                }
+                else
+                {
+                    throw ExceptionEx.ThrowBusinessException(ex);
+                }
+            }
+        }
+
         /// <summary>
         /// 获取Acc_Reward表实体数据
         /// <param name="keyValue">主键</param>

Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/LogisticsManagement/Acc_Reward/Acc_RewardEntity.cs

@@ -11,7 +11,7 @@ namespace Learun.Application.TwoDevelopment.LogisticsManagement
     /// 日 期：2020-08-11 16:46
     /// 描 述：宿舍奖励
     /// </summary>
-    public class Acc_RewardEntity 
+    public class Acc_RewardEntity
     {
         #region  实体成员
         /// <summary>
@@ -112,6 +112,8 @@ namespace Learun.Application.TwoDevelopment.LogisticsManagement
         }
         #endregion
         #region  扩展字段
+        [NotMapped]
+        public string num { get; set; }
         #endregion
     }
 }

Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/LogisticsManagement/Acc_Reward/Acc_RewardIBLL.cs

@@ -21,6 +21,7 @@ namespace Learun.Application.TwoDevelopment.LogisticsManagement
         /// <param name="queryJson">查询参数</param>
         /// <returns></returns>
         IEnumerable<Acc_RewardEntity> GetPageList(Pagination pagination, string queryJson);
+        IEnumerable<Acc_RewardEntity> GetPageListForStatistics(Pagination pagination, string queryJson);
         /// <summary>
         /// 获取Acc_Reward表实体数据
         /// <param name="keyValue">主键</param>

Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/LogisticsManagement/Acc_Reward/Acc_RewardService.cs

@@ -57,6 +57,72 @@ namespace Learun.Application.TwoDevelopment.LogisticsManagement
             }
         }
 
+        /// <summary>
+        /// 奖励统计
+        /// </summary>
+        /// <param name="pagination"></param>
+        /// <param name="queryJson"></param>
+        /// <returns></returns>
+        public IEnumerable<Acc_RewardEntity> GetPageListForStatistics(Pagination pagination, string queryJson)
+        {
+            try
+            {
+                var strSql = new StringBuilder();
+                var filedSql = "";
+                var groupSql = "";
+                strSql.Append("SELECT ");
+
+                var queryParam = queryJson.ToJObject();
+                // 虚拟参数
+                var dp = new DynamicParameters(new { });
+                if (!queryParam["SYear"].IsEmpty()&& queryParam["SYear"].ToString().Trim()=="1")
+                {
+                    filedSql += " SYear,";
+                }
+                if (!queryParam["Semester"].IsEmpty() && queryParam["Semester"].ToString().Trim() == "1")
+                {
+                    filedSql += " Semester,";
+                }
+                if (!queryParam["Dormitory"].IsEmpty() && queryParam["Dormitory"].ToString().Trim() == "1")
+                {
+                    filedSql += " Dormitory,";
+                }
+                if (!queryParam["Unit"].IsEmpty() && queryParam["Unit"].ToString().Trim() == "1")
+                {
+                    filedSql += " Unit,";
+                }
+                if (!queryParam["Floor"].IsEmpty() && queryParam["Floor"].ToString().Trim() == "1")
+                {
+                    filedSql += " Floor,";
+                }
+                if (!queryParam["RId"].IsEmpty() && queryParam["RId"].ToString().Trim() == "1")
+                {
+                    filedSql += " RId,";
+                }
+                if (!string.IsNullOrEmpty(filedSql))
+                {
+                    strSql.Append(filedSql);
+                    groupSql = " group by " + filedSql.Substring(0, filedSql.Length - 1);
+                }
+
+                strSql.Append(" count(1) as num  FROM Acc_Reward t ");
+                strSql.Append("  WHERE 1=1 ");
+                strSql.Append(groupSql);
+                return this.BaseRepository("CollegeMIS").FindList<Acc_RewardEntity>(strSql.ToString(), dp, pagination);
+            }
+            catch (Exception ex)
+            {
+                if (ex is ExceptionEx)
+                {
+                    throw;
+                }
+                else
+                {
+                    throw ExceptionEx.ThrowServiceException(ex);
+                }
+            }
+        }
+
         /// <summary>
         /// 获取Acc_Reward表实体数据
         /// <param name="keyValue">主键</param>