更新

RMYY_CallCenter_Api.Model/T_Con_WorkOrder.cs

@@ -69,6 +69,9 @@ namespace RMYY_CallCenter_Api.Model
         private DateTime? _f_cathetertime;
         private string _f_bednum;
         private string _f_inpatientnum;
+        private string _f_typename1;
+        private string _f_typename2;
+        private string _f_typename3;
         /// <summary>
         /// 工单ID
         /// </summary>
@@ -503,5 +506,29 @@ namespace RMYY_CallCenter_Api.Model
         }
         #endregion Model
 
+        #region 扩展
+        /// <summary>
+        /// 工单类型名称
+        /// </summary>
+        public string  typename1
+        {
+            set { _f_typename1 = value; }
+            get { return _f_typename1; }
+        }
+        public string typename2
+        {
+            set { _f_typename2 = value; }
+            get { return _f_typename2; }
+        }
+        public string typename3
+        {
+            set { _f_typename3 = value; }
+            get { return _f_typename3; }
+        }
+        /// <summary>
+        /// 工单状态名称
+        /// </summary>
+        public string Wostate { get; set; }
+        #endregion
     }
 }

RMYY_CallCenter_Api.Utility/Helper/EnumHelper.cs

@@ -38,5 +38,15 @@ namespace RMYY_CallCenter_Api.Utility
             return null;
         }
 
+        /// <summary>
+        /// 枚举参数
+        /// </summary>
+        /// <typeparam name="T"></typeparam>
+        /// <returns></returns>
+        public static List<T> ToList<T>()
+        {
+            return Enum.GetValues(typeof(T)).Cast<T>().ToList();
+        }
+
     }
 }

RMYY_CallCenter_Api/Common/Common.cs

@@ -1,8 +1,11 @@
-using RMYY_CallCenter_Api.Utility;
+using RMYY_CallCenter_Api.Models.Dto;
+using RMYY_CallCenter_Api.Utility;
 using System;
 using System.Collections.Generic;
+using System.ComponentModel;
 using System.Data;
 using System.Linq;
+using System.Reflection;
 using System.Web;
 
 namespace RMYY_CallCenter_Api
@@ -48,5 +51,29 @@ namespace RMYY_CallCenter_Api
                 return actions1;
             }
         }
+
+
+
+        /// <summary>
+        /// 获取工单枚举状态
+        /// </summary>
+        /// <param name="eErrorDetailCode"></param>
+        /// <returns></returns>
+        public static List<TypeState> GetGongDanState<T>()
+        {
+            List<TypeState> slist = new List<TypeState>();
+            foreach (int myCode in Enum.GetValues(typeof(T)))
+            {
+                TypeState model = new TypeState();
+                model.StateId = myCode.ToString();//获取值
+                model.StateValue = Enum.GetName(typeof(T), myCode);//获取名称
+                FieldInfo fieldinfo = typeof(T).GetField(model.StateValue);
+                Object[] objs = fieldinfo.GetCustomAttributes(typeof(DescriptionAttribute), false);
+                DescriptionAttribute des = (DescriptionAttribute)objs[0];
+                model.StateRemark = des?.Description ?? "";
+                slist.Add(model);//添加到list
+            }
+            return slist;
+        }
     }
 }

RMYY_CallCenter_Api/Controllers/System/KnowledgeController.cs

@@ -24,12 +24,12 @@ namespace RMYY_CallCenter_Api.Controllers.System
         /// <param name="pagesize"></param>
         /// <param name="pageindex"></param>
         /// <returns></returns>
