学校新闻 校园风光管理

移动端学校基本信息介绍功能开发

Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Controllers/SchoolNewsController.cs

@@ -0,0 +1,119 @@
+using Learun.Util;
+using System.Data;
+using Learun.Application.TwoDevelopment.EducationalAdministration;
+using System.Web.Mvc;
+using System.Collections.Generic;
+
+namespace Learun.Application.Web.Areas.EducationalAdministration.Controllers
+{
+    /// <summary>
+    /// 版 本 Learun-ADMS V7.0.6 力软敏捷开发框架
+    /// Copyright (c) 2013-2020 力软信息技术（苏州）有限公司
+    /// 创 建：超级管理员
+    /// 日 期：2021-05-21 11:05
+    /// 描 述：校园新闻
+    /// </summary>
+    public class SchoolNewsController : MvcControllerBase
+    {
+        private SchoolNewsIBLL schoolNewsIBLL = new SchoolNewsBLL();
+
+        #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="pagination">分页参数</param>
+        /// <param name="queryJson">查询参数</param>
+        /// <returns></returns>
+        [HttpGet]
+        [AjaxOnly]
+        public ActionResult GetPageList(string pagination, string queryJson)
+        {
+            Pagination paginationobj = pagination.ToObject<Pagination>();
+            var data = schoolNewsIBLL.GetPageList(paginationobj, queryJson);
+            var jsonData = new
+            {
+                rows = data,
+                total = paginationobj.total,
+                page = paginationobj.page,
+                records = paginationobj.records
+            };
+            return Success(jsonData);
+        }
+        /// <summary>
+        /// 获取表单数据
+        /// </summary>
+        /// <param name="keyValue">主键</param>
+        /// <returns></returns>
+        [HttpGet]
+        [AjaxOnly]
+        public ActionResult GetFormData(string keyValue)
+        {
+            var LR_OA_SchoolNewsData = schoolNewsIBLL.GetLR_OA_SchoolNewsEntity( keyValue );
+            LR_OA_SchoolNewsData.F_NewsContent = WebHelper.HtmlDecode(LR_OA_SchoolNewsData.F_NewsContent);
+            var jsonData = new {
+                LR_OA_SchoolNews = LR_OA_SchoolNewsData,
+            };
+            return Success(jsonData);
+        }
+        #endregion
+
+        #region 提交数据
+
+        /// <summary>
+        /// 删除实体数据
+        /// </summary>
+        /// <param name="keyValue">主键</param>
+        /// <returns></returns>
+        [HttpPost]
+        [AjaxOnly]
+        public ActionResult DeleteForm(string keyValue)
+        {
+            schoolNewsIBLL.DeleteEntity(keyValue);
+            return Success("删除成功！");
+        }
+        /// <summary>
+        /// 保存实体数据（新增、修改）
+        /// </summary>
+        /// <param name="keyValue">主键</param>
+        /// <param name="strEntity">实体</param>
+        /// <returns></returns>
+        [HttpPost]
+        [ValidateAntiForgeryToken]
+        [AjaxOnly]
+        [ValidateInput(false)]
+        public ActionResult SaveForm(string keyValue,  LR_OA_SchoolNewsEntity entity)
+        {
+            entity.F_NewsContent = WebHelper.HtmlEncode(entity.F_NewsContent);
+            schoolNewsIBLL.SaveEntity(keyValue,entity);
+            if (string.IsNullOrEmpty(keyValue))
+            {
+            }
+            return Success("保存成功！");
+        }
+        #endregion
+
+    }
+}

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

@@ -0,0 +1,52 @@
+@{
+    ViewBag.Title = "校园新闻";
+    Layout = "~/Views/Shared/_Form.cshtml";
+}
+<div class="lr-form-wrap" id="form">
+    <div class="col-xs-12 lr-form-item"  data-table="LR_OA_SchoolNews" >
+        <div class="lr-form-item-title">标题<font face="宋体">*</font></div>
+        <input id="F_FullHead" type="text" class="form-control" isvalid="yes" checkexpession="NotNull" />
+    </div>
+    <div class="col-xs-6 lr-form-item" data-table="LR_OA_SchoolNews">
+        <div class="lr-form-item-title">类别<font face="宋体">*</font></div>
+        <div id="F_CategoryId" isvalid="yes" checkexpession="NotNull"></div>
+        <input type="hidden" id="F_Category" />
+    </div>
+    <div class="col-xs-6 lr-form-item"  data-table="LR_OA_SchoolNews" >
+        <div class="lr-form-item-title">发布时间<font face="宋体">*</font></div>
+        <input id="F_ReleaseTime" type="text" class="form-control lr-input-wdatepicker" onfocus="WdatePicker({ dateFmt:'yyyy-MM-dd HH:mm',onpicked: function () { $('#F_ReleaseTime').trigger('change'); } })"  isvalid="yes" checkexpession="NotNull" />
+    </div>
+    <div class="col-xs-6 lr-form-item"  data-table="LR_OA_SchoolNews" >
+        <div class="lr-form-item-title">信息来源<font face="宋体">*</font></div>
+        <input id="F_SourceName" type="text" class="form-control" isvalid="yes" checkexpession="NotNull" />
+    </div>
+    <div class="col-xs-6 lr-form-item"  data-table="LR_OA_SchoolNews" >
+        <div class="lr-form-item-title">来源地址</div>
+        <input id="F_SourceAddress" type="text" class="form-control"  />
+    </div>
+    <div class="col-xs-6 lr-form-item"  data-table="LR_OA_SchoolNews" >
+        <div class="lr-form-item-title">接收部门</div>
+        <div id="F_SendDeptId"  ></div>
+    </div>
+    <div class="col-xs-6 lr-form-item"  data-table="LR_OA_SchoolNews" >
+        <div class="lr-form-item-title">接收岗位</div>
+        <div id="F_SendPostId"></div>
+    </div>
+    <div class="col-xs-12 lr-form-item"  data-table="LR_OA_SchoolNews" >
+        <div class="checkbox">
+            <label>
+                <input id="F_EnabledMark" type="checkbox" checked="checked" />
+                启用
+            </label>
+        </div>
+    </div>
+    <div class="col-xs-12 lr-form-item"  data-table="LR_OA_SchoolNews" >
+        <div class="lr-form-item-title">标题图片</div>
+        <div id="F_NewsImage"  ></div>
+    </div>
+    <div class="col-xs-12 lr-form-item"  data-table="LR_OA_SchoolNews" >
+        <div class="lr-form-item-title">内容</div>
+        <div id="editor" style="height:300px;"></div>
+    </div>
+</div>
+@Html.AppendJsFile("/Areas/EducationalAdministration/Views/SchoolNews/Form.js")

Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/SchoolNews/Form.js

@@ -0,0 +1,72 @@
+/*
+ * 版 本 Learun-ADMS-Ultimate V7.0.0 数字化智慧校园(http://www.learun.cn) 
+ * Copyright (c) 2013-2018 北京泉江科技有限公司 
+ * 创建人：陈彬彬
+ * 日 期：2017.11.11
+ * 描 述：公告通知
+ */
+var acceptClick;
+var keyValue = request('keyValue');
+var bootstrap = function ($, learun) {
+    "use strict";
+    var ue;
+    var page = {
+        init: function () {
+            page.bind();
+            page.initData();
+        },
+        bind: function () {
+            //公告类别
+            $('#F_CategoryId').lrDataItemSelect({
+                code: 'MessageType', maxHeight: 230, select: function (item) {
+                    if (item != null && item != undefined) {
+                        $("#F_Category").val(item.text);
+                    }
+                }
+            });
+            $('#F_NewsImage').lrUploader();
+            $('#F_SendDeptId').lrDepartmentSelect({ type: 'treemultiple' });
+            $('#F_SendPostId').lrPostSelect({ type: 'treemultiple' });
+            //内容编辑器
+            ue = UE.getEditor('editor');
+        },
+        initData: function () {
+            if (!!keyValue) {
+                $.lrSetForm(top.$.rootUrl + '/EducationalAdministration/SchoolNews/GetFormData?keyValue=' + keyValue, function (data) {
+                    var data = data.LR_OA_SchoolNews;
+                    $('#form').lrSetFormData(data);
+                    setTimeout(function () {
+                        ue.setContent(data.F_NewsContent);
+                    }, 100);
+                });
+            }
+        }
+    };
+    acceptClick = function (callBack) {
+        if (!$('#form').lrValidform()) {
+            return false;
+        }
+        learun.clientdata.getAsync('dataItem', {
+            key: $("#F_CategoryId").lrselectGet(),
+            code: 'MessageType',
+            callback: function (_data) {
+                $("#F_Category").val(_data.text);
+
+                var postData = $('#form').lrGetFormData(keyValue);
+                postData["F_NewsContent"] = ue.getContent(null, null, true);
+                $.lrSaveForm(top.$.rootUrl + '/EducationalAdministration/SchoolNews/SaveForm?keyValue=' + keyValue, postData, function (res) {
+                    // 保存成功后才回调
+                    if (!!callBack) {
+                        callBack();
+                    }
+                });
+            }
+        });
+
+
+    }
+
+    page.init();
+}
+
+

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

@@ -0,0 +1,42 @@
+@{
+    ViewBag.Title = "校园新闻";
+    Layout = "~/Views/Shared/_Index.cshtml";
+}
+<div class="lr-layout">
+    <div class="lr-layout-center">
+        <div class="lr-layout-wrap lr-layout-wrap-notitle">
+            <div class="lr-layout-tool">
+                <div class="lr-layout-tool-left">
+                    <div class="lr-layout-tool-item">
+                        <div id="multiple_condition_query">
+                            <div class="lr-query-formcontent">
+                                <div class="col-xs-12 lr-form-item">
+                                    <div class="lr-form-item-title">标题</div>
+                                    <input id="F_FullHead" type="text" class="form-control" />
+                                </div>
+                                <div class="col-xs-12 lr-form-item">
+                                    <div class="lr-form-item-title">类别</div>
+                                    <div id="F_CategoryId"></div>
+                                </div>
+                            </div>
+                        </div>
+                    </div>
+                </div>
+                <div class="lr-layout-tool-right">
+                    <div class="btn-group btn-group-sm">
+                        <a id="lr_refresh" class="btn btn-default"><i class="fa fa-refresh"></i></a>
+                    </div>
+                    <div class="btn-group btn-group-sm" learun-authorize="yes">
+                        <a id="lr_add" class="btn btn-default"><i class="fa fa-plus"></i>&nbsp;新增</a>
+                        <a id="lr_edit" class="btn btn-default"><i class="fa fa-pencil-square-o"></i>&nbsp;编辑</a>
+                        <a id="lr_delete" class="btn btn-default"><i class="fa fa-trash-o"></i>&nbsp;删除</a>
+                        <a id="lr_print" class="btn btn-default"><i class="fa fa-print"></i>&nbsp;打印</a>
+                    </div>
+                </div>
+            </div>
+            <div class="lr-layout-body" id="gridtable"></div>
+        </div>
+    </div>
+</div>
+@Html.AppendJsFile("/Areas/EducationalAdministration/Views/SchoolNews/Index.js")
+

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

