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

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

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

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

@@ -0,0 +1,41 @@
+@{
+    ViewBag.Title = "公共区域卫生管理";
+    Layout = "~/Views/Shared/_Form.cshtml";
+}
+<div class="lr-form-wrap">
+    <div id="form">
+        <div class="col-xs-6 lr-form-item" data-table="Acc_PublicAreaHealth">
+            <div class="lr-form-item-title">专业部<font face="宋体">*</font></div>
+            <div id="DeptNo" isvalid="yes" checkexpession="NotNull"></div>
+        </div>
+        <div class="col-xs-6 lr-form-item" data-table="Acc_PublicAreaHealth">
+            <div class="lr-form-item-title">专业<font face="宋体">*</font></div>
+            <div id="MajorNo" isvalid="yes" checkexpession="NotNull"></div>
+        </div>
+        <div class="col-xs-6 lr-form-item" data-table="Acc_PublicAreaHealth">
+            <div class="lr-form-item-title">班级<font face="宋体">*</font></div>
+            <div id="ClassNo" isvalid="yes" checkexpession="NotNull"></div>
+        </div>
+        <div class="col-xs-6 lr-form-item" data-table="Acc_PublicAreaHealth">
+            <div class="lr-form-item-title">学生<font face="宋体">*</font></div>
+            <div id="StuNo" isvalid="yes" checkexpession="NotNull"></div>
+        </div>
+    </div>
+    <div class="col-xs-12 lr-form-item" data-table="Acc_PublicAreaHealth">
+        <div class="lr-form-item-title">日期<font face="宋体">*</font></div>
+        <input id="Date" type="text" isvalid="yes" checkexpession="NotNull" class="form-control lr-input-wdatepicker" onfocus="WdatePicker({ dateFmt:'yyyy-MM-dd HH:mm:ss' })" />
+    </div>
+    <div class="col-xs-12 lr-form-item" data-table="Acc_PublicAreaHealth">
+        <div class="lr-form-item-title">奖分</div>
+        <input id="AddScore" type="text" class="form-control" />
+    </div>
+    <div class="col-xs-12 lr-form-item" data-table="Acc_PublicAreaHealth">
+        <div class="lr-form-item-title">扣分</div>
+        <input id="MinusScore" type="text" class="form-control" />
+    </div>
+    <div class="col-xs-12 lr-form-item" data-table="Acc_PublicAreaHealth">
+        <div class="lr-form-item-title">奖扣分原因<font face="宋体">*</font></div>
+        <textarea id="Reason" class="form-control" isvalid="yes" checkexpession="NotNull"  style="height:150px;"></textarea>
+    </div>
+</div>
+@Html.AppendJsFile("/Areas/LogisticsManagement/Views/Acc_PublicAreaHealth/Form.js")

Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LogisticsManagement/Views/Acc_PublicAreaHealth/Form.js

