流程模板启用停用接口

流程分页查询接口
流程版本更新接口

WorkFlowApi/WorkFlowApi.Business/BaseBusiness.cs

@@ -273,10 +273,18 @@ namespace WorkFlowApi.Business
             List<SqlParameter> ps = new List<SqlParameter>();
             foreach (var p in Prop.Where(p => p.Name.ToLower() != KeyField.ToLower()))
             {
-                if (string.IsNullOrEmpty(fieldvalues)) { fieldvalues = string.Format("[{0}]=@{1}", p.Name, p.Name); }
-                else { fieldvalues += string.Format(",[{0}]=@{1}", p.Name, p.Name); }
+                var value = p.GetValue(entity, null) ?? DBNull.Value;
+                if (value != null)
+                {
+                    if (value.ToString() != "")
+                    {
+                        if (string.IsNullOrEmpty(fieldvalues)) { fieldvalues = string.Format("[{0}]=@{1}", p.Name, p.Name); }
+                        else { fieldvalues += string.Format(",[{0}]=@{1}", p.Name, p.Name); }
 
-                ps.Add(new SqlParameter(string.Format("@{0}", p.Name), p.GetValue(entity, null) ?? DBNull.Value));
+                        ps.Add(new SqlParameter(string.Format("@{0}", p.Name), p.GetValue(entity, null) ?? DBNull.Value));
+                    }
+                }
+                   
             }
 
             string sql = string.Format("update [{0}] set {1} where [{2}]='{3}';", type.Name, fieldvalues, KeyField, KeyProp?.GetValue(entity, null) ?? null);

WorkFlowApi/WorkFlowApi.Business/Scheme/WFSchemeInfoBusiness.cs

@@ -12,6 +12,7 @@ using WorkFlowApi.Entity.SchemeView;
 using WorkFlowApi.IBusiness.Scheme;
 using WorkFlowApi.Utility;
 using WorkFlowApi.ViewModels.Input;
+using WorkFlowApi.ViewModels.View;
 
 namespace WorkFlowApi.Business.Scheme
 {
@@ -41,7 +42,7 @@ namespace WorkFlowApi.Business.Scheme
                     strWhereSql.AppendFormat(" AND t.F_Category = '{0}' )", getSchemeInfoPageListReq.category);
                 }
 
-                string fields = string.Join(",", Prop.Select(p => string.Format("[{0}]", p.Name))) + "F_Type,F_CreateDate,F_CreateUserId,F_CreateUserName";
+                string fields = string.Join(",", Prop.Select(p => string.Format("[{0}]", p.Name))) + ",F_Type,F_CreateDate,F_CreateUserId,F_CreateUserName";
                 var dt = DbHelperSQL.RunPagination("V_SchemeInfo", KeyField, fields, strWhereSql.ToString(), "ORDER BY F_CreateDate desc", getSchemeInfoPageListReq.pagesize, getSchemeInfoPageListReq.page, true, out RecordCount);
                 return dt.ConvertToList<SchemeInfoEntityView>();
             }
@@ -53,6 +54,29 @@ namespace WorkFlowApi.Business.Scheme
           
         }
 
+        public List<SchemeView> GetSchemePageList(GetSchemePageListReq  getSchemePageListReq, out int RecordCount)
+        {
+            try
+            {
+                var strWhereSql = new StringBuilder();
+                if (!getSchemePageListReq.schemeInfoId.IsNullOrEmpty())
+                {
+                    strWhereSql.AppendFormat("and F_SchemeInfoId = '{0}'", getSchemePageListReq.schemeInfoId);
+                }
+
+              var dt = wFSchemeBusiness.GetDataTablePage(strWhereSql.ToString(), "ORDER BY F_CreateDate DESC", getSchemePageListReq.pagesize, getSchemePageListReq.page,out RecordCount).ConvertToList<T_WF_Scheme>();
+
+              return dt.MapToList<SchemeView>();
+
+            }
+            catch (Exception)
+            {
+
+                throw;
+            }
+
+        }
+
 
         public void SaveSchemeInfo(SaveSchemeInfoReq  saveSchemeInfoReq, T_Sys_UserAccount currentUser)
         {
@@ -76,8 +100,6 @@ namespace WorkFlowApi.Business.Scheme
                     InsertExe(t_WF_SchemeInfo);
                     wFSchemeBusiness.InsertExe(t_WF_Scheme);
 
-
-
                 }
                 else
                 {
@@ -108,14 +130,10 @@ namespace WorkFlowApi.Business.Scheme
 
                     }
 