@@ -0,0 +1,129 @@
+/*
+ * 版 本 Learun-ADMS-Ultimate V7.0.0 数字化智慧校园(http://www.learun.cn) 
+ * Copyright (c) 2013-2018 北京泉江科技有限公司 
+ * 创建人：陈彬彬
+ * 日 期：2017.07.11
+ * 描 述：公告通知	
+ */
+var refreshGirdData; // 更新数据
+var bootstrap = function ($, learun) {
+    "use strict";
+    var processId = '';
+    var page = {
+        init: function () {
+            page.initGrid();
+            page.bind();
+        },
+        bind: function () {
+            $('#multiple_condition_query').lrMultipleQuery(function (queryJson) {
+                page.search(queryJson);
+            }, 220, 400);
+            //公告类别
+            $('#F_CategoryId').lrDataItemSelect({
+                code: 'MessageType'
+            });
+            // 刷新
+            $('#lr_refresh').on('click', function () {
+                location.reload();
+            });
+            // 新增
+            $('#lr_add').on('click', function () {
+                learun.layerForm({
+                    id: 'form',
+                    title: '新增',
+                    url: top.$.rootUrl + '/EducationalAdministration/SchoolNews/Form',
+                    width: 1200,
+                    height: 750,
+                    callBack: function (id) {
+                        return top[id].acceptClick(refreshGirdData);
+                    }
+                });
+            });
+            // 编辑
+            $('#lr_edit').on('click', function () {
+                var keyValue = $('#gridtable').jfGridValue('F_NewsId');
+                if (learun.checkrow(keyValue)) {
+                    learun.layerForm({
+                        id: 'form',
+                        title: '编辑',
+                        url: top.$.rootUrl + '/EducationalAdministration/SchoolNews/Form?keyValue=' + keyValue,
+                        width: 1200,
+                        height: 750,
+                        callBack: function (id) {
+                            return top[id].acceptClick(refreshGirdData);
+                        }
+                    });
+                }
+            });
+            // 删除
+            $('#lr_delete').on('click', function () {
+                var keyValue = $('#gridtable').jfGridValue('F_NewsId');
+                if (learun.checkrow(keyValue)) {
+                    learun.layerConfirm('是否确认删除该项！', function (res) {
+                        if (res) {
+                            learun.deleteForm(top.$.rootUrl + '/EducationalAdministration/SchoolNews/DeleteForm', { keyValue: keyValue }, function () {
+                                refreshGirdData();
+                            });
+                        }
+                    });
+                }
+            });
+            // 打印
+            $('#lr_print').on('click', function () {
+                $('#gridtable').jqprintTable();
+            });
+        },
+        initGrid: function () {
+            $('#gridtable').jfGrid({
+                url: top.$.rootUrl + '/EducationalAdministration/SchoolNews/GetPageList',
+                headData: [
+                    { label: '标题', name: 'F_FullHead', index: 'F_FullHead', width: 600, align: 'left' },
+                    { label: '发布人员', name: 'F_CreateUserName', index: 'F_CreateUserName', width: 100, align: 'left' },
+                    { label: '类别', name: 'F_Category', index: 'F_Category', width: 100, align: 'center' },
+                    {
+                        label: "发布时间", name: "F_ReleaseTime", index: "F_ReleaseTime", width: 140, align: "center",
+                        formatter: function (cellvalue) {
+                            return learun.formatDate(cellvalue, 'yyyy-MM-dd hh:mm');
+                        }
+                    },
+                    { label: '信息来源', name: 'F_SourceName', index: 'F_SourceName', width: 100, align: 'center' },
+                    {
+                        label: "有效", name: "F_EnabledMark", width: 50, align: "center",
+                        formatter: function (cellvalue) {
+                            return cellvalue == 1 ? "<i class=\"fa fa-toggle-on\"></i>" : "<i class=\"fa fa-toggle-off\"></i>";
+                        }
+                    },
+                    { label: "创建时间", name: "F_CreateDate", index: "F_CreateDate", width: 130, align: "center" }
+                ],
+                mainId: 'F_NewsId',
+                reloadSelected: true,
+                isMultiselect: true,
+                isPage: true,
+                sidx: 'F_CreateDate',
+                sord: 'desc'
+            });
+            page.search();
+        },
+        search: function (param) {
+            param = param || {};
+            $('#gridtable').jfGridSet('reload', { queryJson: JSON.stringify(param) });
+        }
+    };
+    // 保存数据后回调刷新
+    refreshGirdData = function (res, postData) {
+        if (res && res.code && res.code == 200) {
+            var postData = {
+                schemeCode: 'OA_News',// 填写流程对应模板编号 
+                processId: processId,
+                level: '1',
+            };
+            learun.httpAsync('Post', top.$.rootUrl + '/LR_NewWorkFlow/NWFProcess/CreateFlow', postData, function (data) {
+                learun.loading(false);
+            });
+        }
+        page.search();
+    }
+    page.init();
+}
+
+

Learun.Framework.Ultimate V7/Learun.Application.Web/Content/phone/css/menu.css

@@ -0,0 +1,35 @@
+.menu {
+	display: flex;
+	align-items: center;
+	justify-content: center;
+	background: #FFFFFF;
+	position: relative;
+}
+
+.menu>a:first-child {
+	width: 10px;
+	position: absolute;
+	left: 15px;
+	display: block;
+	line-height: 0;
+}
+.menu>div:first-child {
+	width: 10px;
+	position: absolute;
+	left: 15px;
+	display: block;
+	line-height: 0;
+}
+.menu>div:first-child>img{
+	width: 100%;
+}
+.menu>a:first-child>img{
+	width: 100%;
+}
+
+.menu>div:last-child {
+	font-weight: 400;
+	color: #414141;
+	font-size: 16px;
+	font-family: Microsoft YaHei;
+}

Learun.Framework.Ultimate V7/Learun.Application.Web/Content/phone/css/split.css

@@ -0,0 +1,4 @@
+.split {
+	height: 7px;
+	background-color: #EFF2F3;
+}

Learun.Framework.Ultimate V7/Learun.Application.Web/Content/phone/css/survey.css

@@ -0,0 +1,196 @@
+* {
+	padding: 0;
+	margin: 0;
+	box-sizing: border-box;
+}
+html,body{
+	height: 100%;
+}
+.surveyCon{
+	display: flex;
+	flex-direction: column;
+	justify-content: center;
+}
+.title_search,.menu,.split{
+	flex-grow: 0;
+	flex-shrink: 0;
+}
+.menuTab {
+	width: 100%;
+	padding-left: 25px;
+	display: flex;
+	justify-content: space-around;
+	align-items: center;
+}
+
+.menuTab div.active {
+	color: #0064D6;
+}
+
+.survey {
+	flex-grow: 1;
+	padding: 20px 2.6%;
+	overflow: auto;
+}
+
+.surveyBox {
+	display: none;
+	/* padding: 10px; */
+}
+
+.surveyBox:first-child {
+	display: block;
+}
+
+.surveyT {
+	padding: 0 25px;
+	line-height: 0;
+	text-align: center;
+}
+
+.surveyT img {
+	width: 100%;
+}
+.surveyT1 img {
+	width: 70%;
+}
+.surveyLine {
+	line-height: 0;
+	text-align: center;
+	margin: 10px 0 15px;
+}
+
+.surveyLine img {
+	width: 61%;
+}
+
+.surveyList div {
+	position: relative;
+	color: #5E5E5E;
+	font-size: 13px;
+	line-height: 24px;
+	margin: 10px 10px;
+	text-indent: 15px;
+}
+
+.surveyList div::after {
+	content: '';
+	position: absolute;
+	left: 0;
+	top: 9px;
+	width: 6px;
+	height: 6px;
+	background-color: #DC9722;
+	border-radius: 50%;
+}
+
+.surveyTxt {
+	color: #5E5E5E;
+	font-size: 13px;
+	line-height: 24px;
+	margin: 10px 0;
+	text-indent: 15px;
+}
+
+.history {
+	position: relative;
+}
+
+.history:after {
+	content: '';
+	width: 2px;
+	background-color: #D7D7D7;
+	/* height: 100%; */
+	position: absolute;
+	left: 0;
+	right: 0;
+	top: 0;
+	bottom: -35px;
+	margin: auto;
+}
+
+.year {
+	position: relative;
+	z-index: 3;
+	width: 60px;
+	height: 60px;
+	margin: 30px auto 20px;
+	border-radius: 50%;
+	background-color: #0064D6;
+	text-align: center;
+	line-height: 60px;
+	font-size: 18px;
+	color: #fff;
+}
+
+.year:after {
+	position: absolute;
+	left: -6px;
+	top: -6px;
+	content: '';
+	width: 70px;
+	height: 70px;
+	border: 1px solid #0064D6;
+	border-radius: 50%;
+}
+.month{
+	position: relative;
+	z-index: 3;
+	margin-top: 20px;
+}
+.monthTxt{
+	color: #5E5E5E;
+	font-size: 13px;
+	line-height: 24px;
+	margin-top: 8px;
+}
+.monthTime{
+	font-size: 15px;
+	line-height: 26px;
+	color: #0064D6;
+	font-weight: bold;
+}
+.month.right{
+	padding-left: 54%;
+}
+.month.left{
+	padding-right: 54%;
+}
+.month.left > .monthTime{
+	text-align: right;
+}
+
+.line{
+	width: 10px;
+	height: 10px;
+	position: absolute;
+	left: 0;
+	right: 0;
+	top: 8px;
+	border-radius: 50%;
+	border:1px solid #0064D6;
+	margin: auto;
+}
+.line:before{
+	content: '';
+	width: 6px;
+	height: 6px;
+	position: absolute;
+	left: 0;
+	bottom: 0;
+	right: 0;
+	top: 0;
+	margin: auto;
+	border-radius: 50%;
+	background-color: #0064D6;
+}
+.monthText {
+	color: #5E5E5E;
+	font-size: 13px;
+	line-height: 24px;
+	margin: 10px 10px;
+	text-indent: 27px;
+}
+
+
+

Learun.Framework.Ultimate V7/Learun.Application.Web/Content/phone/css/title_search.css

@@ -0,0 +1,31 @@
+.title_search {
+	padding: 0 2.6%;
+	background: #0064D6;
+	display: flex;
+	align-items: center;
+	justify-content: space-between;
+}
+
+.title_search>div:first-child {
+	display: flex;
+	align-items: center;
+}
+
+.title_search>div:last-child {
+	position: relative;
+}
+
+#search {
+	border: none;
+	outline: none;
+	border-radius: 50px;
+	padding-left: 15px;
+	width: 38.8%;
+}
+
+#search_icon {
+	position: absolute;
+	top: 50%;
+	right: 0px;
+	transform: translate(0%, -50%);
+}

Learun.Framework.Ultimate V7/Learun.Application.Web/Content/phone/js/getSize.js

@@ -0,0 +1,2 @@
+var pageHeight = window.screen.height
+var pageWidth = window.screen.width

Learun.Framework.Ultimate V7/Learun.Application.Web/Content/phone/js/menu.js

@@ -0,0 +1,2 @@
+var menu = document.getElementsByClassName('menu')[0]
+menu.style.height = (pageHeight * 0.064) + 'px'

Learun.Framework.Ultimate V7/Learun.Application.Web/Content/phone/js/title_search.js

@@ -0,0 +1,7 @@
+var title_search = document.getElementsByClassName('title_search')[0]
+title_search.style.paddingTop = (pageHeight * 0.008) + 'px'
+title_search.style.paddingBottom = (pageHeight * 0.008) + 'px'
+search.style.height = (pageHeight * 0.0434) + 'px'
+search.style.width = (pageWidth * 0.388) + 'px'
+search_icon.style.width = (pageWidth * 0.0384) + 'px'
+search_icon.style.right = (pageWidth * 0.03) + 'px'

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

@@ -806,6 +806,7 @@
     <Compile Include="Areas\LR_Desktop\Controllers\SSO_Drag_CardSortManageController.cs" />
     <Compile Include="Areas\AssetManagementSystem\Controllers\AssStorageRoomController.cs" />
     <Compile Include="Areas\PersonnelManagement\Controllers\VisitorInfoController.cs" />
+    <Compile Include="Areas\EducationalAdministration\Controllers\SchoolNewsController.cs" />
   </ItemGroup>
   <ItemGroup>
     <Content Include="Areas\AdmissionsPlatform\Views\AP_OnlineUserInfo\DropOutIndex.js" />
