修改工单

CallCenterApi/CallCenterApi.Interface/CallCenterApi.Interface/Controllers/InfoController.cs

@@ -127,7 +127,7 @@ namespace CallCenterApi.Interface.Controllers
         //受理区域统计(按小时统计)
         private object GetAreaCount24()
         {
-            var areaList = new BLL.T_Sys_Area().GetModelList(" 1=1 ");
+            var areaList = new BLL.T_Sys_Area().GetModelList(" F_PrentId=0 and F_State=0 ");
 
             int[] hours = { 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19, 20, 21, 22, 23, 24 };
 

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

@@ -77,7 +77,6 @@ namespace CallCenterApi.Interface.Controllers.workorder
             //} 
             #endregion
 
-
             #region 多个上传
             HttpFileCollection files = RequestString.GetFiles();
             if (files.Count > 0)
@@ -299,7 +298,10 @@ namespace CallCenterApi.Interface.Controllers.workorder
                     sql = " and F_IsDelete=1 and F_IsEnabled=0 ";
                     break;
                 case "0"://待处理工单
-                    sql += " and F_CreateUser='" + userModel.F_UserCode + "'";
+                    if (userModel.F_RoleCode != "GLY")
+                    {
+                        sql += " and F_CreateUser='" + userModel.F_UserCode + "'";
+                    }
 
                     if (strstate.Trim() != "" && strstate != "undefined")
                     {
@@ -718,7 +720,7 @@ namespace CallCenterApi.Interface.Controllers.workorder
                     {
                         sql += " and F_WorkOrderId in (select F_WorkOrderId from T_Bus_AssignedInfo where F_State=1 and F_IsDelete=0 and "
                         + " (F_MainDeptId = " + userModel.F_DeptId + " or ','+F_OtherDeptIds+',' like '," + userModel.F_DeptId + ",'))";
-                    }                    
+                    }
                     break;
                 case "1"://已查收的工单
                     sql += "  and F_WorkOrderID in(select F_WorkOrderID from T_Bus_AssignedInfo where F_State=1 and F_IsDelete=0 and F_IsSure=1 ";
@@ -873,11 +875,11 @@ namespace CallCenterApi.Interface.Controllers.workorder
             var config = configBll.GetModelList(" F_ParamCode='PlayPath' ").FirstOrDefault();
             foreach (DataRow dr in dt.Rows)
             {
-                if (dr["F_LeaveRecordId"] != null && dr["F_LeaveRecordId"].ToString()!="")
+                if (dr["F_LeaveRecordId"] != null && dr["F_LeaveRecordId"].ToString() != "")
                 {
                     dr["FilePath"] = GetLeavePath(dr["F_LeaveRecordId"].ToString(), config.F_ParamValue);
                 }
-                else if (dr["F_CallRecordId"] != null && dr["F_CallRecordId"].ToString()!="")
+                else if (dr["F_CallRecordId"] != null && dr["F_CallRecordId"].ToString() != "")
                 {
                     dr["FilePath"] = GetCallPath(dr["F_CallRecordId"].ToString(), config.F_ParamValue);
                 }
@@ -895,8 +897,6 @@ namespace CallCenterApi.Interface.Controllers.workorder
             };
 
             return Content(obj.ToJson());
-
-
         }
 
         /// <summary>
@@ -906,7 +906,6 @@ namespace CallCenterApi.Interface.Controllers.workorder
         [Authority]
         public ActionResult GetTimeOutList()
         {
-
             DataTable dt = new DataTable();
 
             int userId = Utils.StrToInt(User.UserData["F_UserID"], 0);
@@ -1022,11 +1021,11 @@ namespace CallCenterApi.Interface.Controllers.workorder
             var config = configBll.GetModelList(" F_ParamCode='PlayPath' ").FirstOrDefault();
             foreach (DataRow dr in dt.Rows)
             {
-                if (dr["F_LeaveRecordId"] != null && dr["F_LeaveRecordId"].ToString()!="")
+                if (dr["F_LeaveRecordId"] != null && dr["F_LeaveRecordId"].ToString() != "")
                 {
                     dr["FilePath"] = GetLeavePath(dr["F_LeaveRecordId"].ToString(), config.F_ParamValue);
                 }
-                else if (dr["F_CallRecordId"] != null && dr["F_CallRecordId"].ToString()!="")
+                else if (dr["F_CallRecordId"] != null && dr["F_CallRecordId"].ToString() != "")
                 {
                     dr["FilePath"] = GetCallPath(dr["F_CallRecordId"].ToString(), config.F_ParamValue);
                 }
@@ -1046,8 +1045,6 @@ namespace CallCenterApi.Interface.Controllers.workorder
             };
 
             return Content(obj.ToJson());
-
-
         }
 
         /// <summary>
