8.13文档

CallCenterApi/CallCenterApi.Interface/CallCenterApi.Interface/Controllers/DepartmentController.cs

@@ -71,7 +71,21 @@ namespace CallCenterApi.Interface.Controllers
 
             return Success("加载成功", dt);
         }
+        public ActionResult GetWebSecondDeptList(int iscbdw = 0)
+        {
+            DataTable dt = new DataTable();
 
+            if (iscbdw == 0)
+            {
+                dt = departmentBLL.GetList(0, "F_State=0 and  ISNULL(F_IsDept, '0') ='1' ", " F_Sort").Tables[0];
+            }
+            else
+            {
+                dt = departmentBLL.GetList(0, "F_State=0 and  ISNULL(F_IsDealDept, '0') ='1'", " F_Sort").Tables[0];
+            }
+
+            return Success("加载成功", dt);
+        }
         /// <summary>
         /// 获取二级部门列表
         /// </summary>

CallCenterApi/CallCenterApi.Interface/CallCenterApi.Interface/Controllers/UserAccountController.cs

@@ -347,7 +347,7 @@ namespace CallCenterApi.Interface.Controllers
         //获取坐席列表
         public ActionResult GetSeatList()
         {
-            List<Model.T_Sys_UserAccount> userSeartList = sysUserAccountBll.GetModelList(" f_seatflag=1 order by f_userid desc ");
+            List<Model.T_Sys_UserAccount> userSeartList = sysUserAccountBll.GetModelList(" f_seatflag=1 and F_DeleteFlag=0  order by f_userid desc ");
             if (userSeartList.Count > 0)
                 return Success("列表加载成功", userSeartList);
             else

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

@@ -84,7 +84,7 @@ namespace CallCenterApi.Interface.Controllers.workorder
             }
             if (accept != 0)
             {
-                sql += " and F_WorkState = '" + 2 + "' ";
+              //  sql += " and F_WorkState = '" + 2 + "' ";
                 sql += "and F_WorkOrderId in (select F_WorkOrderId FROM T_Bus_AssignedInfo WHERE F_IsDelete = 0 AND F_IsSure = 0 and DateDiff(HH, F_CreateTime , GETDATE())> 6 )";
             }
             if (isobservation!= -1)
@@ -2342,7 +2342,7 @@ namespace CallCenterApi.Interface.Controllers.workorder
             }
             else
             {
-                sql += " and (F_WorkState in (2,4,8)" + sqlwhere + "or  (( isnull(F_DealTime,'')<>'' and F_LimitTime<F_DealTime) or ( isnull(F_DealTime,'')='' and F_LimitTime<F_CloseTime) ) " + sqlwhere1 + "and F_WorkState =9)";
+                sql += " and (F_WorkState in (2,4,8)" + sqlwhere ;
             }
             if (strworkid.Trim() != "" && strworkid != "undefined")
             {
@@ -5147,8 +5147,9 @@ namespace CallCenterApi.Interface.Controllers.workorder
                                 modelT_Bus_AssignedInfo.F_LimitTime = limittime;//办理时限
                                 modelT_Bus_AssignedInfo.F_MainDeptId = maindeptid;//主办单位id
                                 modelT_Bus_AssignedInfo.F_OtherDeptIds = otherdeptids;//协办单位id
-                                var mag = RoleInfoModel.F_RoleName + ":" + userModel.F_UserName + "(" + userModel.F_Mobile + ")" +
-                                    DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss");
+                              //  var mag = RoleInfoModel.F_RoleName + ":" + userModel.F_UserName + "(" + userModel.F_Mobile + ")" +
+                                    //DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss");
+                                var mag = DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss");
                                 modelT_Bus_AssignedInfo.F_AssignedOpinion = assignedopinion+" "+ mag;//交办意见
                                 modelT_Bus_AssignedInfo.F_State = state;//0草稿  1正式
                                 modelT_Bus_AssignedInfo.F_CreateUser = userModel.F_UserCode;
@@ -8465,7 +8466,7 @@ namespace CallCenterApi.Interface.Controllers.workorder
                         modelT_Bus_AssignedInfo.F_LimitTime = limittime;//办理时限
                                                                         //modelT_Bus_AssignedInfo.F_MainDeptId = maindeptid;//主办单位id
                                                                         //modelT_Bus_AssignedInfo.F_OtherDeptIds = otherdeptids;//协办单位id
-                        var mag = RoleInfoModel.F_RoleName + ":" + userModel.F_UserName + "(" + userModel.F_Mobile + ")" +
+                        var mag = 
                                   DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss");
                         modelT_Bus_AssignedInfo.F_AssignedOpinion = assignedopinion+"  " +mag;//交办意见