@@ -965,6 +966,8 @@
     <Content Include="Areas\EducationalAdministration\Views\R_EnterSchool\Form.js" />
     <Content Include="Areas\EducationalAdministration\Views\R_EnterSchool\DeptReport.js" />
     <Content Include="Areas\EducationalAdministration\Views\R_EnterSchool\Index.js" />
+    <Content Include="Areas\EducationalAdministration\Views\SchoolNews\Form.js" />
+    <Content Include="Areas\EducationalAdministration\Views\SchoolNews\Index.js" />
     <Content Include="Areas\EducationalAdministration\Views\ScoreStatistics\Form.js" />
     <Content Include="Areas\EducationalAdministration\Views\ScoreStatistics\Index.js" />
     <Content Include="Areas\EducationalAdministration\Views\StuAttendanceLeave\IndexInStudent.js" />
@@ -3232,6 +3235,37 @@
     <Content Include="Content\paper\dist\local\zh-TW.js" />
     <Content Include="Content\paper\easing.js" />
     <Content Include="Content\paper\images\duigou.png" />
+    <Content Include="Content\phone\css\menu.css" />
+    <Content Include="Content\phone\css\split.css" />
+    <Content Include="Content\phone\css\survey.css" />
+    <Content Include="Content\phone\css\title_search.css" />
+    <Content Include="Content\phone\imgs\backBtn.png" />
+    <Content Include="Content\phone\imgs\backBtn_white.png" />
+    <Content Include="Content\phone\imgs\bg.png" />
+    <Content Include="Content\phone\imgs\list_1.png" />
+    <Content Include="Content\phone\imgs\list_2.png" />
+    <Content Include="Content\phone\imgs\list_3.png" />
+    <Content Include="Content\phone\imgs\list_4.png" />
+    <Content Include="Content\phone\imgs\list_botom.png" />
+    <Content Include="Content\phone\imgs\newStudentGui\process.png" />
+    <Content Include="Content\phone\imgs\newStudentGui\title.png" />
+    <Content Include="Content\phone\imgs\new_icon.png" />
+    <Content Include="Content\phone\imgs\proDsc\list_1.png" />
+    <Content Include="Content\phone\imgs\proDsc\list_2.png" />
+    <Content Include="Content\phone\imgs\proDsc\list_3.png" />
+    <Content Include="Content\phone\imgs\proDsc\list_4.png" />
+    <Content Include="Content\phone\imgs\proDsc\list_5.png" />
+    <Content Include="Content\phone\imgs\proDsc\list_6.png" />
+    <Content Include="Content\phone\imgs\schoolNews\list_main.png" />
+    <Content Include="Content\phone\imgs\search_icon.png" />
+    <Content Include="Content\phone\imgs\survey1.png" />
+    <Content Include="Content\phone\imgs\survey2.png" />
+    <Content Include="Content\phone\imgs\survey3.png" />
+    <Content Include="Content\phone\imgs\title.png" />
+    <Content Include="Content\phone\js\getSize.js" />
+    <Content Include="Content\phone\js\jquery.min.js" />
+    <Content Include="Content\phone\js\menu.js" />
+    <Content Include="Content\phone\js\title_search.js" />
     <Content Include="Content\qingju\128.png" />
     <Content Include="Content\signalr\jquery.signalR-2.2.2.js" />
     <Content Include="Content\signalr\jquery.signalR-2.2.2.min.js" />
@@ -3951,6 +3985,14 @@
     <Content Include="Content\webuploader\webuploader.withoutimage.min.js" />
     <Content Include="Areas\LR_WorkFlowModule\Views\WfScheme\Form.cshtml" />
     <Content Include="Areas\LR_WorkFlowModule\Views\WfScheme\HistoryForm.cshtml" />
+    <Content Include="PhonePage\index.html" />
+    <Content Include="PhonePage\newStudentGui.html" />
+    <Content Include="PhonePage\proDsc.html" />
+    <Content Include="PhonePage\schoolNewsDetails.html" />
+    <Content Include="PhonePage\schoolNewsList.html" />
+    <Content Include="PhonePage\schoolSceneryList.html" />
+    <Content Include="PhonePage\server.js" />
+    <Content Include="PhonePage\survey.html" />
     <Content Include="Resource\wav\收到新消息.wav" />
     <Content Include="Views\Home\AdminAccordion\Index.css" />
     <Content Include="Views\Home\AdminAccordion\Index.js" />
@@ -6381,6 +6423,7 @@
     <Content Include="Areas\PersonnelManagement\Views\VisitorInfo\Index.js" />
     <Content Include="Areas\PersonnelManagement\Views\VisitorInfo\Form.cshtml" />
     <Content Include="Areas\PersonnelManagement\Views\VisitorInfo\Form.js" />
+    <Content Include="Areas\EducationalAdministration\Views\SchoolNews\Form.cshtml" />
   </ItemGroup>
   <ItemGroup>
     <Folder Include="Areas\EducationalAdministration\Views\OpenLessonPlanOfElectivePre\" />
@@ -7189,6 +7232,7 @@
     <Content Include="Areas\LR_OAModule\Views\LostArticleInfo\FormView.cshtml" />
     <Content Include="Areas\LR_OAModule\Views\LostArticleInfo\Index.cshtml" />
     <Content Include="Areas\LR_OAModule\Views\LostArticleInfo\FormClaim.cshtml" />
+    <None Include="Areas\EducationalAdministration\Views\SchoolNews\Index.cshtml" />
     <None Include="Properties\PublishProfiles\FolderProfile.pubxml" />
     <Content Include="Views\Login\Default-beifen.cshtml" />
     <None Include="Properties\PublishProfiles\FolderProfile1.pubxml" />

Learun.Framework.Ultimate V7/Learun.Application.Web/PhonePage/index.html

@@ -0,0 +1,123 @@
+<!DOCTYPE html>
+<html>
+	<head>
+		<meta charset="utf-8">
+		<meta name="viewport"
+			content="width=device-width, initial-scale=1, minimum-scale=1, maximum-scale=1, user-scalable=no" />
+		<title>导航</title>
+		<style>
+			*{
+				margin: 0;
+				padding: 0;
+			}
+			.bg{
+				position: fixed;
+				width: 100%;
+				height: 100%;
+				left: 0;
+				top: 0;
+				z-index: -1;
+			}
+			.bg img{
+				width: 100%;
+				height: 100%;
+			}
+			.title{
+				width: 70%;
+				margin: 0 auto;
+				/* margin-top: 8%; */
+			}
+			.list{
+				padding: 0 2.6%;
+				
+				display: flex;
+				flex-wrap: wrap;
+				justify-content: space-between;
+				
+			}
+			.list>a{
+				width: 48.5%;
+				/* float: left; */
+				position: relative;
+				display: block;
+			}
+			.list>a>img{
+				height: 100%;
+			}
+			.list_main{
+				position: absolute;
+				font-weight: 400;
+				color: #FFFFFF;
+			    left: 24px; top: 21.59px; font-size: 16.8px;
+			}
+			.list_main span{
+				opacity: .6;
+			}
+			.list_main p {
+				opacity: .9;
+			}
+		</style>
+	</head>
+	<body>
+		<div class="bg">
+			<img src="../Content/phone/imgs/bg.png" alt="">
+		</div>
+		<div class="title">
+			<img src="../Content/phone/imgs/title.png" alt="" width="100%">
+		</div>
+		<div class="list">
+			<a style="margin-right: 3%;" class="list_child" href="/PhonePage/survey.html">
+				<img src="../Content/phone/imgs/list_1.png" alt="" width="100%">
+				<div class="list_main">
+					<p>学校概况</p>
+					<span>Go</span>
+				</div>
+			</a>
+			<a class="list_child" href="/PhonePage/proDsc.html">
+				<img src="../Content/phone/imgs/list_2.png" alt="" width="100%">
+				<div class="list_main">
+					<p>专业介绍</p>
+					<span>Go</span>
+				</div>
+			</a>
+			<a style="margin-right: 3%;" class="list_child" href="/PhonePage/schoolNewsList.html">
+				<img src="../Content/phone/imgs/list_3.png" alt="" width="100%">
+				<div class="list_main" style="color: #313131;">
+					<p >学校新闻</p>
+					<span>Go</span>
+				</div>
+			</a>
+			<a class="list_child" href="/PhonePage/schoolSceneryList.html">
+				<img src="../Content/phone/imgs/list_4.png" alt="" width="100%">
+				<div class="list_main">
+					<p>校园风光</p>
+					<span>Go</span>
+				</div>
+			</a>
+            <a class="list_child" style="width: 100%;" href="/PhonePage/newStudentGui.html">
+                <img src="../Content/phone/imgs/list_botom.png" alt="" width="100%">
+                <div class="list_main">
+                    <p>新生指引</p>
+                    <span>Go</span>
+                </div>
+            </a>
+		</div>
+		<script type="text/javascript">
+			var pageHeight = window.screen.height
+			var pageWidth = window.screen.width
+			var title = document.getElementsByClassName('title')[0]
+			var lists = document.getElementsByClassName('list_child')
+			var list_main = document.getElementsByClassName('list_main')
+			for(var i=0;i<lists.length;i++){
+				lists[i].style.marginBottom = (pageHeight*0.02)+'px';
+			}
+			for(var i=0;i<list_main.length;i++){
+				list_main[i].style.left = (pageWidth*0.06)+'px';
+				list_main[i].style.top = (pageHeight*0.034)+'px';
+				list_main[i].style.fontSize = (pageWidth*0.042)+'px';
+			}
+			title.style.marginTop=(pageHeight*0.059)+'px';
+			title.style.marginBottom=(pageHeight*0.05)+'px';
+		</script>
+	</body>
+</html>

Learun.Framework.Ultimate V7/Learun.Application.Web/PhonePage/newStudentGui.html

@@ -0,0 +1,46 @@
+<!DOCTYPE html>
+<html>
+	<head>
+		<meta charset="utf-8">
+		<meta name="viewport"
+			content="width=device-width, initial-scale=1, minimum-scale=1, maximum-scale=1, user-scalable=no" />
+		<title>新生指引</title>
+		<link rel="stylesheet" type="text/css" href="../Content/phone/css/title_search.css"/>
+		<link rel="stylesheet" href="../Content/phone/css/menu.css">
+		<link rel="stylesheet" href="../Content/phone/css/split.css">
+		<style>
+			*{
+				padding: 0;
+				margin: 0;
+			}
+		</style>
+	</head>
+	<body>
+		<div class="title_search">
+			<div style="width: 46.4%;">
+				<img src="../Content/phone/imgs/newStudentGui/title.png" alt="" width="100%">
+			</div>
+			<!--<div>
+				<input type="text" id="search"placeholder="课程搜索..." />
+				<img src="../Content/phone/imgs/search_icon.png" alt="" id="search_icon">
+			</div>-->
+		</div>
+		<div class="menu">
+			<a href="index.html">
+				<img src="../Content/phone/imgs/backBtn.png" alt="" width="100%" >
+			</a>
+			<div>新生指引</div>
+		</div>
+		<div class="split"></div>
+		<div>
+			<img src="../Content/phone/imgs/newStudentGui/process.png" alt="" width="100%">
+		</div>
+		<div style="height: 10px;"></div>
+		<script src="../Content/phone/js/getSize.js"></script>
+		<script src="../Content/phone/js/title_search.js"></script>
+		<script src="../Content/phone/js/menu.js"></script>
+		<script type="text/javascript">
+			menu.style.height = (pageHeight * 0.056) + 'px'
+		</script>
+	</body>
+</html>

Learun.Framework.Ultimate V7/Learun.Application.Web/PhonePage/proDsc.html