@@ -1062,6 +1059,7 @@ namespace CallCenterApi.Interface.Controllers.workorder
             Model.T_Sys_UserAccount userModel = userBLL.GetModel(userId);
 
             string strworkorderid = HttpUtility.UrlDecode(RequestString.GetQueryString("workorderid"));
+            int type = RequestString.GetInt("type", 0);//0基本信息1监察意见2领导批示3办理情况4回访信息5督办信息6办理过程
             if (!string.IsNullOrEmpty(strworkorderid))
             {
                 string sql = "select *,dbo.GetUserName(F_CreateUser) as UserName,dbo.GetDictionaryName(F_InfoType) as TypeName1,"
@@ -1090,11 +1088,7 @@ namespace CallCenterApi.Interface.Controllers.workorder
                                     + "from T_Bus_VisitResult where F_State=1 and F_IsDelete=0 and F_WorkOrderId ='" + strworkorderid + "'";
                     string gcsql = "select *,dbo.GetUserName(F_CreateUser) as UserName "
                                     + "from T_Bus_Operation where F_IsDelete=0 and F_WorkOrderId ='" + strworkorderid + "'";
-                    //if (userModel.F_RoleCode == "WLDW")
-                    //{
-                    //    jbsql += " and F_DeptId='" + userModel.F_DeptId + "'";
-                    //    fksql += " and F_BackDeptId='" + userModel.F_DeptId + "'";
-                    //}
+
 
                     #region 声音文件
                     dt.Columns.Add("FilePath", typeof(string));
@@ -1211,8 +1205,6 @@ namespace CallCenterApi.Interface.Controllers.workorder
             {
                 return Error("参数传输失败");
             }
-
-
         }
 
         /// <summary>
@@ -1256,8 +1248,6 @@ namespace CallCenterApi.Interface.Controllers.workorder
             {
                 return Error("参数传输失败");
             }
-
-
         }
 
         /// <summary>
@@ -1301,8 +1291,6 @@ namespace CallCenterApi.Interface.Controllers.workorder
             {
                 return Error("参数传输失败");
             }
-
-
         }
 
         /// <summary>
@@ -1311,7 +1299,6 @@ namespace CallCenterApi.Interface.Controllers.workorder
         /// <returns></returns>
         public ActionResult AddWorkOrder()
         {
-
             if (Request.IsAuthenticated)
             {
                 int userId = Utils.StrToInt(User.UserData["F_UserID"], 0);
@@ -1407,8 +1394,8 @@ namespace CallCenterApi.Interface.Controllers.workorder
                                     modelT_Bus_WorkOrder.F_EndUser = userModel.F_UserCode;
                                     modelT_Bus_WorkOrder.F_EndTime = DateTime.Now;
                                     modelT_Bus_WorkOrder.F_IsClosed = 1;
-                                    modelT_Bus_WorkOrder.F_CloseUser= userModel.F_UserCode;
-                                    modelT_Bus_WorkOrder.F_CloseTime= DateTime.Now;
+                                    modelT_Bus_WorkOrder.F_CloseUser = userModel.F_UserCode;
+                                    modelT_Bus_WorkOrder.F_CloseTime = DateTime.Now;
                                 }
                                 else if (issubmit == 1)
                                 {
@@ -1569,8 +1556,6 @@ namespace CallCenterApi.Interface.Controllers.workorder
         [Authority]
         public ActionResult AddWorkOrderByLY()
         {
-
-
             int userId = Utils.StrToInt(User.UserData["F_UserID"], 0);
 
             Model.T_Sys_UserAccount userModel = userBLL.GetModel(userId);
@@ -1729,8 +1714,6 @@ namespace CallCenterApi.Interface.Controllers.workorder
             {
                 return Error("权限不足");
             }
-
-
         }
 
         /// <summary>
@@ -1740,15 +1723,12 @@ namespace CallCenterApi.Interface.Controllers.workorder
         [Authority]
         public ActionResult EditWorkOrder()
         {
-
-
             int userId = Utils.StrToInt(User.UserData["F_UserID"], 0);
 
             Model.T_Sys_UserAccount userModel = userBLL.GetModel(userId);
 
             if (userModel.F_RoleCode == "ZXHWY" || userModel.F_RoleCode == "ZXBZ" || userModel.F_RoleCode == "GLY")
             {
-
                 string workorderid = RequestString.GetFormString("workorderid");
 
                 int source = RequestString.GetInt("source", 0);
@@ -1889,8 +1869,6 @@ namespace CallCenterApi.Interface.Controllers.workorder
             {
                 return Success("权限不足");
             }
-
-
         }
 
         /// <summary>
@@ -2051,8 +2029,6 @@ namespace CallCenterApi.Interface.Controllers.workorder
             {
                 return Success("权限不足");
             }
-
-
         }
 
         /// <summary>
@@ -2063,8 +2039,6 @@ namespace CallCenterApi.Interface.Controllers.workorder
         [Authority]
         public ActionResult SubmitWorkOrder(string[] ids)
         {
-
-
             int userId = Utils.StrToInt(User.UserData["F_UserID"], 0);
 
             Model.T_Sys_UserAccount userModel = userBLL.GetModel(userId);
@@ -2118,15 +2092,13 @@ namespace CallCenterApi.Interface.Controllers.workorder
                 }
                 else
                 {
-                    return Error("提交的ID不能为空");
+                    return Error("操作失败");
                 }
             }
             else
             {
                 return Error("权限不足");
             }
-
-
         }
 
         /// <summary>
