公文下发添加下发角色

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

@@ -366,7 +366,6 @@ namespace Learun.Application.Web.Areas.EducationalAdministration.Controllers
             sys_SendFileIBLL.ChangeStatusByProcessId(guid, 2);
             return Success("操作成功！");
         }
-
         /// <summary>
         /// 结束下发
         /// </summary>
@@ -381,13 +380,33 @@ namespace Learun.Application.Web.Areas.EducationalAdministration.Controllers
             return Success("下发成功！");
         }
 
+        /// <summary>
+        /// 提交
+        /// </summary>
+        /// <param name="keyValue"></param>
+        /// <returns></returns>
+        [HttpPost]
+        [AjaxOnly]
+        public ActionResult IssueList(string keyValue, string CreateUser)
+        {
 
-        /* public ActionResult ReceiveFile(string keyValue)
-         {
- 
-             return View();
-         }*/
-
+            sys_SendFileIBLL.IssueList(keyValue, CreateUser);
+            return Success("操作成功！");
+        }
+        
+        /// <summary>
+        /// 作废
+        /// </summary>
+        /// <param name="keyValue"></param>
+        /// <returns></returns>
+        [HttpPost]
+        [AjaxOnly]
+        public ActionResult CancelList(string keyValue)
+        {
+            sys_SendFileIBLL.CancelList(keyValue);
+            return Success("操作成功！");
+        }
+        
         #endregion
 
     }

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

@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
   <PropertyGroup>
@@ -7521,11 +7521,11 @@
     <VisualStudio>
       <FlavorProperties GUID="{349c5851-65df-11da-9384-00065b846f21}">
         <WebProjectProperties>
-          <UseIIS>True</UseIIS>
-          <AutoAssignPort>True</AutoAssignPort>
-          <DevelopmentServerPort>20472</DevelopmentServerPort>
-          <DevelopmentServerVPath>/</DevelopmentServerVPath>
-          <IISUrl>http://localhost:12345/</IISUrl>
+         <UseIIS>False</UseIIS>
+		  <AutoAssignPort>True</AutoAssignPort>
+		  <DevelopmentServerPort>20472</DevelopmentServerPort>
+		  <DevelopmentServerVPath>/</DevelopmentServerVPath>
+		  <IISUrl>http://localhost:20873/</IISUrl>
           <NTLMAuthentication>False</NTLMAuthentication>
           <UseCustomServer>False</UseCustomServer>
           <CustomServerUrl>

Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/Sys_SendFile/Sys_SendFileMap.cs

@@ -1,29 +0,0 @@
-using Learun.Application.TwoDevelopment.EducationalAdministration;
-using System.Data.Entity.ModelConfiguration;
-
-namespace  Learun.Application.Mapping
-{
-    /// <summary>
-    /// 版 本 Learun-ADMS-Ultimate V7.0.0 数字化智慧校园 
-    /// Copyright (c) 2013-2018 北京泉江科技有限公司 
-    /// 创 建：超级管理员
-    /// 日 期：2019-04-11 10:31
-    /// 描 述：公文发送
-    /// </summary>
-    public class Sys_SendFileMap : EntityTypeConfiguration<Sys_SendFileEntity>
-    {
-        public Sys_SendFileMap()
-        {
-            #region  表、主键
-            //表
-            this.ToTable("SYS_SENDFILE");
-            //主键
-            this.HasKey(t => t.SFileId);
-            #endregion
-
-            #region  配置关系
-            #endregion
-        }
-    }
-}
-

Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/Sys_SendFile/Sys_SendFileService.cs

@@ -44,12 +44,6 @@ namespace Learun.Application.TwoDevelopment.EducationalAdministration
                 var queryParam = queryJson.ToJObject();
                 // 虚拟参数
                 var dp = new DynamicParameters(new { });
-                if (queryParam["StartTime"].ToString() != "1753-01-01" && queryParam["EndTime"].ToString() != "3000-01-01")
-                {
-                    dp.Add("startTime", queryParam["StartTime"].ToDate(), DbType.DateTime);
-                    dp.Add("endTime", queryParam["EndTime"].ToDate(), DbType.DateTime);
-                    strSql.Append(" AND ( t.SendTime >= @startTime AND t.SendTime <= @endTime ) ");
-                }
                 if (!queryParam["Title"].IsEmpty())
                 {
                     dp.Add("Title", "%" + queryParam["Title"].ToString() + "%", DbType.String);
@@ -60,16 +54,16 @@ namespace Learun.Application.TwoDevelopment.EducationalAdministration
                     dp.Add("SenderId", "" + queryParam["SenderId"].ToString() + "", DbType.String);
                     strSql.Append(" AND t.SenderId = @SenderId ");
                 }
-                if (!queryParam["Receiver"].IsEmpty())
-                {
-                    dp.Add("Receiver", "%" + queryParam["Receiver"].ToString() + "%", DbType.String);
-                    strSql.Append(" AND t.Receiver Like @Receiver ");
-                }
-                //sql条件
-                if (!queryParam["SqlParameter"].IsEmpty())
-                {
-                    strSql.Append(queryParam["SqlParameter"].ToString());
-                }
+                //if (!queryParam["Receiver"].IsEmpty())
+                //{
+                //    dp.Add("Receiver", "%" + queryParam["Receiver"].ToString() + "%", DbType.String);
+                //    strSql.Append(" AND t.Receiver Like @Receiver ");
+                //}
+                ////sql条件
+                //if (!queryParam["SqlParameter"].IsEmpty())
+                //{
+                //    strSql.Append(queryParam["SqlParameter"].ToString());
+                //}
                 return this.BaseRepository().FindList<Sys_SendFileEntity>(strSql.ToString(), dp, pagination);
             }
             catch (Exception ex)

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

@@ -94,6 +94,7 @@
     <Compile Include="Delegate\NWFDelegateRuleEntity.cs" />
     <Compile Include="Delegate\NWFDelegateService.cs" />
     <Compile Include="NodeMethod\DispatchMethod.cs" />
+    <Compile Include="NodeMethod\MeetingManagementApplyMethod.cs" />
     <Compile Include="NodeMethod\StuCancelDisciplineManageMethod.cs" />
     <Compile Include="NodeMethod\TeacherCancelLeaveManageMethod.cs" />
     <Compile Include="NodeMethod\StuDisciplineManageMethod.cs" />

Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.WorkFlow/NodeMethod/MeetingManagementApplyMethod.cs

@@ -0,0 +1,27 @@
+using Learun.Application.TwoDevelopment.PersonnelManagement;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace Learun.Application.WorkFlow
+{
+    public class MeetingManagementApplyMethod : IWorkFlowMethod
+    {
+        MeetingManagementIBLL meetingManagementIBLL = new MeetingManagementBLL();
+
+
+        public void Execute(WfMethodParameter parameter)
+        {
+            if (parameter.code == "agree")
+            {
+                meetingManagementIBLL.ChangeStatusByProcessId(parameter.processId, "1", parameter.userId);
+            }
+            else
+            {
+                meetingManagementIBLL.ChangeStatusByProcessId(parameter.processId, "2", parameter.userId);
+            }
+        }
+    }
+}