11111

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

@@ -99,7 +99,7 @@ namespace CallCenterApi.Interface.Controllers.knowledge
                 "T_RepositoryInformation a",
                 "F_RepositoryId",
                 "*,(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 ",
+                ",dbo.GetDeptName(CONVERT (int ,(select F_DeptId  from T_Sys_UserAccount  where F_UserId = a.F_CreateBy)) ) DeptName ",
                 sql,
                 "ORDER BY F_RepositoryId desc",
                 pagesize,

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

@@ -2395,7 +2395,8 @@ namespace CallCenterApi.Interface.Controllers.workorder
                 case "0"://待处理工单
                     if (User.F_RoleCode != "GLY" && User.F_RoleCode != "ZXLD" && User.F_RoleCode != "SPZ" && User.F_RoleCode != "SPZJZ")
                     {
-                        //话务员，已办待回访菜单中可以看到所有工单并能操作
+                       
+                        ////话务员，已办待回访菜单中可以看到所有工单并能操作
                         if (User.F_RoleCode != "ZJZY" && User.F_RoleCode != "ZXHWY")
                             sql += " and F_CreateUser='" + User.F_UserCode + "'";
                         //话务员，已办待回访菜单中可以看到所有工单并能操作
@@ -2451,7 +2452,7 @@ namespace CallCenterApi.Interface.Controllers.workorder
 
                         sql += " and F_WorkState in (0) ";
 
-                        if (User.F_RoleCode == "ZXHWY")
+                        if (User.F_RoleCode != "GLY")
                             sql += " and F_CreateUser='" + User.F_UserCode + "'";
 
                     }
@@ -12735,7 +12736,8 @@ namespace CallCenterApi.Interface.Controllers.workorder
             if (modelT_Bus_WorkOrder != null)
             {
                 //if (modelT_Bus_WorkOrder.F_WorkState == 1 || (modelT_Bus_WorkOrder.F_WorkState == 9 && modelT_Bus_WorkOrder.F_IsResult==1))
-                if (modelT_Bus_WorkOrder.F_WorkState == (int)EnumWorkState.submit || (modelT_Bus_WorkOrder.F_WorkState == (int)EnumWorkState.finish && modelT_Bus_WorkOrder.F_IsResult == 1))
+                if (modelT_Bus_WorkOrder.F_WorkState == (int)EnumWorkState.submit|| modelT_Bus_WorkOrder.F_WorkState == (int)EnumWorkState.resubmit || 
+                    (modelT_Bus_WorkOrder.F_WorkState == (int)EnumWorkState.finish && modelT_Bus_WorkOrder.F_IsResult == 1))
                 {
                     using (TransactionScope trans = new TransactionScope(TransactionScopeOption.Required, new TimeSpan(0, 10, 0)))
                     {
@@ -20362,7 +20364,7 @@ namespace CallCenterApi.Interface.Controllers.workorder
                                           
                                             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();
+                                            var resdatetime = dt.Rows[limittimes-1]["F_OffDate"].ToString();
                                             if (!string.IsNullOrEmpty(resdatetime))
                                             {
                                                  resdatetime = GetLimittime(limittimes);
@@ -21598,7 +21600,7 @@ namespace CallCenterApi.Interface.Controllers.workorder
         {
             int maindeptid = RequestString.GetInt("maindeptid", 0);
             string otherdeptids = RequestString.GetFormString("otherdeptids");
-            DateTime limittime = DateTime.Parse(RequestString.GetFormString("limittime") + " 23:59:59");
+            int limittime = RequestString.GetInt("limittime", 6);
             string assignedopinion = RequestString.GetFormString("assignedopinion");
             if (User.F_RoleCode == "ZJZY" || User.F_RoleCode == "GLY" || User.F_RoleCode == "DDZG" || User.F_RoleCode == "ZXLD" || User.F_RoleCode == "ZXHWY" || User.F_RoleCode == "SPZ" || User.F_RoleCode == "SPZJZ")
             {
@@ -21803,12 +21805,12 @@ namespace CallCenterApi.Interface.Controllers.workorder
                                             int n = Int32.Parse(DbHelperSQL.GetSingle("select count(1) from T_Bus_AssignedInfo WITH(NOLOCK) where F_WorkOrderId='" + modelT_Bus_WorkOrder.F_WorkOrderId + "' and  F_State=1 and F_IsSure=1 and F_IsDelete=0 and isnull(F_IsReload,0)>0").ToString());
                                             Model.T_Bus_AssignedInfo newmodelT_Bus_AssignedInfo = new Model.T_Bus_AssignedInfo();
                                             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 " +limittime  + " 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();
+                                            var resdatetime = dt.Rows[limittime-1]["F_OffDate"].ToString();
                                             if (!string.IsNullOrEmpty(resdatetime))
                                             {
-                                                resdatetime = GetLimittime(6);
+                                                resdatetime = GetLimittime(limittime);
                             //                    resdatetime = resdatetime.Split(' ')[0] + " " + DateTime.Now.ToString("HH:mm:ss");
                             //                    var datatime = DateTime.Now.AddDays(6);
                             //                    if (Convert.ToDateTime(resdatetime) > datatime)
@@ -21856,7 +21858,7 @@ namespace CallCenterApi.Interface.Controllers.workorder
                                                 keyValuePairs.Add("F_IsReload", n + 1);
                                                 // modelT_Bus_WorkOrder.F_IsReload = n + 1;
                                                 if (!string.IsNullOrEmpty(resdatetime))
-                                                    keyValuePairs.Add("F_LimitTime", DateTime.Parse(resdatetime.Split(' ')[0] + " 23:59:59"));
+                                                    keyValuePairs.Add("F_LimitTime", DateTime.Parse(resdatetime));
                                                 keyValuePairs.Add("F_IsOverdue", 0);
                                                 //  modelT_Bus_WorkOrder.F_IsOverdue = 0;
 

CallCenterApi/CallCenterApi.Interface/CallCenterApi.Interface/Models/Common/ButtonGroup.cs

@@ -406,10 +406,10 @@ namespace CallCenterApi.Interface.Models.Common
 
                     }
 
-                    if (code == "ZXHWY")
-                    {//待审核交办时可撤单
-                        buttons.Add(withdraw());
-                    }
+                    //if (code == "ZXHWY")
+                    //{//待审核交办时可撤单
+                    //    buttons.Add(withdraw());
+                    //}
                     break;
                 case "2":
                     //二级网络单位 管理员