@@ -0,0 +1,107 @@
+/* * 版 本 Learun-ADMS-Ultimate V7.0.0 数字化智慧校园(http://www.learun.cn) 
+ * Copyright (c) 2013-2018 北京泉江科技有限公司 
+ * 创建人：超级管理员
+ * 日  期：2020-08-11 16:55
+ * 描  述：公共区域卫生管理
+ */
+var acceptClick;
+var keyValue = request('keyValue');
+var bootstrap = function ($, learun) {
+    "use strict";
+    var selectedRow = learun.frameTab.currentIframe().selectedRow;
+    var page = {
+        init: function () {
+            $('.lr-form-wrap').lrscroll();
+            page.bind();
+            page.initData();
+        },
+        bind: function () {
+            $('#DeptNo').lrselect({
+                allowSearch: true,
+                value: "deptno",
+                text: "deptname",
+                url: top.$.rootUrl + '/LR_SystemModule/DataSource/GetDataTable?code=CdDeptInfo',
+                select: function (item) {
+                    if (item) {
+                        $('#MajorNo').lrselectRefresh({
+                            allowSearch: true,
+                            url: top.$.rootUrl + '/LR_SystemModule/DataSource/GetDataTable?code=CdMajorInfo',
+                            param: { strWhere: "DeptNo='" + item.deptno + "' AND CheckMark=1" }
+                        });
+                    } else {
+                        $('#MajorNo').lrselectRefresh({
+                            allowSearch: true,
+                            url: top.$.rootUrl + '/LR_SystemModule/DataSource/GetDataTable?code=CdMajorInfo',
+                            param: { strWhere: "1=1 AND CheckMark=1" }
+                        });
+                    }
+
+                }
+            });
+            $('#MajorNo').lrselect({
+                allowSearch: true,
+                url: top.$.rootUrl + '/LR_SystemModule/DataSource/GetDataTable?code=CdMajorInfo',
+                value: "majorno",
+                text: "majorname",
+                param: { strWhere: "1=1 AND CheckMark=1" },
+                select: function (item) {
+                    if (item) {
+                        $('#ClassNo').lrselectRefresh({
+                            allowSearch: true,
+                            url: top.$.rootUrl + '/LR_SystemModule/DataSource/GetDataTable?code=bjsj',
+                            param: { strWhere: "majorno='" + item.majorno + "' AND CheckMark=1" }
+                        });
+                    } else {
+                        $('#ClassNo').lrselectRefresh({
+                            allowSearch: true,
+                            url: top.$.rootUrl + '/LR_SystemModule/DataSource/GetDataTable?code=bjsj',
+                            param: { strWhere: "1=1 AND CheckMark=1" }
+                        });
+                    }
+                }
+            });
+            $('#ClassNo').lrselect({
+                allowSearch: true,
+                url: top.$.rootUrl + '/LR_SystemModule/DataSource/GetDataTable?code=bjsj',
+                param: { strWhere: "1=1 AND CheckMark=1" },
+                value: "classno",
+                text: "classname"
+            });
+            $('#StuNo').lrDataSourceSelect({ code: 'StuInfoBasic', value: 'stuno', text: 'stuname'});
+
+        },
+        initData: function () {
+            if (!!keyValue) {
+                $.lrSetForm(top.$.rootUrl + '/LogisticsManagement/Acc_PublicAreaHealth/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]);
+                        }
+                    }
+                });
+            }
+            if (!!selectedRow) {
+                $('#form').lrSetFormData(selectedRow);
+            }
+        }
+    };
+    // 保存数据
+    acceptClick = function (callBack) {
+        if (!$('body').lrValidform()) {
+            return false;
+        }
+        var postData = {
+            strEntity: JSON.stringify($('body').lrGetFormData())
+        };
+        $.lrSaveForm(top.$.rootUrl + '/LogisticsManagement/Acc_PublicAreaHealth/SaveForm?keyValue=' + keyValue, postData, function (res) {
+            // 保存成功后才回调
+            if (!!callBack) {
+                callBack();
+            }
+        });
+    };
+    page.init();
+}

Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LogisticsManagement/Views/Acc_PublicAreaHealth/Index.cshtml

@@ -0,0 +1,54 @@
+@{
+    ViewBag.Title = "公共区域卫生管理";
+    Layout = "~/Views/Shared/_Index.cshtml";
+}
+<div class="lr-layout ">
+    <div class="lr-layout-center">
+        <div class="lr-layout-wrap lr-layout-wrap-notitle ">
+            <div class="lr-layout-tool">
+                <div class="lr-layout-tool-left">
+                    <div class="lr-layout-tool-item">
+                        <div id="datesearch"></div>
+                    </div>
+                    <div class="lr-layout-tool-item">
+                        <div id="multiple_condition_query">
+                            <div class="lr-query-formcontent">
+                                <div class="col-xs-12 lr-form-item">
+                                    <div class="lr-form-item-title">专业部</div>
+                                    <div id="DeptNo"></div>
+                                </div>
+                                <div class="col-xs-12 lr-form-item">
+                                    <div class="lr-form-item-title">专业</div>
+                                    <div id="MajorNo"></div>
+                                </div>
+                                <div class="col-xs-12 lr-form-item">
+                                    <div class="lr-form-item-title">班级</div>
+                                    <div id="ClassNo"></div>
+                                </div>
+                                <div class="col-xs-12 lr-form-item">
+                                    <div class="lr-form-item-title">学生姓名</div>
+                                    <input id="StuName" type="text" class="form-control" />
+                                </div>
+                            </div>
+                        </div>
+                    </div>
+                </div>
+                <div class="lr-layout-tool-right">
+                    <div class=" btn-group btn-group-sm">
+                        <a id="lr_refresh" class="btn btn-default"><i class="fa fa-refresh"></i></a>
+                    </div>
+                    <div 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 class=" btn-group btn-group-sm" learun-authorize="yes">
+                        <a id="lr_addQuickly" class="btn btn-default"><i class="fa fa-plus"></i>&nbsp;快速新增</a>
+                    </div>
+                </div>
+            </div>
+            <div class="lr-layout-body" id="gridtable"></div>
+        </div>
+    </div>
+</div>
+@Html.AppendJsFile("/Areas/LogisticsManagement/Views/Acc_PublicAreaHealth/Index.js")

Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LogisticsManagement/Views/Acc_PublicAreaHealth/Index.js

