app2.0 手机端我的会议

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

@@ -199,6 +199,9 @@
     <Compile Include="Modules\EducationalAdministration\ArrangeExamTermApi.cs" />
     <Compile Include="Modules\EducationalAdministration\ArrangeExamTermNewApi.cs" />
     <Compile Include="Modules\EducationalAdministration\LoginUserBindApi.cs" />
+    <Compile Include="Modules\PersonnelManagement\MeetingManagementApi.cs" />
+    <Compile Include="Modules\PersonnelManagement\MeetingMinutesApi.cs" />
+    <Compile Include="Modules\PersonnelManagement\MeetingSignInRecordApi.cs" />
     <Compile Include="Modules\RecruiterPeopleApi.cs" />
     <Compile Include="Modules\PushMessageApi.cs" />
     <Compile Include="Modules\EvalApi.cs" />

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

@@ -2,6 +2,7 @@
 using Learun.Util;
 using System.Collections.Generic;
 using Learun.Application.TwoDevelopment.PersonnelManagement;
+
 namespace Learun.Application.WebApi
 {
     /// <summary>

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

@@ -454,6 +454,10 @@
     <Compile Include="PersonnelManagement\MeetingManagement\MeetingManagementEntity.cs" />
     <Compile Include="PersonnelManagement\MeetingManagement\MeetingManagementIBLL.cs" />
     <Compile Include="PersonnelManagement\MeetingManagement\MeetingManagementService.cs" />
+    <Compile Include="PersonnelManagement\MeetingMinutes\MeetingMinutesBLL.cs" />
+    <Compile Include="PersonnelManagement\MeetingMinutes\MeetingMinutesEntity.cs" />
+    <Compile Include="PersonnelManagement\MeetingMinutes\MeetingMinutesIBLL.cs" />
+    <Compile Include="PersonnelManagement\MeetingMinutes\MeetingMinutesService.cs" />
     <Compile Include="PersonnelManagement\MeetingSignInRecord\MeetingSignInRecordBLL.cs" />
     <Compile Include="PersonnelManagement\MeetingSignInRecord\MeetingSignInRecordEntity.cs" />
     <Compile Include="PersonnelManagement\MeetingSignInRecord\MeetingSignInRecordIBLL.cs" />

Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/PersonnelManagement/MeetingManagement/MeetingManagementBLL.cs

@@ -114,31 +114,6 @@ namespace Learun.Application.TwoDevelopment.PersonnelManagement
                 }
             }
         }
-
-        /// <summary>
-        /// 获取MeetingManagement表实体数据
-        /// <param name="keyValue">主键</param>
-        /// <summary>
-        /// <returns></returns>
-        public DataTable GetStatisticList(string queryJson)
-        {
-            try
-            {
-                return meetingManagementService.GetStatisticList(queryJson);
-            }
-            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/MeetingManagement/MeetingManagementIBLL.cs

@@ -40,12 +40,6 @@ namespace Learun.Application.TwoDevelopment.PersonnelManagement
         /// <summary>
         /// <returns></returns>
         MeetingManagementEntity GetMeetingManagementEntityByProcessId(string processId);
-        /// <summary>
-        /// 获取报表数据
-        /// </summary>
-        /// <param name="queryJson"></param>
-        /// <returns></returns>
-        DataTable GetStatisticList(string queryJson);
         #endregion
 
         #region 提交数据

Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/PersonnelManagement/MeetingManagement/MeetingManagementService.cs

@@ -179,55 +179,6 @@ namespace Learun.Application.TwoDevelopment.PersonnelManagement
             }
         }
 