@@ -0,0 +1,191 @@
+<!DOCTYPE html>
+<html>
+<head>
+    <meta charset="utf-8">
+    <meta name="viewport"
+          content="width=device-width, initial-scale=1, minimum-scale=1, maximum-scale=1, user-scalable=no" />
+    <link rel="stylesheet" href="../Content/phone/css/title_search.css">
+    <link rel="stylesheet" type="text/css" href="../Content/phone/css/menu.css" />
+    <link rel="stylesheet" href="../Content/phone/css/split.css">
+    <title>专业介绍</title>
+    <style>
+        * {
+            margin: 0;
+            padding: 0;
+        }
+
+        .list {
+            padding: 0 2.6%;
+            display: flex;
+            justify-content: space-between;
+            flex-wrap: wrap;
+        }
+
+        .list_child {
+            width: 47%;
+            border: solid 1px #E7EDEF;
+            text-align: center;
+            /* position: relative; */
+            display: block;
+            text-decoration: none;
+        }
+
+            .list_child img {
+                width: 100%;
+            }
+
+            .list_child > div {
+                /* margin: 12px 0; */
+                color: #414141;
+                font-size: 13px;
+                position: relative;
+            }
+
+        .list_names {
+            text-align: left;
+            padding: 0 10px;
+            font-size: 13px;
+            line-height: 20px;
+            color: #414141;
+        }
+
+        .img_names {
+            position: absolute;
+            top: 0;
+            width: 126px;
+            color: #FFFFFF !important;
+            font-size: 18px !important;
+            font-weight: bold !important;
+            left: 50%;
+            top: 50%;
+            transform: translate(-50%,-50%);
+        }
+    </style>
+</head>
+<body>
+    <div class="title_search">
+        <div style="width: 46.4%;">
+            <img src="../Content/phone/imgs/newStudentGui/title.png" alt="" width="100%">
+        </div>
+        <div>
+            <input type="text" id="search" placeholder="专业搜索..." />
+            <img src="../Content/phone/imgs/search_icon.png" alt="" id="search_icon">
+        </div>
+    </div>
+    <div class="menu">
+        <div onclick="go('index.html')">
+            <img src="../Content/phone/imgs/backBtn.png" alt="" width="100%">
+        </div>
+        <div>专业介绍</div>
+    </div>
+    <div class="split"></div>
+    <div class="list" id="list">
+
+        <!--<a class="list_child" href="schoolNewsDetails.html">
+            <div>
+                <img src="../Content/phone/imgs/proDsc/list_2.png" alt="">
+                <div class="img_names">建筑装饰技术</div>
+            </div>
+            <div class="list_names">建筑装饰技术</div>
+        </a>
+        <a class="list_child" href="schoolNewsDetails.html">
+            <div>
+                <img src="../Content/phone/imgs/proDsc/list_3.png" alt="">
+                <div class="img_names">
+                    <div>人工智能</div>
+                    <div>技术与应用</div>
+                </div>
+            </div>
+            <div class="list_names">人工智能技术与应用</div>
+        </a>
+        <a class="list_child" href="schoolNewsDetails.html">
+            <div>
+                <img src="../Content/phone/imgs/proDsc/list_4.png" alt="">
+                <div class="img_names">数控技术应用</div>
+            </div>
+
+            <div class="list_names">数控技术应用</div>
+        </a>
+        <a class="list_child" href="schoolNewsDetails.html">
+            <div>
+                <img src="../Content/phone/imgs/proDsc/list_5.png" alt="">
+                <div class="img_names">学前教育</div>
+            </div>
+
+            <div class="list_names">学前教育</div>
+        </a>
+        <a class="list_child" href="schoolNewsDetails.html">
+            <div>
+                <img src="../Content/phone/imgs/proDsc/list_6.png" alt="">
+                <div class="img_names">建筑工程造价</div>
+            </div>
+
+            <div class="list_names">建筑工程造价</div>
+        </a>-->
+    </div>
+    <div style="height: 10px;"></div>
+    <script src="../Content/phone/js/jquery.min.js"></script>
+    <script src="../Content/phone/js/getSize.js" type="text/javascript" charset="utf-8"></script>
+    <script src="../Content/phone/js/title_search.js" type="text/javascript" charset="utf-8"></script>
+    <script src="../Content/phone/js/menu.js" type="text/javascript" charset="utf-8"></script>
+    <script src="server.js"></script>
+    <script type="text/javascript">
+        $(function () {
+            GetList("");
+        });
+        var lists = document.getElementsByClassName('list_child');
+        var names = document.getElementsByClassName('list_names');
+        for (var i = 0; i < lists.length; i++) {
+            lists[i].style.marginTop = (pageHeight * 0.017) + 'px';
+        }
+
+        for (var i = 0; i < names.length; i++) {
+            names[i].style.marginTop = (pageHeight * 0.009) + 'px';
+            names[i].style.marginBottom = (pageHeight * 0.017) + 'px';
+        }
+        function go(url) {
+            window.location.href = url;
+        }
+        //获取专业列表
+        function GetList(keyword) {
+            $.ajax({
+                url: serverurl + '/arrangelesson/getCdMajorList?keyword=' + keyword,
+                type: "GET",
+                dataType: "json",
+                async: true,
+                cache: false,
+                success: function (data) {
+                    var data = data.data;
+                    var photo = '../Content/phone/imgs/proDsc/list_5.png';
+                    if (data.Photo) {
+                        photo = data[i].Photo;
+                    }
+                    var html = '';
+                    for (var i = 0; i < data.length; i++) {
+                        html += '<a class="list_child" href="/PhonePage/schoolNewsDetails.html?Id=' + data[i].ID + '&type=3">';
+                        html += '<div>';
+                        html += '<img src="' + photo + '" alt="">';
+                        html += '<div class="img_names">' + data[i].MajorName + '</div>';
+                        html += '</div>';
+                        html += '<div class="list_names">' + data[i].MajorName + '</div>';
+                        html += '</a>';
+                    }
+                    $('#list').html(html);
+                },
+                error: function (XMLHttpRequest, textStatus, errorThrown) {
+
+                },
+                beforeSend: function () {
+                },
+                complete: function () {
+                }
+            });
+        }
+
+        //关键字搜索
+        $('#search_icon').on('click', function () {
+            GetList($('#search').val());
+        });
+    </script>
+</body>
+</html>

Learun.Framework.Ultimate V7/Learun.Application.Web/PhonePage/schoolNewsDetails.html

@@ -0,0 +1,117 @@
+<!DOCTYPE html>
+<html>
+<head>
+    <meta charset="utf-8">
+    <meta name="viewport"
+          content="width=device-width, initial-scale=1, minimum-scale=1, maximum-scale=1, user-scalable=no" />
+    <title>学校新闻</title>
+    <link rel="stylesheet" href="../Content/phone/css/menu.css">
+    <style>
+        * {
+            margin: 0;
+            padding: 0;
+        }
+
+        .menu {
+            background-color: #0064D6;
+        }
+
+        .main_title {
+            color: #282828;
+            font-size: 17px;
+            font-weight: bold;
+        }
+
+        .main_time {
+            color: #9A9A9A;
+            font-size: 12px;
+            text-align: right;
+        }
+
+        .main_content {
+            color: #5E5E5E;
+            font-size: 14px;
+        }
+
+        .main {
+            padding: 0px 20px;
+            margin: 30px 0 10px;
+        }
+    </style>
+</head>
+<body>
+    <div class="menu">
+        <a href="javascript:history.back();">
+            <img src="../Content/phone/imgs/backBtn_white.png" alt="" width="100%">
+        </a>
+        <div style="color: #FFFFFF;font-weight: bold;" id="title">学校新闻</div>
+    </div>
+    <div class="main">
+        <div class="main_title">
+            
+        </div>
+        <div class="main_time">
+            
+        </div>
+        <div class="main_content" style="margin-top: 10px;" id="main_content">
+            
+        </div>
+    </div>
+    <script src="../Content/phone/js/jquery.min.js"></script>
+    <script src="../Content/phone/js/getSize.js"></script>
+    <script src="../Content/phone/js/menu.js"></script>
+<script src="server.js"></script>
+
+<script type="text/javascript">
+    //type: 1学校新闻，2校园风光，3 专业介绍
+    var type = getQueryString('type');
+    var Id = getQueryString('Id');
+    $(function () {
+
+        GetDetails();
+    });
+    //获取详情
+    function GetDetails() {
+        console.log(type + "," + Id);
+        $.ajax({
+            url: serverurl + '/arrangelesson/GetSchoolNewsDetails?type=' + type + '&Id=' + Id,
+            type: "GET",
+            dataType: "json",
+            async: true,
+            cache: false,
+            success: function (data) {
+                var data = data.data;
+                var title = ""; 
+                if (type == '1') {
+                    title = '学校新闻';
+                } else if (type == '2') {
+                    title = '校园风光';
+                }
+                else if (type == '3') {
+                    title = '专业介绍';
+                }
+                $('#title').html(title);
+                $('.main_title').html(data.title);
+                $('.main_time').html(data.time);
+                //$('.main_content').innerHTML(data.desc);
+                document.getElementById('main_content').innerHTML = data.desc;
+            },
+            error: function (XMLHttpRequest, textStatus, errorThrown) {
+
+            },
+            beforeSend: function () {
+            },
+            complete: function () {
+            }
+        });
+    }
+
+    function getQueryString(name){
+        var reg = new RegExp("(^|&)"+ name +"=([^&]*)(&|$)");
+        var r = window.location.search.substr(1).match(reg);
+        if(r!=null)return  unescape(r[2]); return null;
+    }
+
+</script>
+</body>
+</html>

Learun.Framework.Ultimate V7/Learun.Application.Web/PhonePage/schoolNewsList.html

