更新

RMYY_CallCenter_Api.Bll/AddLogBll.cs

@@ -0,0 +1,58 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+using System.Transactions;
+
+namespace RMYY_CallCenter_Api.Bll
+{
+   public class AddLogBll
+    {
+        T_Dis_WorkOrderItem itembll = new T_Dis_WorkOrderItem();
+        /// <summary>
+        /// 添加工单记录
+        /// </summary>
+        public long AddLog(int woid, int wostate, int type, string content, int itemtype, int opttype, string nextuser, int nextdept, string usercode, int F_IsUsed = 0)
+        {
+
+            Model.T_Dis_WorkOrderItem itemModel = new Model.T_Dis_WorkOrderItem();
+            #region 
+            long res = 0;
+            //处理当前工单的记录之前的记录过期
+            var itemlast = itembll.GetModelList(" isnull(F_IsUsed,'0')='0' and F_ItemType=" + itemtype + " and  F_WoID=" + woid + " and  (F_CreateUser=" + usercode + " or F_NextUser like '%" + usercode + "%')");
+            using (TransactionScope trans = new TransactionScope(TransactionScopeOption.Required, new TimeSpan(0, 10, 0)))
+            {
+                if (F_IsUsed == 0)
+                {
+
+                    if (itemlast.Count > 0)
+                    {
+                        foreach (var it in itemlast)
+                        {
+                            it.F_IsUsed = 1;
+                            itembll.Update(it);
+                        }
+                    }
+                }
+                #endregion
+                itemModel.F_WoID = woid;
+                itemModel.F_WoState = wostate;
+                itemModel.F_WoType = type;
+                itemModel.F_ItemType = itemtype;
+                itemModel.F_OptType = opttype;
+                itemModel.F_OptContent = content;
+                itemModel.F_NextUser = nextuser;
+                itemModel.F_NextDept = nextdept;
+                itemModel.F_IsUsed = F_IsUsed;
+                itemModel.F_CreateTime = DateTime.Now;
+                itemModel.F_CreateUser = usercode;
+                res = itembll.Add(itemModel);
+                trans.Complete();
+            }
+            return res;
+        }
+
+
+    }
+}

RMYY_CallCenter_Api.Bll/RMYY_CallCenter_Api.Bll.csproj

@@ -33,6 +33,7 @@
   <ItemGroup>
     <Reference Include="System" />
     <Reference Include="System.Core" />
+    <Reference Include="System.Transactions" />
     <Reference Include="System.Xml.Linq" />
     <Reference Include="System.Data.DataSetExtensions" />
     <Reference Include="Microsoft.CSharp" />
@@ -41,6 +42,7 @@
     <Reference Include="System.Xml" />
   </ItemGroup>
   <ItemGroup>
+    <Compile Include="AddLogBll.cs" />
     <Compile Include="PagerBll.cs" />
     <Compile Include="T_Acc_WorkOrder.cs" />
     <Compile Include="T_Call_Blacklist.cs" />

RMYY_CallCenter_Api.Dal/T_Sys_DictionaryValue.cs

@@ -251,8 +251,8 @@ namespace RMYY_CallCenter_Api.Dal
         public DataSet GetList(string strWhere)
         {
             StringBuilder strSql = new StringBuilder();
-            strSql.Append("select F_DictionaryValueId,F_DictionaryFlag,F_ValueCode,F_Name,F_Sort,F_Describe,F_State,F_TimeOut with(nolock) ");
-            strSql.Append(" FROM T_Sys_DictionaryValue ");
+            strSql.Append("select F_DictionaryValueId,F_DictionaryFlag,F_ValueCode,F_Name,F_Sort,F_Describe,F_State,F_TimeOut  ");
+            strSql.Append(" FROM T_Sys_DictionaryValue with(nolock)");
             if (strWhere.Trim() != "")
             {
                 strSql.Append(" where " + strWhere);

RMYY_CallCenter_Api.Dal/T_Wo_StatusOpt.cs

@@ -41,17 +41,21 @@ namespace RMYY_CallCenter_Api.Dal
         {
             StringBuilder strSql = new StringBuilder();
             strSql.Append("insert into T_Wo_StatusOpt(");
-            strSql.Append("F_State,F_Type,F_MenuId)");
+            strSql.Append("F_State,F_Type,F_MenuId,F_OptMethod,F_Remark)");
             strSql.Append(" values (");
-            strSql.Append("@F_State,@F_Type,@F_MenuId)");
+            strSql.Append("@F_State,@F_Type,@F_MenuId,@F_OptMethod,@F_Remark)");
             strSql.Append(";select @@IDENTITY");
             SqlParameter[] parameters = {
                     new SqlParameter("@F_State", SqlDbType.Int,4),
                     new SqlParameter("@F_Type", SqlDbType.Int,4),
-                    new SqlParameter("@F_MenuId", SqlDbType.Int,4)};
+                    new SqlParameter("@F_MenuId", SqlDbType.Int,4),
+                    new SqlParameter("@F_OptMethod", SqlDbType.VarChar,200),
+                    new SqlParameter("@F_Remark", SqlDbType.NText)};
             parameters[0].Value = model.F_State;
             parameters[1].Value = model.F_Type;
             parameters[2].Value = model.F_MenuId;
+            parameters[3].Value = model.F_OptMethod;
+            parameters[4].Value = model.F_Remark;
 
             object obj = DbHelperSQL.GetSingle(strSql.ToString(), parameters);
             if (obj == null)
@@ -72,17 +76,23 @@ namespace RMYY_CallCenter_Api.Dal
             strSql.Append("update T_Wo_StatusOpt set ");
             strSql.Append("F_State=@F_State,");
             strSql.Append("F_Type=@F_Type,");
-            strSql.Append("F_MenuId=@F_MenuId");
+            strSql.Append("F_MenuId=@F_MenuId,");
+            strSql.Append("F_OptMethod=@F_OptMethod,");
+            strSql.Append("F_Remark=@F_Remark");
             strSql.Append(" where F_Id=@F_Id");
             SqlParameter[] parameters = {
                     new SqlParameter("@F_State", SqlDbType.Int,4),
                     new SqlParameter("@F_Type", SqlDbType.Int,4),
                     new SqlParameter("@F_MenuId", SqlDbType.Int,4),
+                    new SqlParameter("@F_OptMethod", SqlDbType.VarChar,200),
+                    new SqlParameter("@F_Remark", SqlDbType.NText),
                     new SqlParameter("@F_Id", SqlDbType.Int,4)};
             parameters[0].Value = model.F_State;
             parameters[1].Value = model.F_Type;
             parameters[2].Value = model.F_MenuId;
-            parameters[3].Value = model.F_Id;
+            parameters[3].Value = model.F_OptMethod;
+            parameters[4].Value = model.F_Remark;
+            parameters[5].Value = model.F_Id;
 
             int rows = DbHelperSQL.ExecuteSql(strSql.ToString(), parameters);
             if (rows > 0)
@@ -146,7 +156,7 @@ namespace RMYY_CallCenter_Api.Dal
         {
 
             StringBuilder strSql = new StringBuilder();
-            strSql.Append("select  top 1 F_Id,F_State,F_Type,F_MenuId from T_Wo_StatusOpt ");
+            strSql.Append("select  top 1 * from T_Wo_StatusOpt");
             strSql.Append(" where F_Id=@F_Id");
             SqlParameter[] parameters = {
                     new SqlParameter("@F_Id", SqlDbType.Int,4)
@@ -190,17 +200,26 @@ namespace RMYY_CallCenter_Api.Dal
                 {
                     model.F_MenuId = int.Parse(row["F_MenuId"].ToString());
                 }
+                if (row["F_OptMethod"] != null)
+                {
+                    model.F_OptMethod = row["F_OptMethod"].ToString();
+                }
+                if (row["F_Remark"] != null)
+                {
+                    model.F_Remark = row["F_Remark"].ToString();
+                }
             }
             return model;
         }
 
+
         /// <summary>
         /// 获得数据列表
         /// </summary>
         public DataSet GetList(string strWhere)
         {
             StringBuilder strSql = new StringBuilder();
-            strSql.Append("select F_Id,F_State,F_Type,F_MenuId ");
+            strSql.Append("select * ");
             strSql.Append(" FROM T_Wo_StatusOpt ");
             if (strWhere.Trim() != "")
             {
@@ -220,7 +239,7 @@ namespace RMYY_CallCenter_Api.Dal
             {
                 strSql.Append(" top " + Top.ToString());
             }
-            strSql.Append(" F_Id,F_State,F_Type,F_MenuId ");
+            strSql.Append(" * ");
             strSql.Append(" FROM T_Wo_StatusOpt ");
             if (strWhere.Trim() != "")
             {

RMYY_CallCenter_Api.Model/T_Sys_Menu.cs

@@ -132,7 +132,7 @@ namespace RMYY_CallCenter_Api.Model
         }
 
         /// <summary>
-        /// 1框架页2无页面3弹出页
+        /// 1框架页2无页面3弹出页(工单类型)
         /// </summary>
         public int? F_MenuType
         {

RMYY_CallCenter_Api.Model/T_Wo_StatusOpt.cs

@@ -19,6 +19,8 @@ namespace RMYY_CallCenter_Api.Model
         private int? _f_state;
         private int? _f_type;
         private int? _f_menuid;
+        private string _f_optmethod;
+        private string _f_remark;
         /// <summary>
         /// 
         /// </summary>
@@ -51,6 +53,22 @@ namespace RMYY_CallCenter_Api.Model
             set { _f_menuid = value; }
             get { return _f_menuid; }
         }
+        /// <summary>
+		/// 操作方法
+		/// </summary>
+		public string F_OptMethod
+        {
+            set { _f_optmethod = value; }
+            get { return _f_optmethod; }
+        }
+        /// <summary>
+        /// 备注
+        /// </summary>
+        public string F_Remark
+        {
+            set { _f_remark = value; }
+            get { return _f_remark; }
+        }
 
         public string F_StateName { get; set; }
 

RMYY_CallCenter_Api.Utility/Tree/TreeModel.cs

@@ -45,6 +45,9 @@ namespace RMYY_CallCenter_Api.Utility
         /// 工单级别类型  (部门类型  1 院区  2 部门)
         /// </summary>
         public int? TypeId { get; set; }
+
+        public string location { get; set; }
+        public string phone { get; set; }
         private List<TreeModel> _children;
         public List<TreeModel> children
         {

RMYY_CallCenter_Api/Common/WorkOrderBase.cs

@@ -118,6 +118,62 @@ namespace RMYY_CallCenter_Api
 
         }
 
+        /// <summary>
+        /// 工单指派记录
+        /// </summary>
+        /// <param name="woid"></param>
+        /// <param name="wostate"></param>
+        /// <param name="type"></param>
+        /// <param name="content"></param>
+        /// <param name="itemtype"></param>
+        /// <param name="opttype"></param>
+        /// <param name="nextuser"></param>
+        /// <param name="nextusername"></param>
+        /// <param name="nextuserphon"></param>
+        /// <param name="nextusertalkie"></param>
+        /// <param name="nextdept"></param>
+        /// <param name="nowUser"></param>
+        /// <param name="F_IsUsed"></param>
+        /// <returns></returns>
+
+        public static long AddLogTrans(int woid, int wostate, int type, string content, int itemtype, int opttype, string nextuser, string nextusername, string nextuserphon, string nextusertalkie, int nextdept, Model.T_Sys_UserAccount nowUser, int F_IsUsed = 0)
+        {
+
+            Model.T_Dis_WorkOrderItem itemModel = new Model.T_Dis_WorkOrderItem();
+            #region 
+            //处理当前工单的记录之前的记录过期
+            var itemlast = itembll.GetModelList(" isnull(F_IsUsed,'0')='0' and F_OptType !=" + (int)EnumDisItemOpt.assign + " and F_ItemType=" + itemtype + " and  F_WoID=" + woid + " and  (F_CreateUser=" + nowUser.F_UserCode + ")");
+            if (F_IsUsed == 0)
+            {
+
+                if (itemlast.Count > 0)
+                {
+                    foreach (var it in itemlast)
+                    {
+                        it.F_IsUsed = 1;
+                        itembll.Update(it);
+                    }
+                }
+            }
+            #endregion
+            itemModel.F_WoID = woid;
+            itemModel.F_WoState = wostate;
+            itemModel.F_WoType = (int)(EnumWorkOrder)(type);//工单类型
+            itemModel.F_ItemType = itemtype;
+            itemModel.F_OptType = opttype;
+            itemModel.F_OptContent = content;
+            itemModel.F_NextUser = nextuser;
+            itemModel.F_NextUserName = nextusername;
+            itemModel.F_NextUserTalkie = nextusertalkie;
+            itemModel.F_NexUserPhon = nextuserphon;
+            itemModel.F_NextDept = nextdept;
+            itemModel.F_IsUsed = F_IsUsed;
+            itemModel.F_CreateTime = DateTime.Now;
+            itemModel.F_CreateUser = nowUser.F_UserCode;
+            var res = itembll.Add(itemModel);
+            return res;
+        }
+
 
         /// <summary>
         /// 获取最大工单分类

RMYY_CallCenter_Api/Controllers/DictionaryType/GongDanTypeController.cs

@@ -35,7 +35,7 @@ namespace RMYY_CallCenter_Api.Controllers
             }
             else
             {
-                sql += $" F_ParentID=0";
+                 sql += $" F_ParentID=0";
                  gModel = gongdanBll.GetList(sql).Tables[0];
             }
             List<T_Sys_GongDan> g_list = gongdanBll.DataTableToList(gModel);

RMYY_CallCenter_Api/Controllers/System/DepartmentController.cs

@@ -111,7 +111,13 @@ namespace RMYY_CallCenter_Api.Controllers.System
                     treeModel.text = entity.F_DeptName;
                     treeModel.parentid = entity.F_ParentId.ToString();
                     treeModel.TypeId = 2;
-                    treeModel.children = TreeRecursion(data, entity.F_DeptId.ToString());
+                    var child= TreeRecursion(data, entity.F_DeptId.ToString());
+                    if(child.Count>0)
+                    {
+                        treeModel.children = child;
+                    }
+                    treeModel.location = entity.F_Location;
+                    treeModel.phone = entity.F_OfficeTelephone;
                     newList.Add(treeModel);
                 }
             }

RMYY_CallCenter_Api/Controllers/System/MenuController.cs

@@ -280,5 +280,38 @@ namespace RMYY_CallCenter_Api.Controllers.System
             }
 
         }
