合并

CallCenterApi/CallCenterApi.Interface/CallCenterApi.Interface/Controllers/knowledge/KnowledgeController.cs

             dt = BLL.PagerBLL.GetListPager(
                 "T_RepositoryInformation a",
                 "F_RepositoryId",
-                "*,(select F_CategoryName   from T_RepositoryCategory  where F_CategoryId =a.F_CategoryId  )as CategoryName ",
+                "*,(select F_CategoryName   from T_RepositoryCategory  where F_CategoryId =a.F_CategoryId  )as CategoryName" +
+                ",dbo.GetDeptName(CONVERT (int ,(select F_DeptId  from T_Sys_UserAccount  where F_UserCode = a.F_CreateBy)) ) DeptName ",
                 sql,
                 "ORDER BY F_RepositoryId desc",
                 pagesize,

CallCenterApi/CallCenterApi.Interface/CallCenterApi.Interface/Controllers/workorder/AffairsController.cs

                         }
                         else
                         {
-                          
+                            delay.F_IsAudit = 0;
                             delay.F_AssignedId = 0;
                             delay.F_OldTime = DateTime.Parse(affairs.TBACKTIME_BF);
                         }

CallCenterApi/CallCenterApi.Interface/CallCenterApi.Interface/Controllers/workorder/WorkOrderController.cs

             string Result = HttpUtility.UrlDecode(RequestString.GetQueryString("Result"));
             int isopen = RequestString.GetInt("isopen", -1);//是否公开
             int jianhang = RequestString.GetInt("jianhang", -1);//省平台工单
-            int orderSign = RequestString.GetInt("orderSign", -1);
             if (jianhang==4)
             {
                 sql += " and F_InfoSource = '2580'";
                     if (butt == null)
                         buttons.Add(ButtonGroup.turnsee());
                 }
+                if (User .F_RoleCode =="GLY")
+                {
+                    var butEdit = buttons.Find(c => c.key == ButtonGroup.edit().key);
+                    if (butEdit == null)
+                        buttons.Add (ButtonGroup.edit());
+                }
+              
+
 
                 dr["Buttons"] = buttons;
             }
             int isopen = RequestString.GetInt("isopen", -1);//是否公开
             if (isopen > -1)
                 sql += " and isnull(F_IsOpen,0) =" + isopen;