-        /// <summary>
-        /// 获取报表数据
-        /// </summary>
-        /// <param name="queryJson">查询参数</param>
-        /// <returns></returns>
-        public DataTable GetStatisticList(string queryJson)
-        {
-            try
-            {
-                var strSql = new StringBuilder();
-                strSql.Append("SELECT  ");
-                strSql.Append(@"
-                t.meetingtitle,
-                t.begintime,
-                t.endtime,
-                t.正常,
-                t.未到
-                ");
-                strSql.Append("  FROM (select m.MeetingTitle,isnull(t.正常,0) 正常,isnull(t.未到,0) 未到,m.BeginTime,m.EndTime from MeetingManagement m left join (select meetid,sum(case issignin when 1 then 1 else 0 end) as 正常, sum(case issignin when 0 then 1 else 0 end) as 未到  from MeetingSignInRecord group by meetid) t on t.MeetID=m.Id)t ");
-                strSql.Append("  WHERE 1=1 ");
-                var queryParam = queryJson.ToJObject();
-                // 虚拟参数
-                var dp = new DynamicParameters(new { });
-                if (!queryParam["meetingtitle"].IsEmpty())
-                {
-                    dp.Add("meetingtitle", "%" + queryParam["meetingtitle"].ToString() + "%", DbType.String);
-                    strSql.Append(" AND t.meetingtitle Like @meetingtitle ");
-                }
-                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.begintime >= @startTime AND t.begintime <= @endTime ) ");
-                }
-                return this.BaseRepository("CollegeMIS").FindTable(strSql.ToString(), dp);
-            }
-            catch (Exception ex)
-            {
-                if (ex is ExceptionEx)
-                {
-                    throw;
-                }
-                else
-                {
-                    throw ExceptionEx.ThrowServiceException(ex);
-                }
-            }
-        }
-
         #endregion
 
         #region 提交数据

Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/PersonnelManagement/MeetingMinutes/MeetingMinutesBLL.cs