@@ -0,0 +1,165 @@
+<!DOCTYPE html>
+<html>
+<head>
+    <meta charset="utf-8">
+    <meta name="viewport"
+          content="width=device-width, initial-scale=1, minimum-scale=1, maximum-scale=1, user-scalable=no" />
+    <title>学校新闻</title>
+    <link rel="stylesheet" href="../Content/phone/css/title_search.css">
+    <link rel="stylesheet" href="../Content/phone/css/menu.css">
+    <link rel="stylesheet" href="../Content/phone/css/split.css">
+    <style>
+        * {
+            margin: 0;
+            padding: 0;
+        }
+
+        .total {
+            padding: 17px 2.6%;
+            font-size: 12px;
+            color: #AEAEAE;
+            border-bottom: 1px solid #F8F8F8;
+        }
+
+            .total span {
+                color: #0064D6;
+                font-size: 16px;
+                margin: 0 8px;
+            }
+
+        .list {
+            padding: 10px 2.6%;
+            color: #282828;
+            font-size: 14px;
+            border-bottom: 1px solid #F8F8F8;
+            display: block;
+            /* text-indent: none; */
+            text-decoration: none;
+        }
+
+            .list > div:first-child {
+                margin-bottom: 5px;
+                display: flex;
+                width: calc(100% - 10px);
+                align-items: center;
+            }
+
+                .list > div:first-child > div:first-child {
+                    margin-right: 10px;
+                    white-space: nowrap;
+                    text-overflow: ellipsis;
+                    overflow: hidden;
+                    word-break: break-all;
+                }
+
+                .list > div:first-child > div:last-child {
+                    display: flex;
+                    align-items: center;
+                    width: 60px;
+                }
+
+        .time {
+            color: #AEAEAE;
+            font-size: 12px;
+            text-align: right;
+        }
+
+        .newCss {
+            width: 30px;
+        }
+    </style>
+</head>
+<div class="title_search">
+    <div style="width: 46.4%;">
+        <img src="../Content/phone/imgs/newStudentGui/title.png" alt="" width="100%">
+    </div>
+    <div>
+        <input type="text" id="search" placeholder="新闻搜索..." />
+        <img src="../Content/phone/imgs/search_icon.png" alt="" id="search_icon">
+    </div>
+</div>
+<div class="menu">
+    <a href="index.html">
+        <img src="../Content/phone/imgs/backBtn.png" alt="" width="100%">
+    </a>
+    <div>学校新闻</div>
+</div>
+<div class="split"></div>
+<div class="total">
+    共有<span id="totalCount"></span>条新闻资讯
+</div>
+<div id="content">
+    <!--<a class="list" href="schoolNewsDetails.html">
+        <div>
+            <div>
+                学校召开专业建设规划研讨会学校召开专业建设规划研讨会学校召开专业建设规划研讨会
+            </div>
+            <div>
+                <img src="../Content/phone/imgs/new_icon.png" alt="" class="newCss">
+            </div>
+
+        </div>
+        <div class="time">2021-03-29</div>
+    </a>
+    <a class="list" href="schoolNewsDetails.html">
+        <div>
+            <div>
+                学校召开专业建设规划研讨会
+            </div>
+            <div>
+                <img src="../Content/phone/imgs/new_icon.png" alt="" class="newCss">
+            </div>
+        </div>
+        <div class="time">2021-03-29</div>
+    </a>-->
+</div>
+<script src="../Content/phone/js/jquery.min.js"></script>
+<script src="../Content/phone/js/getSize.js" type="text/javascript" charset="utf-8"></script>
+<script src="../Content/phone/js/menu.js" type="text/javascript" charset="utf-8"></script>
+<script src="../Content/phone/js/title_search.js" type="text/javascript" charset="utf-8"></script>
+<script src="server.js"></script>
+<script type="text/javascript">
+    $(function () {
+        GetNews();
+    });
+
+    //获取学校新闻
+    function GetNews() {
+        $.ajax({
+            url: serverurl + '/arrangelesson/GetSchoolNewList?categoryId=0',
+            type: "GET",
+            dataType: "json",
+            async: true,
+            cache: false,
+            success: function (data) {
+                var data = data.data;
+                $('#totalCount').html(data.length);
+                var html = '';
+                for (var i = 0; i < data.length; i++) {
+                    html += '<a class="list" href="schoolNewsDetails.html?type=1&Id=' + data[i].F_NewsId+'">';
+                    html += '<div>';
+                    html += '<div>' + data[i].F_FullHead +'</div>';
+                    //html += '<div>';
+                    //html += '<img src="../Content/phone/imgs/new_icon.png" alt="" class="newCss">';
+                    //html += '</div>';
+                    html += '</div>';
+                    html += '<div class="time">' + data[i].F_ReleaseTime + '</div>';
+                    html += '</a>';
+                }
+                
+                $('#content').html(html);
+
+            },
+            error: function (XMLHttpRequest, textStatus, errorThrown) {
+
+            },
+            beforeSend: function () {
+            },
+            complete: function () {
+            }
+        });
+    }
+</script>
+<body>
+</body>
+</html>

Learun.Framework.Ultimate V7/Learun.Application.Web/PhonePage/schoolSceneryList.html

@@ -0,0 +1,138 @@
+<!DOCTYPE html>
+<html>
+	<head>
+		<meta charset="utf-8">
+		<meta name="viewport"
+			content="width=device-width, initial-scale=1, minimum-scale=1, maximum-scale=1, user-scalable=no" />
+		<link rel="stylesheet" href="../Content/phone/css/title_search.css">
+		<link rel="stylesheet" type="text/css" href="../Content/phone/css/menu.css" />
+		<link rel="stylesheet" href="../Content/phone/css/split.css">
+		<title>校园风光</title>
+		<style>
+			* {
+				margin: 0;
+				padding: 0;
+			}
+			.list{
+				padding: 0 2.6%;
+				
+				display: flex;
+				justify-content: space-between;
+				flex-wrap: wrap;	
+			}
+			.list_child{
+				width: 47%;
+				border: solid 1px #E7EDEF;
+				text-align: center;
+				display: block;
+				text-decoration: none;
+			}
+			.list_child img{
+				width: 100%;
+			}
+			.list_child>div{
+				/* margin: 12px 0; */
+				color: #414141;
+				font-size: 13px;
+			}
+			
+		</style>
+	</head>
+	<body>
+		<div class="title_search">
+			<div style="width: 46.4%;">
+				<img src="../Content/phone/imgs/newStudentGui/title.png" alt="" width="100%">
+			</div>
+			<div>
+				<input type="text" id="search" placeholder="校园风光搜索..." />
+				<img src="../Content/phone/imgs/search_icon.png" alt="" id="search_icon">
+			</div>
+		</div>
+		<div class="menu">
+			<a href="index.html">
+				<img src="../Content/phone/imgs/backBtn.png" alt="" width="100%">
+			</a>
+			<div>校园风光</div>
+		</div>
+		<div class="split"></div>
+		<div class="list">
+			<!--<a class="list_child" href="schoolNewsDetails.html">
+				<img src="../Content/phone/imgs/schoolNews/list_main.png" alt="">
+				<div class="list_names">校园风光</div>
+			</a>
+			<a class="list_child" href="schoolNewsDetails.html">
+				<img src="../Content/phone/imgs/schoolNews/list_main.png" alt="">
+				<div class="list_names">校园风光</div>
+			</a>
+			<a class="list_child" href="schoolNewsDetails.html">
+				<img src="../Content/phone/imgs/schoolNews/list_main.png" alt="">
+				<div class="list_names">校园风光</div>
+			</a>
+			<a class="list_child" href="schoolNewsDetails.html">
+				<img src="../Content/phone/imgs/schoolNews/list_main.png" alt="">
+				<div class="list_names">校园风光</div>
+			</a>-->
+		</div>
+		<div style="height: 10px;"></div>
+	<script src="../Content/phone/js/jquery.min.js"></script>
+		<script src="../Content/phone/js/getSize.js" type="text/javascript" charset="utf-8"></script>
+		<script src="../Content/phone/js/title_search.js" type="text/javascript" charset="utf-8"></script>
+		<script src="../Content/phone/js/menu.js" type="text/javascript" charset="utf-8"></script>
+	<script src="server.js"></script>
+		<script type="text/javascript">
+		    var lists = document.getElementsByClassName('list_child');
+			var names = document.getElementsByClassName('list_names');
+			for(var i=0;i<lists.length;i++) {
+			    lists[i].style.marginTop = (pageHeight * 0.017) + 'px';
+			}
+			
+			for(var i=0;i<names.length;i++) {
+			    names[i].style.marginTop = (pageHeight * 0.009) + 'px';
+			    names[i].style.marginBottom = (pageHeight * 0.017) + 'px';
+			}
+
+			$(function () {
+			    GetNews();
+			});
+
+			//获取校园风光
+			function GetNews() {
+			    $.ajax({
+			        url: serverurl + '/arrangelesson/GetSchoolNewList?categoryId=1',
+			        type: "GET",
+			        dataType: "json",
+			        async: true,
+			        cache: false,
+			        success: function (data) {
+			            var data = data.data;
+			            var html = '';
+                        for (var i = 0; i < data.length; i++) {
+                            var  img = '../Content/phone/imgs/schoolNews/list_main.png';
+                            if (data[i].F_NewsImage) {
+                                var path = data[i].F_NewsImage;
+                                var index = path.lastIndexOf("Resource");
+                                path = path.substring(index, path.length);
+                                img = path;
+                            }
+                            html += '<a class="list_child" href="schoolNewsDetails.html?type=1&Id=' + data[i].F_NewsId + '">';
+                            //html += '<img src="' + img + '" alt="">';
+                            html += '<img src="../Resource/System/20210521/wu_1f66i72fpbmi11011j911pg51fbk7.png"  alt="">';
+                            html += '<div class="list_names">' + data[i].F_FullHead+'</div>';
+                            html += '</a>';
+			            }
+			            
+                        $('.list').html(html);
+
+			        },
+			        error: function (XMLHttpRequest, textStatus, errorThrown) {
+
+			        },
+			        beforeSend: function () {
+			        },
+			        complete: function () {
+			        }
+			    });
+			}
+		</script>
+	</body>
+</html>

Learun.Framework.Ultimate V7/Learun.Application.Web/PhonePage/server.js

@@ -0,0 +1 @@
+var serverurl ="http://localhost:31173";

Learun.Framework.Ultimate V7/Learun.Application.Web/PhonePage/survey.html

@@ -0,0 +1,160 @@
+<!DOCTYPE html>
+<html>
+<head>
+    <meta charset="utf-8">
+    <meta name="viewport"
+          content="width=device-width, initial-scale=1, minimum-scale=1, maximum-scale=1, user-scalable=no" />
+    <title>新生指引</title>
+    <link rel="stylesheet" type="text/css" href="../Content/phone/css/title_search.css" />
+    <link rel="stylesheet" href="../Content/phone/css/split.css">
+    <link rel="stylesheet" href="../Content/phone/css/menu.css">
+    <link rel="stylesheet" href="../Content/phone/css/survey.css">
+</head>
+<body class="surveyCon">
+    <div class="title_search">
+        <div style="width: 46.4%;">
+            <img src="../Content/phone/imgs/newStudentGui/title.png" alt="" width="100%">
+        </div>
+        <!--<div>
+            <input type="text" id="search" placeholder="课程搜索..." />
+            <img src="../Content/phone/imgs/search_icon.png" alt="" id="search_icon">
+        </div>-->
+    </div>
+    <div class="menu">
+        <a href="javascript:history.back();">
+            <img src="../Content/phone/imgs/backBtn.png" alt="" width="100%">
+        </a>
+        <div class="menuTab">
+            <div class="active">学校简介</div>
+            <div>历史沿革</div>
+            <div>学校荣誉</div>
+        </div>
+    </div>
+    <div class="split"></div>
+    <div class="survey">
+        <div class="surveyBox">
+            <!--学校简介-->
+            <div class="surveyT surveyT1">
+                <img src="../Content/phone/imgs/survey1.png" alt="">
+            </div>
+            <div class="surveyLine">
+                <img src="../Content/phone/imgs/survey2.png" alt="">
+            </div>
+            <div class="monthText" id="BriefIntroduction">
+                
+            </div>
+        </div>
+        <div class="surveyBox">
+            <!--历史沿革-->
+            <div class="surveyTxt">
+                建校半个多世纪以来，学校性质由技工改为中专，又由中专改为技工，继而进行半工半读教改实验，最后恢复中专性质。其间学校8易归属
+            </div>
+            <div class="history">
+                <div class="year">1993</div>
+                <!-- <div class="historyCard"></div> -->
+                <div class="month right">
+                    <span class="line"></span>
+                    <div class="monthTime">2月</div>
+                    <div class="monthTxt">学校名称：中华人民共和国重工业部建筑材料工业管理局琉璃河技工学校 办学性质：技工 隶属上级：重工业部建筑材料工业管理局</div>
+                    <div class="monthTxt">学校名称：中华人民共和国重工业部建筑材料工业管理局琉璃河技工学校 办学性质：技工 隶属上级：重工业部建筑材料工业管理局</div>
+                </div>
+                <div class="month left">
+                    <span class="line"></span>
+                    <div class="monthTime">3月</div>
+                    <div class="monthTxt">学校名称：中华人民共和国重工业部建筑材料工业管理局琉璃河技工学校 办学性质：技工 隶属上级：重工业部建筑材料工业管理局</div>
+                </div>
+                <div class="month right">
+                    <span class="line"></span>
+                    <div class="monthTime">4月</div>
+                    <div class="monthTxt">学校名称：中华人民共和国重工业部建筑材料工业管理局琉璃河技工学校 办学性质：技工 隶属上级：重工业部建筑材料工业管理局</div>
+                </div>
+                <div class="month left">
+                    <span class="line"></span>
+                    <div class="monthTime">5月</div>
+                    <div class="monthTxt">学校名称：中华人民共和国重工业部建筑材料工业管理局琉璃河技工学校 办学性质：技工 隶属上级：重工业部建筑材料工业管理局</div>
+                </div>
+            </div>
+            <div class="history">
+                <div class="year">1995</div>
+                <!-- <div class="historyCard"></div> -->
+                <div class="month right">
+                    <span class="line"></span>
+                    <div class="monthTime">2月</div>
+                    <div class="monthTxt">学校名称：中华人民共和国重工业部建筑材料工业管理局琉璃河技工学校 办学性质：技工 隶属上级：重工业部建筑材料工业管理局</div>
+                </div>
+                <div class="month left">
+                    <span class="line"></span>
+                    <div class="monthTime">3月</div>
+                    <div class="monthTxt">学校名称：中华人民共和国重工业部建筑材料工业管理局琉璃河技工学校 办学性质：技工 隶属上级：重工业部建筑材料工业管理局</div>
+                </div>
+                <div class="month right">
+                    <span class="line"></span>
+                    <div class="monthTime">4月</div>
+                    <div class="monthTxt">学校名称：中华人民共和国重工业部建筑材料工业管理局琉璃河技工学校 办学性质：技工 隶属上级：重工业部建筑材料工业管理局</div>
+                </div>
+                <div class="month left">
+                    <span class="line"></span>
+                    <div class="monthTime">5月</div>
+                    <div class="monthTxt">学校名称：中华人民共和国重工业部建筑材料工业管理局琉璃河技工学校 办学性质：技工 隶属上级：重工业部建筑材料工业管理局</div>
+                </div>
+            </div>
+        </div>
+        <div class="surveyBox">
+            <!--学校荣誉-->
+            <div class="surveyT">
+                <img src="../Content/phone/imgs/survey3.png" alt="">
+            </div>
+            <div class="surveyLine">
+                <img src="../Content/phone/imgs/survey2.png" alt="">
+            </div>
+            <div class="surveyList">
+                <div>1980年11月，学校被国家教育部命名为“全国重点中等专业学校1980年11月，学校被国家教育部命名为“全国重点中等专业学校</div>
+                <div>1980年11月，学校被国家教育部命名为“全国重点中等专业学校1980年11月，学校被国家教育部命名为“全国重点中等专业学校</div>
+                <div>1980年11月，学校被国家教育部命名为“全国重点中等专业学校1980年11月，学校被国家教育部命名为“全国重点中等专业学校</div>
+            </div>
+        </div>
+    </div>
+    <!-- <div style="height: 10px;"></div> -->
+    <script src="../Content/phone/js/jquery.min.js"></script>
+    <script src="../Content/phone/js/getSize.js"></script>
+    <script src="../Content/phone/js/title_search.js"></script>
+    <script src="../Content/phone/js/menu.js"></script>
+    <script src="server.js"></script>
+    <script type="text/javascript">
+        $(function () {
+            GetMonthText();
+        });
+        menu.style.height = (pageHeight * 0.056) + 'px';
+        $('.menuTab').on('click',
+            'div',
+            function () {
+                if ($(this).hasClass('active')) {
+                    return;
+                }
+                var ind = $(this).index();
+                $(this).addClass('active').siblings().removeClass('active');
+                $('.surveyBox').css('display', 'none').eq(ind).fadeIn();
+            });
+        //获取校区简介
+        function GetMonthText() {
+            $.ajax({
+                url: serverurl + '/arrangelesson/getBriefIntroductionById?companyId=' +'207fa1a9-160c-4943-a89b-8fa4db0547ce',
+                type: "GET",
+                dataType: "json",
+                async: true,
+                cache: false,
+                success: function (data) {
+                    $('#BriefIntroduction').html(data);
+                },
+                error: function (XMLHttpRequest, textStatus, errorThrown) {
+
+                },
+                beforeSend: function () {
+                },
+                complete: function () {
+                }
+            });
+        }
+    </script>
+</body>
+</html>

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