@@ -2137,7 +2109,6 @@ namespace CallCenterApi.Interface.Controllers.workorder
         [Authority]
         public ActionResult SuperWorkOrder()
         {
-
             int userId = Utils.StrToInt(User.UserData["F_UserID"], 0);
             Model.T_Sys_UserAccount userModel = userBLL.GetModel(userId);
 
@@ -2194,8 +2165,6 @@ namespace CallCenterApi.Interface.Controllers.workorder
             {
                 return Error("操作失败");
             }
-
-
         }
 
         /// <summary>
@@ -2205,8 +2174,6 @@ namespace CallCenterApi.Interface.Controllers.workorder
         [Authority]
         public ActionResult AssignWorkOrder()
         {
-
-
             int userId = Utils.StrToInt(User.UserData["F_UserID"], 0);
 
             Model.T_Sys_UserAccount userModel = userBLL.GetModel(userId);
@@ -2226,6 +2193,7 @@ namespace CallCenterApi.Interface.Controllers.workorder
                 var deptinfo = new BLL.T_Sys_Department().GetModel(maindeptid);
                 if (modelT_Bus_WorkOrder != null && deptinfo != null)
                 {
+                    int aid = 0;
                     using (TransactionScope trans = new TransactionScope())
                     {
                         if (assignid == 0)
@@ -2244,7 +2212,7 @@ namespace CallCenterApi.Interface.Controllers.workorder
                             modelT_Bus_AssignedInfo.F_IsOverdue = 0;
                             modelT_Bus_AssignedInfo.F_IsSure = 0;
                             modelT_Bus_AssignedInfo.F_IsReload = 0;
-                            assignBLL.Add(modelT_Bus_AssignedInfo);
+                            aid=assignBLL.Add(modelT_Bus_AssignedInfo);
 
                             #endregion
                         }
@@ -2263,6 +2231,7 @@ namespace CallCenterApi.Interface.Controllers.workorder
                                 modelT_Bus_AssignedInfo.F_CreateUser = userModel.F_UserCode;
                                 modelT_Bus_AssignedInfo.F_CreateTime = DateTime.Now;
                                 assignBLL.Update(modelT_Bus_AssignedInfo);
+                                aid = modelT_Bus_AssignedInfo.F_Id;
                             }
 
                             #endregion
@@ -2305,7 +2274,7 @@ namespace CallCenterApi.Interface.Controllers.workorder
                 }
                 else
                 {
-                    return Error("无法查到原始工单" + workorderid + "/" + maindeptid);
+                    return Error("操作失败");
                 }
 
             }
@@ -2313,8 +2282,6 @@ namespace CallCenterApi.Interface.Controllers.workorder
             {
                 return Error("权限不足");
             }
-
-
         }
 
         /// <summary>