-        public ActionResult GetList(string keywords, int typeid, int pagesize = 10, int pageindex = 1)
+        public ActionResult GetList(string keywords, int typeid=0, int pagesize = 10, int pageindex = 1)
         {
             string sql = "and F_IsDel=0";
             DataTable dt = new DataTable();
             if (!string.IsNullOrEmpty(keywords))
-                sql += $" and F_KeyWords like'%" + keywords.Trim() + "%' or F_Title like '%" + keywords.Trim() + "%' or F_Content like '%" + keywords.Trim() + "%'";
+                sql += $" and (F_KeyWords like'%" + keywords.Trim() + "%' or F_Title like '%" + keywords.Trim() + "%' or F_Content like '%" + keywords.Trim() + "%')";
             if (typeid != 0)
             {
                 if(GetKnType(typeid)!="")
@@ -51,7 +51,7 @@ namespace RMYY_CallCenter_Api.Controllers.System
             var modelist = knbll.DataTableToList(dt);
             var obj = new
             {
-                state = "sucess",
+                state = "success",
                 message = "成功",
                 rows = modelist
             };

RMYY_CallCenter_Api/Controllers/WorkOrder/Con_WorkOrderController.cs

@@ -1,4 +1,5 @@
-using RMYY_CallCenter_Api.Models.Enum;
+using RMYY_CallCenter_Api.Models.Dto;
+using RMYY_CallCenter_Api.Models.Enum;
 using RMYY_CallCenter_Api.Models.Input;
 using RMYY_CallCenter_Api.Utility;
 using System;
@@ -7,6 +8,7 @@ using System.Data;
 using System.Linq;
 using System.Web;
 using System.Web.Mvc;
+using System.Transactions;
 
 namespace RMYY_CallCenter_Api.Controllers
 {
@@ -17,6 +19,7 @@ namespace RMYY_CallCenter_Api.Controllers
         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();
 
         /// <summary>
         /// 获取列表
@@ -35,8 +38,14 @@ namespace RMYY_CallCenter_Api.Controllers
                 #region 查询条件
                 string sql = $" and F_IsDel=0";
                 DataTable date = new DataTable();
-                if (type > 0 && type < 6)
-                    sql += $" and F_type1=" + type;
+                if (type != 0)
+                {
+                    if (type == 1001 || type == 1002 || type == 1003 || type == 1004 || type == 1005)
+                    {
+                        sql += $" and F_type2=" + type;
+                    }
+                    else return Error("工单类型错误！");
+                }
                 if (starttime.Trim() != "" && starttime != "undefined")
                     sql += $" and datediff(day,F_CreateTime,'" + starttime + "') <=0 ";
                 if (endtime.Trim() != "" && endtime != "undefined")
@@ -47,8 +56,9 @@ namespace RMYY_CallCenter_Api.Controllers
                 }
                 if (state >= 0)
                 {
-                    int[] arr ={0,1,2,3,4,5,6,10 };
-                    if (arr.Contains(state))
+                    List<int> tlist = Common.GetGongDanState<EnumWorkOrderState>().Select(t=>Convert.ToInt32(t.StateId)).ToList();
+                    string liststr = string.Join(",", tlist);
+                    if (liststr.Contains(state.ToString()))
                     {
                         sql += $"and F_State=" + state;
                     }
@@ -77,7 +87,68 @@ namespace RMYY_CallCenter_Api.Controllers
                     {
                         state = "success",
                         message = "成功",
-                        rows = modellist,
+                        rows = modellist.Select(p =>
+                              new
+                              {
+                                  Wostate = EnumHelper.GetDescription((EnumWorkOrderState)p.F_State),
+                                  typename1 = tybll.GetModel(Convert.ToInt32(p.F_type1))?.F_Name ?? "",
+                                  typename2 = tybll.GetModel(Convert.ToInt32(p.F_type2))?.F_Name ?? "",
+                                  typename3 = tybll.GetModel(Convert.ToInt32(p.F_type3))?.F_Name ?? "",
+                                  F_ID=p.F_ID,
+                                  F_WorkOrderCode=p.F_WorkOrderCode,
+                                  F_Source=p.F_Source,
+                                  F_type1= p.F_type1,
+                                  F_type2=p.F_type2,
+                                  F_type3=p.F_type3,
+                                  F_Customer=p.F_Customer,
+                                  F_Sex=p.F_Sex,
+                                  F_Phon=p.F_Phon,
+                                  F_CusAddress=p.F_CusAddress,
+                                  F_IdCard=p.F_IdCard,
+                                  F_ServiceItems=p.F_ServiceItems,
+                                  F_Address=p.F_Address,
+                                  F_FirstCheckHospital=p.F_FirstCheckHospital,
+                                  F_NoduleSize=p.F_NoduleSize,
+                                  F_FirstFindTime=p.F_FirstFindTime,
+                                  F_Urgency=p.F_Urgency,
+                                  F_Cathetertype=p.F_Cathetertype,
+                                  F_Catheterdept=p.F_Catheterdept,
+                                  F_Cathetertime=p.F_Cathetertime,
+                                  F_BedNum=p.F_BedNum,
+                                  F_InpatientNum=p.F_InpatientNum,
+                                  F_DealType=p.F_DealType,
+                                  F_WorkOrderContents=p.F_WorkOrderContents,
+                                  F_DealOpinions=p.F_DealOpinions,
+                                  F_CallID=p.F_CallID,
+                                  F_DealResult=p.F_DealResult,
+                                  F_HandleBy=p.F_HandleBy,
+                                  F_HandleTime=p.F_HandleTime,
+                                  F_NotHandleReasons=p.F_NotHandleReasons,
+                                  F_ResponDept=p.F_ResponDept,
+                                  F_ResponPerson=p.F_ResponPerson,
+                                  F_LimitTime=p.F_LimitTime,
+                                  F_IsReturnBak=p.F_IsReturnBak,
+                                  F_ReturnBakTime=p.F_ReturnBakTime,
+                                  F_CreateUserID=p.F_CreateUserID,
+                                  F_CreateUser=p.F_CreateUser,
+                                  F_CreateTime=p.F_CreateTime,
+                                  F_IsDel=p.F_IsDel,
+                                  F_CreateUserName=p.F_CreateUserName,
+                                  F_DeleteBy=p.F_DeleteBy,
+                                  F_DeleteTime=p.F_DeleteTime,
+                                  F_IsAudit=p.F_IsAudit,
+                                  F_AuditState=p.F_AuditState,
+                                  F_AuditUser=p.F_AuditUser,
+                                  F_AuditTime=p.F_AuditTime,
+                                  F_AuditCont=p.F_AuditCont,
+                                  F_AppointTime=p.F_AppointTime,
+                                  F_Answer=p.F_Answer,
+                                  F_DealContents=p.F_DealContents,
+                                  F_File=p.F_File,
+                                  F_Satisfaction=p.F_Satisfaction,
+                                  F_State=p.F_State
+
+                              }),
                         total = recordCount
                     };
                     return Content(obj.ToJson());
@@ -89,6 +160,18 @@ namespace RMYY_CallCenter_Api.Controllers
         }
 
 
+
+
+        /// <summary>
+        /// 获取工单类型
+        /// </summary>
+        /// <returns></returns>
+        public ActionResult GetTypeState()
+        {
+            List<TypeState> tlist= Common.GetGongDanState<EnumWorkOrderState>();
+            return Content(tlist.ToJson());
+        }
+
         /// <summary>
         /// 获取工单详情
         /// </summary>
@@ -111,6 +194,9 @@ namespace RMYY_CallCenter_Api.Controllers
                     user = userbll.GetModel(model.F_HandleBy);
                 }
                 var itemlist = itembll.GetModelList(" F_WoID="+ id +"");
+                model.typename1 = tybll.GetModel(Convert.ToInt32(model.F_type1))?.F_Name ?? "";
+                model.typename2 = tybll.GetModel(Convert.ToInt32(model.F_type2))?.F_Name ?? "";
+                model.typename3 = tybll.GetModel(Convert.ToInt32(model.F_type3))?.F_Name ?? "";
                  //List<Con_WorkOrderInput> Input = modeltoopi(list);
                     if (model != null)
                     {
@@ -118,8 +204,8 @@ namespace RMYY_CallCenter_Api.Controllers
                         {
                             state = "success",
                             message = "成功",
-                            model = model,
-                            user= user,
+                            model = model,                        
+                            user = user,
                             //total = ItemList(itemlist)
                         };
                         return Content(obj.ToJson());
@@ -233,13 +319,13 @@ namespace RMYY_CallCenter_Api.Controllers
         /// 添加工单
         /// </summary>
         /// <returns></returns>
-        public ActionResult AddWorkOrder(Con_WorkOrderInput input, int overtime=0, int opt = 0,string cont="")
+        public ActionResult AddWorkOrder(Con_WorkOrderInput input, int overtime = 0, int opt = 0, string cont = "")
         {
-  
+
             if (User != null)
             {
                 #region 添加判断
-                if (!(input.F_Type1!=1001 || input.F_Type1 != 1002 ||input.F_Type1 != 1003 || input.F_Type1 != 1004 || input.F_Type1 != 1005))
+                if (!(input.F_Type2 != 1001 || input.F_Type2 != 1002 || input.F_Type2 != 1003 || input.F_Type2 != 1004 || input.F_Type2 != 1005))
                     return Error("工单类型错误！");
                 if (opt == 0)
                     return Error("请选择处理方式！");
@@ -247,12 +333,12 @@ namespace RMYY_CallCenter_Api.Controllers
                     return Error("请输入客户姓名！");
                 if (string.IsNullOrEmpty(input.F_Phon))
                     return Error("请输入客户电话！");
-                if (input.F_Type1 == 1004)
+                if (input.F_Type2 == 1004)
                 {
                     if (string.IsNullOrEmpty(input.F_ServiceItems))
                         return Error("请选择服务项目！");
                 }
-                if (input.F_Type1 == 1003)
+                if (input.F_Type2 == 1003)
                 {
                     if (string.IsNullOrEmpty(input.F_Address))
                         return Error("请填写地区！");
@@ -265,128 +351,129 @@ namespace RMYY_CallCenter_Api.Controllers
                 var model = new Model.T_Con_WorkOrder();
                 model = inputtoobj(model, input, 0);
                 model.F_LimitTime = overtime;
-                int n = orderbll.Add(model);
-                if (n > 0)
+                if (opt == 1)
+                    model.F_DealType = "立即办理";
+                else if (opt == 2)
+                    model.F_DealType = "提交审核";
+                else if (opt == 3)
+                    model.F_DealType = "转派";
+                using (TransactionScope trans = new TransactionScope(TransactionScopeOption.Required, new TimeSpan(0, 10, 0)))
                 {
-                    Model.T_Con_WorkOrder work = orderbll.GetModel(n);
-                    var deptmodel = deptbll.GetModel(User.F_DeptId);
-                    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);
-                    if (opt == 1)//立即办理
+                    #region 添加工单
+                    int n = orderbll.Add(model);
+                    if (n > 0)
                     {
-                        if (work != null)
+                        Model.T_Con_WorkOrder work = orderbll.GetModel(n);
+                        var deptmodel = deptbll.GetModel(User.F_DeptId);
+                        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);
+                        if (opt == 1)//立即办理
                         {
-                            if(input.F_Type1==1001 || input.F_Type1 == 1003)
+
+                            if (input.F_Type2 == 1001 || input.F_Type2 == 1003)
                             {
-                                work.F_DealType = "立即办理";
                                 var res = DealWO(User, work, cont, "", 1);
                                 if (res)
                                 {
                                     #region 给患者发送短信
                                     #endregion
-                                    return Success("处理成功！");
                                 }
-                                else return Error("处理失败！");
                             }
+                            else return Error("此工单类型不支持立即办理！");
                         }
-                        else
-                            return Error("处理失败！");
-                    }
-                    else if (opt == 2)//提交审核
-                    {
-                        if (input.F_Type1 == 1002)//投诉建议需要提交审核
+                        else if (opt == 2)//提交审核
                         {
-                            Model.T_Sys_UserAccount userleader = userbll.GetModelList(" F_DeptId=" + deptmodel.F_DeptId + " and F_RoleId=60 ").FirstOrDefault();//护士长角色
-                            if (userleader != null)
+                            if (input.F_Type2 == 1002)//投诉建议需要提交审核
                             {
-                                AddLog(work.F_ID, 0, deptname + userleader.F_UserName + "(" + User.F_UserCode + ")" + "待审批", (int)EnumItemType.audit, (int)EnumItemOpt.audit, userleader.F_UserCode, userleader.F_DeptId, User);
-                                return Success("已提交审核！");
+                                Model.T_Sys_UserAccount userleader = userbll.GetModelList(" F_DeptId=" + deptmodel.F_DeptId + " and F_RoleId=2016 ").FirstOrDefault();//护士长角色
+                                if (userleader != null)
+                                {
+                                    AddLog(work.F_ID, 0, deptname + userleader.F_UserName + "(" + User.F_UserCode + ")" + "待审批", (int)EnumItemType.audit, (int)EnumItemOpt.audit, userleader.F_UserCode, userleader.F_DeptId, User);
+
+                                }
+                                else
+                                    return Error("提交审核失败！");
                             }
-                            else
-                                return Error("提交审核失败！");
-                        }
+                            else return Error("此工单类型不支持审核！");
 
-                    }
-                    else if (opt == 3)//转派
-                    {
-                        if (input.F_Type1 == 1004 || input.F_Type1 == 1005)//家庭预约,静脉置管维护 立即处理并给健康事业部或置管室 推送一条钉钉消息
+                        }
+                        else if (opt == 3)//转派
                         {
-                            int clbm = 0;//健康事业部的部门Id
-                            bool tt = DealWO(User, work, cont, "", 1);
-                            if (tt)
+                            if (input.F_Type2 == 1004 || input.F_Type2 == 1005)//家庭预约,静脉置管维护 立即处理并给健康事业部或置管室 推送一条钉钉消息
                             {
-                                #region  给健康事业部或 置管室 推送一条钉钉消息
-                                #endregion
-                                return Success("处理成功！");
+                                int clbm = 0;//健康事业部的部门Id
+                                bool tt = DealWO(User, work, cont, "", 1);
+                                if (tt)
+                                {
+                                    #region  给健康事业部或 置管室 推送一条钉钉消息
+                                    #endregion
+                                }
                             }
-                            else
-                                return Error("提交失败！");
+                            else return Error("此工单类型不支持转派！");
+                            //if (input.F_Type1 == 2)//投诉建议转派至行风办
+                            //{
+                            //    int clbm = 0;//行风办的部门Id
+                            //    bool tt = AssignWO(user, work, cont, 0, clbm);
+                            //    if (tt)
+                            //    {
+                            //        return Success("转派成功！");
+                            //    }
+                            //    else
+                            //        return Error("提交失败！");
 
-                        }
-                        //if (input.F_Type1 == 2)//投诉建议转派至行风办
-                        //{
-                        //    int clbm = 0;//行风办的部门Id
-                        //    bool tt = AssignWO(user, work, cont, 0, clbm);
-                        //    if (tt)
-                        //    {
-                        //        return Success("转派成功！");
-                        //    }
-                        //    else
-                        //        return Error("提交失败！");
+                            //}
+                            //else//其他交有保障中心处理
+                            //{
+                            //    int clbm = 0;//综合保障中心的部门Id
+                            //    bool tt = AssignWO(user, work, cont, 0, clbm);
+                            //    if (tt)
+                            //    {
+                            //        return Success("转派成功！");
+                            //    }
+                            //    else
+                            //        return Error("提交失败！");
 
-                        //}
-                        //else//其他交有保障中心处理
-                        //{
-                        //    int clbm = 0;//综合保障中心的部门Id
-                        //    bool tt = AssignWO(user, work, cont, 0, clbm);
-                        //    if (tt)
-                        //    {
-                        //        return Success("转派成功！");
-                        //    }
-                        //    else
-                        //        return Error("提交失败！");
+                            //}
+                        }
 
-                        //}
                     }
-
+                    else
+                        return Error("添加失败！");
+                    #endregion
+                    trans.Complete();
                 }
-                else
-                    return Error("添加失败！");
+                return Success("添加成功！");
             }