@@ -4,6 +4,7 @@ using System.Linq;
 using System.Web;
 using Learun.Application.Organization;
 using Learun.Application.TwoDevelopment.EducationalAdministration;
+using Learun.Util;
 using Nancy;
 
 namespace Learun.Application.WebApi.Modules
@@ -54,6 +55,16 @@ namespace Learun.Application.WebApi.Modules
             //按条件重置基础数据同步状态
             Get["/initbasicdata"] = InitBasicData;
 
+            //信息浏览
+            //校区简介
+            Get["/getBriefIntroductionById"] = GetBriefIntroductionById;
+            //学校新闻、校园风光
+            Get["/getSchoolNewList"] = GetSchoolNewList;
+            //专业列表
+            Get["/getCdMajorList"] = GetCdMajorList;
+            //新闻详情
+            Get["/getSchoolNewsDetails"] = GetSchoolNewsDetails;
+
         }
         private readonly ArrangeLessonTermIBLL arrangeLessonTermIBLL = new ArrangeLessonTermBLL();
         private readonly StuScoreIBLL stuScoreIBLL = new StuScoreBLL();
@@ -66,6 +77,8 @@ namespace Learun.Application.WebApi.Modules
         ClassInfoIBLL classInfoIbll = new ClassInfoBLL();
         UserIBLL userIbll = new UserBLL();
         private CompanyIBLL companyIbll = new CompanyBLL();
+        private SchoolNewsIBLL schoolNewsIBLL = new SchoolNewsBLL();
+        private CdMajorIBLL cdMajorIBLL = new CdMajorBLL();
 
         private StuSelectLessonListOfElectiveIBLL stuSelectLessonListOfElectiveIbll =
             new StuSelectLessonListOfElectiveBLL();
@@ -335,5 +348,110 @@ namespace Learun.Application.WebApi.Modules
             var result = allList.Select(x => new { x.BuKaoFlag, x.AcademicYearNo, x.Semester, x.StuId, x.StuName, x.LessonId, x.LessonName, x.ClassId, x.ClassName, x.EmpId, x.EmpName }).OrderBy(x => x.BuKaoFlag).ThenByDescending(x => x.AcademicYearNo).ThenByDescending(x => x.Semester).ThenBy(x => x.StuId);
             return Success(result);
         }
+
+
+        /// <summary>
+        /// 获取学校简介
+        /// </summary>
+        /// <param name="_"></param>
+        /// <returns></returns>
+        private Response GetBriefIntroductionById(dynamic _)
+        {
+            string companyId = Request.Query["companyId"];
+            if (string.IsNullOrEmpty(companyId))
+            {
+                return Fail("参数有误！");
+            }
+            var result = companyIbll.GetEntity(companyId);
+            if (result == null)
+                return Fail("找不到数据！");
+            else
+            {
+                return Success(result.F_BriefIntroduction);
+            }
+        }
+
+        /// <summary>
+        /// 获取学校新闻列表、校园风光列表
+        /// </summary>
+        /// <param name="_"></param>
+        /// <returns></returns>
+        public Response GetSchoolNewList(dynamic _)
+        {
+            string categoryId = Request.Query["categoryId"];
+            var result = schoolNewsIBLL.GetListByCategoryId(categoryId);
+            return Success(result);
+        }
+        /// <summary>
+        /// 获取专业列表
+        /// </summary>
+        /// <param name="_"></param>
+        /// <returns></returns>
+        public Response GetCdMajorList(dynamic _)
+        {
+            string keyword = Request.Query["keyword"];
+            var result = cdMajorIBLL.GetAllList(keyword);
+            return Success(result);
+        }
+        /// <summary>
+        /// 获取详情
+        /// </summary>
+        /// <param name="_"></param>
+        /// <returns></returns>
+        public Response GetSchoolNewsDetails(dynamic _)
+        {
+            string Id = Request.Query["Id"];
+            //type: 1学校新闻，2校园风光，3 专业介绍
+            string type = Request.Query["type"];
+
+            var title = "";
+            var time = "";
+            var desc = "";
+            switch (type)
+            {
+                case "1":
+                    {
+                        //学校新闻
+                        var result = schoolNewsIBLL.GetLR_OA_SchoolNewsEntity(Id);
+                        if (result != null)
+                        {
+                            title = result.F_FullHead;
+                            time = result.F_ReleaseTime.HasValue? result.F_ReleaseTime.Value.ToString("yyyy-MM-dd"):"";
+                            desc = result.F_NewsContent;
+                        }
+                        break;
+                    }
+                case "2":
+                    {
+                        //校园风光
+                        var result = schoolNewsIBLL.GetLR_OA_SchoolNewsEntity(Id);
+                        if (result != null)
+                        {
+                            title = result.F_FullHead;
+                            time = result.F_ReleaseTime.HasValue ? result.F_ReleaseTime.Value.ToString("yyyy-MM-dd") : "";
+                            desc = result.F_NewsContent;
+                        }
+                        break;
+                    }
+                case "3":
+                    {
+                        //专业介绍
+                        var result = cdMajorIBLL.GetCdMajorEntity(Id);
+                        if (result != null)
+                        {
+                            title = result.MajorName;
+                            time = "";
+                            desc = result.Introduce;
+                        }
+                        break;
+                    }
+
+            }
+
+            object obj = new { title = title, desc = WebHelper.HtmlDecode(desc) };
+            return Success(obj);
+        }
+
+
     }
 }

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

@@ -6,9 +6,9 @@
   <add name="CollegeMIS" connectionString="Server=123.57.209.16;Initial Catalog=CollegeMIS_西昌;User ID=sa;Password=bjqjkj@2014~2015!" providerName="System.Data.SqlClient" />-->
 
   <!--金隅-->
-  <add name="BaseDb" connectionString="Server=192.168.100.225;Initial Catalog=adms7ultimate2;User ID=sa;Password=Jykj@2019" providerName="System.Data.SqlClient" />
-  <add name="CollegeMIS" connectionString="Server=192.168.100.225;Initial Catalog=CollegeMIS;User ID=sa;Password=Jykj@2019" providerName="System.Data.SqlClient" />
-  <add name="hangfireString" connectionString="Server=192.168.100.225;Initial Catalog=Hangfire;User ID=sa;Password=Jykj@2019" providerName="System.Data.SqlClient" />
+  <add name="BaseDb" connectionString="Server=192.168.100.224;Initial Catalog=adms7ultimate2;User ID=sa;Password=Jykj@2019" providerName="System.Data.SqlClient" />
+  <add name="CollegeMIS" connectionString="Server=192.168.100.224;Initial Catalog=CollegeMIS;User ID=sa;Password=Jykj@2019" providerName="System.Data.SqlClient" />
+  <add name="hangfireString" connectionString="Server=192.168.100.224;Initial Catalog=Hangfire;User ID=sa;Password=Jykj@2019" providerName="System.Data.SqlClient" />
   <!--<add name="hangfireString" connectionString="Server=123.57.209.16;Initial Catalog=Hangfire;User ID=sa;Password=bjqjkj@2014~2015!" providerName="System.Data.SqlClient" />-->
   <!--demo.quanjiang.com-->
   <!--<add name="BaseDb" connectionString="Server=123.57.209.16;Initial Catalog=adms7ultimate2;User ID=sa;Password=bjqjkj@2014~2015!" providerName="System.Data.SqlClient" />

Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.Mapping/EducationalAdministration/LR_OA_SchoolNewsMap.cs

@@ -0,0 +1,29 @@
+using Learun.Application.TwoDevelopment.EducationalAdministration;
+using System.Data.Entity.ModelConfiguration;
+
+namespace  Learun.Application.Mapping
+{
+    /// <summary>
+    /// 版 本 Learun-ADMS V7.0.6 力软敏捷开发框架
+    /// Copyright (c) 2013-2020 力软信息技术（苏州）有限公司
+    /// 创 建：超级管理员
+    /// 日 期：2021-05-21 11:05
+    /// 描 述：校园新闻
+    /// </summary>
+    public class LR_OA_SchoolNewsMap : EntityTypeConfiguration<LR_OA_SchoolNewsEntity>
+    {
+        public LR_OA_SchoolNewsMap()
+        {
+            #region 表、主键
+            //表
+            this.ToTable("LR_OA_SCHOOLNEWS");
+            //主键
+            this.HasKey(t => t.F_NewsId);
+            #endregion
+
+            #region 配置关系
+            #endregion
+        }
+    }
+}
+

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