@@ -0,0 +1,247 @@
+/* * 版 本 Learun-ADMS-Ultimate V7.0.0 数字化智慧校园(http://www.learun.cn) 
+ * Copyright (c) 2013-2018 北京泉江科技有限公司 
+ * 创建人：超级管理员
+ * 日  期：2020-08-11 16:55
+ * 描  述：公共区域卫生管理
+ */
+var selectedRow;
+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);
+            }, 220, 400);
+            // 时间搜索框
+            $('#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();
+            });
+            $('#DeptNo').lrselect({
+                allowSearch: true,
+                value: "deptno",
+                text: "deptname",
+                url: top.$.rootUrl + '/LR_SystemModule/DataSource/GetDataTable?code=CdDeptInfo',
+                select: function (item) {
+                    if (item) {
+                        $('#MajorNo').lrselectRefresh({
+                            allowSearch: true,
+                            url: top.$.rootUrl + '/LR_SystemModule/DataSource/GetDataTable?code=CdMajorInfo',
+                            param: { strWhere: "DeptNo='" + item.deptno + "' AND CheckMark=1" }
+                        });
+                    } else {
+                        $('#MajorNo').lrselectRefresh({
+                            allowSearch: true,
+                            url: top.$.rootUrl + '/LR_SystemModule/DataSource/GetDataTable?code=CdMajorInfo',
+                            param: { strWhere: "1=1 AND CheckMark=1" }
+                        });
+                    }
+
+                }
+            });
+            $('#MajorNo').lrselect({
+                allowSearch: true,
+                url: top.$.rootUrl + '/LR_SystemModule/DataSource/GetDataTable?code=CdMajorInfo',
+                value: "majorno",
+                text: "majorname",
+                param: { strWhere: "1=1 AND CheckMark=1" },
+                select: function (item) {
+                    if (item) {
+                        $('#ClassNo').lrselectRefresh({
+                            allowSearch: true,
+                            url: top.$.rootUrl + '/LR_SystemModule/DataSource/GetDataTable?code=bjsj',
+                            param: { strWhere: "majorno='" + item.majorno + "' AND CheckMark=1" }
+                        });
+                    } else {
+                        $('#ClassNo').lrselectRefresh({
+                            allowSearch: true,
+                            url: top.$.rootUrl + '/LR_SystemModule/DataSource/GetDataTable?code=bjsj',
+                            param: { strWhere: "1=1 AND CheckMark=1" }
+                        });
+                    }
+                }
+            });
+            $('#ClassNo').lrselect({
+                allowSearch: true,
+                url: top.$.rootUrl + '/LR_SystemModule/DataSource/GetDataTable?code=bjsj',
+                param: { strWhere: "1=1 AND CheckMark=1" },
+                value: "classno",
+                text: "classname"
+            });
+
+            // 新增
+            $('#lr_add').on('click', function () {
+                selectedRow = null;
+                learun.layerForm({
+                    id: 'form',
+                    title: '新增',
+                    url: top.$.rootUrl + '/LogisticsManagement/Acc_PublicAreaHealth/Form',
+                    width: 800,
+                    height: 600,
+                    callBack: function (id) {
+                        return top[id].acceptClick(refreshGirdData);
+                    }
+                });
+            });
+            // 编辑
+            $('#lr_edit').on('click', function () {
+                selectedRow = null;
+                var keyValue = $('#gridtable').jfGridValue('Id');
+                if (learun.checkrow(keyValue)) {
+                    learun.layerForm({
+                        id: 'form',
+                        title: '编辑',
+                        url: top.$.rootUrl + '/LogisticsManagement/Acc_PublicAreaHealth/Form?keyValue=' + keyValue,
+                        width: 800,
+                        height: 600,
+                        callBack: function (id) {
+                            return top[id].acceptClick(refreshGirdData);
+                        }
+                    });
+                }
+            });
+            // 删除
+            $('#lr_delete').on('click', function () {
+                var keyValue = $('#gridtable').jfGridValue('Id');
+                if (learun.checkrow(keyValue)) {
+                    learun.layerConfirm('是否确认删除该项！', function (res) {
+                        if (res) {
+                            learun.deleteForm(top.$.rootUrl + '/LogisticsManagement/Acc_PublicAreaHealth/DeleteForm', { keyValue: keyValue }, function () {
+                                refreshGirdData();
+                            });
+                        }
+                    });
+                }
+            });
+
+            // 快速新增
+            $('#lr_addQuickly').on('click', function () {
+                var keyValue = $('#gridtable').jfGridValue('Id');
+                if (learun.checkrow(keyValue)) {
+                    selectedRow = $('#gridtable').jfGridGet('rowdata');
+                    //console.log(selectedRow);
+                    learun.layerForm({
+                        id: 'form',
+                        title: '快速新增',
+                        url: top.$.rootUrl + '/LogisticsManagement/Acc_PublicAreaHealth/Form',
+                        width: 800,
+                        height: 600,
+                        callBack: function (id) {
+                            return top[id].acceptClick(refreshGirdData);
+                        }
+                    });
+                }
+            });
+        },
+        // 初始化列表
+        initGird: function () {
+            $('#gridtable').jfGrid({
+                url: top.$.rootUrl + '/LogisticsManagement/Acc_PublicAreaHealth/GetPageList',
+                headData: [
+                    {
+                        label: "专业部", name: "DeptNo", width: 100, align: "left",
+                        formatterAsync: function (callback, value, row, op, $cell) {
+                            learun.clientdata.getAsync('custmerData', {
+                                url: '/LR_SystemModule/DataSource/GetDataTable?code=' + 'CdDeptInfo',
+                                key: value,
+                                keyId: 'deptno',
+                                callback: function (_data) {
+                                    callback(_data['deptname']);
+                                }
+                            });
+                        }
+                    },
+                    {
+                        label: "专业", name: "MajorNo", width: 100, align: "left",
+                        formatterAsync: function (callback, value, row, op, $cell) {
+                            learun.clientdata.getAsync('custmerData', {
+                                url: '/LR_SystemModule/DataSource/GetDataTable?code=' + 'CdMajorInfo',
+                                key: value,
+                                keyId: 'majorno',
+                                callback: function (_data) {
+                                    callback(_data['majorname']);
+                                }
+                            });
+                        }
+                    },
+                    {
+                        label: "班级", name: "ClassNo", width: 100, align: "left",
+                        formatterAsync: function (callback, value, row, op, $cell) {
+                            learun.clientdata.getAsync('custmerData', {
+                                url: '/LR_SystemModule/DataSource/GetDataTable?code=' + 'bjsj',
+                                key: value,
+                                keyId: 'classno',
+                                callback: function (_data) {
+                                    callback(_data['classname']);
+                                }
+                            });
+                        }
+                    },
+                    {
+                        label: "学生姓名", name: "StuNo", width: 100, align: "left",
+                        formatterAsync: function (callback, value, row, op, $cell) {
+                            learun.clientdata.getAsync('custmerData', {
+                                url: '/LR_SystemModule/DataSource/GetDataTable?code=' + 'StuInfoBasic',
+                                key: value,
+                                keyId: 'stuno',
+                                callback: function (_data) {
+                                    callback(_data['stuname']);
+                                }
+                            });
+                        }
+                    },
+                    { label: "日期", name: "Date", width: 130, align: "left" },
+                    { label: "奖分", name: "AddScore", width: 100, align: "left" },
+                    { label: "扣分", name: "MinusScore", width: 100, align: "left" },
+                    { label: "奖扣分原因", name: "Reason", width: 200, align: "left" },
+                ],
+                mainId: 'Id',
+                isPage: true
+            });
+            page.search();
+        },
+        search: function (param) {
+            param = param || {};
+            param.StartTime = startTime;
+            param.EndTime = endTime;
+            $('#gridtable').jfGridSet('reload', { queryJson: JSON.stringify(param) });
+        }
+    };
+    refreshGirdData = function () {
+        page.search();
+    };
+    page.init();
+}

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