-
             return Error("无操作权限！");
         }
 
-         /// <summary>
-         /// 修改工单
-         /// </summary>
-         /// <param name="input"></param>
-         /// <param name="opt"></param>
-         /// <param name="cont"></param>
-         /// <returns></returns>
-        public ActionResult UpdateWorkOrder(Con_WorkOrderInput input,int opt=0,string cont="")
+        /// <summary>
+        /// 修改工单
+        /// </summary>
+        /// <param name="input"></param>
+        /// <param name="opt"></param>
+        /// <param name="cont"></param>
+        /// <returns></returns>
+        public ActionResult UpdateWorkOrder(Con_WorkOrderInput input, int opt = 0, string cont = "")
         {
-            int userId = 1;
-            if (userId != 0)
+            if (User != null)
             {
-                string usercode = "8000";
-                Model.T_Sys_UserAccount user = userbll.GetModel(userId);
-                Model.T_Sys_Role role = rolebll.GetModel(user.F_RoleId);
+                //Model.T_Sys_Role role = rolebll.GetModel(user.F_RoleId);
                 #region 添加判断
-                if (!(input.F_Type1 > 0 && input.F_Type1 < 6))
+                if (!(input.F_Type2 != 1001 || input.F_Type2 != 1002 || input.F_Type2 != 1003 || input.F_Type2 != 1004 || input.F_Type2 != 1005))
                     return Error("工单类型错误！");
                 if (string.IsNullOrEmpty(input.F_Customer))
                     return Error("请输入客户姓名！");
                 if (string.IsNullOrEmpty(input.F_Phon))
                     return Error("请输入客户电话！");
-                if (input.F_Type1 == 4)
+                if (input.F_Type2 == 4)
                 {
                     if (string.IsNullOrEmpty(input.F_ServiceItems))
                         return Error("请选择服务项目！");
                 }
-                if (input.F_Type1 == 3)
+                if (input.F_Type2 == 3)
                 {
                     if (string.IsNullOrEmpty(input.F_Address))
                         return Error("请填写地区！");
@@ -399,9 +486,9 @@ namespace RMYY_CallCenter_Api.Controllers
                 var model = orderbll.GetModel(input.F_ID);
                 if (model == null)
                     return Error("查询不到此工单！");
-                if (user.F_UserCode != "8000")
+                if (User.F_UserCode != "8000")
                 {
-                    if (model.F_CreateUserID != user.F_UserCode)
+                    if (model.F_CreateUserID != User.F_UserCode)
                         return Error("非创建人不能修改工单！");
                     if (model.F_State == 2)
                         return Error("此工单已接单不能修改！");
@@ -409,72 +496,80 @@ namespace RMYY_CallCenter_Api.Controllers
                         return Error("此工单已处理不能修改！");
                 }
                 model = inputtoobj(model, input, 1);
-                bool n = orderbll.Update(model);
-                if (n)
+                using (TransactionScope trans = new TransactionScope(TransactionScopeOption.Required, new TimeSpan(0, 10, 0)))
                 {
-                    var deptmodel = deptbll.GetModel(user.F_DeptId);
-                    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);
-                    if (opt == 1)//立即办理
+                    #region 修改工单
+                    if (opt == 1)
+                        model.F_DealType = "立即办理";
+                    else if (opt == 2)
+                        model.F_DealType = "提交审核";
+                    else if (opt == 3)
+                        model.F_DealType = "转派";
+                    bool n = orderbll.Update(model);
+                    if (n)
                     {
-                        if (model != null)
+                        var deptmodel = deptbll.GetModel(User.F_DeptId);
+                        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);
+                        if (opt == 1)//立即办理
                         {
-                            if (input.F_Type1 == 1001 || input.F_Type1 == 1003)
+                            if (input.F_Type2 == 1001 || input.F_Type2 == 1003)
                             {
-                                var res = DealWO(user, model, cont, "", 1);
+                                var res = DealWO(User, model, cont, "", 1);
                                 if (res)
                                 {
                                     #region 给患者发送短信
                                     #endregion
-                                    return Success("处理成功！");
                                 }
-                                else return Error("处理失败！");
                             }
+                            else return Error("此工单类型不支持立即办理！");
+
                         }
-                        else
-                            return Error("处理失败！");
-                    }
-                    else if (opt == 2)//提交审核
-                    {
-                        if (input.F_Type1 == 1002)//投诉建议需要提交审核
+                        else if (opt == 2)//提交审核
                         {
-                            Model.T_Sys_UserAccount userleader = userbll.GetModelList(" F_DeptId=" + deptmodel.F_DeptId + " and F_RoleId=60 ").FirstOrDefault();//护士长角色
-                            if (userleader != null)
+                            if (input.F_Type2 == 1002)//投诉建议需要提交审核
                             {
-                                AddLog(model.F_ID, 0, deptname + userleader.F_UserName + "(" + user.F_UserCode + ")" + "待审批", (int)EnumItemType.audit, (int)EnumItemOpt.audit, userleader.F_UserCode, userleader.F_DeptId, user);
-                                return Success("已提交审核！");
+                                Model.T_Sys_UserAccount userleader = userbll.GetModelList(" F_DeptId=" + deptmodel.F_DeptId + " and F_RoleId=2016 ").FirstOrDefault();//护士长角色
+                                if (userleader != null)
+                                {
+                                    AddLog(model.F_ID, 0, deptname + userleader.F_UserName + "(" + User.F_UserCode + ")" + "待审批", (int)EnumItemType.audit, (int)EnumItemOpt.audit, userleader.F_UserCode, userleader.F_DeptId, User);
+                                }
+                                else
+                                    return Error("提交审核失败！");
                             }
-                            else
-                                return Error("提交审核失败！");
-                        }
+                            else return Error("此工单类型不支持审核！");
 
-                    }
-                    else if (opt == 3)//转派
-                    {
-                        if (input.F_Type1 == 1004 || input.F_Type1 == 1005)//家庭预约,静脉置管维护 立即处理并给健康事业部或置管室 推送一条钉钉消息
+                        }
+                        else if (opt == 3)//转派
                         {
-                            int clbm = 0;//健康事业部的部门Id
-                            bool tt = DealWO(user, model, cont, "", 1);
-                            if (tt)
+                            if (input.F_Type2 == 1004 || input.F_Type2 == 1005)//家庭预约,静脉置管维护 立即处理并给健康事业部或置管室 推送一条钉钉消息
                             {
-                                #region  给健康事业部或 置管室 推送一条钉钉消息
-                                #endregion
-                                return Success("处理成功！");
-                            }
-                            else
-                                return Error("提交失败！");
+                                int clbm = 0;//健康事业部的部门Id
+                                bool tt = DealWO(User, model, cont, "", 1);
+                                if (tt)
+                                {
+                                    #region  给健康事业部或 置管室 推送一条钉钉消息
+                                    #endregion
+                                }                              
 
+                            }
+                            else return Error("此工单类型不支持转派！");
                         }
-                    }
 