@@ -560,6 +560,7 @@
     <Compile Include="AssetManagementSystem\Ass_Storage_RoomMap.cs" />
     <Compile Include="PersonnelManagement\VisitorInfoMap.cs" />
     <Compile Include="LR_Desktop\LostArticleInfoMap.cs" />
+    <Compile Include="EducationalAdministration\LR_OA_SchoolNewsMap.cs" />
   </ItemGroup>
   <ItemGroup>
     <ProjectReference Include="..\..\..\Learun.Application.Organization\Learun.Application.Organization.csproj">

Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/CdMajor/CdMajorBLL.cs

@@ -59,6 +59,31 @@ namespace Learun.Application.TwoDevelopment.EducationalAdministration
                 }
             }
         }
+
+        /// <summary>
+        /// 获取专业所有数据
+        /// </summary>
+        /// <param name="keyword"></param>
+        /// <returns></returns>
+        public IEnumerable<CdMajorEntity> GetAllList(string keyword)
+        {
+            try
+            {
+                return cdMajorService.GetAllList(keyword);
+            }
+            catch (Exception ex)
+            {
+                if (ex is ExceptionEx)
+                {
+                    throw;
+                }
+                else
+                {
+                    throw ExceptionEx.ThrowBusinessException(ex);
+                }
+            }
+        }
+        
         public IEnumerable<CdMajorEntity> GetListByDeptNo(string DeptNo)
         {
             try

Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/CdMajor/CdMajorIBLL.cs

@@ -22,7 +22,12 @@ namespace Learun.Application.TwoDevelopment.EducationalAdministration
         /// <returns></returns>
         IEnumerable<CdMajorEntity> GetPageList(Pagination pagination, string queryJson);
         IEnumerable<CdMajorEntity> GetElectivePageList(string queryJson);
-
+        /// <summary>
+        /// 获取专业所有列表
+        /// </summary>
+        /// <param name="keyword"></param>
+        /// <returns></returns>
+        IEnumerable<CdMajorEntity> GetAllList(string keyword);
         IEnumerable<CdMajorEntity> GetListByDeptNo(string DeptNo);
         /// <summary>
         /// 获取CdMajor表实体数据

Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/CdMajor/CdMajorService.cs

@@ -86,6 +86,7 @@ namespace Learun.Application.TwoDevelopment.EducationalAdministration
                 }
             }
         }
+
         public IEnumerable<CdMajorEntity> GetElectivePageList(string queryJson)
         {
             try
@@ -146,6 +147,53 @@ namespace Learun.Application.TwoDevelopment.EducationalAdministration
             }
         }
 