+
+        /// <summary>
+        /// 获取工单对应的操作按钮
+        /// </summary>
+        /// <param name="type"></param>
+        /// <returns></returns>
+        public ActionResult GetButtonList(int type)
+        {
+            if (type > 0)
+            {
+                string sql = $" F_State=1 and F_Type=3 and F_MenuType={type}";
+                var modelist = menuBLL.GetModelList(sql);
+                var rows = modelist.Select(p =>
+                {
+                    return new
+                    {
+                        F_MenuId=p.F_MenuId,
+                        F_MenuName=p.F_MenuName,
+                        F_Action=p.F_Action
+                    };
+                }
+                );
+                var obj = new
+                {
+                    state = "success",
+                    message = "成功",
+                    rows = rows
+                };
+                return Content(obj.ToJson());
+            }
+            else
+                return Error("参数错误！");
+        }
     }
 }

RMYY_CallCenter_Api/Controllers/System/WoStatusOptController.cs

@@ -100,9 +100,9 @@ namespace RMYY_CallCenter_Api.Controllers.System
         /// <param name="menuid"></param>
         /// <param name="id"></param>
         /// <returns></returns>
-        public ActionResult AddModel(int state,int type,int menuid,int id=0)
+        public ActionResult AddModel(int state,int type,int menuid,string opt="",int id=0)
         {
-            if (state == 0)
+            if (state<0)
                 return Error("请选择工单状态！");
             if(type==0)
                 return Error("请选择工单类型！");
@@ -114,6 +114,7 @@ namespace RMYY_CallCenter_Api.Controllers.System
                 optmodel.F_State = state;
                 optmodel.F_Type = type;
                 optmodel.F_MenuId = menuid;
+                optmodel.F_OptMethod = opt;
                 optbll.Update(optmodel);
                 return Success("修改成功！");
             }
@@ -123,6 +124,7 @@ namespace RMYY_CallCenter_Api.Controllers.System
                 optmodel.F_State = state;
                 optmodel.F_Type = type;
                 optmodel.F_MenuId = menuid;
+                optmodel.F_OptMethod = opt;
                 optbll.Add(optmodel);
                 return Success("添加成功！");
             }

RMYY_CallCenter_Api/Controllers/WorkOrder/Con_WorkOrderController.cs

