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

Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/PersonnelManagement/Views/DutySchedule/Index.cshtml

@@ -7,6 +7,15 @@
         <div class="lr-layout-wrap lr-layout-wrap-notitle ">
             <div class="lr-layout-tool">
                 <div class="lr-layout-tool-left">
+                    <div class="lr-layout-tool-item">
+                        <div id="datesearch"></div>
+                    </div>
+                    <div class="lr-layout-tool-item">
+                        <input id="txt_Keyword" type="text" class="form-control" placeholder="请输入要查询关键字" />
+                    </div>
+                    <div class="lr-layout-tool-item">
+                        <a id="btn_Search" class="btn btn-primary btn-sm"><i class="fa fa-search"></i>&nbsp;查询</a>
+                    </div>
                 </div>
                 <div class="lr-layout-tool-right">
                     <div class=" btn-group btn-group-sm">

Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/PersonnelManagement/Views/DutySchedule/Index.js

@@ -7,12 +7,46 @@
 var refreshGirdData;
 var bootstrap = function ($, learun) {
     "use strict";
+    var startTime;
+    var endTime;
     var page = {
         init: function () {
             page.initGird();
             page.bind();
         },
         bind: function () {
+            // 时间搜索框
+            $('#datesearch').lrdate({
+                dfdata: [
+                    { name: '今天', begin: function () { return learun.getDate('yyyy-MM-dd 00:00:00') }, end: function () { return learun.getDate('yyyy-MM-dd 23:59:59') } },
+                    { name: '近7天', begin: function () { return learun.getDate('yyyy-MM-dd 00:00:00', 'd', -6) }, end: function () { return learun.getDate('yyyy-MM-dd 23:59:59') } },
+                    { name: '近1个月', begin: function () { return learun.getDate('yyyy-MM-dd 00:00:00', 'm', -1) }, end: function () { return learun.getDate('yyyy-MM-dd 23:59:59') } },
+                    { name: '近3个月', begin: function () { return learun.getDate('yyyy-MM-dd 00:00:00', 'm', -3) }, end: function () { return learun.getDate('yyyy-MM-dd 23:59:59') } }
+                ],
+                // 月
+                mShow: false,
+                premShow: false,
+                // 季度
+                jShow: false,
+                prejShow: false,
+                // 年
+                ysShow: false,
+                yxShow: false,
+                preyShow: false,
+                yShow: false,
+                // 默认
+                dfvalue: '1',
+                selectfn: function (begin, end) {
+                    startTime = begin;
+                    endTime = end;
+                    page.search();
+                }
+            });
+            // 查询
+            $('#btn_Search').on('click', function () {
+                var keyword = $('#txt_Keyword').val();
+                page.search({ keyword: keyword });
+            });
             // 刷新
             $('#lr_refresh').on('click', function () {
                 location.reload();
@@ -82,11 +116,15 @@ var bootstrap = function ($, learun) {
                 ],
                 mainId: 'ID',
                 isPage: true,
+                sidx: 'createtime',
+                sord: 'desc' 
             });
             page.search();
         },
         search: function (param) {
             param = param || {};
+            param.StartTime = startTime;
+            param.EndTime = endTime;
             $('#gridtable').jfGridSet('reload', { queryJson: JSON.stringify(param) });
         }
     };

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

@@ -9,6 +9,7 @@ using System.Text;
 using System.Data;
 using Learun.Application.OA;
 using Learun.Application.Organization;
+using System;
 
 namespace Learun.Application.WebApi.Modules
 {
@@ -18,12 +19,15 @@ namespace Learun.Application.WebApi.Modules
         private NoticeIBLL noticeIBLL = new NoticeBLL();
         private DepartmentIBLL departmentIBLL = new DepartmentBLL();
         private PostIBLL postIBLL = new PostBLL();
+        private LR_OA_NewsReadIBLL lR_OA_NewsReadIBLL = new LR_OA_NewsReadBLL();
 
         public NewsApi()
         : base("/learun/news")
         {
             Get["/list"] = GetList;
             Get["/shList"] = GetshList;
+
+            Post["/newsRead"] = NewsRead;
         }
 
 
@@ -137,11 +141,40 @@ namespace Learun.Application.WebApi.Modules
             }
             return Success(shlist);
         }
-        #region 私有类
 
+        /// <summary>
+        /// 阅读通知公告
+        /// <summary>
+        /// <returns></returns>
+        public Response NewsRead(dynamic _)
+        {
+            var loginUserInfo = LoginUserInfo.Get();
+            NoticeEntity parameter = this.GetReqData<NoticeEntity>();
+
+            //判断当前用户是否阅读当前通知公告
+            var entity = lR_OA_NewsReadIBLL.GetLR_OA_NewsReadEntityByNewsIdAndUserId(parameter.newsId, loginUserInfo.userId);
+            if (entity == null)
+            {
+                var lR_OA_NewsRead = new LR_OA_NewsReadEntity()
+                {
+                    NewsId = parameter.newsId,
+                    RUserId = loginUserInfo.userId,
+                    RUserName = loginUserInfo.realName,
+                    RTime = DateTime.Now
+                };
+                lR_OA_NewsReadIBLL.SaveEntity("", lR_OA_NewsRead);
+
+                //修改当前通知公告的浏览量
+                lR_OA_NewsReadIBLL.UpdateNewsPV(parameter.newsId);
+            }
+
+            return Success("阅读成功！");
+        }
+        #region 私有类
         private class NoticeEntity
         {
             public string ProgressId { get; set; }
+            public string newsId { get; set; }
         }
         #endregion
 