-                  
-
-
 
                 }
 
                
-
             }
             catch (Exception e)
             {
@@ -139,5 +157,49 @@ namespace WorkFlowApi.Business.Scheme
             }
             
         }
+
+        public void UpdateState(string keyValue, int state, T_Sys_UserAccount currentUser)
+        {
+            try
+            {
+                T_WF_SchemeInfo t_WF_SchemeInfo = new T_WF_SchemeInfo()
+                {
+                    F_Id = keyValue,
+                    F_EnabledMark = state
+                };
+                UpdateExe(t_WF_SchemeInfo);
+
+            }
+            catch (Exception)
+            {
+
+                throw;
+            }
+           
+        }
+
+        public void UpdateScheme(string schemeInfoId, string schemeId, T_Sys_UserAccount currentUser)
+        {
+            try
+            {
+                T_WF_Scheme t_WF_Scheme = wFSchemeBusiness.GetEntity(schemeId);
+                T_WF_SchemeInfo t_WF_SchemeInfo = new T_WF_SchemeInfo()
+                {
+                    F_Id= schemeInfoId,
+                    F_SchemeId= schemeId
+                };
+                if (t_WF_Scheme.F_Type != 1)
+                {
+                    t_WF_SchemeInfo.F_EnabledMark = 0;
+                }
+
+                UpdateExe(t_WF_SchemeInfo);
+            }
+            catch (Exception)
+            {
+
+                throw;
+            }
+        }
     }
 }

WorkFlowApi/WorkFlowApi.IBusiness/Scheme/IWFSchemeInfoBusiness.cs

@@ -7,13 +7,17 @@ using WorkFlowApi.Entity;
 using WorkFlowApi.Entity.SchemeEntity;
 using WorkFlowApi.Entity.SchemeView;
 using WorkFlowApi.ViewModels.Input;
+using WorkFlowApi.ViewModels.View;
 
 namespace WorkFlowApi.IBusiness.Scheme
 {
    public interface IWFSchemeInfoBusiness : IBaseBusiness<T_WF_SchemeInfo>
     {
         List<SchemeInfoEntityView> GetSchemeInfoPageList(GetSchemeInfoPageListReq getSchemeInfoPageListReq, out int RecordCount);
+        List<SchemeView> GetSchemePageList(GetSchemePageListReq getSchemePageListReq, out int RecordCount);
         void SaveSchemeInfo(SaveSchemeInfoReq  saveSchemeInfoReq, T_Sys_UserAccount currentUser);
         void DeleteSchemeInfo(string keyValue, T_Sys_UserAccount currentUser);
+        void UpdateState(string keyValue, int state, T_Sys_UserAccount currentUser);
+        void UpdateScheme(string schemeInfoId, string schemeId, T_Sys_UserAccount currentUser);
     }
 }

WorkFlowApi/WorkFlowApi.Models/Class1.cs

@@ -1,12 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-
-namespace WorkFlowApi.ViewModels
-{
-    class Class1
-    {
-    }
-}

WorkFlowApi/WorkFlowApi.Models/Input/GetSchemePageListReq.cs

@@ -0,0 +1,16 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace WorkFlowApi.ViewModels.Input
+{
+    public class GetSchemePageListReq: PageInput
+    {
+        /// <summary>
+        /// 流程信息主键
+        /// </summary>
+        public string schemeInfoId { get; set; }
+    }
+}

WorkFlowApi/WorkFlowApi.Models/View/SchemeView.cs