@@ -381,6 +381,7 @@
     <Compile Include="Areas\EducationalAdministration\Controllers\TeachPlanController.cs" />
     <Compile Include="Areas\EducationalAdministration\Controllers\TeachSwitchController.cs" />
     <Compile Include="Areas\EducationalAdministration\EducationalAdministrationAreaRegistration.cs" />
+    <Compile Include="Areas\LogisticsManagement\Controllers\Acc_PublicAreaHealthController.cs" />
     <Compile Include="Areas\LogisticsManagement\Controllers\Acc_StuDayRoutineController.cs" />
     <Compile Include="Areas\LogisticsManagement\Controllers\APAppointmentPsychologistController.cs" />
     <Compile Include="Areas\LogisticsManagement\Controllers\CompanyNewsController.cs" />
@@ -1481,6 +1482,8 @@
     <Content Include="Areas\LogisticsManagement\Views\Accommodation\IndexBed.js" />
     <Content Include="Areas\LogisticsManagement\Views\Accommodation\IndexClassify.js" />
     <Content Include="Areas\LogisticsManagement\Views\Accommodation\IndexDistribution.js" />
+    <Content Include="Areas\LogisticsManagement\Views\Acc_PublicAreaHealth\Form.js" />
+    <Content Include="Areas\LogisticsManagement\Views\Acc_PublicAreaHealth\Index.js" />
     <Content Include="Areas\LogisticsManagement\Views\Acc_StuDayRoutine\Form.js" />
     <Content Include="Areas\LogisticsManagement\Views\Acc_StuDayRoutine\Index.js" />
     <Content Include="Areas\LogisticsManagement\Views\ADR_Record\AttendanceReportByWeek.js" />