Learun.Framework.Ultimate V7/Learun.Application.WebApi/Modules/PersonnelManagement/DutyScheduleApi.cs

@@ -1,4 +1,5 @@
-using Nancy;
+using System;
+using Nancy;
 using Learun.Util;
 using System.Collections.Generic;
 using Learun.Application.TwoDevelopment.EducationalAdministration;
@@ -21,9 +22,13 @@ namespace Learun.Application.WebApi.Modules
         /// 注册接口 
         /// <summary> 
         public DutyScheduleApi()
-            : base("/Learun/adms/PersonnelManagement/DutySchedule")
+            : base("/learun/adms/PersonnelManagement/DutySchedule")
         {
             Get["/pagelist"] = GetPageList;
+            Get["/list"] = GetList;
+            Get["/form"] = GetForm;
+            Post["/save"] = SaveForm;
+            Post["/delete"] = DeleteForm;
         }
         #region  获取数据 
 
@@ -45,6 +50,74 @@ namespace Learun.Application.WebApi.Modules
             };
             return Success(jsonData);
         }
+
+        /// <summary>
+        /// 获取页面显示列表数据
+        /// <summary>
+        /// <param name="_"></param>
+        /// <returns></returns>
+        public Response GetList(dynamic _)
+        {
+            string queryJson = this.GetReqData();
+            var data = dutyScheduleIBLL.GetList();
+            return Success(data);
+        }
+        /// <summary>
+        /// 获取表单数据
+        /// <summary>
+        /// <param name="_"></param>
+        /// <returns></returns>
+        public Response GetForm(dynamic _)
+        {
+            string keyValue = this.GetReqData();
+            var ScheduleData = dutyScheduleIBLL.GetDutyScheduleEntity(keyValue);
+            //ScheduleData.StartTime = Convert.ToDateTime((ScheduleData.StartTime.ToDate().ToString("yyyy-MM-dd") + " " + ScheduleData.StartTime.Substring(0, 2) + ":" + ScheduleData.StartTime.Substring(2, 2)).ToDate().ToString("yyyy-MM-dd HH:mm"));
+            //ScheduleData.EndTime = Convert.ToDateTime((ScheduleData.EndTime.ToDate().ToString("yyyy-MM-dd") + " " + ScheduleData.EndTime.Substring(0, 2) + ":" + ScheduleData.F_EndTime.Substring(2, 2)).ToDate().ToString("yyyy-MM-dd HH:mm"));
+            var jsonData = new
+            {
+                Schedule = ScheduleData,
+            };
+            return Success(jsonData);
+        }
+        #endregion
+
+        #region 提交数据
+        /// <summary>
+        /// 保存实体数据（新增、修改）
+        /// <param name="_"></param>
+        /// <summary>
+        /// <returns></returns>
+        public Response SaveForm(dynamic _)
+        {
+            ReqFormEntity parameter = this.GetReqData<ReqFormEntity>();
+            DutyScheduleEntity entity = parameter.strEntity.ToObject<DutyScheduleEntity>();
+            dutyScheduleIBLL.SaveEntity(parameter.keyValue, entity);
+            return Success("保存成功！");
+        }
+
+
+        /// <summary>
+        /// 删除实体数据
+        /// <param name="_"></param>
+        /// <summary>
+        /// <returns></returns>
+        public Response DeleteForm(dynamic _)
+        {
+            string keyValue = this.GetReqData();
+            dutyScheduleIBLL.DeleteEntity(keyValue);
+            return Success("删除成功！");
+        }
+        #endregion
+
+        #region 私有类
+        /// <summary>
+        /// 表单实体类
+        /// <summary>
+        private class ReqFormEntity
+        {
+            public string keyValue { get; set; }
+            public string strEntity { get; set; }
+        }
         #endregion
     }
 }

Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/PersonnelManagement/DutySchedule/DutyScheduleBLL.cs

@@ -66,6 +66,28 @@ namespace Learun.Application.TwoDevelopment.PersonnelManagement
             }
         }
 
+        /// <summary>
+        /// 获取列表
+        /// </summary>
+        /// <returns>返回列表</returns>
+        public IEnumerable<DutyScheduleEntity> GetList()
+        {
+            try
+            {
+                return dutyScheduleService.GetList();
+            }
+            catch (Exception ex)
+            {
+                if (ex is ExceptionEx)
+                {
+                    throw;
+                }
+                else
+                {
+                    throw ExceptionEx.ThrowBusinessException(ex);
+                }
+            }
+        }
         #endregion
 
         #region  提交数据

Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/PersonnelManagement/DutySchedule/DutyScheduleIBLL.cs