@@ -2324,8 +2291,6 @@ namespace CallCenterApi.Interface.Controllers.workorder
         [Authority]
         public ActionResult TakeBackWorkOrder()
         {
-
-
             int userId = Utils.StrToInt(User.UserData["F_UserID"], 0);
 
             Model.T_Sys_UserAccount userModel = userBLL.GetModel(userId);
@@ -2417,8 +2382,6 @@ namespace CallCenterApi.Interface.Controllers.workorder
             {
                 return Error("权限不足");
             }
-
-
         }
 
         /// <summary>
@@ -2428,8 +2391,6 @@ namespace CallCenterApi.Interface.Controllers.workorder
         [Authority]
         public ActionResult ReceiveWorkOrder()
         {
-
-
             int userId = Utils.StrToInt(User.UserData["F_UserID"], 0);
 
             Model.T_Sys_UserAccount userModel = userBLL.GetModel(userId);
@@ -2492,8 +2453,6 @@ namespace CallCenterApi.Interface.Controllers.workorder
             {
                 return Error("权限不足");
             }
-
-
         }
 
         /// <summary>
@@ -2592,8 +2551,6 @@ namespace CallCenterApi.Interface.Controllers.workorder
             {
                 return Error("权限不足");
             }
-
-
         }
 
         /// <summary>
@@ -2603,8 +2560,6 @@ namespace CallCenterApi.Interface.Controllers.workorder
         [Authority]
         public ActionResult AuditRebackWorkOrder()
         {
-
-
             int userId = Utils.StrToInt(User.UserData["F_UserID"], 0);
 
             Model.T_Sys_UserAccount userModel = userBLL.GetModel(userId);
@@ -2724,8 +2679,6 @@ namespace CallCenterApi.Interface.Controllers.workorder
             {
                 return Error("权限不足");
             }
-
-
         }
 
         /// <summary>
@@ -2735,8 +2688,6 @@ namespace CallCenterApi.Interface.Controllers.workorder
         [Authority]
         public ActionResult DelayWorkOrder()
         {
-
-
             int userId = Utils.StrToInt(User.UserData["F_UserID"], 0);
 
             Model.T_Sys_UserAccount userModel = userBLL.GetModel(userId);
@@ -2808,14 +2759,11 @@ namespace CallCenterApi.Interface.Controllers.workorder
                 {
                     return Error("操作失败");
                 }
-
             }
             else
             {
                 return Error("权限不足");
             }
-
-
         }
 
         /// <summary>
@@ -2910,8 +2858,6 @@ namespace CallCenterApi.Interface.Controllers.workorder
             {
                 return Error("权限不足");
             }
-
-
         }
 
         /// <summary>
@@ -2921,8 +2867,6 @@ namespace CallCenterApi.Interface.Controllers.workorder
         [Authority]
         public ActionResult FeedBackWorkOrder()
         {
-
-
             int userId = Utils.StrToInt(User.UserData["F_UserID"], 0);
 
             Model.T_Sys_UserAccount userModel = userBLL.GetModel(userId);
@@ -3059,8 +3003,6 @@ namespace CallCenterApi.Interface.Controllers.workorder
             {
                 return Error("权限不足");
             }
-
-
         }
 
         /// <summary>
@@ -3070,8 +3012,6 @@ namespace CallCenterApi.Interface.Controllers.workorder
         [Authority]
         public ActionResult VisitWorkOrder()
         {
-
-
             int userId = Utils.StrToInt(User.UserData["F_UserID"], 0);
 
             Model.T_Sys_UserAccount userModel = userBLL.GetModel(userId);
@@ -3086,9 +3026,9 @@ namespace CallCenterApi.Interface.Controllers.workorder
                 int state = RequestString.GetInt("state", 0);//0保存 1保存并下一步
                 int visitid = RequestString.GetInt("visitid", 0);
                 string result = RequestString.GetFormString("result");//回访情况
-                                                                      //int nexttype = RequestString.GetInt("nexttype", 0);//1重办 2结案
-                                                                      //string overseeopinion = RequestString.GetFormString("overseeopinion");//督办意见
-                                                                      //string finalopinion = RequestString.GetFormString("finalopinion");//结案意见
+                //int nexttype = RequestString.GetInt("nexttype", 0);//1重办 2结案
+                //string overseeopinion = RequestString.GetFormString("overseeopinion");//督办意见
+                //string finalopinion = RequestString.GetFormString("finalopinion");//结案意见
 
                 string callid = RequestString.GetFormString("callid");
 
@@ -3214,7 +3154,6 @@ namespace CallCenterApi.Interface.Controllers.workorder
             {
                 return Error("权限不足");
             }
-
         }
 
         /// <summary>