@@ -7866,6 +7869,8 @@
     <Content Include="Areas\LogisticsManagement\Views\Accommodation\FormMainClass.cshtml" />
     <Content Include="Areas\LogisticsManagement\Views\Acc_StuDayRoutine\Form.cshtml" />
     <Content Include="Areas\LogisticsManagement\Views\Acc_StuDayRoutine\Index.cshtml" />
+    <Content Include="Areas\LogisticsManagement\Views\Acc_PublicAreaHealth\Form.cshtml" />
+    <Content Include="Areas\LogisticsManagement\Views\Acc_PublicAreaHealth\Index.cshtml" />
     <None Include="Properties\PublishProfiles\CustomProfile.pubxml" />
     <None Include="Properties\PublishProfiles\FolderProfile.pubxml" />
     <Content Include="Views\Login\Default-beifen.cshtml" />

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

@@ -126,6 +126,7 @@
     <Compile Include="EvaluationTeach\Eval_QuestionItemsMap.cs" />
     <Compile Include="EvaluationTeach\Eval_QuestionMap.cs" />
     <Compile Include="EvaluationTeach\Eval_QuestionResultMap.cs" />
+    <Compile Include="LogisticsManagement\Acc_PublicAreaHealthMap.cs" />
     <Compile Include="LogisticsManagement\Acc_StuDayRoutineMap.cs" />
     <Compile Include="LogisticsManagement\ProjectDataManageMap.cs" />
     <Compile Include="LogisticsManagement\ProjectPhaseManageMap.cs" />

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

@@ -0,0 +1,29 @@
+using Learun.Application.TwoDevelopment.LogisticsManagement;
+using System.Data.Entity.ModelConfiguration;
+
+namespace  Learun.Application.Mapping
+{
+    /// <summary>
+    /// 版 本 Learun-ADMS-Ultimate V7.0.0 数字化智慧校园 
+    /// Copyright (c) 2013-2018 北京泉江科技有限公司 
+    /// 创 建：超级管理员
+    /// 日 期：2020-08-11 16:55
+    /// 描 述：公共区域卫生管理
+    /// </summary>
+    public class Acc_PublicAreaHealthMap : EntityTypeConfiguration<Acc_PublicAreaHealthEntity>
+    {
+        public Acc_PublicAreaHealthMap()
+        {
+            #region  表、主键
+            //表
+            this.ToTable("ACC_PUBLICAREAHEALTH");
+            //主键
+            this.HasKey(t => t.Id);
+            #endregion
+
+            #region  配置关系
+            #endregion
+        }
+    }
+}
+

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

@@ -369,6 +369,10 @@
     <Compile Include="Feixing\SysDictDetailApiViewModel.cs" />
     <Compile Include="Feixing\SystemInfoViewModel.cs" />
     <Compile Include="Feixing\UserModel.cs" />