+        /// <summary>
+        /// 获取所有列表数据
+        /// <summary>
+        /// <param name="queryJson">查询参数</param>
+        /// <returns></returns>
+        public IEnumerable<CdMajorEntity> GetAllList(string keyword)
+        {
+            try
+            {
+                var strSql = new StringBuilder();
+                strSql.Append("SELECT ");
+                strSql.Append(@"
+                t.ID,
+                t.MajorName,
+                t.MajorNo,
+                t.Photo
+                ");
+                strSql.Append("  FROM CdMajor t ");
+                strSql.Append("  WHERE 1=1 ");
+                if (!string.IsNullOrEmpty(keyword))
+                    strSql.Append($" and (t.MajorName like '%{keyword}%' or t.MajorNo like '%{keyword}%')");
+
+                IEnumerable<CdMajorEntity> list= this.BaseRepository("CollegeMIS").FindList<CdMajorEntity>(strSql.ToString());
+                foreach (var entity in list.Where(x=>!string.IsNullOrEmpty(x.Photo)))
+                {
+                    var LR_Base_AnnexesFile = BaseRepository("BaseDb").FindEntity<dynamic>("select * from LR_Base_AnnexesFile where F_FolderId='" + entity.Photo + "'", null);
+                    if (LR_Base_AnnexesFile != null)
+                    {
+                        entity.Photo = LR_Base_AnnexesFile.F_FilePath;
+                    }
+                }
+
+                return list;
+            }
+            catch (Exception ex)
+            {
+                if (ex is ExceptionEx)
+                {
+                    throw;
+                }
+                else
+                {
+                    throw ExceptionEx.ThrowServiceException(ex);
+                }
+            }
+        }
+
         internal bool GetAny()
         {
             try
@@ -380,7 +428,7 @@ namespace Learun.Application.TwoDevelopment.EducationalAdministration
         {
             try
             {
-                return BaseRepository("CollegeMIS").FindList<CdMajorEntity>(m=>m.CheckMark==true);
+                return BaseRepository("CollegeMIS").FindList<CdMajorEntity>(m => m.CheckMark == true);
             }
             catch (Exception ex)
             {

Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/SchoolNews/LR_OA_SchoolNewsEntity.cs

@@ -0,0 +1,193 @@
+using Learun.Util;
+using System;
+using System.ComponentModel.DataAnnotations.Schema;
+
+namespace Learun.Application.TwoDevelopment.EducationalAdministration
+{
+    /// <summary>
+    /// 版 本 Learun-ADMS V7.0.6 力软敏捷开发框架
+    /// Copyright (c) 2013-2020 力软信息技术（苏州）有限公司
+    /// 创 建：超级管理员
+    /// 日 期：2021-05-21 11:05
+    /// 描 述：校园新闻
+    /// </summary>
+    public class LR_OA_SchoolNewsEntity 
+    {
+        #region 实体成员
+        /// <summary>
+        /// F_NewsId
+        /// </summary>
+        [Column("F_NEWSID")]
+        public string F_NewsId { get; set; }
+        /// <summary>
+        /// F_TypeId
+        /// </summary>
+        [Column("F_TYPEID")]
+        public int? F_TypeId { get; set; }
+        /// <summary>
+        /// F_CategoryId  0校园新闻，1校园风光
+        /// </summary>
+        [Column("F_CATEGORYID")]
+        public string F_CategoryId { get; set; }
+        /// <summary>
+        /// F_Category
+        /// </summary>
+        [Column("F_CATEGORY")]
+        public string F_Category { get; set; }
+        /// <summary>
+        /// F_FullHead
+        /// </summary>
+        [Column("F_FULLHEAD")]
+        public string F_FullHead { get; set; }
+        /// <summary>
+        /// F_FullHeadColor
+        /// </summary>
+        [Column("F_FULLHEADCOLOR")]
+        public string F_FullHeadColor { get; set; }
+        /// <summary>
+        /// F_BriefHead
+        /// </summary>
+        [Column("F_BRIEFHEAD")]
+        public string F_BriefHead { get; set; }
+        /// <summary>
+        /// F_AuthorName
+        /// </summary>
+        [Column("F_AUTHORNAME")]
+        public string F_AuthorName { get; set; }
+        /// <summary>
+        /// F_CompileName
+        /// </summary>
+        [Column("F_COMPILENAME")]
+        public string F_CompileName { get; set; }
+        /// <summary>
+        /// F_TagWord
+        /// </summary>
+        [Column("F_TAGWORD")]
+        public string F_TagWord { get; set; }
+        /// <summary>
+        /// F_Keyword
+        /// </summary>
+        [Column("F_KEYWORD")]
+        public string F_Keyword { get; set; }
+        /// <summary>
+        /// F_SourceName
+        /// </summary>
+        [Column("F_SOURCENAME")]
+        public string F_SourceName { get; set; }
+        /// <summary>
+        /// F_SourceAddress
+        /// </summary>
+        [Column("F_SOURCEADDRESS")]
+        public string F_SourceAddress { get; set; }
+        /// <summary>
+        /// F_NewsContent
+        /// </summary>
+        [Column("F_NEWSCONTENT")]
+        public string F_NewsContent { get; set; }
+        /// <summary>
+        /// F_PV
+        /// </summary>
+        [Column("F_PV")]
+        public int? F_PV { get; set; }
+        /// <summary>
+        /// F_ReleaseTime
+        /// </summary>
+        [Column("F_RELEASETIME")]
+        public DateTime? F_ReleaseTime { get; set; }
+        /// <summary>
+        /// F_SortCode
+        /// </summary>
+        [Column("F_SORTCODE")]
+        public int? F_SortCode { get; set; }
+        /// <summary>
+        /// F_DeleteMark
+        /// </summary>
+        [Column("F_DELETEMARK")]
+        public int? F_DeleteMark { get; set; }
+        /// <summary>
+        /// F_EnabledMark
+        /// </summary>
+        [Column("F_ENABLEDMARK")]
+        public int? F_EnabledMark { get; set; }
+        /// <summary>
+        /// F_Description
+        /// </summary>
+        [Column("F_DESCRIPTION")]
+        public string F_Description { get; set; }
+        /// <summary>
+        /// F_CreateDate
+        /// </summary>
+        [Column("F_CREATEDATE")]
+        public DateTime? F_CreateDate { get; set; }
+        /// <summary>
+        /// F_CreateUserId
+        /// </summary>
+        [Column("F_CREATEUSERID")]
+        public string F_CreateUserId { get; set; }
+        /// <summary>
+        /// F_CreateUserName
+        /// </summary>
+        [Column("F_CREATEUSERNAME")]
+        public string F_CreateUserName { get; set; }
+        /// <summary>
+        /// F_ModifyDate
+        /// </summary>
+        [Column("F_MODIFYDATE")]
+        public DateTime? F_ModifyDate { get; set; }
+        /// <summary>
+        /// F_ModifyUserId
+        /// </summary>
+        [Column("F_MODIFYUSERID")]
+        public string F_ModifyUserId { get; set; }
+        /// <summary>
+        /// F_ModifyUserName
+        /// </summary>
+        [Column("F_MODIFYUSERNAME")]
+        public string F_ModifyUserName { get; set; }
+        /// <summary>
+        /// F_NewsImage
+        /// </summary>
+        [Column("F_NEWSIMAGE")]
+        public string F_NewsImage { get; set; }
+        /// <summary>
+        /// F_SendDeptId
+        /// </summary>
+        [Column("F_SENDDEPTID")]
+        public string F_SendDeptId { get; set; }
+        /// <summary>
+        /// F_SendPostId
+        /// </summary>
+        [Column("F_SENDPOSTID")]
+        public string F_SendPostId { get; set; }
+        #endregion
+
+        #region 扩展操作
+        /// <summary>
+        /// 新增调用
+        /// </summary>
+        public void Create()
+        {
+            this.F_NewsId = Guid.NewGuid().ToString();
+            this.F_CreateDate = DateTime.Now;
+            UserInfo userInfo = LoginUserInfo.Get();
+            this.F_CreateUserId = userInfo.userId;
+            this.F_CreateUserName = userInfo.realName;
+        }
+        /// <summary>
+        /// 编辑调用
+        /// </summary>
+        /// <param name="keyValue"></param>
+        public void Modify(string keyValue)
+        {
+            this.F_NewsId = keyValue;
+            this.F_ModifyDate = DateTime.Now;
+            UserInfo userInfo = LoginUserInfo.Get();
+            this.F_ModifyUserId = userInfo.userId;
+            this.F_ModifyUserName = userInfo.realName;
+        }
+        #endregion
+        #region 扩展字段
+        #endregion
+    }
+}
+

Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/SchoolNews/SchoolNewsBLL.cs

@@ -0,0 +1,148 @@
+using Learun.Util;
+using System;
+using System.Data;
+using System.Collections.Generic;
+
+namespace Learun.Application.TwoDevelopment.EducationalAdministration
+{
+    /// <summary>
+    /// 版 本 Learun-ADMS V7.0.6 力软敏捷开发框架
+    /// Copyright (c) 2013-2020 力软信息技术（苏州）有限公司
+    /// 创 建：超级管理员
+    /// 日 期：2021-05-21 11:05
+    /// 描 述：校园新闻
+    /// </summary>
+    public class SchoolNewsBLL : SchoolNewsIBLL
+    {
+        private SchoolNewsService schoolNewsService = new SchoolNewsService();
+
+        #region 获取数据
+
+        /// <summary>
+        /// 获取页面显示列表数据
+        /// </summary>
+        /// <param name="pagination">分页参数</param>
+        /// <param name="queryJson">查询参数</param>
+        /// <returns></returns>
+        public IEnumerable<LR_OA_SchoolNewsEntity> GetPageList(Pagination pagination, string queryJson)
+        {
+            try
+            {
+                return schoolNewsService.GetPageList(pagination, queryJson);
+            }
+            catch (Exception ex)
+            {
+                if (ex is ExceptionEx)
+                {
+                    throw;
+                }
+                else
+                {
+                    throw ExceptionEx.ThrowBusinessException(ex);
+                }
+            }
+        }
+
+        /// <summary>
+        /// 获取页面显示列表数据
+        /// </summary>
+        /// <returns></returns>
+        public IEnumerable<LR_OA_SchoolNewsEntity> GetListByCategoryId(string categoryId)
+        {
+            try
+            {
+                return schoolNewsService.GetListByCategoryId(categoryId);
+            }
+            catch (Exception ex)
+            {
+                if (ex is ExceptionEx)
+                {
+                    throw;
+                }
+                else
+                {
+                    throw ExceptionEx.ThrowBusinessException(ex);
+                }
+            }
+        }
+
+        /// <summary>
+        /// 获取LR_OA_SchoolNews表实体数据
+        /// </summary>
+        /// <param name="keyValue">主键</param>
+        /// <returns></returns>
+        public LR_OA_SchoolNewsEntity GetLR_OA_SchoolNewsEntity(string keyValue)
+        {
+            try
+            {
+                return schoolNewsService.GetLR_OA_SchoolNewsEntity(keyValue);
+            }
+            catch (Exception ex)
+            {
+                if (ex is ExceptionEx)
+                {
+                    throw;
+                }
+                else
+                {
+                    throw ExceptionEx.ThrowBusinessException(ex);
+                }
+            }
+        }
+
+        #endregion
+
+        #region 提交数据
+
+        /// <summary>
+        /// 删除实体数据
+        /// </summary>
+        /// <param name="keyValue">主键</param>
+        public void DeleteEntity(string keyValue)
+        {
+            try
+            {
+                schoolNewsService.DeleteEntity(keyValue);
+            }
+            catch (Exception ex)
+            {
+                if (ex is ExceptionEx)
+                {
+                    throw;
+                }
+                else
+                {
+                    throw ExceptionEx.ThrowBusinessException(ex);
+                }
+            }
+        }
+
+        /// <summary>
+        /// 保存实体数据（新增、修改）
+        /// </summary>
+        /// <param name="keyValue">主键</param>
+        /// <param name="entity">实体</param>
+        /// <returns></returns>
+        public void SaveEntity(string keyValue, LR_OA_SchoolNewsEntity entity)
+        {
+            try
+            {
+                schoolNewsService.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/EducationalAdministration/SchoolNews/SchoolNewsIBLL.cs

@@ -0,0 +1,54 @@
+using Learun.Util;
+using System.Data;
+using System.Collections.Generic;
+
+namespace Learun.Application.TwoDevelopment.EducationalAdministration
+{
+    /// <summary>
+    /// 版 本 Learun-ADMS V7.0.6 力软敏捷开发框架
+    /// Copyright (c) 2013-2020 力软信息技术（苏州）有限公司
+    /// 创 建：超级管理员
+    /// 日 期：2021-05-21 11:05
+    /// 描 述：校园新闻
+    /// </summary>
+    public interface SchoolNewsIBLL
+    {
+        #region 获取数据
+
+        /// <summary>
+        /// 获取页面显示列表数据
+        /// </summary>
+        /// <param name="queryJson">查询参数</param>
+        /// <returns></returns>
+        IEnumerable<LR_OA_SchoolNewsEntity> GetPageList(Pagination pagination, string queryJson);
+        /// <summary>
+        /// 获取数据根据类别
+        /// </summary>
+        /// <param name="categoryId"></param>
+        /// <returns></returns>
+        IEnumerable<LR_OA_SchoolNewsEntity> GetListByCategoryId(string categoryId);
+        /// <summary>
+        /// 获取LR_OA_SchoolNews表实体数据
+        /// </summary>
+        /// <param name="keyValue">主键</param>
+        /// <returns></returns>
+        LR_OA_SchoolNewsEntity GetLR_OA_SchoolNewsEntity(string keyValue);
+        #endregion
+
+        #region 提交数据
+
+        /// <summary>
+        /// 删除实体数据
+        /// </summary>
+        /// <param name="keyValue">主键</param>
+        void DeleteEntity(string keyValue);
+        /// <summary>
+        /// 保存实体数据（新增、修改）
+        /// </summary>
+        /// <param name="keyValue">主键</param>
+        /// <param name="entity">实体</param>
+        void SaveEntity(string keyValue, LR_OA_SchoolNewsEntity entity);
+        #endregion
+
+    }
+}

Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/SchoolNews/SchoolNewsService.cs

@@ -0,0 +1,182 @@
+using Dapper;
+using Learun.DataBase.Repository;
+using Learun.Util;
+using System;
+using System.Collections.Generic;
+using System.Data;
+using System.Linq;
+using System.Text;
+
+namespace Learun.Application.TwoDevelopment.EducationalAdministration
+{
+    /// <summary>
+    /// 版 本 Learun-ADMS V7.0.6 力软敏捷开发框架
+    /// Copyright (c) 2013-2020 力软信息技术（苏州）有限公司
+    /// 创 建：超级管理员
+    /// 日 期：2021-05-21 11:05
+    /// 描 述：校园新闻
+    /// </summary>
+    public class SchoolNewsService : RepositoryFactory
+    {
+        #region 获取数据
+
+        /// <summary>
+        /// 获取页面显示列表数据
+        /// </summary>
+        /// <param name="pagination">查询参数</param>
+        /// <param name="queryJson">查询参数</param>
+        /// <returns></returns>
+        public IEnumerable<LR_OA_SchoolNewsEntity> GetPageList(Pagination pagination, string queryJson)
+        {
+            try
+            {
+                var strSql = new StringBuilder();
+                strSql.Append("SELECT ");
+                strSql.Append(@"
+                t.*
+                ");
+                strSql.Append("  FROM LR_OA_SchoolNews t ");
+                strSql.Append("  WHERE 1=1 ");
+                var queryParam = queryJson.ToJObject();
+                // 虚拟参数
+                var dp = new DynamicParameters(new { });
+                if (!queryParam["F_FullHead"].IsEmpty())
+                {
+                    dp.Add("F_FullHead", "%" + queryParam["F_FullHead"].ToString() + "%", DbType.String);
+                    strSql.Append(" AND t.F_FullHead Like @F_FullHead ");
+                }
+                if (!queryParam["F_CategoryId"].IsEmpty())
+                {
+                    dp.Add("F_CategoryId", queryParam["F_CategoryId"].ToInt(), DbType.Int32);
+                    strSql.Append(" AND t.F_CategoryId = @F_CategoryId ");
+                }
+                return this.BaseRepository().FindList<LR_OA_SchoolNewsEntity>(strSql.ToString(), dp, pagination);
+            }
+            catch (Exception ex)
+            {
+                if (ex is ExceptionEx)
+                {
+                    throw;
+                }
+                else
+                {
+                    throw ExceptionEx.ThrowServiceException(ex);
+                }
+            }
+        }
+
+        public IEnumerable<LR_OA_SchoolNewsEntity> GetListByCategoryId(string categoryId)
+        {
+            var strSql = new StringBuilder();
+            strSql.Append("SELECT ");
+            strSql.Append(@"
+                t.F_NewsId,
+                t.F_CategoryId,
+                t.F_FullHead,
+                t.F_ReleaseTime,
+                t.F_NewsImage
+                ");
+            strSql.Append("  FROM LR_OA_SchoolNews t ");
+            strSql.Append("  WHERE F_EnabledMark=1 ");
+            strSql.Append($"  and F_CategoryId='{categoryId}' ");
+            IEnumerable<LR_OA_SchoolNewsEntity> list = this.BaseRepository("BaseDb").FindList<LR_OA_SchoolNewsEntity>(strSql.ToString());
+            foreach (var entity in list.Where(x => !string.IsNullOrEmpty(x.F_NewsImage)))
+            {
+                var LR_Base_AnnexesFile = BaseRepository("BaseDb").FindEntity<dynamic>("select * from LR_Base_AnnexesFile where F_FolderId='" + entity.F_NewsImage + "'", null);
+                if (LR_Base_AnnexesFile != null)
+                {
+                    entity.F_NewsImage = LR_Base_AnnexesFile.F_FilePath;
+                }
+            }
+
+            return list;
+        }
+
+        /// <summary>
+        /// 获取LR_OA_SchoolNews表实体数据
+        /// </summary>
+        /// <param name="keyValue">主键</param>
+        /// <returns></returns>
+        public LR_OA_SchoolNewsEntity GetLR_OA_SchoolNewsEntity(string keyValue)
+        {
+            try
+            {
+                return this.BaseRepository().FindEntity<LR_OA_SchoolNewsEntity>(keyValue);
+            }
+            catch (Exception ex)
+            {
+                if (ex is ExceptionEx)
+                {
+                    throw;
+                }
+                else
+                {
+                    throw ExceptionEx.ThrowServiceException(ex);
+                }
+            }
+        }
+
+        #endregion
+
+        #region 提交数据
+
+        /// <summary>
+        /// 删除实体数据
+        /// </summary>
+        /// <param name="keyValue">主键</param>
+        public void DeleteEntity(string keyValue)
+        {
+            try
+            {
+                this.BaseRepository().Delete<LR_OA_SchoolNewsEntity>(t => t.F_NewsId == keyValue);
+            }
+            catch (Exception ex)
+            {
+                if (ex is ExceptionEx)
+                {
+                    throw;
+                }
+                else
+                {
+                    throw ExceptionEx.ThrowServiceException(ex);
+                }
+            }
+        }
+
+        /// <summary>
+        /// 保存实体数据（新增、修改）
+        /// </summary>
+        /// <param name="keyValue">主键</param>
+        /// <param name="entity">实体</param>
+        public void SaveEntity(string keyValue, LR_OA_SchoolNewsEntity entity)
+        {
+            try
+            {
+                if (!string.IsNullOrEmpty(keyValue))
+                {
+                    entity.Modify(keyValue);
+                    this.BaseRepository().Update(entity);
+                }
+                else
+                {
+                    entity.Create();
+                    this.BaseRepository().Insert(entity);
+                }
+            }
+            catch (Exception ex)
+            {
+                if (ex is ExceptionEx)
+                {
+                    throw;
+                }
+                else
+                {
+                    throw ExceptionEx.ThrowServiceException(ex);
+                }
+            }
+        }
+
+        #endregion
+
+    }
+}

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

@@ -1657,6 +1657,10 @@
     <Compile Include="PersonnelManagement\VisitorInfo\VisitorInfoService.cs" />
     <Compile Include="PersonnelManagement\VisitorInfo\VisitorInfoBLL.cs" />
     <Compile Include="PersonnelManagement\VisitorInfo\VisitorInfoIBLL.cs" />
+    <Compile Include="EducationalAdministration\SchoolNews\LR_OA_SchoolNewsEntity.cs" />
+    <Compile Include="EducationalAdministration\SchoolNews\SchoolNewsService.cs" />
+    <Compile Include="EducationalAdministration\SchoolNews\SchoolNewsBLL.cs" />
+    <Compile Include="EducationalAdministration\SchoolNews\SchoolNewsIBLL.cs" />
   </ItemGroup>
   <ItemGroup>
     <ProjectReference Include="..\..\..\Learun.Application.Organization\Learun.Application.Organization.csproj">