更新

RMYY_CallCenter_Api/Controllers/System/KnowledgeController.cs

@@ -24,16 +24,17 @@ namespace RMYY_CallCenter_Api.Controllers.System
         /// <param name="pagesize"></param>
         /// <param name="pageindex"></param>
         /// <returns></returns>
-        public ActionResult GetList(string keywords, int typeid, int ptypeid = 0, int pagesize = 10, int pageindex = 1)
+        public ActionResult GetList(string keywords, int typeid, 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() + "%'";
             if (typeid != 0)
-                sql += $" and F_TypeId=" + typeid;
-            if (ptypeid != 0)
-                sql += $" and F_TypeId in(select F_GDId from T_Sys_GongDan where F_TypeId=" + ptypeid + ")";
+            {
+                if(GetKnType(typeid)!="")
+                sql += $" and F_TypeId in (" + GetKnType(typeid) + ")";
+            }
             int recordCount = 0;
             dt = Bll.PagerBll.GetListPager
                 (
@@ -58,6 +59,54 @@ namespace RMYY_CallCenter_Api.Controllers.System
         }
 
         /// <summary>
+        /// 获取工单类别
+        /// </summary>
+        /// <param name="typeid"></param>
+        /// <returns></returns>
+        public string  GetKnType(int typeid)
+        {
+            string tsql = "";
+            string tsql1 = "";
+            string tsql2 = "";
+            var model = gdbll.GetModel(typeid);
+            if (model != null)
+            {
+                if (model.F_TypeId == 1)
+                {
+                    var glist = gdbll.GetModelList("F_ParentID=" + typeid).Select(p => p.F_GDId).ToList();
+                    if (glist.Count > 0)
+                    {
+
+                        tsql1 = string.Join(",", glist);
+                        var glist1 = gdbll.GetModelList("F_ParentID in (" + tsql1 + ")").Select(p => p.F_GDId).ToList();
+                        tsql2 = string.Join(",", glist1);
+                        tsql = tsql1 +","+ tsql2 +","+ typeid.ToString();
+                      
+                    }
+                    else return "";
+                }
+                if (model.F_TypeId == 2)
+                {
+                    var glist = gdbll.GetModelList("F_ParentID ="+ typeid).Select(p => p.F_GDId).ToList();
+                    if (glist.Count > 0)
+                    {
+
+                        tsql1 = string.Join(",", glist);                       
+                        tsql = tsql1 + "," + typeid.ToString();
+                    }
+                    else return "";
+                }
+                if (model.F_TypeId == 3)
+                {
+                    tsql = typeid.ToString();
+                }
+                return tsql;
+            }
+            else return "";
+
+        }
+
+        /// <summary>
         /// 获取知识库
         /// </summary>
         /// <param name="kid"></param>
@@ -205,7 +254,7 @@ namespace RMYY_CallCenter_Api.Controllers.System
                     treeModel.children = TreeRecursion(dt, item.F_GDId.ToString());
                     treelist.Add(treeModel);
                 }
-            }
+            }  
             return treelist;
         }
 

RMYY_CallCenter_Api/Controllers/WorkOrder/Con_WorkOrderController.cs