+    <Compile Include="LogisticsManagement\Acc_PublicAreaHealth\Acc_PublicAreaHealthBLL.cs" />
+    <Compile Include="LogisticsManagement\Acc_PublicAreaHealth\Acc_PublicAreaHealthEntity.cs" />
+    <Compile Include="LogisticsManagement\Acc_PublicAreaHealth\Acc_PublicAreaHealthIBLL.cs" />
+    <Compile Include="LogisticsManagement\Acc_PublicAreaHealth\Acc_PublicAreaHealthService.cs" />
     <Compile Include="LogisticsManagement\Acc_StuDayRoutine\Acc_StuDayRoutineBLL.cs" />
     <Compile Include="LogisticsManagement\Acc_StuDayRoutine\Acc_StuDayRoutineEntity.cs" />
     <Compile Include="LogisticsManagement\Acc_StuDayRoutine\Acc_StuDayRoutineIBLL.cs" />

Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/LogisticsManagement/Acc_PublicAreaHealth/Acc_PublicAreaHealthBLL.cs

@@ -0,0 +1,124 @@
+using Learun.Util;
+using System;
+using System.Data;
+using System.Collections.Generic;
+
+namespace Learun.Application.TwoDevelopment.LogisticsManagement
+{
+    /// <summary>
+    /// 版 本 Learun-ADMS-Ultimate V7.0.0 数字化智慧校园 
+    /// Copyright (c) 2013-2018 北京泉江科技有限公司 
+    /// 创 建：超级管理员
+    /// 日 期：2020-08-11 16:55
+    /// 描 述：公共区域卫生管理
+    /// </summary>
+    public class Acc_PublicAreaHealthBLL : Acc_PublicAreaHealthIBLL
+    {
+        private Acc_PublicAreaHealthService acc_PublicAreaHealthService = new Acc_PublicAreaHealthService();
+
+        #region  获取数据
+
+        /// <summary>
+        /// 获取页面显示列表数据
+        /// <summary>
+        /// <param name="queryJson">查询参数</param>
+        /// <returns></returns>
+        public IEnumerable<Acc_PublicAreaHealthEntity> GetPageList(Pagination pagination, string queryJson)
+        {
+            try
+            {
+                return acc_PublicAreaHealthService.GetPageList(pagination, queryJson);
+            }
+            catch (Exception ex)
+            {
+                if (ex is ExceptionEx)
+                {
+                    throw;
+                }
+                else
+                {
+                    throw ExceptionEx.ThrowBusinessException(ex);
+                }
+            }
+        }
+
+        /// <summary>
+        /// 获取Acc_PublicAreaHealth表实体数据
+        /// <param name="keyValue">主键</param>
+        /// <summary>
+        /// <returns></returns>
+        public Acc_PublicAreaHealthEntity GetAcc_PublicAreaHealthEntity(string keyValue)
+        {
+            try
+            {
+                return acc_PublicAreaHealthService.GetAcc_PublicAreaHealthEntity(keyValue);
+            }
+            catch (Exception ex)
+            {
+                if (ex is ExceptionEx)
+                {
+                    throw;
+                }
+                else
+                {
+                    throw ExceptionEx.ThrowBusinessException(ex);
+                }
+            }
+        }
+
+        #endregion
+
+        #region  提交数据
+
+        /// <summary>
+        /// 删除实体数据
+        /// <param name="keyValue">主键</param>
+        /// <summary>
+        /// <returns></returns>
+        public void DeleteEntity(string keyValue)
+        {
+            try
+            {
+                acc_PublicAreaHealthService.DeleteEntity(keyValue);
+            }
+            catch (Exception ex)
+            {
+                if (ex is ExceptionEx)
+                {
+                    throw;
+                }
+                else
+                {
+                    throw ExceptionEx.ThrowBusinessException(ex);
+                }
+            }
+        }
+
+        /// <summary>
+        /// 保存实体数据（新增、修改）
+        /// <param name="keyValue">主键</param>
+        /// <summary>
+        /// <returns></returns>
+        public void SaveEntity(string keyValue, Acc_PublicAreaHealthEntity entity)
+        {
+            try
+            {
+                acc_PublicAreaHealthService.SaveEntity(keyValue, entity);
+            }
+            catch (Exception ex)
+            {
+                if (ex is ExceptionEx)
+                {
+                    throw;
+                }
+                else
+                {
+                    throw ExceptionEx.ThrowBusinessException(ex);
+                }
+            }
+        }
+
+        #endregion
+
+    }
+}

Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/LogisticsManagement/Acc_PublicAreaHealth/Acc_PublicAreaHealthEntity.cs