@@ -0,0 +1,43 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace WorkFlowApi.ViewModels.View
+{
+    public class SchemeView
+    {
+        public string Id { get; set; }
+        /// <summary> 
+        /// 流程模板信息主键 
+        /// </summary> 
+        /// <returns></returns> 
+        public string SchemeInfoId { get; set; }
+        /// <summary> 
+        /// 1.正式2.草稿 
+        /// </summary> 
+        /// <returns></returns> 
+        public int? Type { get; set; }
+        /// <summary> 
+        /// 创建时间 
+        /// </summary> 
+        /// <returns></returns> 
+        public DateTime? CreateDate { get; set; }
+        /// <summary> 
+        /// 创建人主键 
+        /// </summary> 
+        /// <returns></returns> 
+        public string CreateUserId { get; set; }
+        /// <summary> 
+        /// 创建人名字 
+        /// </summary> 
+        /// <returns></returns> 
+        public string CreateUserName { get; set; }
+        /// <summary> 
+        /// 流程模板内容 
+        /// </summary> 
+        /// <returns></returns> 
+        public string Content { get; set; }
+    }
+}

WorkFlowApi/WorkFlowApi.Models/WorkFlowApi.ViewModels.csproj

@@ -42,7 +42,7 @@
     <Reference Include="System.Xml" />
   </ItemGroup>
   <ItemGroup>
-    <Compile Include="Class1.cs" />
+    <Compile Include="Input\GetSchemePageListReq.cs" />
     <Compile Include="Input\SaveSchemeInfoReq.cs" />
     <Compile Include="Input\GetSchemeInfoPageListReq.cs" />
     <Compile Include="Input\LoginInput.cs" />
@@ -50,6 +50,7 @@
     <Compile Include="Input\UserAccountInput.cs" />
     <Compile Include="Properties\AssemblyInfo.cs" />
     <Compile Include="View\SchemeInfoView.cs" />
+    <Compile Include="View\SchemeView.cs" />
     <Compile Include="View\UserAccountView.cs" />
   </ItemGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />

WorkFlowApi/WorkFlowApi/Controllers/Scheme/WFSchemeController.cs

@@ -20,6 +20,7 @@ namespace WorkFlowApi.Controllers.Scheme
     public class WFSchemeController : BaseController
     {
         private readonly IWFSchemeInfoBusiness  _wFSchemeInfo;
+    
         /// <summary>
         /// 构造函数
         /// </summary>
@@ -34,6 +35,7 @@ namespace WorkFlowApi.Controllers.Scheme
         [HttpPost]
         public IHttpActionResult GetSchemeInfoPageList(GetSchemeInfoPageListReq  getSchemeInfoPageListReq)
         {
+            LogHelper.Info("GetSchemeInfoPageList-请求开始:"+getSchemeInfoPageListReq.ToJson()+"\n");
             int total = 0;
             try
             {
@@ -42,11 +44,41 @@ namespace WorkFlowApi.Controllers.Scheme
                     return Error("请求参数不正确");
                 }
                 var list= _wFSchemeInfo.GetSchemeInfoPageList(getSchemeInfoPageListReq,out total);
+                LogHelper.Info("GetSchemeInfoPageList-请求结束:" + list.ToJson() + "\n");
                 return Success("成功", list.MapToList<SchemeInfoView>(), total);
+               
             }
-            catch (Exception)
+            catch (Exception e)
             {
+                LogHelper.Error("GetSchemeInfoPageList-请求异常:" + e.Message + "\n");
+                return Error("系统异常");
+            }
+
+        }
+        /// <summary>
+        /// 获取流程分页信息
+        /// </summary>
+        /// <param name="getSchemePageListReq"></param>
+        /// <returns></returns>
+        [HttpPost]
+        public IHttpActionResult GetSchemePageList(GetSchemePageListReq  getSchemePageListReq)
+        {
+            LogHelper.Info("GetSchemePageList-请求开始:" + getSchemePageListReq.ToJson() + "\n");
+            int total = 0;
+            try
+            {
+                if (getSchemePageListReq == null)
+                {
+                    return Error("请求参数不正确");
+                }
+                var list = _wFSchemeInfo.GetSchemePageList(getSchemePageListReq, out total);
+                LogHelper.Info("GetSchemePageList-请求结束:" + list.ToJson() + "\n");
+                return Success("成功", list, total);
 
+            }
+            catch (Exception e)
+            {
+                LogHelper.Error("GetSchemePageList-请求异常:" + e.Message + "\n");
                 return Error("系统异常");
             }
 
@@ -59,6 +91,7 @@ namespace WorkFlowApi.Controllers.Scheme
         [HttpPost]
         public IHttpActionResult SaveSchemeInfo(SaveSchemeInfoReq  saveSchemeInfoReq)
         {
+            LogHelper.Info("SaveSchemeInfo-请求开始:" + saveSchemeInfoReq.ToJson() + "\n");
             try
             {
                 T_WF_SchemeInfo t_WF_SchemeInfo = saveSchemeInfoReq.schemeInfo.MapTo<T_WF_SchemeInfo>();
@@ -71,11 +104,12 @@ namespace WorkFlowApi.Controllers.Scheme
                 }
               
                 _wFSchemeInfo.SaveSchemeInfo(saveSchemeInfoReq, CurrentUser);
+                LogHelper.Info("SaveSchemeInfo-请求结束:" + "保存成功" + "\n");
                 return Success("保存成功");
             }
-            catch (Exception)
+            catch (Exception e)
             {
-
+                LogHelper.Error("SaveSchemeInfo-请求异常:" + e.Message + "\n");
                 return Error("系统异常");
             }
         }