@@ -14,12 +14,13 @@ namespace RMYY_CallCenter_Api.Controllers
 {
     public class Con_WorkOrderController : BaseController
     {
-        private Bll.T_Con_WorkOrderItem itembll = new Bll.T_Con_WorkOrderItem();
+        private Bll.T_Dis_WorkOrderItem itembll = new Bll.T_Dis_WorkOrderItem();
         private Bll.T_Sys_UserAccount userbll = new Bll.T_Sys_UserAccount();
         private Bll.T_Sys_Department deptbll = new Bll.T_Sys_Department();
         private Bll.T_Con_WorkOrder orderbll = new Bll.T_Con_WorkOrder();
         private Bll.T_Sys_Role rolebll = new Bll.T_Sys_Role();
         private Bll.T_Sys_GongDan tybll = new Bll.T_Sys_GongDan();
+        private Bll.AddLogBll logbll = new Bll.AddLogBll();
 
         /// <summary>
         /// 获取列表
@@ -71,7 +72,7 @@ namespace RMYY_CallCenter_Api.Controllers
 
                     if (User.F_RoleCode == "HSZ")//护士长角色
                     {
-                        string idstr = GetGongDanId(User.F_UserCode);
+                        string idstr = GetGongDanstr(User.F_UserCode);
                         if (!string.IsNullOrEmpty(idstr))
                         {
                             sql += $" or F_ID in (" + idstr + ")";
@@ -80,11 +81,8 @@ namespace RMYY_CallCenter_Api.Controllers
                     if (User.F_RoleCode == "BZ")//行风办
                     {
                         transql = GetTranPersonsql(User.F_UserCode);
-                        if (transql != "")
-                        {
-                            sql += $" or F_Id in (" + transql + ")";
-                            wokerlist = transql.Split(',').Distinct().ToList();
-                        }
+                        sql += $" or F_Id in (" + transql + ")";
+                        wokerlist = transql.Split(',').Distinct().ToList();
                     }
                 }
                 #endregion
@@ -191,15 +189,17 @@ namespace RMYY_CallCenter_Api.Controllers
         /// </summary>
         /// <param name="ucode"></param>
         /// <returns></returns>
-        private string GetGongDanId(string ucode)
+        private string GetGongDanstr(string ucode)
         {
+            string wotype = $"{(int)EnumWorkOrder.consultation},{(int)EnumWorkOrder.complaint},{(int)EnumWorkOrder.externalcons},{(int)EnumWorkOrder.appointment}";
             string str = string.Empty;
-            var list = itembll.GetModelList("F_OptType=" + (int)EnumItemOpt.audit + " and F_ItemType=" + (int)EnumItemType.audit + " and F_WoState="+(int)EnumWorkOrderState.audit+" and F_NextUser=" + ucode + " ").Select(t => t.F_WoID).Distinct().ToList();
-            if (list.Count > 0)
-                foreach (var item in list)
-                {
-                    str = string.IsNullOrEmpty(str) ? item.ToString() : str + "," + item.ToString();
-                }
+            str = $"select F_WoID from T_Dis_WorkOrderItem where F_OptType=" + (int)EnumItemOpt.audit + " and F_ItemType=" + (int)EnumItemType.audit + " and F_WoState=" + (int)EnumWorkOrderState.audit + " and F_NextUser=" + ucode + " and F_WoType in(" + wotype + ")";
+            //var list = itembll.GetModelList("F_OptType=" + (int)EnumItemOpt.audit + " and F_ItemType=" + (int)EnumItemType.audit + " and F_WoState="+(int)EnumWorkOrderState.audit+" and F_NextUser=" + ucode + " and F_WoType in("+wotype+")").Select(t => t.F_WoID).Distinct().ToList();
+            //if (list.Count > 0)
+            //    foreach (var item in list)
+            //    {
+            //        str = string.IsNullOrEmpty(str) ? item.ToString() : str + "," + item.ToString();
+            //    }
             return str;
         }
         /// <summary>
@@ -209,13 +209,9 @@ namespace RMYY_CallCenter_Api.Controllers
         /// <returns></returns>
         private string GetTransql(string usercode)
         {
+            string wotype = $"{(int)EnumWorkOrder.consultation},{(int)EnumWorkOrder.complaint},{(int)EnumWorkOrder.externalcons},{(int)EnumWorkOrder.appointment}";
             string str = string.Empty;
-            var list = itembll.GetModelList("F_OptType=" + (int)EnumItemOpt.assign + "and F_WoState=" + (int)EnumWorkOrderState.assign + " and F_NextUser=" + usercode + " ").Select(t => t.F_WoID).Distinct<long>().ToList();
-            if (list.Count > 0)
-                foreach (var item in list)
-                {
-                    str = string.IsNullOrEmpty(str) ? item.ToString() : str + "," + item.ToString();
-                }
+            str = $"select F_WoID from T_Dis_WorkOrderItem where F_OptType = " + (int)EnumItemOpt.assign + "and F_WoState = " + (int)EnumWorkOrderState.assign + " and F_NextUser = " + usercode + " and F_WoType in(" + wotype + ")";           
             return str;
         }
         /// <summary>
@@ -226,18 +222,8 @@ namespace RMYY_CallCenter_Api.Controllers
         /// <returns></returns>
         private string GetTranPersonsql(string usercode)
         {
-            string wokerlist = "";
-            string[] wokerarr = { };
-                var itemlist = itembll.GetModelList("F_CreateUser=" + usercode + " or F_NextUser=" + usercode + "").Select(t => t.F_WoID).Distinct<long>().ToList();
-                if (itemlist.Count > 0)
-                {
-                    foreach (var item in itemlist)
-                    {
-                        wokerlist = string.IsNullOrEmpty(wokerlist) ? item.ToString() : wokerlist + "," + item.ToString();
-                    }
-                    if (wokerlist != "")
-                        wokerarr = wokerlist.Split(',');
-                }
+            string wotype = $"{(int)EnumWorkOrder.consultation},{(int)EnumWorkOrder.complaint},{(int)EnumWorkOrder.externalcons},{(int)EnumWorkOrder.appointment}";
+            string wokerlist = $"select F_WoID from T_Dis_WorkOrderItem where F_CreateUser=" + usercode + " or F_NextUser=" + usercode + " and F_WoType in(" + wotype + ")";         
             return wokerlist;
         }
 
@@ -392,7 +378,7 @@ namespace RMYY_CallCenter_Api.Controllers
                         string deptname = "";
                         if (deptmodel != null)
                             deptname = deptmodel.F_DeptName + "-";
-                        AddLog(work.F_ID, 0, deptname + User.F_UserName + "(" + User.F_UserCode + ")" + "创建工单", (int)EnumWorkOrderState.neworder, (int)EnumItemOpt.create, "", 0, User);
+                       logbll.AddLog(work.F_ID, 0,(int)work.F_type1, deptname + User.F_UserName + "(" + User.F_UserCode + ")" + "创建工单", (int)EnumWorkOrderState.neworder, (int)EnumItemOpt.create, "", 0, User.F_UserCode);
                         if (opt == 1)//立即办理
                         {
 
@@ -416,7 +402,7 @@ namespace RMYY_CallCenter_Api.Controllers
                                 {
                                     work.F_State = (int)EnumWorkOrderState.audit;
                                     orderbll.Update(work);
-                                    AddLog(work.F_ID, (int)work.F_State, deptname + userleader.F_UserName + "(" + User.F_UserCode + ")" + "待审批", (int)EnumItemType.audit, (int)EnumItemOpt.audit, userleader.F_UserCode, userleader.F_DeptId, User);
+                                   logbll.AddLog(work.F_ID, (int)work.F_State,(int)work.F_type1, deptname + userleader.F_UserName + "(" + User.F_UserCode + ")" + "待审批", (int)EnumItemType.audit, (int)EnumItemOpt.audit, userleader.F_UserCode, userleader.F_DeptId, User.F_UserCode);
                                 }
                                 else
                                     return Error("提交审核失败！");
@@ -513,7 +499,7 @@ namespace RMYY_CallCenter_Api.Controllers
                         string deptname = "";
                         if (deptmodel != null)
                             deptname = deptmodel.F_DeptName + "-";
-                        AddLog(input.F_ID, 0, deptname + User.F_UserName + "(" + User.F_UserCode + ")" + "修改工单", (int)EnumItemType.update, (int)EnumItemOpt.update, "", 0, User);
+                       logbll.AddLog(input.F_ID, 0,(int)model.F_type1, deptname + User.F_UserName + "(" + User.F_UserCode + ")" + "修改工单", (int)EnumItemType.update, (int)EnumItemOpt.update, "", 0, User.F_UserCode);
                         if (opt == 1)//立即办理
                         {
                             //if (input.F_Type2 == 1001 || input.F_Type2 == 1003)
@@ -537,7 +523,7 @@ namespace RMYY_CallCenter_Api.Controllers
                                 {
                                     model.F_State = (int)EnumWorkOrderState.audit;
                                     orderbll.Update(model);
-                                    AddLog(model.F_ID, (int)model.F_State, deptname + userleader.F_UserName + "(" + User.F_UserCode + ")" + "待审批", (int)EnumItemType.audit, (int)EnumItemOpt.audit, userleader.F_UserCode, userleader.F_DeptId, User);
+                                   logbll.AddLog(model.F_ID, (int)model.F_State, (int)model.F_type1, deptname + userleader.F_UserName + "(" + User.F_UserCode + ")" + "待审批", (int)EnumItemType.audit, (int)EnumItemOpt.audit, userleader.F_UserCode, userleader.F_DeptId, User.F_UserCode);
                                 }
                                 else
                                     return Error("提交审核失败！");
@@ -626,7 +612,7 @@ namespace RMYY_CallCenter_Api.Controllers
                         #endregion
 
                         #region 插入操作记录
-                        AddLog(womodel.F_ID, (int)womodel.F_State, User.F_UserName + "(" + User.F_UserCode + ")" + "删除了工单", (int)EnumItemType.delete, (int)EnumItemOpt.delete, "", 0, User);
+                       logbll.AddLog(womodel.F_ID,(int)womodel.F_type1,(int)womodel.F_State, User.F_UserName + "(" + User.F_UserCode + ")" + "删除了工单", (int)EnumItemType.delete, (int)EnumItemOpt.delete, "", 0, User.F_UserCode);
                         #endregion
                     }
                     else return Error("删除失败！");
@@ -727,40 +713,40 @@ namespace RMYY_CallCenter_Api.Controllers
         /// <summary>
         /// 添加工单记录
         /// </summary>
-        public long AddLog(int woid, int wostate, string content, int itemtype, int opttype, string nextuser, int nextdept, Model.T_Sys_UserAccount nowUser, int F_IsUsed = 0)
-        {
+        //public long AddLog(int woid, int wostate, string content, int itemtype, int opttype, string nextuser, int nextdept, Model.T_Sys_UserAccount nowUser, int F_IsUsed = 0)
+        //{
 
-            Model.T_Con_WorkOrderItem itemModel = new Model.T_Con_WorkOrderItem();
-            #region 
-            //处理当前工单的记录之前的记录过期
-            var itemlast = itembll.GetModelList(" isnull(F_IsUsed,'0')='0' and F_ItemType=" + itemtype + " and  F_WoID=" + woid + " ");
-            if (F_IsUsed == 0)
-            {
+        //    Model.T_Con_WorkOrderItem itemModel = new Model.T_Con_WorkOrderItem();
+        //    #region 
+        //    //处理当前工单的记录之前的记录过期
+        //    var itemlast = itembll.GetModelList(" isnull(F_IsUsed,'0')='0' and F_ItemType=" + itemtype + " and  F_WoID=" + woid + " ");
+        //    if (F_IsUsed == 0)
+        //    {
 
-                if (itemlast.Count > 0)
-                {
-                    foreach (var it in itemlast)
-                    {
-                        it.F_IsUsed = 1;
-                        itembll.Update(it);
-                    }
-                }
-            }
-            #endregion
-            itemModel.F_WoID = woid;
-            itemModel.F_WoState = wostate;
-            itemModel.F_ItemType = itemtype;
-            itemModel.F_OptType = opttype;
-            itemModel.F_OptContent = content;
-            itemModel.F_NextUser = nextuser;
-            itemModel.F_NextDept = nextdept;
-            itemModel.F_IsSMS = 0;
-            itemModel.F_IsUsed = F_IsUsed;
-            itemModel.F_CreateTime = DateTime.Now;
-            itemModel.F_CreateUser = nowUser.F_UserCode;
-            var res = itembll.Add(itemModel);
-            return res;
-        }
+        //        if (itemlast.Count > 0)
+        //        {
+        //            foreach (var it in itemlast)
+        //            {
+        //                it.F_IsUsed = 1;
+        //                itembll.Update(it);
+        //            }
+        //        }
+        //    }
+        //    #endregion
+        //    itemModel.F_WoID = woid;
+        //    itemModel.F_WoState = wostate;
+        //    itemModel.F_ItemType = itemtype;
+        //    itemModel.F_OptType = opttype;
+        //    itemModel.F_OptContent = content;
+        //    itemModel.F_NextUser = nextuser;
+        //    itemModel.F_NextDept = nextdept;
+        //    itemModel.F_IsSMS = 0;
+        //    itemModel.F_IsUsed = F_IsUsed;
+        //    itemModel.F_CreateTime = DateTime.Now;
+        //    itemModel.F_CreateUser = nowUser.F_UserCode;
+        //    var res = itembll.Add(itemModel);
+        //    return res;
+        //}
 
         /// <summary>
         /// 根据model返回Input对象
@@ -997,7 +983,7 @@ namespace RMYY_CallCenter_Api.Controllers
                 if (!string.IsNullOrEmpty(cont))
                     optcont = "，说明：" + cont;
                 var content = deptname + nowUser.F_UserName + "(" + nowUser.F_UserCode + ")" + opt + "工单给 " + tousername + optcont;
-                var itemid = AddLog(wokerModel.F_ID, wostate, content, (int)EnumItemType.deal, optbut, touser, clbm, nowUser);
+                var itemid =logbll.AddLog(wokerModel.F_ID, wostate,(int)wokerModel.F_type1, content, (int)EnumItemType.deal, optbut, touser, clbm, nowUser.F_UserCode);
                 #endregion
                 if (itemid > 0)
                 {
@@ -1042,14 +1028,14 @@ namespace RMYY_CallCenter_Api.Controllers
                     {
                         if (AuditState == 1)
                         {
-                            res = AddLog(wmodel.F_ID, wmodel.F_State.Value, deptname + ua.F_UserName + "(" + ua.F_UserCode + ")" + "工单审批：已同意审批" + AuditCont, (int)EnumItemType.audit, (int)EnumItemOpt.reaudit, ua.F_UserCode, ua.F_DeptId, ua);
+                            res =logbll.AddLog(wmodel.F_ID, wmodel.F_State.Value,(int)wmodel.F_type1, deptname + ua.F_UserName + "(" + ua.F_UserCode + ")" + "工单审批：已同意审批" + AuditCont, (int)EnumItemType.audit, (int)EnumItemOpt.reaudit, ua.F_UserCode, ua.F_DeptId, ua.F_UserCode);
                             AssignWO(User, wmodel, "", 0, (int)clbm);
                             wmodel.F_State = (int)EnumWorkOrderState.assign;//待处理
                             wmodel.F_AuditState = 1;
                         }
                         if (AuditState == 2)
                         {
-                            res = AddLog(wmodel.F_ID, wmodel.F_State.Value, ua.F_UserName + "(" + ua.F_UserCode + ")" + "工单审批：未同意审批" + AuditCont, (int)EnumItemType.audit, (int)EnumItemOpt.reback, ua.F_UserCode, ua.F_DeptId, ua);
+                            res =logbll.AddLog(wmodel.F_ID, wmodel.F_State.Value,(int)wmodel.F_type1, ua.F_UserName + "(" + ua.F_UserCode + ")" + "工单审批：未同意审批" + AuditCont, (int)EnumItemType.audit, (int)EnumItemOpt.reback, ua.F_UserCode, ua.F_DeptId, ua.F_UserCode);
                             wmodel.F_State = (int)EnumWorkOrderState.audit;//待审批
                             wmodel.F_AuditState = 2;
                         }
@@ -1150,7 +1136,7 @@ namespace RMYY_CallCenter_Api.Controllers
             if (!string.IsNullOrEmpty(cont))
                 optcont = "，处理内容：" + cont;
             var content = deptname + nowUser.F_UserName + "(" + nowUser.F_UserCode + ")" + opt + "工单" + optcont;
-            var itemid = AddLog(model.F_ID, wostate, content, (int)EnumItemType.deal, optbut, "", 0, nowUser);
+            var itemid =logbll.AddLog(model.F_ID, wostate,(int)model.F_type1, content, (int)EnumItemType.deal, optbut, "", 0, nowUser.F_UserCode);
             if (itemid > 0)
             {
                 #region 处理工单

RMYY_CallCenter_Api/Controllers/WorkOrder/T_Acc_WorkOrderController.cs

@@ -15,6 +15,7 @@ namespace RMYY_CallCenter_Api.Controllers.WorkOrder
         private Bll.T_Acc_WorkOrder orderbll = new Bll.T_Acc_WorkOrder();
         private Bll.T_Sys_UserAccount userbll = new Bll.T_Sys_UserAccount();
         private Bll.T_Dis_WorkOrderItem itembll = new Bll.T_Dis_WorkOrderItem();
+        private Bll.AddLogBll logbll = new Bll.AddLogBll();
 
         /// <summary>
         /// 陪检获取列表 陪检服务 血站取血
@@ -428,7 +429,7 @@ namespace RMYY_CallCenter_Api.Controllers.WorkOrder
                 if (n > 0)
                 {
                     var wmodel = orderbll.GetModel(n);
-                    AddLog(n, 0, type, User.F_UserName + "(" + User.F_UserCode + ")" + "创建新工单", 0, (int)EnumAccItemOpt.create, "", 0, User);
+                    logbll.AddLog(n, 0, type, User.F_UserName + "(" + User.F_UserCode + ")" + "创建新工单", 0, (int)EnumAccItemOpt.create, "", 0, User.F_UserCode);
                     return Success("操作成功！");
                 }
                 else return Error("添加失败");
@@ -503,7 +504,7 @@ namespace RMYY_CallCenter_Api.Controllers.WorkOrder
                 bool n = orderbll.Update(model);
                 if (n)
                 {
-                    AddLog(woid, (int)model.F_State, (int)model.F_Type, User.F_UserName + "(" + User.F_UserCode + ")" + "修改工单", (int)EnumAccItemOpt.update, (int)EnumAccItemOpt.update, "", 0, User);
+                   logbll.AddLog(woid, (int)model.F_State, (int)model.F_Type, User.F_UserName + "(" + User.F_UserCode + ")" + "修改工单", (int)EnumAccItemOpt.update, (int)EnumAccItemOpt.update, "", 0, User.F_UserCode);
                     return Success("操作成功！");
                 }
                 else return Error("修改失败");
@@ -816,7 +817,7 @@ namespace RMYY_CallCenter_Api.Controllers.WorkOrder
             if (!string.IsNullOrEmpty(cont))
                 optcont = "，说明：" + cont;
             var content = nowUser.F_UserName + "(" + nowUser.F_UserCode + ")" + opt + optcont;
-            var itemid = AddLog(model.F_Id, wostate1, (int)model.F_Type, content, (int)EnumDevItemType.deal, optbut, "", 0, nowUser);
+            var itemid =logbll.AddLog(model.F_Id, wostate1, (int)model.F_Type, content, (int)EnumDevItemType.deal, optbut, "", 0, nowUser.F_UserCode);
             if (itemid > 0)
             {
                 #region 判断工单的状态
@@ -984,40 +985,40 @@ namespace RMYY_CallCenter_Api.Controllers.WorkOrder
         /// <summary>
         /// 添加工单记录
         /// </summary>
-        public long AddLog(int woid, int wostate, int type, string content, int itemtype, int opttype, string nextuser, int nextdept, Model.T_Sys_UserAccount nowUser, int F_IsUsed = 0)
-        {
+        //public long AddLog(int woid, int wostate, int type, string content, int itemtype, int opttype, string nextuser, int nextdept, Model.T_Sys_UserAccount nowUser, int F_IsUsed = 0)
+        //{
 
-            Model.T_Dis_WorkOrderItem itemModel = new Model.T_Dis_WorkOrderItem();
-            #region 
-            //处理当前工单的记录之前的记录过期
-            var itemlast = itembll.GetModelList(" isnull(F_IsUsed,'0')='0' and F_ItemType=" + itemtype + " and  F_WoID=" + woid + " and  (F_CreateUser=" + nowUser.F_UserCode + " or F_NextUser like '%" + nowUser.F_UserCode + "%')");
-            if (F_IsUsed == 0)
-            {
+        //    Model.T_Dis_WorkOrderItem itemModel = new Model.T_Dis_WorkOrderItem();
+        //    #region 
+        //    //处理当前工单的记录之前的记录过期
+        //    var itemlast = itembll.GetModelList(" isnull(F_IsUsed,'0')='0' and F_ItemType=" + itemtype + " and  F_WoID=" + woid + " and  (F_CreateUser=" + nowUser.F_UserCode + " or F_NextUser like '%" + nowUser.F_UserCode + "%')");
+        //    if (F_IsUsed == 0)
+        //    {
 
-                if (itemlast.Count > 0)
-                {
-                    foreach (var it in itemlast)
-                    {
-                        it.F_IsUsed = 1;
-                        itembll.Update(it);
-                    }
-                }
-            }
-            #endregion
-            itemModel.F_WoID = woid;
-            itemModel.F_WoState = wostate;
-            itemModel.F_WoType = type;
-            itemModel.F_ItemType = itemtype;
-            itemModel.F_OptType = opttype;
-            itemModel.F_OptContent = content;
-            itemModel.F_NextUser = nextuser;
-            itemModel.F_NextDept = nextdept;
-            itemModel.F_IsUsed = F_IsUsed;
-            itemModel.F_CreateTime = DateTime.Now;
-            itemModel.F_CreateUser = nowUser.F_UserCode;
-            var res = itembll.Add(itemModel);
-            return res;
-        }
+        //        if (itemlast.Count > 0)
+        //        {
+        //            foreach (var it in itemlast)
+        //            {
+        //                it.F_IsUsed = 1;
+        //                itembll.Update(it);
+        //            }
+        //        }
+        //    }
+        //    #endregion
+        //    itemModel.F_WoID = woid;
+        //    itemModel.F_WoState = wostate;
+        //    itemModel.F_WoType = type;
+        //    itemModel.F_ItemType = itemtype;
+        //    itemModel.F_OptType = opttype;
+        //    itemModel.F_OptContent = content;
+        //    itemModel.F_NextUser = nextuser;
+        //    itemModel.F_NextDept = nextdept;
+        //    itemModel.F_IsUsed = F_IsUsed;
+        //    itemModel.F_CreateTime = DateTime.Now;
+        //    itemModel.F_CreateUser = nowUser.F_UserCode;
+        //    var res = itembll.Add(itemModel);
+        //    return res;
+        //}
 
         /// <summary>
         /// 删除工单
@@ -1042,7 +1043,7 @@ namespace RMYY_CallCenter_Api.Controllers.WorkOrder
                         #endregion
 
                         #region 插入操作记录
-                        AddLog(womodel.F_Id, (int)womodel.F_State, (int)womodel.F_Type, User.F_UserName + "(" + User.F_UserCode + ")" + "删除了工单", (int)EnumAccItemOpt.delete, (int)EnumAccItemOpt.delete, "", 0, User);
+                       logbll.AddLog(womodel.F_Id, (int)womodel.F_State, (int)womodel.F_Type, User.F_UserName + "(" + User.F_UserCode + ")" + "删除了工单", (int)EnumAccItemOpt.delete, (int)EnumAccItemOpt.delete, "", 0, User.F_UserCode);
                         #endregion
                     }
                 }

RMYY_CallCenter_Api/Controllers/WorkOrder/T_Dev_WorkOrderController.cs

@@ -15,6 +15,7 @@ namespace RMYY_CallCenter_Api.Controllers.WorkOrder
         private Bll.T_Dev_WorkOrder orderbll = new Bll.T_Dev_WorkOrder();
         private Bll.T_Dev_WorkOrderItem itembll = new Bll.T_Dev_WorkOrderItem();
         private Bll.T_Sys_UserAccount userbll = new Bll.T_Sys_UserAccount();
+        private Bll.AddLogBll logbll = new Bll.AddLogBll();
 
 
 
@@ -357,7 +358,7 @@ namespace RMYY_CallCenter_Api.Controllers.WorkOrder
                 {
                     int clbm = 2002;//设备科
                     var wmodel = orderbll.GetModel(n);
-                    AddLog(n, 0, User.F_UserName + "(" + User.F_UserCode + ")" + "创建新工单", (int)EnumDevItemType.deal, (int)EnumDevItemOpt.create, "", 0, User);
+                    logbll.AddLog(n, 0, (int)EnumWorkOrder.Dev, User.F_UserName + "(" + User.F_UserCode + ")" + "创建新工单", (int)EnumDevItemType.deal, (int)EnumDevItemOpt.create, "", 0, User.F_UserCode);
                     AssignWO(User, wmodel, "", "", clbm);
                     string[] _list = devmessages.TrimEnd(',').Split(',');
                     try
@@ -424,7 +425,7 @@ namespace RMYY_CallCenter_Api.Controllers.WorkOrder
                 {
                     int clbm = 2002;//设备科
                     var wmodel = orderbll.GetModel(n);
-                    AddLog(n, 0, User.F_UserName + "(" + User.F_UserCode + ")" + "创建新工单", (int)EnumDevItemType.deal, (int)EnumDevItemOpt.create, "", 0, User);
+                   logbll.AddLog(n, 0, (int)EnumWorkOrder.Dev, User.F_UserName + "(" + User.F_UserCode + ")" + "创建新工单", (int)EnumDevItemType.deal, (int)EnumDevItemOpt.create, "", 0, User.F_UserCode);
                     string[] _list = devmessages.TrimEnd(',').Split(',');
                     for (int i = 0; i < _list.Length; i++)
                     {
@@ -495,7 +496,7 @@ namespace RMYY_CallCenter_Api.Controllers.WorkOrder
                 if (n)
                 {
                     int clbm = 2002;//设备科
-                    AddLog(woid, (int)wmodel.F_State, User.F_UserName + "(" + User.F_UserCode + ")" + "修改工单", (int)EnumDevItemType.update, (int)EnumDevItemOpt.update, "", 0, User);
+                  logbll.AddLog(woid, (int)wmodel.F_State, (int)EnumWorkOrder.Dev, User.F_UserName + "(" + User.F_UserCode + ")" + "修改工单", (int)EnumDevItemType.update, (int)EnumDevItemOpt.update, "", 0, User.F_UserCode);
                     //AssignWO(User1, wmodel, "", "", clbm);
                     #region 删除之前记录
                     string sql = $"F_WoId=" + woid;
@@ -533,39 +534,39 @@ namespace RMYY_CallCenter_Api.Controllers.WorkOrder
         /// <summary>
         /// 添加工单记录
         /// </summary>
-        public long AddLog(int woid, int wostate, string content, int itemtype, int opttype, string nextuser, int nextdept, Model.T_Sys_UserAccount nowUser, int F_IsUsed = 0)
-        {
-
-            Model.T_Dev_WorkOrderItem itemModel = new Model.T_Dev_WorkOrderItem();
-            #region 
-            //处理当前工单的记录之前的记录过期
-            var itemlast = itembll.GetModelList(" isnull(F_IsUsed,'0')='0' and F_ItemType=" + itemtype + " and  F_WoID=" + woid + "");
-            if (F_IsUsed == 0)
-            {
-
-                if (itemlast.Count > 0)
-                {
-                    foreach (var it in itemlast)
-                    {
-                        it.F_IsUsed = 1;
-                        itembll.Update(it);
-                    }
-                }
-            }
-            #endregion
-            itemModel.F_WoID = woid;
-            itemModel.F_WoState = wostate;
-            itemModel.F_ItemType = itemtype;
-            itemModel.F_OptType = opttype;
-            itemModel.F_OptContent = content;
-            itemModel.F_NextUser = nextuser;
-            itemModel.F_NextDeptId = nextdept;
-            itemModel.F_IsUsed = F_IsUsed;
-            itemModel.F_CreateTime = DateTime.Now;
-            itemModel.F_CreateUser = nowUser.F_UserCode;
-            var res = itembll.Add(itemModel);
-            return res;
-        }
+        //public long AddLog(int woid, int wostate, string content, int itemtype, int opttype, string nextuser, int nextdept, Model.T_Sys_UserAccount nowUser, int F_IsUsed = 0)
+        //{
+
+        //    Model.T_Dev_WorkOrderItem itemModel = new Model.T_Dev_WorkOrderItem();
+        //    #region 
+        //    //处理当前工单的记录之前的记录过期
+        //    var itemlast = itembll.GetModelList(" isnull(F_IsUsed,'0')='0' and F_ItemType=" + itemtype + " and  F_WoID=" + woid + "");
+        //    if (F_IsUsed == 0)
+        //    {
+
+        //        if (itemlast.Count > 0)
+        //        {
+        //            foreach (var it in itemlast)
+        //            {
+        //                it.F_IsUsed = 1;
+        //                itembll.Update(it);
+        //            }
+        //        }
+        //    }
+        //    #endregion
+        //    itemModel.F_WoID = woid;
+        //    itemModel.F_WoState = wostate;
+        //    itemModel.F_ItemType = itemtype;
+        //    itemModel.F_OptType = opttype;
+        //    itemModel.F_OptContent = content;
+        //    itemModel.F_NextUser = nextuser;
+        //    itemModel.F_NextDeptId = nextdept;
+        //    itemModel.F_IsUsed = F_IsUsed;
+        //    itemModel.F_CreateTime = DateTime.Now;
+        //    itemModel.F_CreateUser = nowUser.F_UserCode;
+        //    var res = itembll.Add(itemModel);
+        //    return res;
+        //}
 
         /// <summary>
         /// 添加工单记录
@@ -649,7 +650,7 @@ namespace RMYY_CallCenter_Api.Controllers.WorkOrder
                 if (!string.IsNullOrEmpty(cont))
                     optcont = "，说明：" + cont;
                 var content =  nowUser.F_UserName + "(" + nowUser.F_UserCode + ")" + opt + "工单给 " + tousername + optcont;
-                var itemid = AddLog(wokerModel.F_Id, wostate, content, (int)EnumDevItemType.deal, optbut, touser, clbm, nowUser);
+                var itemid =logbll.AddLog(wokerModel.F_Id, wostate, (int)EnumWorkOrder.Dev, content, (int)EnumDevItemType.deal, optbut, touser, clbm, nowUser.F_UserCode);
                 #endregion
                 if (itemid > 0)
                 {
@@ -816,7 +817,7 @@ namespace RMYY_CallCenter_Api.Controllers.WorkOrder
                     if (orderbll.Update(omodel))
                     {
                         #region 写入工单操作记录
-                        AddLog(woid, (int)EnumDevWorkOrderState.checkout, User.F_UserName + "(" + User.F_UserCode + ")" + "反馈设备已出库", (int)EnumDevItemType.deal, (int)EnumDevItemOpt.checkout, "", 0, User);
+                       logbll.AddLog(woid, (int)EnumDevWorkOrderState.checkout, (int)EnumWorkOrder.Dev, User.F_UserName + "(" + User.F_UserCode + ")" + "反馈设备已出库", (int)EnumDevItemType.deal, (int)EnumDevItemOpt.checkout, "", 0, User.F_UserCode);
                         #endregion
                         return Success("出库成功！");
                     }
@@ -1066,8 +1067,8 @@ namespace RMYY_CallCenter_Api.Controllers.WorkOrder
                 int n = orderbll.Add(dmodel);
                 if (n > 0)
                 {
-                    AddLog(n, (int)EnumDevWorkOrderState.checkout, User.F_UserName + "(" + User.F_UserCode + ")" + "创建返还工单", (int)EnumDevItemType.deal, (int)EnumDevItemOpt.create, "", 0, User);
-                    AddLog(woid, (int)EnumDevWorkOrderState.checkout, User.F_UserName + "(" + User.F_UserCode + ")" + "创建返还工单", (int)EnumDevItemType.deal, (int)EnumDevItemOpt.create, "", 0, User);
+                   logbll.AddLog(n, (int)EnumDevWorkOrderState.checkout, (int)EnumWorkOrder.Dev, User.F_UserName + "(" + User.F_UserCode + ")" + "创建返还工单", (int)EnumDevItemType.deal, (int)EnumDevItemOpt.create, "", 0, User.F_UserCode);
+                  logbll.AddLog(woid, (int)EnumDevWorkOrderState.checkout, (int)EnumWorkOrder.Dev, User.F_UserName + "(" + User.F_UserCode + ")" + "创建返还工单", (int)EnumDevItemType.deal, (int)EnumDevItemOpt.create, "", 0, User.F_UserCode);
                     return Success("操作成功！");
                 }
                 omodel.F_WoID = n;//关联工单id
@@ -1173,10 +1174,10 @@ namespace RMYY_CallCenter_Api.Controllers.WorkOrder
             if (!string.IsNullOrEmpty(cont))
                 optcont = "，说明：" + cont;
             var content = nowUser.F_UserName + "(" + nowUser.F_UserCode + ")" + opt + optcont;
-            var itemid = AddLog(model.F_Id, wostate, content, (int)EnumDevItemType.deal, optbut, "", 0, nowUser);
+            var itemid =logbll.AddLog(model.F_Id, wostate, (int)EnumWorkOrder.Dev, content, (int)EnumDevItemType.deal, optbut, "", 0, nowUser.F_UserCode);
             if (type == 2 && model.F_WoID>0)
             {
-                AddLog(model.F_WoID, (int)EnumDevWorkOrderState.receive, content, (int)EnumDevItemType.deal, optbut, "", 0, nowUser);
+               logbll.AddLog(model.F_WoID, (int)EnumDevWorkOrderState.receive, (int)EnumWorkOrder.Dev, content, (int)EnumDevItemType.deal, optbut, "", 0, nowUser.F_UserCode);
                 orderbll.Update(fmodel);
             }
             if (itemid > 0)
@@ -1298,7 +1299,7 @@ namespace RMYY_CallCenter_Api.Controllers.WorkOrder
                         if (!string.IsNullOrEmpty(storContents))
                             optcont = "，说明：" + storContents;
                         #region 写入工单操作记录
-                        AddLog(woid, workstate, User.F_UserName + "(" + User.F_UserCode + ")" + opt + optcont, (int)EnumDevItemType.deal, (int)EnumDevItemOpt.storage, "", 0, User);
+                       logbll.AddLog(woid, workstate, (int)EnumWorkOrder.Dev, User.F_UserName + "(" + User.F_UserCode + ")" + opt + optcont, (int)EnumDevItemType.deal, (int)EnumDevItemOpt.storage, "", 0, User.F_UserCode);
                         if (omodel.F_WoID > 0)
                         {
                             var fmodel = orderbll.GetModel(omodel.F_WoID);
@@ -1306,7 +1307,7 @@ namespace RMYY_CallCenter_Api.Controllers.WorkOrder
                             fmodel.F_DevName = string.IsNullOrEmpty(omodel.F_DevName) ? storContents : fmodel.F_DevName + "," + storContents;
                             fmodel.F_DevOutState = state;
                             fmodel.F_State = workstate;
-                            AddLog(omodel.F_WoID, workstate, User.F_UserName + "(" + User.F_UserCode + ")" + opt + optcont, (int)EnumDevItemType.deal, (int)EnumDevItemOpt.storage, "", 0, User);
+                           logbll.AddLog(omodel.F_WoID, workstate, (int)EnumWorkOrder.Dev, User.F_UserName + "(" + User.F_UserCode + ")" + opt + optcont, (int)EnumDevItemType.deal, (int)EnumDevItemOpt.storage, "", 0, User.F_UserCode);
                             orderbll.Update(fmodel);
                         }
                         #endregion

RMYY_CallCenter_Api/Controllers/WorkOrder/T_Dis_WorkOrderController.cs

@@ -16,6 +16,7 @@ namespace RMYY_CallCenter_Api.Controllers.WorkOrder
     {
         Bll.T_Sys_UserAccount userbll = new Bll.T_Sys_UserAccount();
         Bll.T_Dis_WorkOrder orderbll = new Bll.T_Dis_WorkOrder();
+        Bll.AddLogBll logbll = new Bll.AddLogBll();
         Bll.T_Dis_WorkOrderItem itembll = new Bll.T_Dis_WorkOrderItem();
         Bll.T_Sys_Department dptbll = new Bll.T_Sys_Department();
         /// <summary>
@@ -423,86 +424,9 @@ namespace RMYY_CallCenter_Api.Controllers.WorkOrder
         /// </summary>
         /// <param name="type"></param>
         /// <returns></returns>
-        public ActionResult GetTypeStatenew(int type,int ftype=0)
+        public ActionResult GetTypeStatenew(int type)
         {
-            
-            List<TypeState> wlist = Common.GetGongDanState<EnumWorkOrderState>();
-            List<TypeState> tlist = Common.GetGongDanState<EnumDisWorkOrderState>();
-            List<TypeState> qlist = Common.GetGongDanState<EnumMatWorkOrderState>();
-            List<TypeState> dlit = Common.GetGongDanState<EnumDevWorkOrderState>();
-            List<TypeState> alit = Common.GetGongDanState<EnumAccWorkOrderState>();
-            List<TypeState> hlit = Common.GetGongDanState<EnumHosWorkOrderState>();
-            List<TypeState> newlist = new List<TypeState>();
-            if (ftype == 3000)
-            {
-                newlist.Add(new TypeState { StateId = "-1", StateValue = "", StateRemark = "全部" });
-                newlist.Add(new TypeState { StateId = "0", StateValue = "", StateRemark = "代派工" });
-                newlist.Add(new TypeState { StateId = "1", StateValue = "", StateRemark = "已转派" });
-                newlist.Add(new TypeState { StateId = "2", StateValue = "", StateRemark = "已处理" });
-                newlist.Add(new TypeState { StateId = "3", StateValue = "", StateRemark = "已完结" });
-                newlist.Add(new TypeState { StateId = "4", StateValue = "", StateRemark = "异常结束" });
-                newlist.Add(new TypeState { StateId = "5", StateValue = "", StateRemark = "已拒单" });
-                newlist.Add(new TypeState { StateId = "6", StateValue = "", StateRemark = "外协作单子" });
-            }
-            else if (ftype == 1000 || ftype == 4000)
-            {
-                newlist = wlist;
-            }
-            else
-            {
-                switch (type)
-                {
-                    case (int)EnumWorkOrder.RedDis:
-                        tlist.RemoveAll(p => ("'" + (int)EnumDisWorkOrderState.dealing + "','" + (int)EnumDisWorkOrderState.takeblood + "','" + (int)EnumDisWorkOrderState.send + "'").Contains(p.StateId));
-                        newlist = tlist;
-                        break;
-
-                    case (int)EnumWorkOrder.OrtherDis:
-                    case (int)EnumWorkOrder.UrgDis:
-                        tlist.RemoveAll(p => ("'" + (int)EnumDisWorkOrderState.stayred + "','" + (int)EnumDisWorkOrderState.staydrug + "','" + (int)EnumDisWorkOrderState.takeblood + "','" + (int)EnumDisWorkOrderState.send + "'").Contains(p.StateId));
-
-                        newlist = tlist;
-                        break;
-
-                    case (int)EnumWorkOrder.BloodDis:
-
-                        tlist.RemoveAll(p => ("'" + (int)EnumDisWorkOrderState.stayred + "','" + (int)EnumDisWorkOrderState.staydrug + "','" + (int)EnumDisWorkOrderState.dealing + "','" + (int)EnumDisWorkOrderState.send + "'").Contains(p.StateId));
-
-                        newlist = tlist;
-                        break;
-                    case (int)EnumWorkOrder.Mat:
-
-                        newlist = qlist;
-                        break;
-                    case (int)EnumWorkOrder.Dev:
-
-                        newlist = dlit;
-                        break;
-                    case (int)EnumWorkOrder.Hos:
-                        newlist = hlit;
-                        break;
-
-                    case (int)EnumWorkOrder.Serve:
-                        alit.RemoveAll(p => ("'" + (int)EnumAccWorkOrderState.dealing +  "'").Contains(p.StateId));
-                        newlist = alit;
-
-                        break;
-                    case (int)EnumWorkOrder.TakeBlood:
-                        alit.RemoveAll(p => ("'" + (int)EnumAccWorkOrderState.arrive + "','" + (int)EnumAccWorkOrderState.keep + "'").Contains(p.StateId));
-                        newlist = alit;
-
-                        break;
-
-                    case (int)EnumWorkOrder.consultation:
-                    case (int)EnumWorkOrder.complaint:
-                    case (int)EnumWorkOrder.externalcons:
-                    case (int)EnumWorkOrder.appointment:
-                    case (int)EnumWorkOrder.maintain:
-                        newlist = wlist;
-
-                        break;
-                }
-            }
+            var newlist = WorkOrderBase.GetTypeState(type);
             return Content(newlist.OrderBy(p => Convert.ToInt32(p.StateId)).ToJson());
 
         }
@@ -852,7 +776,7 @@ namespace RMYY_CallCenter_Api.Controllers.WorkOrder
                     if (n > 0)
                     {
                         var wmodel = orderbll.GetModel(n);
-                        AddLog(n, 0, type, User.F_UserName + "(" + User.F_UserCode + ")" + "创建新工单", 0, (int)EnumDisItemOpt.create, "", 0, User);
+                        logbll.AddLog(n, 0, type, User.F_UserName + "(" + User.F_UserCode + ")" + "创建新工单", 0, (int)EnumDisItemOpt.create, "", 0, User.F_UserCode);
                     }
                     else return Error("添加失败");
                 }
@@ -868,7 +792,7 @@ namespace RMYY_CallCenter_Api.Controllers.WorkOrder
                     if (n > 0)
                     {
                         var wmodel = orderbll.GetModel(n);
-                        AddLog(n, 0, type, User.F_UserName + "(" + User.F_UserCode + ")" + "创建新工单", 0, (int)EnumDisItemOpt.create, "", 0, User);
+                        logbll.AddLog(n, 0, type, User.F_UserName + "(" + User.F_UserCode + ")" + "创建新工单", 0, (int)EnumDisItemOpt.create, "", 0, User.F_UserCode);
                     }
                     else return Error("添加失败");
                 }
@@ -904,7 +828,7 @@ namespace RMYY_CallCenter_Api.Controllers.WorkOrder
                         int tt = orderbll.Add(model);
                         if (tt > 0)
                         {
-                            AddLog(tt, 0, type, User.F_UserName + "(" + User.F_UserCode + ")" + "创建新工单", 0, (int)EnumDisItemOpt.create, "", 0, User);
+                            logbll.AddLog(tt, 0, type, User.F_UserName + "(" + User.F_UserCode + ")" + "创建新工单", 0, (int)EnumDisItemOpt.create, "", 0, User.F_UserCode);
                         }
                         else return Error("添加失败");
                         //deptstr += sendeptid + ",";
@@ -945,7 +869,7 @@ namespace RMYY_CallCenter_Api.Controllers.WorkOrder
                             int tt = orderbll.Add(model);
                             if (tt > 0)
                             {
-                                AddLog(tt, 0, type, User.F_UserName + "(" + User.F_UserCode + ")" + "创建新工单", 0, (int)EnumDisItemOpt.create, "", 0, User);
+                               logbll.AddLog(tt, 0, type, User.F_UserName + "(" + User.F_UserCode + ")" + "创建新工单", 0, (int)EnumDisItemOpt.create, "", 0, User.F_UserCode);
                             }
                             else return Error("添加失败");
                             //deptstr += sendeptid + ",";
@@ -1047,7 +971,7 @@ namespace RMYY_CallCenter_Api.Controllers.WorkOrder
                     bool n = orderbll.Update(model);
                     if (n)
                     {
-                        AddLog(woid, 0, type, User.F_UserName + "(" + User.F_UserCode + ")" + "修改工单", 0, (int)EnumDisItemOpt.update, "", 0, User);
+                       logbll.AddLog(woid, 0, type, User.F_UserName + "(" + User.F_UserCode + ")" + "修改工单", (int)EnumDisItemType.update, (int)EnumDisItemOpt.update, "", 0, User.F_UserCode);
                     }
                     else return Error("修改失败");
                 }
@@ -1061,7 +985,7 @@ namespace RMYY_CallCenter_Api.Controllers.WorkOrder
                     bool n = orderbll.Update(model);
                     if (n)
                     {
-                        AddLog(woid, 0, type, User.F_UserName + "(" + User.F_UserCode + ")" + "修改工单", 0, (int)EnumDisItemOpt.update, "", 0, User);
+                       logbll.AddLog(woid, 0, type, User.F_UserName + "(" + User.F_UserCode + ")" + "修改工单", (int)EnumDisItemType.update, (int)EnumDisItemOpt.update, "", 0, User.F_UserCode);
                     }
                     else return Error("修改失败");
                 }
@@ -1096,7 +1020,7 @@ namespace RMYY_CallCenter_Api.Controllers.WorkOrder
                                 bool tt = orderbll.Update(model);
                                 if (tt)
                                 {
-                                    AddLog(woid, 0, type, User.F_UserName + "(" + User.F_UserCode + ")" + "修改工单", 0, (int)EnumDisItemOpt.update, "", 0, User);
+                                   logbll.AddLog(woid, 0, type, User.F_UserName + "(" + User.F_UserCode + ")" + "修改工单", (int)EnumDisItemType.update, (int)EnumDisItemOpt.update, "", 0, User.F_UserCode);
                                 }
                                 else return Error("修改失败");
                             }
@@ -1199,7 +1123,7 @@ namespace RMYY_CallCenter_Api.Controllers.WorkOrder
             optbut = (int)EnumDisItemOpt.assign;
             wostate = (int)EnumDisWorkOrderState.assign;//已指派待查收
             content = nowUser.F_UserName + "(" + nowUser.F_UserCode + ")" + opt + "工单给 " + tousername + optcont;
-            itemid = AddLogTrans(wokerModel.F_Id, wostate, (int)wokerModel.F_Type, content, (int)EnumDisItemType.deal, optbut, touser, clus.F_UserName, userphon, usertalkie, clbm, nowUser);
+            itemid = WorkOrderBase.AddLogTrans(wokerModel.F_Id, wostate, (int)wokerModel.F_Type, content, (int)EnumDisItemType.deal, optbut, touser, clus.F_UserName, userphon, usertalkie, clbm, nowUser);
             #endregion
             if (itemid > 0)
             {
@@ -1365,7 +1289,7 @@ namespace RMYY_CallCenter_Api.Controllers.WorkOrder
             var omodel = orderbll.GetModel(woid);
             if (omodel != null)
             {           
-                var n = AddLogTrans(woid, (int)omodel.F_State, (int)omodel.F_Type, user.F_UserName + "(" + user.F_UserCode + ")" + "确认完结工单", (int)EnumDisItemType.deal, (int)EnumDisItemOpt.over, "", "", phon, talkie, 0, User);
+                var n =WorkOrderBase.AddLogTrans(woid, (int)omodel.F_State, (int)omodel.F_Type, user.F_UserName + "(" + user.F_UserCode + ")" + "确认完结工单", (int)EnumDisItemType.deal, (int)EnumDisItemOpt.over, "", "", phon, talkie, 0, User);
                 //if (DealWO(ua, omodel, "", "", 6))
                 if (n > 0)
                 {
@@ -1474,7 +1398,7 @@ namespace RMYY_CallCenter_Api.Controllers.WorkOrder
             if (!string.IsNullOrEmpty(cont))
                 optcont = "，说明：" + cont;
             var content = nowUser.F_UserName + "(" + nowUser.F_UserCode + ")" + opt + optcont;
-            var itemid = AddLog(model.F_Id, wostate1, (int)model.F_Type, content, (int)EnumDevItemType.deal, optbut, "", 0, nowUser);
+            var itemid =logbll.AddLog(model.F_Id, wostate1, (int)model.F_Type, content, (int)EnumDevItemType.deal, optbut, "", 0, User.F_UserCode);
             if (itemid > 0)
             {
                 #region 判断工单的状态
@@ -1573,81 +1497,81 @@ namespace RMYY_CallCenter_Api.Controllers.WorkOrder
         /// <summary>
         /// 添加工单记录
         /// </summary>
-        public long AddLogTrans(int woid, int wostate, int type, string content, int itemtype, int opttype, string nextuser, string nextusername, string nextuserphon, string nextusertalkie, int nextdept, Model.T_Sys_UserAccount nowUser, int F_IsUsed = 0)
-        {
-
-            Model.T_Dis_WorkOrderItem itemModel = new Model.T_Dis_WorkOrderItem();
-            #region 
-            //处理当前工单的记录之前的记录过期
-            var itemlast = itembll.GetModelList(" isnull(F_IsUsed,'0')='0' and F_OptType !="+ (int)EnumDisItemOpt.assign+" and F_ItemType=" + itemtype + " and  F_WoID=" + woid + " and  (F_CreateUser=" + nowUser.F_UserCode + ")");
-            if (F_IsUsed == 0)
-            {
-
-                if (itemlast.Count > 0)
-                {
-                    foreach (var it in itemlast)
-                    {
-                        it.F_IsUsed = 1;
-                        itembll.Update(it);
-                    }
-                }
-            }
-            #endregion
-            itemModel.F_WoID = woid;
-            itemModel.F_WoState = wostate;
-            itemModel.F_WoType = (int)(EnumWorkOrder)(type);//工单类型
-            itemModel.F_ItemType = itemtype;
-            itemModel.F_OptType = opttype;
-            itemModel.F_OptContent = content;
-            itemModel.F_NextUser = nextuser;
-            itemModel.F_NextUserName = nextusername;
-            itemModel.F_NextUserTalkie = nextusertalkie;
-            itemModel.F_NexUserPhon = nextuserphon;
-            itemModel.F_NextDept = nextdept;
-            itemModel.F_IsUsed = F_IsUsed;
-            itemModel.F_CreateTime = DateTime.Now;
-            itemModel.F_CreateUser = nowUser.F_UserCode;
-            var res = itembll.Add(itemModel);
-            return res;
-        }
+        //public long AddLogTrans(int woid, int wostate, int type, string content, int itemtype, int opttype, string nextuser, string nextusername, string nextuserphon, string nextusertalkie, int nextdept, Model.T_Sys_UserAccount nowUser, int F_IsUsed = 0)
+        //{
+
+        //    Model.T_Dis_WorkOrderItem itemModel = new Model.T_Dis_WorkOrderItem();
+        //    #region 
+        //    //处理当前工单的记录之前的记录过期
+        //    var itemlast = itembll.GetModelList(" isnull(F_IsUsed,'0')='0' and F_OptType !="+ (int)EnumDisItemOpt.assign+" and F_ItemType=" + itemtype + " and  F_WoID=" + woid + " and  (F_CreateUser=" + nowUser.F_UserCode + ")");
+        //    if (F_IsUsed == 0)
+        //    {
+
+        //        if (itemlast.Count > 0)
+        //        {
+        //            foreach (var it in itemlast)
+        //            {
+        //                it.F_IsUsed = 1;
+        //                itembll.Update(it);
+        //            }
+        //        }
+        //    }
+        //    #endregion
+        //    itemModel.F_WoID = woid;
+        //    itemModel.F_WoState = wostate;
+        //    itemModel.F_WoType = (int)(EnumWorkOrder)(type);//工单类型
+        //    itemModel.F_ItemType = itemtype;
+        //    itemModel.F_OptType = opttype;
+        //    itemModel.F_OptContent = content;
+        //    itemModel.F_NextUser = nextuser;
+        //    itemModel.F_NextUserName = nextusername;
+        //    itemModel.F_NextUserTalkie = nextusertalkie;
+        //    itemModel.F_NexUserPhon = nextuserphon;
+        //    itemModel.F_NextDept = nextdept;
+        //    itemModel.F_IsUsed = F_IsUsed;
+        //    itemModel.F_CreateTime = DateTime.Now;
+        //    itemModel.F_CreateUser = nowUser.F_UserCode;
+        //    var res = itembll.Add(itemModel);
+        //    return res;
+        //}
 
         /// <summary>
         /// 添加工单记录
         /// </summary>
-        public long AddLog(int woid, int wostate, int type, string content, int itemtype, int opttype, string nextuser, int nextdept, Model.T_Sys_UserAccount nowUser, int F_IsUsed = 0)
-        {
-
-            Model.T_Dis_WorkOrderItem itemModel = new Model.T_Dis_WorkOrderItem();
-            #region 
-            //处理当前工单的记录之前的记录过期
-            var itemlast = itembll.GetModelList(" isnull(F_IsUsed,'0')='0' and F_ItemType=" + itemtype + " and  F_WoID=" + woid + " and  (F_CreateUser=" + nowUser.F_UserCode + " or F_NextUser like '%" + nowUser.F_UserCode + "%')");
-            if (F_IsUsed == 0)
-            {
-
-                if (itemlast.Count > 0)
-                {
-                    foreach (var it in itemlast)
-                    {
-                        it.F_IsUsed = 1;
-                        itembll.Update(it);
-                    }
-                }
-            }
-            #endregion
-            itemModel.F_WoID = woid;
-            itemModel.F_WoState = wostate;
-            itemModel.F_WoType = type;
-            itemModel.F_ItemType = itemtype;
-            itemModel.F_OptType = opttype;
-            itemModel.F_OptContent = content;
-            itemModel.F_NextUser = nextuser;
-            itemModel.F_NextDept = nextdept;
-            itemModel.F_IsUsed = F_IsUsed;
-            itemModel.F_CreateTime = DateTime.Now;
-            itemModel.F_CreateUser = nowUser.F_UserCode;
-            var res = itembll.Add(itemModel);
-            return res;
-        }
+        //public long AddLog(int woid, int wostate, int type, string content, int itemtype, int opttype, string nextuser, int nextdept, Model.T_Sys_UserAccount nowUser, int F_IsUsed = 0)
+        //{
+
+        //    Model.T_Dis_WorkOrderItem itemModel = new Model.T_Dis_WorkOrderItem();
+        //    #region 
+        //    //处理当前工单的记录之前的记录过期
+        //    var itemlast = itembll.GetModelList(" isnull(F_IsUsed,'0')='0' and F_ItemType=" + itemtype + " and  F_WoID=" + woid + " and  (F_CreateUser=" + nowUser.F_UserCode + " or F_NextUser like '%" + nowUser.F_UserCode + "%')");
+        //    if (F_IsUsed == 0)
+        //    {
+
+        //        if (itemlast.Count > 0)
+        //        {
+        //            foreach (var it in itemlast)
+        //            {
+        //                it.F_IsUsed = 1;
+        //                itembll.Update(it);
+        //            }
+        //        }
+        //    }
+        //    #endregion
+        //    itemModel.F_WoID = woid;
+        //    itemModel.F_WoState = wostate;
+        //    itemModel.F_WoType = type;
+        //    itemModel.F_ItemType = itemtype;
+        //    itemModel.F_OptType = opttype;
+        //    itemModel.F_OptContent = content;
+        //    itemModel.F_NextUser = nextuser;
+        //    itemModel.F_NextDept = nextdept;
+        //    itemModel.F_IsUsed = F_IsUsed;
+        //    itemModel.F_CreateTime = DateTime.Now;
+        //    itemModel.F_CreateUser = nowUser.F_UserCode;
+        //    var res = itembll.Add(itemModel);
+        //    return res;
+        //}
 
         /// <summary>
         /// 

RMYY_CallCenter_Api/Controllers/WorkOrder/T_Hos_WorkOrderController.cs

@@ -15,6 +15,7 @@ namespace RMYY_CallCenter_Api.Controllers.WorkOrder
         private Bll.T_Hos_WorkOrder orderbll = new Bll.T_Hos_WorkOrder();
         private Bll.T_Sys_UserAccount userbll = new Bll.T_Sys_UserAccount();
         private Bll.T_Hos_WorkOrderItem itembll = new Bll.T_Hos_WorkOrderItem();
+        private Bll.AddLogBll logbll = new Bll.AddLogBll();
 
 
 
@@ -504,7 +505,7 @@ namespace RMYY_CallCenter_Api.Controllers.WorkOrder
             {
                 int clbm = 2002;//设备科
                 var wmodel = orderbll.GetModel(n);
-                AddLog(n, 0, User.F_UserName + "(" + User.F_UserCode + ")" + "创建新工单", (int)EnumHosItemType.deal, (int)EnumHosItemOpt.create, "", 0, User);
+                logbll.AddLog(n, 0, (int)EnumWorkOrder.Hos, User.F_UserName + "(" + User.F_UserCode + ")" + "创建新工单", (int)EnumHosItemType.deal, (int)EnumHosItemOpt.create, "", 0, User.F_UserCode);
                 AssignWO(User, wmodel, "", "", clbm);
                 return Success("操作成功！");
             }
@@ -589,7 +590,7 @@ namespace RMYY_CallCenter_Api.Controllers.WorkOrder
             if (n)
             {
                 int clbm = 2002;//设备科
-                AddLog(woid, 0, User.F_UserName + "(" + User.F_UserCode + ")" + "修改工单", (int)EnumHosItemType.update, (int)EnumHosItemOpt.update, "", 0, User);
+                logbll.AddLog(woid, 0, (int)EnumWorkOrder.Hos, User.F_UserName + "(" + User.F_UserCode + ")" + "修改工单", (int)EnumHosItemType.update, (int)EnumHosItemOpt.update, "", 0, User.F_UserCode);
                 //AssignWO(User1, model, "", "", clbm);
                 return Success("操作成功！");
             }
@@ -635,7 +636,7 @@ namespace RMYY_CallCenter_Api.Controllers.WorkOrder
             if (!string.IsNullOrEmpty(cont))
                 optcont = "，说明：" + cont;
             var content = nowUser.F_UserName + "(" + nowUser.F_UserCode + ")" + opt + "工单给 " + tousername + optcont;
-            var itemid = AddLog(wokerModel.F_Id, wostate, content, (int)EnumDevItemType.deal, optbut, touser, clbm, nowUser);
+            var itemid = logbll.AddLog(wokerModel.F_Id, wostate, (int)EnumWorkOrder.Hos,content, (int)EnumDevItemType.deal, optbut, touser, clbm, nowUser.F_UserCode);
             #endregion
             if (itemid > 0)
             {
@@ -677,7 +678,7 @@ namespace RMYY_CallCenter_Api.Controllers.WorkOrder
                     if (orderbll.Update(omodel))
                     {
                         #region 写入工单操作记录
-                        AddLog(woid, (int)EnumHosWorkOrderState.sure, User.F_UserName + "(" + User.F_UserCode + ")" + "已确认", (int)EnumHosItemType.deal, (int)EnumHosItemOpt.sure, "", 0, User);
+                       logbll.AddLog(woid, (int)EnumHosWorkOrderState.sure, (int)EnumWorkOrder.Hos, User.F_UserName + "(" + User.F_UserCode + ")" + "已确认", (int)EnumHosItemType.deal, (int)EnumHosItemOpt.sure, "", 0, User.F_UserCode);
                         #endregion
                     }
                     return Success("操作成功！");
@@ -868,8 +869,8 @@ namespace RMYY_CallCenter_Api.Controllers.WorkOrder
                     {
                         var newmodel = orderbll.GetModel(n);
                         var oldmodel = orderbll.GetModel((int)newmodel.F_WoID);
-                        AddLog(n, 0, User.F_UserName + "(" + User.F_UserCode + ")" + "创建新工单", (int)EnumHosItemType.deal, (int)EnumHosItemOpt.create, "", 0, User);
-                        AddLog(oldmodel.F_Id, (int)oldmodel.F_State, User.F_UserName + "(" + User.F_UserCode + ")" + "创建新工单", (int)EnumHosItemType.deal, (int)EnumHosItemOpt.create, "", 0, User);
+                        logbll.AddLog(n, 0, (int)EnumWorkOrder.Hos, User.F_UserName + "(" + User.F_UserCode + ")" + "创建新工单", (int)EnumHosItemType.deal, (int)EnumHosItemOpt.create, "", 0, User.F_UserCode);
+                        logbll.AddLog(oldmodel.F_Id, (int)oldmodel.F_State, (int)EnumWorkOrder.Hos, User.F_UserName + "(" + User.F_UserCode + ")" + "创建新工单", (int)EnumHosItemType.deal, (int)EnumHosItemOpt.create, "", 0, User.F_UserCode);
                         #region 处理转运人信息
                         if (transMestr == "")
                             return Error("转运人的信息不能为空！");
@@ -897,7 +898,7 @@ namespace RMYY_CallCenter_Api.Controllers.WorkOrder
                             else return Error("转运人编号和手机号不能为空！");
                         }
                         #endregion
-                        AddLog(oldmodel.F_Id, (int)EnumHosWorkOrderState.awaitfetch, User.F_UserName + "(" + User.F_UserCode + ")" + "指派工单给" + transperson, (int)EnumDevItemType.deal, (int)EnumHosItemOpt.assign, transcodestr, 0, User);
+                        logbll.AddLog(oldmodel.F_Id, (int)EnumHosWorkOrderState.awaitfetch, (int)EnumWorkOrder.Hos, User.F_UserName + "(" + User.F_UserCode + ")" + "指派工单给" + transperson, (int)EnumDevItemType.deal, (int)EnumHosItemOpt.assign, transcodestr, 0, User.F_UserCode);
                         oldmodel.F_State = (int)EnumHosWorkOrderState.awaitfetch;//已指派待取件
                         newmodel.F_ActorCode = transcodestr;//转派人编码字符串
                         newmodel.F_ActorName = transperson;
@@ -1148,7 +1149,7 @@ namespace RMYY_CallCenter_Api.Controllers.WorkOrder
             //}
             //#endregion
             var content = nowUser.F_UserName + "(" + nowUser.F_UserCode + ")" + opt;
-            var itemid = AddLog(model.F_Id, wostate1, content, (int)EnumDevItemType.deal, optbut, "", 0, nowUser);
+            var itemid =logbll.AddLog(model.F_Id, wostate1, (int)EnumWorkOrder.Hos, content, (int)EnumDevItemType.deal, optbut, "", 0, nowUser.F_UserCode);
             if (itemid > 0)
             {
                 #region 判断工单的状态
@@ -1203,7 +1204,7 @@ namespace RMYY_CallCenter_Api.Controllers.WorkOrder
                 }
                 if (!string.IsNullOrEmpty(model.F_ActorCode) && type == 4 || type == 5 || type == 6)
                 {
-                    AddLog((int)model.F_WoID, (int)model.F_State, content, (int)EnumDevItemType.deal, 0, "", 0, nowUser);
+                    logbll.AddLog((int)model.F_WoID, (int)EnumWorkOrder.Hos,(int)model.F_State, content, (int)EnumDevItemType.deal, 0, "", 0, nowUser.F_UserCode);
                     int i = 0;
                     transcode = model.F_ActorCode.Split(',');
                     if (transcode.Count() > 0)
@@ -1366,39 +1367,39 @@ namespace RMYY_CallCenter_Api.Controllers.WorkOrder
         /// <summary>
         /// 添加工单记录
         /// </summary>
-        public long AddLog(int woid, int wostate, string content, int itemtype, int opttype, string nextuser, int nextdept, Model.T_Sys_UserAccount nowUser, int F_IsUsed = 0)
-        {
+        //public long AddLog(int woid, int wostate, string content, int itemtype, int opttype, string nextuser, int nextdept, Model.T_Sys_UserAccount nowUser, int F_IsUsed = 0)
+        //{
 
-            Model.T_Hos_WorkOrderItem itemModel = new Model.T_Hos_WorkOrderItem();
-            #region 
-            //处理当前工单的记录之前的记录过期
-            var itemlast = itembll.GetModelList(" isnull(F_IsUsed,'0')='0' and F_ItemType=" + itemtype + " and  F_WoID=" + woid + " and  (F_CreateUser=" + nowUser.F_UserCode + " or F_NextUser like '%" + nowUser.F_UserCode + "%')");
-            if (F_IsUsed == 0)
-            {
+        //    Model.T_Hos_WorkOrderItem itemModel = new Model.T_Hos_WorkOrderItem();
+        //    #region 
+        //    //处理当前工单的记录之前的记录过期
+        //    var itemlast = itembll.GetModelList(" isnull(F_IsUsed,'0')='0' and F_ItemType=" + itemtype + " and  F_WoID=" + woid + " and  (F_CreateUser=" + nowUser.F_UserCode + " or F_NextUser like '%" + nowUser.F_UserCode + "%')");
+        //    if (F_IsUsed == 0)
+        //    {
 
-                if (itemlast.Count > 0)
-                {
-                    foreach (var it in itemlast)
-                    {
-                        it.F_IsUsed = 1;
-                        itembll.Update(it);
-                    }
-                }
-            }
-            #endregion
-            itemModel.F_WoID = woid;
-            itemModel.F_WoState = wostate;
-            itemModel.F_ItemType = itemtype;
-            itemModel.F_OptType = opttype;
-            itemModel.F_OptContent = content;
-            itemModel.F_NextUser = nextuser;
-            itemModel.F_NextDeptId = nextdept;
-            itemModel.F_IsUsed = F_IsUsed;
-            itemModel.F_CreateTime = DateTime.Now;
-            itemModel.F_CreateUser = nowUser.F_UserCode;
-            var res = itembll.Add(itemModel);
-            return res;
-        }
+        //        if (itemlast.Count > 0)
+        //        {
+        //            foreach (var it in itemlast)
+        //            {
+        //                it.F_IsUsed = 1;
+        //                itembll.Update(it);
+        //            }
+        //        }
+        //    }
+        //    #endregion
+        //    itemModel.F_WoID = woid;
+        //    itemModel.F_WoState = wostate;
+        //    itemModel.F_ItemType = itemtype;
+        //    itemModel.F_OptType = opttype;
+        //    itemModel.F_OptContent = content;
+        //    itemModel.F_NextUser = nextuser;
+        //    itemModel.F_NextDeptId = nextdept;
+        //    itemModel.F_IsUsed = F_IsUsed;
+        //    itemModel.F_CreateTime = DateTime.Now;
+        //    itemModel.F_CreateUser = nowUser.F_UserCode;
+        //    var res = itembll.Add(itemModel);
+        //    return res;
+        //}
 
 
         /// <summary>

RMYY_CallCenter_Api/Controllers/WorkOrder/T_Mat_WorkOrderController.cs

@@ -13,6 +13,7 @@ namespace RMYY_CallCenter_Api.Controllers.WorkOrder
         private Bll.T_Mat_WorkOrder orderbll = new Bll.T_Mat_WorkOrder();
         private Bll.T_Sys_UserAccount userbll = new Bll.T_Sys_UserAccount();
         private Bll.T_Mat_WorkOrderItem itembll = new Bll.T_Mat_WorkOrderItem();
+        private Bll.AddLogBll logbll = new Bll.AddLogBll();
 
         /// <summary>
         /// 获取列表 物资转移
@@ -389,7 +390,7 @@ namespace RMYY_CallCenter_Api.Controllers.WorkOrder
                             int tt = orderbll.Add(model);
                             if (tt > 0)
                             {
-                                AddLog(tt, 0, User.F_UserName + "(" + User.F_UserCode + ")" + "创建新工单", 0, (int)EnumDisItemOpt.create, "", 0, User);
+                              logbll.AddLog(tt, 0, (int)EnumWorkOrder.Mat, User.F_UserName + "(" + User.F_UserCode + ")" + "创建新工单", 0, (int)EnumDisItemOpt.create, "", 0, User.F_UserCode);
                             }
                         }
                         else return Error("操作失败,请填写正确信息！");
@@ -460,7 +461,7 @@ namespace RMYY_CallCenter_Api.Controllers.WorkOrder
             model.F_IsDel = 0;
             if (orderbll.Update(model))
             {
-                AddLog(woid, 0, User.F_UserName + "(" + User.F_UserCode + ")" + "修改工单", (int)EnumMatItemType.update, (int)EnumMatItemOpt.update, "", 0, User);
+               logbll.AddLog(woid, 0,(int)EnumWorkOrder.Mat, User.F_UserName + "(" + User.F_UserCode + ")" + "修改工单", (int)EnumMatItemType.update, (int)EnumMatItemOpt.update, "", 0, User.F_UserCode);
                 return Success("修改成功！");
             }
             else return Error("修改失败");
@@ -471,39 +472,39 @@ namespace RMYY_CallCenter_Api.Controllers.WorkOrder
         /// <summary>
         /// 添加工单记录
         /// </summary>
-        public long AddLog(int woid, int wostate, string content, int itemtype, int opttype, string nextuser, int nextdept, Model.T_Sys_UserAccount nowUser, int F_IsUsed = 0)
-        {
+        //public long AddLog(int woid, int wostate, string content, int itemtype, int opttype, string nextuser, int nextdept, Model.T_Sys_UserAccount nowUser, int F_IsUsed = 0)
+        //{
 
-            Model.T_Mat_WorkOrderItem itemModel = new Model.T_Mat_WorkOrderItem();
-            #region 
-            //处理当前工单的记录之前的记录过期
-            var itemlast = itembll.GetModelList(" isnull(F_IsUsed,'0')='0' and F_ItemType=" + itemtype + " and  F_WoID=" + woid + " and  (F_CreateUser=" + nowUser.F_UserCode + " or F_NextUser like '%" + nowUser.F_UserCode + "%')");
-            if (F_IsUsed == 0)
-            {
+        //    Model.T_Mat_WorkOrderItem itemModel = new Model.T_Mat_WorkOrderItem();
+        //    #region 
+        //    //处理当前工单的记录之前的记录过期
+        //    var itemlast = itembll.GetModelList(" isnull(F_IsUsed,'0')='0' and F_ItemType=" + itemtype + " and  F_WoID=" + woid + " and  (F_CreateUser=" + nowUser.F_UserCode + " or F_NextUser like '%" + nowUser.F_UserCode + "%')");
+        //    if (F_IsUsed == 0)
+        //    {
 
-                if (itemlast.Count > 0)
-                {
-                    foreach (var it in itemlast)
-                    {
-                        it.F_IsUsed = 1;
-                        itembll.Update(it);
-                    }
-                }
-            }
-            #endregion
-            itemModel.F_WoID = woid;
-            itemModel.F_WoState = wostate;
-            itemModel.F_ItemType = itemtype;
-            itemModel.F_OptType = opttype;
-            itemModel.F_OptContent = content;
-            itemModel.F_NextUser = nextuser;
-            itemModel.F_NextDept = nextdept;
-            itemModel.F_IsUsed = F_IsUsed;
-            itemModel.F_CreateTime = DateTime.Now;
-            itemModel.F_CreateUser = nowUser.F_UserCode;
-            var res = itembll.Add(itemModel);
-            return res;
-        }
+        //        if (itemlast.Count > 0)
+        //        {
+        //            foreach (var it in itemlast)
+        //            {
+        //                it.F_IsUsed = 1;
+        //                itembll.Update(it);
+        //            }
+        //        }
+        //    }
+        //    #endregion
+        //    itemModel.F_WoID = woid;
+        //    itemModel.F_WoState = wostate;
+        //    itemModel.F_ItemType = itemtype;
+        //    itemModel.F_OptType = opttype;
+        //    itemModel.F_OptContent = content;
+        //    itemModel.F_NextUser = nextuser;
+        //    itemModel.F_NextDept = nextdept;
+        //    itemModel.F_IsUsed = F_IsUsed;
+        //    itemModel.F_CreateTime = DateTime.Now;
+        //    itemModel.F_CreateUser = nowUser.F_UserCode;
+        //    var res = itembll.Add(itemModel);
+        //    return res;
+        //}
 
 
         /// <summary>
@@ -848,7 +849,7 @@ namespace RMYY_CallCenter_Api.Controllers.WorkOrder
             if (!string.IsNullOrEmpty(cont))
                 optcont = "，说明：" + cont;
             var content = nowUser.F_UserName + "(" + nowUser.F_UserCode + ")" + opt + optcont;
-            var itemid = AddLog(model.F_Id, wostate1, content, (int)EnumMatItemType.deal, optbut, "", 0, nowUser);
+            var itemid =logbll.AddLog(model.F_Id, wostate1, (int)EnumWorkOrder.Mat, content, (int)EnumMatItemType.deal, optbut, "", 0, nowUser.F_UserCode);
             if (itemid > 0)
             {
                 #region 判断工单的状态

RMYY_CallCenter_Api/Controllers/WorkOrder/WorkOrderReportController.cs

@@ -13,6 +13,78 @@ namespace RMYY_CallCenter_Api.Controllers.WorkOrder
 {
     public class WorkOrderReportController : BaseController
     {
+
+        /// <summary>
+        /// 我的提交
+        /// </summary>
+        /// <param name="keyword"></param>
+        /// <param name="starttime"></param>
+        /// <param name="endtime"></param>
+        /// <param name="pageindex"></param>
+        /// <param name="pagesize"></param>
+        /// <param name="state"></param>
+        /// <returns></returns>
+        public ActionResult GetSubmitList(string name,string phone,string wocode, string starttime = "", string endtime = "", int pageindex = 1, int pagesize = 10, int state = -1, int type = 0, int loweltype = 0)
+        {
+            if (User != null)
+            {
+                int recordCount = 0;
+                string sql = $" and prosercode={User.F_UserCode}";
+                if (string.IsNullOrEmpty(name))
+                {
+                    sql += $" and prosername like '%{name}%'";
+                }
+                if (string.IsNullOrEmpty(phone))
+                {
+                    sql += $" and proserphone like '%{phone}%'";
+                }
+                if (string.IsNullOrEmpty(wocode))
+                {
+                    sql += $" and wocode like '%{wocode}%'";
+                }
+                if (type > 0)
+                {
+                    sql += $" and  fwotype={type}";
+                }
+                if (loweltype > 0)
+                {
+                    sql += $" and  swotype={loweltype}";
+                }
+                if (state >= 0)
+                {
+                    sql += $" and  wostate={state}";
+                }
+                Dictionary<string, object> paras = new Dictionary<string, object>();
+                paras.Add("@keyword", sql);
+                paras.Add("@sdate", starttime);
+                paras.Add("@edate", endtime);
+                paras.Add("@pageindex", pageindex);
+                paras.Add("@pagesize", pagesize);
+                var dataset = DbHelperSQL.RunProcedure("P_GetComWorkOrder", paras, "AllWokerOrder");
+                var data = dataset.Tables[0];
+                recordCount = Convert.ToInt32(dataset.Tables[1].Rows[0]["recordCount"]);
+                var workklist = DataTableExtensions.ToList<TotalWorkeOrderDto>(data).ToList();
+                foreach (var item in workklist)
+                {
+                    item.WstateName = GetWoState(item.fwotype, item.swotype, item.wostate);
+                    //item.WoName = Utility.EnumHelper.GetDescription((EnumWorkOrder)item.swotype);
+                    item.WoName = new Bll.T_Sys_GongDan().GetModel(item.swotype)?.F_Name ?? "";
+                }
+                var obj = new
+                {
+                    state = "success",
+                    message = "成功",
+                    rows = workklist,
+                    total = recordCount
+
+                };
+                return Content(obj.ToJson());
+            }
+            return Error("无操作权限！");
+        }
+
+
+
         /// <summary>
         /// 综合调度工单管理查询分页
         /// </summary>
@@ -23,17 +95,17 @@ namespace RMYY_CallCenter_Api.Controllers.WorkOrder
         /// <param name="pagesize"></param>
         /// <param name="state"></param>
         /// <returns></returns>
-        public ActionResult GetList(string keyword = "", string starttime = "", string endtime = "", int pageindex = 1, int pagesize = 10, int state = -1, int type = 0)
+        public ActionResult GetComprehensiveList(string keyword = "", string starttime = "", string endtime = "", int pageindex = 1, int pagesize = 10, int state = -1, int type = 0)
         {
             int recordCount = 0;
-            string sql ="";
+            string sql = "";
             if (!string.IsNullOrEmpty(keyword))
             {
-               sql += $" and wocontent like '%{keyword}%' or wocode like '%{keyword}%' or proserphone like '%{keyword}%'";             
+                sql += $" and wocontent like '%{keyword}%' or wocode like '%{keyword}%' or proserphone like '%{keyword}%'";
             }
             if (type > 0)
             {
-               sql += $" and  swotype={type}";
+                sql += $" and  swotype={type}";
             }
             if (state >= 0)
             {
@@ -41,7 +113,7 @@ namespace RMYY_CallCenter_Api.Controllers.WorkOrder
             }
             Dictionary<string, object> paras = new Dictionary<string, object>();
             paras.Add("@keyword", sql);
-            paras.Add("@sdate",starttime);
+            paras.Add("@sdate", starttime);
             paras.Add("@edate", endtime);
             paras.Add("@pageindex", pageindex);
             paras.Add("@pagesize", pagesize);
@@ -53,7 +125,7 @@ namespace RMYY_CallCenter_Api.Controllers.WorkOrder
             {
                 item.WstateName = GetWoState(item.fwotype, item.swotype, item.wostate);
                 //item.WoName = Utility.EnumHelper.GetDescription((EnumWorkOrder)item.swotype);
-                item.WoName = new Bll.T_Sys_GongDan().GetModel(item.swotype)?.F_Name??"";
+                item.WoName = new Bll.T_Sys_GongDan().GetModel(item.swotype)?.F_Name ?? "";
             }
             var obj = new
             {