@@ -0,0 +1,111 @@
+using Learun.Util;
+using System;
+using System.ComponentModel.DataAnnotations.Schema;
+
+namespace Learun.Application.TwoDevelopment.LogisticsManagement
+{
+    /// <summary>
+    /// 版 本 Learun-ADMS-Ultimate V7.0.0 数字化智慧校园 
+    /// Copyright (c) 2013-2018 北京泉江科技有限公司 
+    /// 创 建：超级管理员
+    /// 日 期：2020-08-11 16:55
+    /// 描 述：公共区域卫生管理
+    /// </summary>
+    public class Acc_PublicAreaHealthEntity
+    {
+        #region  实体成员
+        /// <summary>
+        /// 编号
+        /// </summary>
+        [Column("ID")]
+        public string Id { get; set; }
+        /// <summary>
+        /// 系
+        /// </summary>
+        [Column("DEPTNO")]
+        public string DeptNo { get; set; }
+        /// <summary>
+        /// 专业
+        /// </summary>
+        [Column("MAJORNO")]
+        public string MajorNo { get; set; }
+        /// <summary>
+        /// 班级
+        /// </summary>
+        [Column("CLASSNO")]
+        public string ClassNo { get; set; }
+        /// <summary>
+        /// 学号
+        /// </summary>
+        [Column("STUNO")]
+        public string StuNo { get; set; }
+        /// <summary>
+        /// 日期
+        /// </summary>
+        [Column("DATE")]
+        public DateTime? Date { get; set; }
+        /// <summary>
+        /// 奖分
+        /// </summary>
+        [Column("ADDSCORE")]
+        public decimal? AddScore { get; set; }
+        /// <summary>
+        /// 扣分
+        /// </summary>
+        [Column("MINUSSCORE")]
+        public decimal? MinusScore { get; set; }
+        /// <summary>
+        /// 奖扣分原因
+        /// </summary>
+        [Column("REASON")]
+        public string Reason { get; set; }
+        /// <summary>
+        /// 创建人
+        /// </summary>
+        [Column("CREATEUSERID")]
+        public string CreateUserId { get; set; }
+        /// <summary>
+        /// 创建时间
+        /// </summary>
+        [Column("CREATETIME")]
+        public DateTime? CreateTime { get; set; }
+        /// <summary>
+        /// 编辑人
+        /// </summary>
+        [Column("MODIFYUSERID")]
+        public string ModifyUserId { get; set; }
+        /// <summary>
+        /// 编辑时间
+        /// </summary>
+        [Column("MODIFYTIME")]
+        public DateTime? ModifyTime { get; set; }
+        #endregion
+
+        #region  扩展操作
+        /// <summary>
+        /// 新增调用
+        /// </summary>
+        public void Create()
+        {
+            this.Id = Guid.NewGuid().ToString();
+            this.CreateTime = DateTime.Now;
+            UserInfo userInfo = LoginUserInfo.Get();
+            this.CreateUserId = userInfo.userId;
+        }
+        /// <summary>
+        /// 编辑调用
+        /// </summary>
+        /// <param name="keyValue"></param>
+        public void Modify(string keyValue)
+        {
+            this.Id = keyValue;
+            this.ModifyTime = DateTime.Now;
+            UserInfo userInfo = LoginUserInfo.Get();
+            this.ModifyUserId = userInfo.userId;
+        }
+        #endregion
+        #region  扩展字段
+        #endregion
+    }
+}
+

Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/LogisticsManagement/Acc_PublicAreaHealth/Acc_PublicAreaHealthIBLL.cs

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

Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/LogisticsManagement/Acc_PublicAreaHealth/Acc_PublicAreaHealthService.cs