+            int IsReturn = RequestString.GetInt("IsReturn", -1);
+            if (IsReturn > -1)
+            {
+                if (strstate == "0")
+                {
+                    if (IsReturn == 1)
+                    {
+                        sql += " and F_IsReturn=1";
+                    }
+                    else
+                    {
+                        sql += " and (F_IsReturn is null or F_IsReturn !=1)";
+                    }
 
+                }
+            }
             string strworkorderid = HttpUtility.UrlDecode(RequestString.GetQueryString("strworkorderid"));
             if (strworkorderid.Trim() != "" && strworkorderid != "undefined")
             {
             int pageindex = 1;
             string strpagesize = RequestString.GetQueryString("pagesize");
             int pagesize = 10;
-
+           
             #region sql 语句相关处理
             int dbtype = RequestString.GetInt("dbtype", 0);
             if (dbdata > 0)
             int isopen = RequestString.GetInt("isopen", -1);
             if (isopen > -1)
                 sql += " and isnull(F_IsOpen,0) =" + isopen;
+            int IsReturn = RequestString.GetInt("IsReturn", -1);
+            if (IsReturn > -1)
+            {
+                if (strstate == "0")
+                {
+                    if (IsReturn == 1)
+                    {
+                        sql += " and F_IsReturn=1";
+                    }
+                    else
+                    {
+                        sql += " and (F_IsReturn is null or F_IsReturn !=1)";
+                    }
 
+                }
+            }
 
             if (dealstarttime.Trim() != "" && dealstarttime != "undefined")
             {
 
             string visitstarttime = HttpUtility.UrlDecode(RequestString.GetQueryString("visitstarttime"));//回访开始时间
             string visitstrendtime = HttpUtility.UrlDecode(RequestString.GetQueryString("visitstrendtime"));//回访结束时间
+            int IsReturn = RequestString.GetInt("IsReturn", -1);
+            if (IsReturn > -1)
+            {
+                if (strstate == "0")
+                {
+                    if (IsReturn == 1)
+                    {
+                        sql += " and F_IsReturn=1";
+                    }
+                    else
+                    {
+                        sql += " and (F_IsReturn is null or F_IsReturn !=1)";
+                    }
 
+                }
+            }
             if (dealstarttime.Trim() != "" && dealstarttime != "undefined")
             {
                 if (dealstrendtime.Trim() != "" && dealstrendtime != "undefined")
             int db = RequestString.GetInt("db", 0);
             int isopen = RequestString.GetInt("isopen", -1);
             int identification = RequestString.GetInt("identification", -1);
+            int IsReturn = RequestString.GetInt("IsReturn", -1);
+            if (IsReturn > -1)
+            {
+                if (strstate == "0")
+                {
+                    if (IsReturn == 1)
+                    {
+                        sql += " and F_IsReturn=1";
+                    }
+                    else
+                    {
+                        sql += " and (F_IsReturn is null or F_IsReturn !=1)";
+                    }
 
+                }
+            }
             if (identification > -1)
             {
                 sql += "and F_Identification='" + identification + "'";
             string strpagesize = RequestString.GetQueryString("pagesize");
             int pagesize = 10;
             string order = "ORDER BY a.F_LimitTime";
+            int IsReturn = RequestString.GetInt("IsReturn", -1);
+            if (IsReturn > -1)
+            {
+                if (strstate == "0")
+                {
+                    if (IsReturn == 1)
+                    {
+                        sql += " and F_IsReturn=1";
+                    }
+                    else
+                    {
+                        sql += " and (F_IsReturn is null or F_IsReturn !=1)";
+                    }
 
+                }
+            }
             #region 模块
             switch (strtab)
             {
             int pageindex = 1;
             string strpagesize = RequestString.GetQueryString("pagesize");
             int pagesize = 10;
+            int IsReturn = RequestString.GetInt("IsReturn", -1);
+            if (IsReturn > -1)
+            {
+                if (strstate == "0")
+                {
+                    if (IsReturn == 1)
+                    {
+                        sql += " and F_IsReturn=1";
+                    }
+                    else
+                    {
+                        sql += " and (F_IsReturn is null or F_IsReturn !=1)";
+                    }
 
+                }
+            }
             switch (strtab)
             {
                 case "0"://待处理工单
             int pageindex = 1;
             string strpagesize = RequestString.GetQueryString("pagesize");
             int pagesize = 10;
+            int IsReturn = RequestString.GetInt("IsReturn", -1);
+            if (IsReturn > -1)
+            {
+                if (strstate == "0")
+                {
+                    if (IsReturn == 1)
+                    {
+                        sql += " and F_IsReturn=1";
+                    }
+                    else
+                    {
+                        sql += " and (F_IsReturn is null or F_IsReturn !=1)";
+                    }
 
+                }
+            }
             #region 模块
             switch (strtab)
             {
             int pageindex = 1;
             string strpagesize = RequestString.GetQueryString("pagesize");
             int pagesize = 10;
+            int IsReturn = RequestString.GetInt("IsReturn", -1);
+            if (IsReturn > -1)
+            {
+                if (strstate == "0")
+                {
+                    if (IsReturn == 1)
+                    {
+                        sql += " and F_IsReturn=1";
+                    }
+                    else
+                    {
+                        sql += " and (F_IsReturn is null or F_IsReturn !=1)";
+                    }
 
+                }
+            }
             #region  坐席&调度员
             string splituser = HttpUtility.UrlDecode(RequestString.GetQueryString("splituser"));
             if (splituser.Trim() != "" && splituser != "undefined")
 
 
             int isRelease = RequestString.GetInt("isRelease", 0);
+            int IsReturn = RequestString.GetInt("IsReturn", -1);
+            if (IsReturn > -1)
+            {
+                if (strstate == "0")
+                {
+                    if (IsReturn == 1)
+                    {
+                        sql += " and F_IsReturn=1";
+                    }
+                    else
+                    {
+                        sql += " and (F_IsReturn is null or F_IsReturn !=1)";
+                    }
 
+                }
+            }
             if (keyid != 0)
             {
                 sql += "and a.F_Key in(select F_ValueId  from  dbo.GetValueId(" + keyid + ")) ";
 
                             #region 操作按钮
                             var btns = new List<ButtonGroup.button>();
-                            string sqljb = "SELECT TOP 1 * FROM T_Bus_AssignedInfo WITH(NOLOCK) WHERE F_WorkOrderId='" + dt.Rows[0]["F_WorkOrderId"].ToString() + "' and F_State=1 and F_IsDelete=0 and F_IsSure<>3   ORDER BY F_Id DESC";
+                            var btnpc= new List<ButtonGroup.button>();
+                            string sqljb = "SELECT TOP 1 * FROM T_Bus_AssignedInfo WITH(NOLOCK) WHERE F_WorkOrderId='" 
+                                + dt.Rows[0]["F_WorkOrderId"].ToString() + "' and F_State=1 and F_IsDelete=0 and F_IsSure<>3   ORDER BY F_Id DESC";
                             var dtjb = DbHelperSQL.Query(sqljb).Tables[0];
                             string ispd = "";
                             if (dtjb != null && dtjb.Rows.Count > 0)
+                            {
+                                var jbzx = dtjb.Rows[0];
                                 ispd = dtjb.Rows[0]["F_IsNext"].ToString();
+                                string iszbdw = "0";
+                                string fmd = jbzx["F_MainDeptId"].ToString();
+                                string fod = jbzx["F_OtherDeptIds"] == null ? "" : jbzx["F_OtherDeptIds"].ToString();
+                                if (fmd == User.F_DeptId.ToString())
+                                { iszbdw = "1"; }
+
+                                else if (fod != "" && fod.Split(',').Contains(User.F_DeptId.ToString()))
+                                {
+                                    iszbdw = "2";
+                                }
+                                if (!(User.F_RoleCode == "WLDW" && iszbdw == "0"))
+                                {
+                                    btnpc = ButtonGroup.GetButtons(dt.Rows[0]["F_WorkState"].ToString(), User.F_RoleCode.ToUpper(), 
+                                        dt.Rows[0]["F_IsResult"].ToString(), iszbdw, ispd, 0);
+                                }
+                            }
+                            else
+                            {
+                                btnpc = ButtonGroup.GetButtons(dt.Rows[0]["F_WorkState"].ToString(), 
+                                    User.F_RoleCode.ToUpper(), dt.Rows[0]["F_IsResult"].ToString(), "0", "", 0);
+                            }
+
+
                             if (User.F_RoleCode == "EJWLDW")
                             {
                                 string sqlejjb = "SELECT TOP 1 * FROM T_Bus_AssignedInfo_Next WITH(NOLOCK) WHERE F_WorkOrderId='" + strworkorderid + "' and F_IsDelete=0 and F_MainDeptId='" + User.F_DeptId + "' order by F_Id desc";
                                 }
 
                             }
-                            btns = ButtonGroup.GetAPPButtons(dt.Rows[0]["F_WorkState"].ToString(), User.F_RoleCode.ToUpper(), dt.Rows[0]["F_IsProResult"].ToString(), dt.Rows[0]["F_InfoSource"].ToString(), ispd);
+                            btns = ButtonGroup.GetAPPButtons
+                                (dt.Rows[0]["F_WorkState"].ToString(), User.F_RoleCode.ToUpper(), dt.Rows[0]["F_IsProResult"].ToString(), 
+                                dt.Rows[0]["F_InfoSource"].ToString(), ispd);
+
+
 
+                           
+                            
+
+                          
 
 
                             #endregion
                                 issend,
                                 isedit,
                                 isnotice,
-                                btndata = btns
+                                btndata = btns,
+                                btnpc
                             };
                             return Success("获取成功", obj);
                         }
                 {
                     return Error("请选择反映类别");
                 }
+                if(type ==0)
+                    return Error("请选择来电类型");
+
                 if (isAutoSendOrder == "1")
                 {
 
                     //如果选择即刻答复：是，即为直办，工单结束
                     if (isresult == 1)
                     {
+                        if (string.IsNullOrEmpty(result))
+                            return Error("请输入办结内容");
                         modelT_Bus_WorkOrder.F_WorkState = (int)EnumWorkState.finish;// 9;//已结案
                         modelT_Bus_WorkOrder.F_DealDeptId = User.F_DeptId;
                         modelT_Bus_WorkOrder.F_DealUser = User.F_UserCode;
                     //如果选择即刻答复：是，即为直办，工单结束
                     if (isresult == 1)
                     {
+                        if (string.IsNullOrEmpty(result))
+                            return Error("请输入办结内容");
                         modelT_Bus_WorkOrder.F_WorkState = (int)EnumWorkState.finish;// 9;//已结案
                         modelT_Bus_WorkOrder.F_DealUser = User.F_UserCode;
                         modelT_Bus_WorkOrder.F_DealTime = DateTime.Now;
                 string workcontent = RequestString.GetFormString("workcontent");
                 string maindeptids = RequestString.GetFormString("maindeptids");
                 int limittimes = RequestString.GetInt("limittimes", 0);
-
+                if (type == 0)
+                    return Error("请选择来电类型");
                 //领导批示
                 string superOpinion = RequestString.GetFormString("superOpinion");
                 lock (_MyLock)
                     //  modelT_Bus_WorkOrder.F_ComTitle = title;//标题
                     keyValuePairs.Add("F_ComContent", content);
                     // modelT_Bus_WorkOrder.F_ComContent = content;//情况摘要（投诉内容）
+                    if(!string .IsNullOrEmpty (files))
                     keyValuePairs.Add("F_File", files);
                     // modelT_Bus_WorkOrder.F_File = files;//附件
                     keyValuePairs.Add("F_IsProtect", isprotect);
 
                     if (isresult == 1)
                     {
+                        if (string.IsNullOrEmpty(result))
+                            return Error("请输入办结内容");
                         keyValuePairs.Add("F_WorkState", 9);
                         modelT_Bus_WorkOrder.F_WorkState = (int)EnumWorkState.finish;// 9;//已结案
                         keyValuePairs.Add("F_DealDeptId", User.F_DeptId);
 
                     #endregion
                     #region 插入操作记录
-                    Model.T_Bus_Operation oper = new Model.T_Bus_Operation();
+                    int edit = 0;
+                    if (modelT_Bus_WorkOrder.F_ComTitle != title || modelT_Bus_WorkOrder.F_ComContent != content)
+                    {
+                        edit = 1;
+                    }
+                    if (issubmit ==1)
+                    {
+                        edit = 1;
+                    }
+
+                     Model.T_Bus_Operation oper = new Model.T_Bus_Operation();
                     oper.F_WorkOrderId = modelT_Bus_WorkOrder.F_WorkOrderId;
                     oper.F_State = modelT_Bus_WorkOrder.F_WorkState;
                     oper.F_CallRecordId = modelT_Bus_WorkOrder.F_CallRecordId;
                     {
                         oper.F_Message = userinfo + " 修改并提交了工单";
                     }
-                    if (modelT_Bus_WorkOrder.F_WorkState == (int)EnumWorkState.resubmit)//1)
+                    else  if (modelT_Bus_WorkOrder.F_WorkState == (int)EnumWorkState.resubmit)//1)
                     {
                         oper.F_Message = userinfo + " 修改了重办工单";
                     }
-                    if (modelT_Bus_WorkOrder.F_WorkState == (int)EnumWorkState.finish)//9)
+                    else   if (modelT_Bus_WorkOrder.F_WorkState == (int)EnumWorkState.finish)//9)
                     {
+                        edit = 1;
                         oper.F_Message = userinfo + " 修改并结案了工单";
                         Task.Run(() =>
                         {
                         {
                             System.Diagnostics.Debug.WriteLine(DateTime.Now);
                         });
-
-                        try
-                        {
-                            if (modelT_Bus_WorkOrder.F_InfoSource == 4606)
-                            {
-                                CommonHelper.pushresult(modelT_Bus_WorkOrder.F_WorkOrderId);
-                            }
-                        }
-                        catch (Exception ex)
-                        {
-
-                            //  FileLog.Error("结案110工单：" + ex.ToJson()); ;
-                        }
                     }
 
                     oper.F_CreateUser = User.F_UserCode;
                     oper.F_CreateTime = DateTime.Now;
                     oper.F_IsDelete = 0;
-
+                    if (edit ==1)
                     operBLL.Add(oper);
+                    else
+                        LogFactory.GetLogger("修改了信息").Warn(User.F_UserCode + " 修改工单信息");
                     //Task.Run(() =>
                     //{//推送消息表
                     //        if (modelT_Bus_WorkOrder.F_WorkState == (int)EnumWorkState.submit)//1)
                 int isprotect = RequestString.GetInt("isprotect", 0);
                 int level = RequestString.GetInt("level", 0);
                 int issubmit = RequestString.GetInt("issubmit", 0);
-
+                if (type == 0)
+                    return Error("请选择来电类型");
                 Model.T_Bus_WorkOrder modelT_Bus_WorkOrder = workorderBLL.GetModel(workorderid);
                 if (modelT_Bus_WorkOrder != null)
                 {
                         //  modelT_Bus_WorkOrder.F_ComTitle = title;//标题
                         keyValuePairs.Add("F_ComContent", content);
                         // modelT_Bus_WorkOrder.F_ComContent = content;//情况摘要（投诉内容）
-                        keyValuePairs.Add("F_File", files);
+                        if (!string.IsNullOrEmpty(files))
+                            keyValuePairs.Add("F_File", files);
                         // modelT_Bus_WorkOrder.F_File = files;//附件
                         keyValuePairs.Add("F_IsProtect", isprotect);
                         // modelT_Bus_WorkOrder.F_IsProtect = isprotect;//保密方式0否1是
                                                                //如果选择即刻答复：是，即为直办，工单结束
                         if (isresult == 1)
                         {
+                            if (string.IsNullOrEmpty(result))
+                                return Error("请输入办结内容");
                             keyValuePairs.Add("F_WorkState", 9);
                             modelT_Bus_WorkOrder.F_WorkState = (int)EnumWorkState.finish;// 9;//已结案
                             keyValuePairs.Add("F_DealDeptId", User.F_DeptId);
 
 
                 Model.T_Bus_WorkOrder modelT_Bus_WorkOrder = workorderBLL.GetModel(workorderid);
+                if(modelT_Bus_WorkOrder.F_WorkState  ==0&& modelT_Bus_WorkOrder.F_IsReturn ==1)
+                {
+                    return Error("工单已回退，不能交办");
+                }
                 var premodeldept = new Model.T_Sys_Department();
                 if (ispd > 0)
                 {
                 int issatisfie = RequestString.GetInt("issatisfie", -1);//0不满意 1满意2基本满意
                 int state = RequestString.GetInt("state", 1);//0保存 1保存并下一步
                 int visitid = RequestString.GetInt("visitid", 0);
-                
-                
+                int limittimes = RequestString.GetInt("limittimes", 6);
+
                 string result = RequestString.GetFormString("result");//回访情况
                 int nexttype = RequestString.GetInt("nexttype", 0);//1重办 2退回重办3仅回访4已办未果
                 string cbreason = RequestString.GetFormString("cbreason");//重办原因
                                             newmodelT_Bus_AssignedInfo.F_WorkOrderId = modelT_Bus_WorkOrder.F_WorkOrderId;
 
                                           
-                                            DataTable dt = DbHelperSQL.Query("select top 6 F_OffDate from  T_Sys_WorkOFFDays  where F_OffState = 1   and " +
+                                            DataTable dt = DbHelperSQL.Query("select top "+ limittimes + " F_OffDate from  T_Sys_WorkOFFDays  where F_OffState = 1   and " +
                                                 "F_OffDate> (select top 1 F_OffDate from T_Sys_WorkOFFDays  where F_OffDate >= '" + DateTime .Now  + "'  and   F_OffState = 1  order by F_OffDate asc) order by F_OffDate ").Tables[0];
                                             var resdatetime = dt.Rows[5]["F_OffDate"].ToString();
                                             if (!string.IsNullOrEmpty(resdatetime))
                                             {
-                                                 resdatetime = GetLimittime(6);
+                                                 resdatetime = GetLimittime(limittimes);
                             //                    resdatetime = resdatetime.Split(' ')[0] + " " + DateTime.Now.ToString("HH:mm:ss");
                             //                    var datatime = DateTime.Now.AddDays(6);
                             //                    if (Convert.ToDateTime(resdatetime) > datatime)
                             return Error("操作失败");
                         }
                     }
+                    if (string.IsNullOrEmpty(result))
+                        return Error("请输入办结内容");
                     using (TransactionScope trans = new TransactionScope(TransactionScopeOption.Required, new TimeSpan(0, 10, 0)))
                     {
                         #region 修改工单记录
 
                 int isprotect = RequestString.GetInt("isprotect", 0);
                 int level = RequestString.GetInt("level", 0);
-
+                if (type == 0)
+                    return Error("请选择来电类型");
                 Model.T_Bus_WorkOrder modelT_Bus_WorkOrder = workorderBLL.GetModel(workorderid);
                 if (modelT_Bus_WorkOrder != null)
                 {
                         //  modelT_Bus_WorkOrder.F_ComTitle = title;//标题
                         keyValuePairs.Add("F_ComContent", content);
                         // modelT_Bus_WorkOrder.F_ComContent = content;//情况摘要（投诉内容）
-                        keyValuePairs.Add("F_File", files);
+                        if (!string.IsNullOrEmpty(files))
+                            keyValuePairs.Add("F_File", files);
                         // modelT_Bus_WorkOrder.F_File = files;//附件
                         keyValuePairs.Add("F_File", isprotect);
                         // modelT_Bus_WorkOrder.F_IsProtect = isprotect;//保密方式0否1是
                         #endregion
 
                         #region 插入操作记录
-                        Model.T_Bus_Operation oper = new Model.T_Bus_Operation();
-                        oper.F_WorkOrderId = modelT_Bus_WorkOrder.F_WorkOrderId;
-                        oper.F_State = modelT_Bus_WorkOrder.F_WorkState;
-                        oper.F_CallRecordId = modelT_Bus_WorkOrder.F_CallRecordId;
-                        oper.F_File = modelT_Bus_WorkOrder.F_File;
+                        if (modelT_Bus_WorkOrder.F_ComTitle !=title || modelT_Bus_WorkOrder.F_ComContent  !=content )
+                        {
+                            Model.T_Bus_Operation oper = new Model.T_Bus_Operation();
+                            oper.F_WorkOrderId = modelT_Bus_WorkOrder.F_WorkOrderId;
+                            oper.F_State = modelT_Bus_WorkOrder.F_WorkState;
+                            oper.F_CallRecordId = modelT_Bus_WorkOrder.F_CallRecordId;
+                            oper.F_File = modelT_Bus_WorkOrder.F_File;
 
-                        string userinfo = User.depname + "(" + User.F_UserCode + ")";
-                        oper.F_Message = userinfo + " 修改了工单基本信息";
-                        oper.F_CreateUser = User.F_UserCode;
-                        oper.F_CreateTime = DateTime.Now;
-                        oper.F_IsDelete = 0;
+                            string userinfo = User.depname + "(" + User.F_UserCode + ")";
+                            oper.F_Message = userinfo + " 修改了工单基本信息";
+                            oper.F_CreateUser = User.F_UserCode;
+                            oper.F_CreateTime = DateTime.Now;
+                            oper.F_IsDelete = 0;
 
-                        operBLL.Add(oper);
+                            operBLL.Add(oper);
+                        }
+                        else
+                        {
+                            LogFactory.GetLogger("修改了信息").Warn(User.F_UserCode + " 修改工单信息");
+                        }
+                     
                         #endregion
 
                         trans.Complete();

CallCenterApi/CallCenterApi.Interface/CallCenterApi.Interface/Controllers/workorder/hb_affairsController.cs

                     else if (type == "35")
                         modelT_Bus_WorkOrder.F_InfoType = 13;
                     else
-                        modelT_Bus_WorkOrder.F_InfoType = 14;
+                        modelT_Bus_WorkOrder.F_InfoType = 90;
                 }
                 else
-                    modelT_Bus_WorkOrder.F_InfoType = 14;
+                    modelT_Bus_WorkOrder.F_InfoType = 90;
                 modelT_Bus_WorkOrder.F_SourceAddress = result["CASE_ADDRESS"] == null ? "" : result["CASE_ADDRESS"].ToString();
                 modelT_Bus_WorkOrder.F_CusName = result["APPLICANT_NAME"] == null ? "" : result["APPLICANT_NAME"].ToString();
                 if (string.IsNullOrEmpty(result["APPLICANT_NAME"].ToString()))