+                    }
+                    else
+                        return Error("修改失败！");
+                    #endregion
+                    trans.Complete();
                 }
-                else
-                    return Error("修改失败！");
+                return Success("操作成功！");
+
             }
 
             return Error("无操作权限！");
+
         }
 
         /// <summary>
@@ -482,26 +577,60 @@ namespace RMYY_CallCenter_Api.Controllers
         /// </summary>
         /// <param name="id"></param>
         /// <returns></returns>
-        public ActionResult DelWorkOrder(int id)
+        //public ActionResult DelWorkOrder(int id)
+        //{
+        //    int userId = User.F_UserId;
+        //    if (userId != 0)
+        //    {
+        //        if (id <= 0)
+        //            return Error("选择要删除的工单！");
+        //        var model = orderbll.GetModel(id);
+        //        if (model == null)
+        //            return Error("查询不到此工单！");
+        //        Model.T_Sys_UserAccount ua = userbll.GetModel(userId);
+        //        if (ua == null)
+        //            return Error("无操作权限！");
+        //        if (ua.F_UserCode != model.F_CreateUser)
+        //            return Error("非创建人不能删除工单！");
+        //        if (orderbll.Delete(id))
+        //            return Success("操作成功！");
+        //        else return Error("设置失败！");
+        //    }            
+        //    return Error("无操作权限！");
+        //}
+
+
+        /// <summary>
+        /// 删除工单
+        /// </summary>
+        /// <returns></returns>
+        public ActionResult DelWorkOrder(string[] ids)
         {
-            int userId = User.F_UserId;
-            if (userId != 0)
+            if (ids != null && ids.Length > 0)
             {
-                if (id <= 0)
-                    return Error("选择要删除的工单！");
-                var model = orderbll.GetModel(id);
-                if (model == null)
-                    return Error("查询不到此工单！");
-                Model.T_Sys_UserAccount ua = userbll.GetModel(userId);
-                if (ua == null)
-                    return Error("无操作权限！");
-                if (ua.F_UserCode != model.F_CreateUser)
-                    return Error("非创建人不能删除工单！");
-                if (orderbll.Delete(id))
-                    return Success("操作成功！");
-                else return Error("设置失败！");
-            }            
-            return Error("无操作权限！");
+                //StringBuilder sb = new StringBuilder();
+                foreach (var item in ids)
+                {
+                    //sb.Append("'" + item + "',");
+                    Model.T_Con_WorkOrder womodel = orderbll.GetModel(Convert.ToInt32(item));
+                    if (womodel != null && womodel.F_State == (int)EnumWorkOrderState.neworder)//0)
+                    {
+                        #region 修改工单记录
+                        womodel.F_IsDel = 1;
+                        womodel.F_DeleteBy = User.F_UserCode;
+                        womodel.F_DeleteTime = DateTime.Now;
+                        orderbll.Update(womodel);
+                        #endregion
+
+                        #region 插入操作记录
+                        AddLog(womodel.F_ID, (int)womodel.F_State, User.F_UserName + "(" + User.F_UserCode + ")" + "删除了工单", (int)EnumItemType.delete, (int)EnumItemOpt.delete, "", 0, User);
+                        #endregion
+                    }
+                    else return Error("删除失败！");
+                }
+                return Success("删除成功！");
+            }
+            return Error("请选择要删除的记录！");
         }
 
 