@@ -88,16 +122,62 @@ namespace WorkFlowApi.Controllers.Scheme
  
         public IHttpActionResult DeleteSchemeInfo(string keyValue)
         {
+            LogHelper.Info("DeleteSchemeInfo-请求开始:" + keyValue + "\n");
             try
             {
                 _wFSchemeInfo.DeleteSchemeInfo(keyValue, CurrentUser);
+                LogHelper.Info("DeleteSchemeInfo-请求结束:" + "删除成功" + "\n");
                 return Success("删除成功");
             }
-            catch (Exception)
+            catch (Exception e)
             {
-
+                LogHelper.Error("DeleteSchemeInfo-请求异常:" + e.Message + "\n");
+                return Error("系统异常");
+            }
+        }
+        /// <summary>
+        /// 启用/停用
+        /// </summary>
+        /// <param name="keyValue"></param>
+        /// <param name="state"></param>
+        /// <returns></returns>
+        public IHttpActionResult UpdateState(string keyValue,int state)
+        {
+            LogHelper.Info("UpdateState-请求开始:" + keyValue+":"+ state + "\n");
+            try
+            {
+                _wFSchemeInfo.UpdateState(keyValue, state, CurrentUser);
+                LogHelper.Info("UpdateState-请求结束:" +"操作成功" + "\n");
+                return Success((state == 1 ? "启用" : "禁用") + "成功！");
+            }
+            catch (Exception e)
+            {
+                LogHelper.Error("UpdateState-请求异常:" +e.Message + "\n");
+                return Error("系统异常");
+            }
+        }
+        /// <summary>
+        /// 更新模板版本
+        /// </summary>
+        /// <param name="schemeInfoId"></param>
+        /// <param name="schemeId"></param>
+        /// <returns></returns>
+        public IHttpActionResult UpdateScheme(string schemeInfoId, string schemeId)
+        {
+            LogHelper.Info("UpdateScheme-请求开始:" + schemeInfoId + ";" + schemeId + "\n");
+            try
+            {
+                _wFSchemeInfo.UpdateScheme(schemeInfoId, schemeId, CurrentUser);
+                LogHelper.Info("UpdateScheme-请求结束:" + "操作成功" + "\n");
+                return Success("更新成功！");
+            }
+            catch (Exception e)
+            {
+                LogHelper.Error("UpdateScheme-请求异常:" + e.Message + "\n");
                 return Error("系统异常");
             }
         }
+
+
     }
 }