@@ -0,0 +1,149 @@
+using Learun.Util;
+using System;
+using System.Data;
+using System.Collections.Generic;
+
+namespace Learun.Application.TwoDevelopment.PersonnelManagement
+{
+    /// <summary>
+    /// 版 本 Learun-ADMS V7.0.6 力软敏捷开发框架
+    /// Copyright (c) 2013-2020 力软信息技术（苏州）有限公司
+    /// 创 建：超级管理员
+    /// 日 期：2021-03-08 10:36
+    /// 描 述：会议纪要
+    /// </summary>
+    public class MeetingMinutesBLL : MeetingMinutesIBLL
+    {
+        private MeetingMinutesService meetingMinutesService = new MeetingMinutesService();
+
+        #region 获取数据
+
+        /// <summary>
+        /// 获取页面显示列表分页数据
+        /// <summary>
+        /// <param name="pagination">分页参数</param>
+        /// <param name="queryJson">查询参数</param>
+        /// <returns></returns>
+        public IEnumerable<MeetingMinutesEntity> GetPageList(Pagination pagination, string queryJson)
+        {
+            try
+            {
+                return meetingMinutesService.GetPageList(pagination, queryJson);
+            }
+            catch (Exception ex)
+            {
+                if (ex is ExceptionEx)
+                {
+                    throw;
+                }
+                else
+                {
+                    throw ExceptionEx.ThrowBusinessException(ex);
+                }
+            }
+        }
+
+        /// <summary>
+        /// 获取页面显示列表数据
+        /// <summary>
+        /// <param name="queryJson">查询参数</param>
+        /// <returns></returns>
+        public IEnumerable<MeetingMinutesEntity> GetList(string queryJson)
+        {
+            try
+            {
+                return meetingMinutesService.GetList(queryJson);
+            }
+            catch (Exception ex)
+            {
+                if (ex is ExceptionEx)
+                {
+                    throw;
+                }
+                else
+                {
+                    throw ExceptionEx.ThrowBusinessException(ex);
+                }
+            }
+        }
+
+        /// <summary>
+        /// 获取MeetingMinutes表实体数据
+        /// <param name="keyValue">主键</param>
+        /// <summary>
+        /// <returns></returns>
+        public MeetingMinutesEntity GetMeetingMinutesEntity(string keyValue)
+        {
+            try
+            {
+                return meetingMinutesService.GetMeetingMinutesEntity(keyValue);
+            }
+            catch (Exception ex)
+            {
+                if (ex is ExceptionEx)
+                {
+                    throw;
+                }
+                else
+                {
+                    throw ExceptionEx.ThrowBusinessException(ex);
+                }
+            }
+        }
+
+        #endregion
+
+        #region 提交数据
+
+        /// <summary>
+        /// 删除实体数据
+        /// <param name="keyValue">主键</param>
+        /// <summary>
+        /// <returns></returns>
+        public void DeleteEntity(string keyValue)
+        {
+            try
+            {
+                meetingMinutesService.DeleteEntity(keyValue);
+            }
+            catch (Exception ex)
+            {
+                if (ex is ExceptionEx)
+                {
+                    throw;
+                }
+                else
+                {
+                    throw ExceptionEx.ThrowBusinessException(ex);
+                }
+            }
+        }
+
+        /// <summary>
+        /// 保存实体数据（新增、修改）
+        /// <param name="keyValue">主键</param>
+        /// <summary>
+        /// <returns></returns>
+        public void SaveEntity(UserInfo userInfo, string keyValue, MeetingMinutesEntity entity)
+        {
+            try
+            {
+                meetingMinutesService.SaveEntity(userInfo, 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/PersonnelManagement/MeetingMinutes/MeetingMinutesEntity.cs

@@ -0,0 +1,78 @@
+using Learun.Util;
+using System;
+using System.ComponentModel.DataAnnotations.Schema;
+
+namespace Learun.Application.TwoDevelopment.PersonnelManagement
+{
+    /// <summary>
+    /// 版 本 Learun-ADMS V7.0.6 力软敏捷开发框架
+    /// Copyright (c) 2013-2020 力软信息技术（苏州）有限公司
+    /// 创 建：超级管理员
+    /// 日 期：2021-03-08 10:36
+    /// 描 述：会议纪要
+    /// </summary>
+    public class MeetingMinutesEntity
+    {
+        #region 实体成员
+        /// <summary>
+        /// 编号
+        /// </summary>
+        [Column("ID")]
+        public string ID { get; set; }
+        /// <summary>
+        /// 会议id
+        /// </summary>
+        [Column("MEETID")]
+        public string MeetID { get; set; }
+        /// <summary>
+        /// 纪要标题
+        /// </summary>
+        [Column("TITLE")]
+        public string Title { get; set; }
+        /// <summary>
+        /// 纪要内容
+        /// </summary>
+        [Column("CONTENT")]
+        public string Content { get; set; }
+        /// <summary>
+        /// 附件
+        /// </summary>
+        [Column("FILES")]
+        public string Files { get; set; }
+        /// <summary>
+        /// 创建时间
+        /// </summary>
+        [Column("CREATETIME")]
+        public DateTime? CreateTime { get; set; }
+        /// <summary>
+        /// 创建人
+        /// </summary>
+        [Column("CREATEUSER")]
+        public string CreateUser { get; set; }
+
+        #endregion
+
+        #region 扩展操作
+        /// <summary>
+        /// 新增调用
+        /// </summary>
+        public void Create(UserInfo userInfo)
+        {
+            this.ID = Guid.NewGuid().ToString();
+        }
+        /// <summary>
+        /// 编辑调用
+        /// </summary>
+        /// <param name="keyValue"></param>
+        public void Modify(string keyValue, UserInfo userInfo)
+        {
+            this.ID = keyValue;
+        }
+        #endregion
+        #region 扩展字段
+        [NotMapped]
+        public string MeetingTitle { get; set; }
+        #endregion
+    }
+}
+

Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/PersonnelManagement/MeetingMinutes/MeetingMinutesIBLL.cs

@@ -0,0 +1,56 @@
+using Learun.Util;
+using System.Data;
+using System.Collections.Generic;
+
+namespace Learun.Application.TwoDevelopment.PersonnelManagement
+{
+    /// <summary>
+    /// 版 本 Learun-ADMS V7.0.6 力软敏捷开发框架
+    /// Copyright (c) 2013-2020 力软信息技术（苏州）有限公司
+    /// 创 建：超级管理员
+    /// 日 期：2021-03-08 10:36
+    /// 描 述：会议纪要
+    /// </summary>
+    public interface MeetingMinutesIBLL
+    {
+        #region 获取数据
+
+        /// <summary>
+        /// 获取页面显示列表分页数据
+        /// <summary>
+        /// <param name="pagination">查询参数</param>
+        /// <param name="queryJson">查询参数</param>
+        /// <returns></returns>
+        IEnumerable<MeetingMinutesEntity> GetPageList(Pagination pagination, string queryJson);
+        /// <summary>
+        /// 获取页面显示列表数据
+        /// <summary>
+        /// <param name="queryJson">查询参数</param>
+        /// <returns></returns>
+        IEnumerable<MeetingMinutesEntity> GetList(string queryJson);
+        /// <summary>
+        /// 获取MeetingMinutes表实体数据
+        /// <param name="keyValue">主键</param>
+        /// <summary>
+        /// <returns></returns>
+        MeetingMinutesEntity GetMeetingMinutesEntity(string keyValue);
+        #endregion
+
+        #region 提交数据
+
+        /// <summary>
+        /// 删除实体数据
+        /// <param name="keyValue">主键</param>
+        /// <summary>
+        /// <returns></returns>
+        void DeleteEntity(string keyValue);
+        /// <summary>
+        /// 保存实体数据（新增、修改）
+        /// <param name="keyValue">主键</param>
+        /// <summary>
+        /// <returns></returns>
+        void SaveEntity(UserInfo userInfo, string keyValue, MeetingMinutesEntity entity);
+        #endregion
+
+    }
+}

Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/PersonnelManagement/MeetingMinutes/MeetingMinutesService.cs

@@ -0,0 +1,198 @@
+using Dapper;
+using Learun.DataBase.Repository;
+using Learun.Util;
+using System;
+using System.Collections.Generic;
+using System.Data;
+using System.Text;
+
+namespace Learun.Application.TwoDevelopment.PersonnelManagement
+{
+    /// <summary>
+    /// 版 本 Learun-ADMS V7.0.6 力软敏捷开发框架
+    /// Copyright (c) 2013-2020 力软信息技术（苏州）有限公司
+    /// 创 建：超级管理员
+    /// 日 期：2021-03-08 10:36
+    /// 描 述：会议纪要
+    /// </summary>
+    public class MeetingMinutesService : RepositoryFactory
+    {
+        #region 获取数据
+
+        /// <summary>
+        /// 获取页面显示列表分页数据
+        /// <summary>
+        /// <param name="pagination">分页参数</param>
+        /// <param name="queryJson">查询参数</param>
+        /// <returns></returns>
+        public IEnumerable<MeetingMinutesEntity> GetPageList(Pagination pagination, string queryJson)
+        {
+            try
+            {
+                var strSql = new StringBuilder();
+                strSql.Append("SELECT t.*,m.MeetingTitle ");
+                strSql.Append("  FROM MeetingMinutes t left join MeetingManagement m on t.MeetID=m.Id  ");
+                strSql.Append("  WHERE 1=1 ");
+                var queryParam = queryJson.ToJObject();
+                // 虚拟参数
+                var dp = new DynamicParameters(new { });
+                if (!queryParam["MeetID"].IsEmpty())
+                {
+                    dp.Add("MeetID", queryParam["MeetID"].ToString(), DbType.String);
+                    strSql.Append(" AND t.MeetID = @MeetID ");
+                }
+                if (!queryParam["MeetingTitle"].IsEmpty())
+                {
+                    dp.Add("MeetingTitle", "%" + queryParam["MeetingTitle"].ToString() + "%", DbType.String);
+                    strSql.Append(" AND m.MeetingTitle Like @MeetingTitle ");
+                }
+                if (!queryParam["Title"].IsEmpty())
+                {
+                    dp.Add("Title", "%" + queryParam["Title"].ToString() + "%", DbType.String);
+                    strSql.Append(" AND t.Title Like @Title ");
+                }
+                return this.BaseRepository("CollegeMIS").FindList<MeetingMinutesEntity>(strSql.ToString(),dp, pagination);
+            }
+            catch (Exception ex)
+            {
+                if (ex is ExceptionEx)
+                {
+                    throw;
+                }
+                else
+                {
+                    throw ExceptionEx.ThrowServiceException(ex);
+                }
+            }
+        }
+
+        /// <summary>
+        /// 获取页面显示列表数据
+        /// <summary>
+        /// <param name="queryJson">查询参数</param>
+        /// <returns></returns>
+        public IEnumerable<MeetingMinutesEntity> GetList(string queryJson)
+        {
+            try
+            {
+                var strSql = new StringBuilder();
+                strSql.Append("SELECT t.* ");
+                strSql.Append("  FROM MeetingMinutes t ");
+                strSql.Append("  WHERE 1=1 ");
+                var queryParam = queryJson.ToJObject();
+                // 虚拟参数
+                var dp = new DynamicParameters(new { });
+                if (!queryParam["MeetID"].IsEmpty())
+                {
+                    dp.Add("MeetID", queryParam["MeetID"].ToString(), DbType.String);
+                    strSql.Append(" AND t.MeetID = @MeetID ");
+                }
+                if (!queryParam["Title"].IsEmpty())
+                {
+                    dp.Add("Title", "%" + queryParam["Title"].ToString() + "%", DbType.String);
+                    strSql.Append(" AND t.Title Like @Title ");
+                }
+                return this.BaseRepository("CollegeMIS").FindList<MeetingMinutesEntity>(strSql.ToString(),dp);
+            }
+            catch (Exception ex)
+            {
+                if (ex is ExceptionEx)
+                {
+                    throw;
+                }
+                else
+                {
+                    throw ExceptionEx.ThrowServiceException(ex);
+                }
+            }
+        }
+
+        /// <summary>
+        /// 获取MeetingMinutes表实体数据
+        /// <param name="keyValue">主键</param>
+        /// <summary>
+        /// <returns></returns>
+        public MeetingMinutesEntity GetMeetingMinutesEntity(string keyValue)
+        {
+            try
+            {
+                return this.BaseRepository("CollegeMIS").FindEntity<MeetingMinutesEntity>(keyValue);
+            }
+            catch (Exception ex)
+            {
+                if (ex is ExceptionEx)
+                {
+                    throw;
+                }
+                else
+                {
+                    throw ExceptionEx.ThrowServiceException(ex);
+                }
+            }
+        }
+
+        #endregion
+
+        #region 提交数据
+
+        /// <summary>
+        /// 删除实体数据
+        /// <param name="keyValue">主键</param>
+        /// <summary>
+        /// <returns></returns>
+        public void DeleteEntity(string keyValue)
+        {
+            try
+            {
+                this.BaseRepository("CollegeMIS").Delete<MeetingMinutesEntity>(t=>t.ID == keyValue);
+            }
+            catch (Exception ex)
+            {
+                if (ex is ExceptionEx)
+                {
+                    throw;
+                }
+                else
+                {
+                    throw ExceptionEx.ThrowServiceException(ex);
+                }
+            }
+        }
+
+        /// <summary>
+        /// 保存实体数据（新增、修改）
+        /// <param name="keyValue">主键</param>
+        /// <summary>
+        /// <returns></returns>
+        public void SaveEntity( UserInfo userInfo, string keyValue, MeetingMinutesEntity entity)
+        {
+            try
+            {
+                if (!string.IsNullOrEmpty(keyValue))
+                {
+                    entity.Modify(keyValue,userInfo);
+                    this.BaseRepository("CollegeMIS").Update(entity);
+                }
+                else
+                {
+                    entity.Create(userInfo);
+                    this.BaseRepository("CollegeMIS").Insert(entity);
+                }
+            }
+            catch (Exception ex)
+            {
+                if (ex is ExceptionEx)
+                {
+                    throw;
+                }
+                else
+                {
+                    throw ExceptionEx.ThrowServiceException(ex);
+                }
+            }
+        }
+
+        #endregion
+
+    }
+}

Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/PersonnelManagement/MeetingSignInRecord/MeetingSignInRecordService.cs

@@ -36,6 +36,11 @@ namespace Learun.Application.TwoDevelopment.PersonnelManagement
                 var queryParam = queryJson.ToJObject();
                 // 虚拟参数
                 var dp = new DynamicParameters(new { });
+                if (!queryParam["MeetID"].IsEmpty())
+                {
+                    dp.Add("MeetID", queryParam["MeetID"].ToString(), DbType.String);
+                    strSql.Append(" AND t.MeetID = @MeetID ");
+                }
                 if (!queryParam["MeetingTitle"].IsEmpty())
                 {
                     dp.Add("MeetingTitle", "%" + queryParam["MeetingTitle"].ToString() + "%", DbType.String);
@@ -46,18 +51,6 @@ namespace Learun.Application.TwoDevelopment.PersonnelManagement
                     dp.Add("ParticipantName", "%" + queryParam["ParticipantName"].ToString() + "%", DbType.String);
                     strSql.Append(" AND t.ParticipantName like @ParticipantName ");
                 }
-                if (!queryParam["IsSignIn"].IsEmpty())
-                {
-                    if (queryParam["IsSignIn"].ToString() == "true")
-                    {
-                        strSql.Append(" AND t.IsSignIn=1 ");
-                    }
-                    else
-                    {
-                        strSql.Append(" AND t.IsSignIn=0 ");
-                    }
-
-                }
 
                 return this.BaseRepository("CollegeMIS").FindList<MeetingSignInRecordEntity>(strSql.ToString(), dp, pagination);
             }
@@ -231,13 +224,18 @@ namespace Learun.Application.TwoDevelopment.PersonnelManagement
                 var meetEntity = this.BaseRepository("CollegeMIS")
                     .FindEntity<MeetingSignInRecordEntity>(a =>
                         a.MeetID == scanParamMeetid && a.ParticipantID == scanParamUserid);
-                if (meetEntity != null)
+                var date = DateTime.Now;
+                var meetEntityList = this.BaseRepository("CollegeMIS")
+                    .FindEntity<MeetingManagementEntity>(x => x.Id == scanParamMeetid);
+                var beginTime = meetEntityList.BeginTime;
+                if (meetEntityList != null && beginTime > date)
                 {
                     meetEntity.IsSignIn = true;
+                    meetEntity.SignInTime = DateTime.Now;
                     this.BaseRepository("CollegeMIS").Update(meetEntity);
                     result = true;
-
                 }
+
                 return result;
 
             }