@@ -0,0 +1,168 @@
+using Dapper;
+using Learun.DataBase.Repository;
+using Learun.Util;
+using System;
+using System.Collections.Generic;
+using System.Data;
+using System.Text;
+
+namespace Learun.Application.TwoDevelopment.LogisticsManagement
+{
+    /// <summary>
+    /// 版 本 Learun-ADMS-Ultimate V7.0.0 数字化智慧校园 
+    /// Copyright (c) 2013-2018 北京泉江科技有限公司 
+    /// 创 建：超级管理员
+    /// 日 期：2020-08-11 16:55
+    /// 描 述：公共区域卫生管理
+    /// </summary>
+    public class Acc_PublicAreaHealthService : RepositoryFactory
+    {
+        #region  获取数据
+
+        /// <summary>
+        /// 获取页面显示列表数据
+        /// <summary>
+        /// <param name="queryJson">查询参数</param>
+        /// <returns></returns>
+        public IEnumerable<Acc_PublicAreaHealthEntity> GetPageList(Pagination pagination, string queryJson)
+        {
+            try
+            {
+                var strSql = new StringBuilder();
+                strSql.Append("SELECT t.* ");
+                strSql.Append("  FROM Acc_PublicAreaHealth t ");
+                strSql.Append(" left join StuInfoBasic s on t.StuNo=s.StuNo ");
+                strSql.Append("  WHERE 1=1 ");
+                var queryParam = queryJson.ToJObject();
+                // 虚拟参数
+                var dp = new DynamicParameters(new { });
+                if (!queryParam["StartTime"].IsEmpty() && !queryParam["EndTime"].IsEmpty())
+                {
+                    dp.Add("startTime", queryParam["StartTime"].ToDate(), DbType.DateTime);
+                    dp.Add("endTime", queryParam["EndTime"].ToDate(), DbType.DateTime);
+                    strSql.Append(" AND ( t.Date >= @startTime AND t.Date <= @endTime ) ");
+                }
+                if (!queryParam["DeptNo"].IsEmpty())
+                {
+                    dp.Add("DeptNo", queryParam["DeptNo"].ToString(), DbType.String);
+                    strSql.Append(" AND t.DeptNo = @DeptNo ");
+                }
+                if (!queryParam["MajorNo"].IsEmpty())
+                {
+                    dp.Add("MajorNo", queryParam["MajorNo"].ToString(), DbType.String);
+                    strSql.Append(" AND t.MajorNo = @MajorNo ");
+                }
+                if (!queryParam["ClassNo"].IsEmpty())
+                {
+                    dp.Add("ClassNo", queryParam["ClassNo"].ToString(), DbType.String);
+                    strSql.Append(" AND t.ClassNo = @ClassNo ");
+                }
+                if (!queryParam["StuName"].IsEmpty())
+                {
+                    dp.Add("StuName", "%"+queryParam["StuName"].ToString()+"%", DbType.String);
+                    strSql.Append(" AND s.StuName like @StuName ");
+                }
+                return this.BaseRepository("CollegeMIS").FindList<Acc_PublicAreaHealthEntity>(strSql.ToString(),dp, pagination);
+            }
+            catch (Exception ex)
+            {
+                if (ex is ExceptionEx)
+                {
+                    throw;
+                }
+                else
+                {
+                    throw ExceptionEx.ThrowServiceException(ex);
+                }
+            }
+        }
+
+        /// <summary>
+        /// 获取Acc_PublicAreaHealth表实体数据
+        /// <param name="keyValue">主键</param>
+        /// <summary>
+        /// <returns></returns>
+        public Acc_PublicAreaHealthEntity GetAcc_PublicAreaHealthEntity(string keyValue)
+        {
+            try
+            {
+                return this.BaseRepository("CollegeMIS").FindEntity<Acc_PublicAreaHealthEntity>(keyValue);
+            }
+            catch (Exception ex)
+            {
+                if (ex is ExceptionEx)
+                {
+                    throw;
+                }
+                else
+                {
+                    throw ExceptionEx.ThrowServiceException(ex);
+                }
+            }
+        }
+
+        #endregion
+
+        #region  提交数据
+
+        /// <summary>
+        /// 删除实体数据
+        /// <param name="keyValue">主键</param>
+        /// <summary>
+        /// <returns></returns>
+        public void DeleteEntity(string keyValue)
+        {
+            try
+            {
+                this.BaseRepository("CollegeMIS").Delete<Acc_PublicAreaHealthEntity>(t=>t.Id == keyValue);
+            }
+            catch (Exception ex)
+            {
+                if (ex is ExceptionEx)
+                {
+                    throw;
+                }
+                else
+                {
+                    throw ExceptionEx.ThrowServiceException(ex);
+                }
+            }
+        }
+
+        /// <summary>
+        /// 保存实体数据（新增、修改）
+        /// <param name="keyValue">主键</param>
+        /// <summary>
+        /// <returns></returns>
+        public void SaveEntity(string keyValue, Acc_PublicAreaHealthEntity entity)
+        {
+            try
+            {
+                if (!string.IsNullOrEmpty(keyValue))
+                {
+                    entity.Modify(keyValue);
+                    this.BaseRepository("CollegeMIS").Update(entity);
+                }
+                else
+                {
+                    entity.Create();
+                    this.BaseRepository("CollegeMIS").Insert(entity);
+                }
+            }
+            catch (Exception ex)
+            {
+                if (ex is ExceptionEx)
+                {
+                    throw;
+                }
+                else
+                {
+                    throw ExceptionEx.ThrowServiceException(ex);
+                }
+            }
+        }
+
+        #endregion
+
+    }
+}