@@ -3224,8 +3163,6 @@ namespace CallCenterApi.Interface.Controllers.workorder
         [Authority]
         public ActionResult RemindWorkOrder()
         {
-
-
             int userId = Utils.StrToInt(User.UserData["F_UserID"], 0);
 
             Model.T_Sys_UserAccount userModel = userBLL.GetModel(userId);
@@ -3282,8 +3219,6 @@ namespace CallCenterApi.Interface.Controllers.workorder
             {
                 return Error("操作失败");
             }
-
-
         }
 
         /// <summary>
@@ -3293,8 +3228,6 @@ namespace CallCenterApi.Interface.Controllers.workorder
         [Authority]
         public ActionResult ReloadWorkOrder()
         {
-
-
             int userId = Utils.StrToInt(User.UserData["F_UserID"], 0);
 
             Model.T_Sys_UserAccount userModel = userBLL.GetModel(userId);
@@ -3405,8 +3338,6 @@ namespace CallCenterApi.Interface.Controllers.workorder
             {
                 return Error("权限不足");
             }
-
-
         }
 
         /// <summary>
@@ -3416,21 +3347,20 @@ namespace CallCenterApi.Interface.Controllers.workorder
         [Authority]
         public ActionResult FinishWorkOrder()
         {
-
-
             int userId = Utils.StrToInt(User.UserData["F_UserID"], 0);
 
             Model.T_Sys_UserAccount userModel = userBLL.GetModel(userId);
 
-            string workorderid = RequestString.GetFormString("workorderid");
-            string finalopinion = RequestString.GetFormString("finalopinion");//结案意见
-            int issatisfie = RequestString.GetInt("issatisfie", 0);//0不满意 1满意
-
-            Model.T_Bus_WorkOrder modelT_Bus_WorkOrder = workorderBLL.GetModel(workorderid);
-            if (modelT_Bus_WorkOrder != null)
+            if (userModel.F_RoleCode == "ZXLD" || userModel.F_RoleCode == "GLY")
             {
-                if (userModel.F_RoleCode == "ZXLD" || userModel.F_RoleCode == "GLY")
+                string workorderid = RequestString.GetFormString("workorderid");
+                string finalopinion = RequestString.GetFormString("finalopinion");//结案意见
+                int issatisfie = RequestString.GetInt("issatisfie", 0);//0不满意 1满意
+
+                Model.T_Bus_WorkOrder modelT_Bus_WorkOrder = workorderBLL.GetModel(workorderid);
+                if (modelT_Bus_WorkOrder != null)
                 {
+
                     using (TransactionScope trans = new TransactionScope())
                     {
                         #region 修改工单记录
@@ -3465,15 +3395,13 @@ namespace CallCenterApi.Interface.Controllers.workorder
                 }
                 else
                 {
-                    return Error("权限不足");
+                    return Error("操作失败");
                 }
             }
             else
             {
-                return Error("操作失败");
+                return Error("权限不足");
             }
-
-
         }
 
         /// <summary>
@@ -3482,8 +3410,6 @@ namespace CallCenterApi.Interface.Controllers.workorder
         /// <returns></returns>
         public ActionResult DelWorkOrder(string[] ids)
         {
-
-
             int userId = Utils.StrToInt(User.UserData["F_UserID"], 0);
 
             Model.T_Sys_UserAccount userModel = userBLL.GetModel(userId);
@@ -3528,8 +3454,6 @@ namespace CallCenterApi.Interface.Controllers.workorder
             {
                 return Error("权限不足");
             }
-
-
         }
 
         /// <summary>

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

@@ -121,7 +121,7 @@ namespace CallCenterApi.Interface.Models.Common
                 case "1":
                     if (code == "ZXLD"||code == "GLY")
                     {
-                        buttons.Add(assign()); buttons.Add(approval()); buttons.Add(instruct());
+                        buttons.Add(edit()); buttons.Add(assign()); buttons.Add(approval()); buttons.Add(instruct());
                     }
                     break;
                 case "2":