@@ -530,8 +659,9 @@ namespace RMYY_CallCenter_Api.Controllers
                 model.F_WorkOrderCode = model.F_WorkOrderCode;//工单编号
                 model.F_Source = model.F_Source;//工单来源
             }
-            model.F_type1 = input.F_Type1;//工单类型:健康咨询，投诉建议，外聘专家咨询，家庭预约上门，静脉置管维护
-            model.F_type2 = input.F_Type2;
+            model.F_type1 = input.F_Type1;//一级工单类型
+            model.F_type2 = input.F_Type2;//工单类型:健康咨询，投诉建议，外聘专家咨询，家庭预约上门，静脉置管维护
+            model.F_type3 = input.F_Type3;//三级工单类型
 
             model.F_Customer = input.F_Customer;//来电人姓名
             model.F_Sex = input.F_Sex;
@@ -909,7 +1039,7 @@ 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);
-                            wmodel.F_State = (int)EnumWorkOrderState.neworder;//待审批
+                            wmodel.F_State = (int)EnumWorkOrderState.neworder;//待转派
                             wmodel.F_AuditState = 1;
                         }
                         if (AuditState == 2)
@@ -963,7 +1093,7 @@ namespace RMYY_CallCenter_Api.Controllers
                             return Error("工单已处理请勿重复操作");
                         else
                         {
-                            var res = DealWO(ua, wmodel, cont, "", 1);
+                            var res = DealWO(ua, wmodel, cont, "", 0);
                             if (res)
                                 return Success("处理成功");
                             else
@@ -992,22 +1122,21 @@ namespace RMYY_CallCenter_Api.Controllers
         public bool DealWO(Model.T_Sys_UserAccount nowUser, Model.T_Con_WorkOrder model, string cont, string F_Files = "", int isover = 0)
         {
             #region 工单处理
-            //var opt = "处理";
-            //int optbut = (int)EnumItemOpt.deal;
-            //int wostate = (int)EnumWorkOrderState.dealing;
-            //if (isover == 1)
-            //{
-            model.F_DealResult = "已处理";//处理结果
-            var opt = "处理完结";
-            int optbut = (int)EnumItemOpt.end;
-            int wostate = (int)EnumWorkOrderState.finish;
+            var opt = "处理";
+            int optbut = (int)EnumItemOpt.deal;
+            int wostate = (int)EnumWorkOrderState.dealing;
+            if (isover == 1)
+            {
+             model.F_DealResult = "已处理";//处理结果
+             opt = "处理完结";
+             optbut = (int)EnumItemOpt.end;
+             wostate = (int)EnumWorkOrderState.finish;
             model.F_HandleBy = nowUser.F_UserCode;
-            //model.F_HandleTime =DateTime.Parse(DateTime.Now.ToString("yyyy-MM-dd  hh:mm:ss"));
-            //}
-            //else
-            //{
-            //    model.F_DealResult = "未处理";//处理结果
-            //}
+            }
+            else
+            {
+                model.F_DealResult = "处理中";//处理结果
+            }
             #region 读取当前登录人部门
             string deptname = "";
             var deptmodel = deptbll.GetModel(nowUser.F_DeptId);

RMYY_CallCenter_Api/Controllers/WorkOrderBaseController.cs

@@ -1,4 +1,5 @@
-using RMYY_CallCenter_Api.Utility;
+using RMYY_CallCenter_Api.Models.Enum;
+using RMYY_CallCenter_Api.Utility;
 using System;
 using System.Collections.Generic;
 using System.Data;
@@ -293,5 +294,6 @@ namespace RMYY_CallCenter_Api.Controllers
         }
 
 
+
     }
 }