@@ -280,6 +280,7 @@ namespace RMYY_CallCenter_Api.Controllers
                         {
                             if(input.F_Type1==1001 || input.F_Type1 == 1003)
                             {
+                                work.F_DealType = "立即办理";
                                 var res = DealWO(User, work, cont, "", 1);
                                 if (res)
                                 {
@@ -561,7 +562,7 @@ namespace RMYY_CallCenter_Api.Controllers
                 model.F_InpatientNum = input.F_InpatientNum;//住院号
             }
 
-            model.F_DealType = input.F_DealType;//处理方式：立即办理，提交审核，转派部门
+            //model.F_DealType = input.F_DealType;//处理方式：立即办理，提交审核，转派部门
             model.F_WorkOrderContents = input.F_WorkOrderContents;//工单内容
             model.F_DealOpinions = input.F_DealOpinions;//处理意见  
             //model.F_DealContents = input.F_DealContents;//处理内容
@@ -805,10 +806,10 @@ namespace RMYY_CallCenter_Api.Controllers
         /// 转派工单
         /// </summary>
 
-        private bool AssignWO(Model.T_Sys_UserAccount nowUser,Model.T_Con_WorkOrder wokerModel,string cont,int clid=0, int clbm = 0)
+        private bool AssignWO(Model.T_Sys_UserAccount nowUser, Model.T_Con_WorkOrder wokerModel, string cont, int clid = 0, int clbm = 0)
         {
 
-            string touser = "";string tousername = "";
+            string touser = ""; string tousername = "";
             int deptid = 0;
             #region 获取接收人
             if (clid != 0)
@@ -888,48 +889,53 @@ namespace RMYY_CallCenter_Api.Controllers
         /// <param name="AuditCont"></param>
         /// <param name="IsAudit"></param>
         /// <returns></returns>
-        public ActionResult GetApproval(int orderid,string AuditCont,int IsAudit=0 )
+        public ActionResult GetApproval(int orderid, string AuditCont, int IsAudit = 0, int AuditState = 1)
         {
-            int userId = 2;
-            if (userId != 0)
+            long res = 0;
+            if (User != null)
             {
-                Model.T_Sys_UserAccount ua = userbll.GetModel(userId);
-                if (ua != null)
+                Model.T_Sys_UserAccount ua = userbll.GetModel(User.F_UserId);
+                Model.T_Con_WorkOrder wmodel = orderbll.GetModel(orderid);
+                if (wmodel != null)
                 {
-                    Model.T_Con_WorkOrder wmodel = orderbll.GetModel(orderid);
-                    if (wmodel != null)
+                    string deptname = "";
+                    var deptmodel = deptbll.GetModel(ua.F_DeptId);
+                    if (deptmodel != null)
+                    {
+                        deptname = deptmodel.F_DeptName + "-";
+                    }
+                    if (IsAudit == 1)
                     {
-                        if (IsAudit == 1)
+                        if (AuditState == 1)
                         {
-                        string deptname = "";
-                        var deptmodel = deptbll.GetModel(ua.F_DeptId);
-                        if (deptmodel != null)
+                            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_AuditState = 1;
+                        }
+                        if (AuditState == 2)
                         {
-                            deptname = deptmodel.F_DeptName + "-";
-                        }               
-                            var 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);
-                            if (res > 0)
-                            {
-                                wmodel.F_State = 0; //待转派
-                                //处理内容
-                                if (!string.IsNullOrEmpty(AuditCont))
-                                wmodel.F_AuditCont += AuditCont + "；";
-                                wmodel.F_IsAudit = IsAudit;
-                                wmodel.F_AuditState = 1;
-                                wmodel.F_AuditUser = ua.F_UserCode;
-                                wmodel.F_AuditTime = DateTime.Now;
-                                orderbll.Update(wmodel);
-                                return Success("审批成功！");
-                            }
-                            else
-                                return Error("审批失败！");
-
+                            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);
+                            wmodel.F_State = (int)EnumWorkOrderState.audit;//待审批
+                            wmodel.F_AuditState = 2;
+                        }
+                        if (res > 0)
+                        {
+                            if (!string.IsNullOrEmpty(AuditCont))
+                            wmodel.F_AuditCont += AuditCont + "；";
+                            wmodel.F_IsAudit = IsAudit;
+                            wmodel.F_AuditUser = ua.F_UserCode;
+                            wmodel.F_AuditTime = DateTime.Now;
+                            orderbll.Update(wmodel);
+                            return Success("审批成功！");
                         }
+                        else
+                            return Error("审批失败！");
                     }
-                }
 
+                }
             }
             return Error("无操作权限");
+
         }
 
         /// <summary>
@@ -983,25 +989,25 @@ namespace RMYY_CallCenter_Api.Controllers
         /// <param name="F_Files"></param>
         /// <param name="isover"></param>
         /// <returns></returns>
-        public bool DealWO(Model.T_Sys_UserAccount nowUser, Model.T_Con_WorkOrder model, string cont, string F_Files="", int isover = 0)
+        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 = "已处理";//处理结果
-                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 = "未处理";//处理结果
-            }
+            //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;
+            model.F_HandleBy = nowUser.F_UserCode;
+            //model.F_HandleTime =DateTime.Parse(DateTime.Now.ToString("yyyy-MM-dd  hh:mm:ss"));
+            //}
+            //else
+            //{
+            //    model.F_DealResult = "未处理";//处理结果
+            //}
             #region 读取当前登录人部门
             string deptname = "";
             var deptmodel = deptbll.GetModel(nowUser.F_DeptId);