@@ -27,6 +27,12 @@ namespace Learun.Application.TwoDevelopment.PersonnelManagement
         /// <summary>
         /// <returns></returns>
         DutyScheduleEntity GetDutyScheduleEntity(string keyValue);
+        /// <summary>
+        /// 获取所有数据
+        /// </summary>
+        /// <returns></returns>
+        IEnumerable<DutyScheduleEntity> GetList();
+
         #endregion
 
         #region  提交数据

Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/PersonnelManagement/DutySchedule/DutyScheduleService.cs

@@ -28,21 +28,27 @@ namespace Learun.Application.TwoDevelopment.PersonnelManagement
         {
             try
             {
+                var adms = this.BaseRepository().getDbConnection().Database;
                 var strSql = new StringBuilder();
                 strSql.Append("SELECT ");
-                strSql.Append(@"
-                t.ID,
-                t.StartTime,
-                t.EndTime,
-                t.Person,
-                t.Remark,u.F_Account,F_RealName
-                ");
-                strSql.Append("  FROM DutySchedule t left join adms7ultimate2.dbo.LR_Base_User u on t.Person=u.F_UserId ");
+                strSql.Append(@" t.* ,u.F_Account,u.F_RealName ");
+                strSql.Append($"  FROM DutySchedule t left join {adms}.dbo.LR_Base_User u on t.Person=u.F_UserId ");
                 strSql.Append("  WHERE 1=1 ");
                 var queryParam = queryJson.ToJObject();
                 // 虚拟参数
                 var dp = new DynamicParameters(new { });
-                return this.BaseRepository("CollegeMIS").FindList<DutyScheduleEntity>(strSql.ToString(),dp, pagination);
+                if (!queryParam["keyword"].IsEmpty())
+                {
+                    dp.Add("keyword", "%" + queryParam["keyword"].ToString() + "%", DbType.String);
+                    strSql.Append(" AND  u.F_RealName Like @keyword ");
+                }
+                if (!queryParam["StartTime"].IsEmpty() && !queryParam["EndTime"].IsEmpty())
+                {
+                    dp.Add("startTime", queryParam["StartTime"].ToDate(), DbType.DateTime);
+                    dp.Add("endTime", queryParam["EndTime"].ToDate(), DbType.DateTime);
+                    strSql.Append(" AND ( t.StartTime >= @startTime AND t.EndTime <= @endTime ) ");
+                }
+                return this.BaseRepository("CollegeMIS").FindList<DutyScheduleEntity>(strSql.ToString(), dp, pagination);
             }
             catch (Exception ex)
             {
@@ -81,6 +87,29 @@ namespace Learun.Application.TwoDevelopment.PersonnelManagement
             }
         }
 
+        /// <summary>
+        /// 获取列表
+        /// </summary>
+        /// <returns>返回列表</returns>
+        public IEnumerable<DutyScheduleEntity> GetList()
+        {
+            try
+            {
+                var adms = this.BaseRepository().getDbConnection().Database;
+                var strSql = new StringBuilder();
+                strSql.Append("SELECT ");
+                strSql.Append(@" t.*, u.F_Account,F_RealName ");
+                strSql.Append($"  FROM DutySchedule t left join {adms}.dbo.LR_Base_User u on t.Person=u.F_UserId ");
+                return this.BaseRepository("CollegeMIS").FindList<DutyScheduleEntity>(strSql.ToString());
+            }
+            catch (Exception ex)
+            {
+                if (ex is ExceptionEx)
+                    throw;
+                else
+                    throw ExceptionEx.ThrowServiceException(ex);
+            }
+        }
         #endregion
 
         #region  提交数据
@@ -94,7 +123,7 @@ namespace Learun.Application.TwoDevelopment.PersonnelManagement
         {
             try
             {
-                this.BaseRepository("CollegeMIS").Delete<DutyScheduleEntity>(t=>t.ID == keyValue);
+                this.BaseRepository("CollegeMIS").Delete<DutyScheduleEntity>(t => t.ID == keyValue);
             }
             catch (Exception ex)
             {
@@ -126,6 +155,7 @@ namespace Learun.Application.TwoDevelopment.PersonnelManagement
                 else
                 {
                     entity.Create();
+                    entity.CreateTime = DateTime.Now;
                     this.BaseRepository("CollegeMIS").Insert(entity);
                 }
             }

Learun.Framework.Ultimate V7/LearunApp-2.2.0/pages/home/notice.vue

@@ -31,15 +31,17 @@ export default {
     async init() {
       this.LOADING('加载中…')
       const noticeItem = this.GET_PARAM()
-
       this.content = this.CONVERT_HTML(noticeItem.f_content)
-
       this.time = moment(noticeItem.f_time).format('HH : mm')
       this.date = moment(noticeItem.f_time).format('YYYY年 M月 D日')
       this.SET_TITLE(noticeItem.f_title)
 
       this.ready = true
       this.HIDE_LOADING()
+	  let _postData = {
+	  	newsId: noticeItem.f_id,
+	  }
+	  this.HTTP_POST('learun/news/newsRead',_postData, '加载数据时出错');
     }
   }
 }