RMYY_CallCenter_Api/Models/Dto/TypeState.cs

@@ -0,0 +1,29 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Web;
+
+namespace RMYY_CallCenter_Api.Models.Dto
+{
+    /// <summary>
+    /// 工单类型
+    /// </summary>
+    public class TypeState
+    {
+        /// <summary>
+        /// 工单状态id
+        /// </summary>
+        public string StateId { get; set; }
+        /// <summary>
+        /// 工单状态名称
+        /// </summary>
+        public string StateValue { get; set; }
+
+
+        /// <summary>
+        /// 工单类型描述
+        /// </summary>
+        public string StateRemark { get; set; }
+    }
+}
+

RMYY_CallCenter_Api/Models/Enum/EnumWorkOrderState.cs

@@ -23,22 +23,24 @@ namespace RMYY_CallCenter_Api.Models.Enum
         abreback,
         [Description("处理中")]
         dealing,
-        [Description("已处理待回访")]
-        dealed,
-        [Description("已回访待完结")]
-        visit,
+        [Description("已处理")]
+        end,
+        //[Description("已处理待回访")]
+        //dealed,
+        //[Description("已回访待完结")]
+        //visit,
         [Description("已完结")]
         finish=10,
-        [Description("已评价")]
-        evaluate,
-        [Description("已退回待指派")]
-        reassign,
-        [Description("导入工单")]
-        usedimport,
-        [Description("微信客户")]
-        customers,
-        [Description("微信未通过")]
-        recustomers,
+        //[Description("已评价")]
+        //evaluate,
+        //[Description("已退回待指派")]
+        //reassign,
+        //[Description("导入工单")]
+        //usedimport,
+        //[Description("微信客户")]
+        //customers,
+        //[Description("微信未通过")]
+        //recustomers,
         [Description("待审批")]
         audit,
     }

RMYY_CallCenter_Api/RMYY_CallCenter_Api.csproj

@@ -49,6 +49,7 @@
     <Reference Include="System" />
     <Reference Include="System.Data" />
     <Reference Include="System.Drawing" />
+    <Reference Include="System.Transactions" />
     <Reference Include="System.Web.DynamicData" />
     <Reference Include="System.Web.Entity" />
     <Reference Include="System.Web.ApplicationServices" />
@@ -159,6 +160,7 @@
       <DependentUpon>Global.asax</DependentUpon>
     </Compile>
     <Compile Include="Models\Dto\TotalWorkeOrderDto.cs" />
+    <Compile Include="Models\Dto\TypeState.cs" />
     <Compile Include="Models\Enum\EnumAccWorkOrderState.cs" />
     <Compile Include="Models\Enum\EnumDevWorkOrderState.cs" />
     <Compile Include="Models\Enum\EnumDisWorkOrderState.cs" />