bug修复

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

@@ -4933,9 +4933,16 @@ namespace CallCenterApi.Interface.Controllers.workorder
                 //获取最新交办信息
                 string iszbdw = "0";
                 int state = Int32.Parse(dr["F_WorkState"].ToString());
+                string ispd = "";
                 if (state > 1)
                 {
                     string sqljb = "SELECT TOP 1 * FROM T_Bus_AssignedInfo WITH(NOLOCK) WHERE F_WorkOrderId='" + dr["F_WorkOrderId"].ToString() + "' and F_State=1 and F_IsDelete=0 and F_IsSure<>3   ORDER BY F_Id DESC";
+                    string sqlej = "";
+                    if (userModel.F_RoleCode == "EJWLDW")
+                    {
+                        sqlej = " select TOP 1 F_LimitTime from T_Bus_AssignedInfo_Next WITH(NOLOCK) where F_State=1 and F_IsDelete=0 and F_WorkOrderId='"+ dr["F_WorkOrderId"].ToString() + "'";
+                    }
+                       
                     var dtjb = DbHelperSQL.Query(sqljb).Tables[0];
                     if (dtjb.Rows.Count > 0)
                     {
@@ -4952,6 +4959,12 @@ namespace CallCenterApi.Interface.Controllers.workorder
                         if (state < (int)EnumWorkState.dealed || state == (int)EnumWorkState.reload)
                         {
                             var lt = dtjb.Rows[0]["F_LimitTime"].ToString();//限制时间
+                            if (userModel.F_RoleCode == "EJWLDW")
+                            {
+                                sqlej = " select TOP 1 F_LimitTime from T_Bus_AssignedInfo_Next WITH(NOLOCK) where F_State=1 and F_IsDelete=0 and F_WorkOrderId='" + dr["F_WorkOrderId"].ToString() + "'";
+                                var dtej = DbHelperSQL.Query(sqljb).Tables[0];
+                                lt= dtej.Rows[0]["F_LimitTime"].ToString();
+                            }
                             dr["LimitTime"] = lt;
                             if (!string.IsNullOrWhiteSpace(lt))
                             {
@@ -5024,7 +5037,7 @@ namespace CallCenterApi.Interface.Controllers.workorder
                                 }
                             }
                         }
-
+                        ispd = dtjb.Rows[0]["F_IsNext"] != null ? dtjb.Rows[0]["F_IsNext"].ToString() : "";
                         #endregion
                     }
                 }
@@ -5038,7 +5051,15 @@ namespace CallCenterApi.Interface.Controllers.workorder
                 }
 
                 List<ButtonGroup.button> btns = new List<ButtonGroup.button>();
-                btns.Add(ButtonGroup.query());
+                if (userModel.F_RoleCode == "EJWLDW")
+                {
+                    btns = ButtonGroup.GetButtons(dr["F_WorkState"].ToString(), userModel.F_RoleCode.ToUpper(), dr["F_IsResult"].ToString(), iszbdw, ispd);
+                    
+                }
+                else
+                {
+                    btns.Add(ButtonGroup.query());
+                }
                 dr["Buttons"] = btns;
             }
             #endregion
@@ -13045,7 +13066,7 @@ namespace CallCenterApi.Interface.Controllers.workorder
                             new BLL.T_Bus_Feedback_Next().Update(modelT_Bus_Feedback_Next);
 
                             string strmsg = "";
-
+                            string message = "";
                             if (state == 1)
                             {
                                 strmsg = "同意";
@@ -13144,7 +13165,6 @@ namespace CallCenterApi.Interface.Controllers.workorder
                             else if (state == 2)
                             {
                                 strmsg = "拒绝";
-
                                 Model.T_Bus_AssignedInfo_Next modelT_Bus_AssignedInfo_Next1 = new BLL.T_Bus_AssignedInfo_Next().GetModel(modelT_Bus_Feedback_Next.F_AssignedId.Value);
                                 modelT_Bus_AssignedInfo_Next1.F_FeedbackTime = null;
                                 new BLL.T_Bus_AssignedInfo_Next().Update(modelT_Bus_AssignedInfo_Next1);
@@ -13180,6 +13200,8 @@ namespace CallCenterApi.Interface.Controllers.workorder
 
                             string userinfo = userModel.depname  + "(" + userModel.F_UserCode + ")";
                             oper.F_Message = userinfo + " " + strmsg + "了此处理";
+                            if (!string.IsNullOrWhiteSpace(reason))
+                                oper.F_Message = oper.F_Message + "，原因：" + reason;
                             oper.F_CreateUser = userModel.F_UserCode;
                             oper.F_CreateTime = DateTime.Now;
                             oper.F_IsDelete = 0;
@@ -13670,6 +13692,7 @@ namespace CallCenterApi.Interface.Controllers.workorder
                             new BLL.T_Bus_PerformDuties().Update(modelT_Bus_PerformDuties);
                             #endregion
                             string strmsg = ""; var isperform = 1; int IsSatisfie = 0;
+                           
                             #region
                             if (state == 1)
                             {
@@ -13680,6 +13703,7 @@ namespace CallCenterApi.Interface.Controllers.workorder
                             else if (state == 2)
                             {
                                 strmsg = "拒绝";
+                                
                                 isperform = 3;
                             }
                             #endregion
@@ -14065,8 +14089,8 @@ namespace CallCenterApi.Interface.Controllers.workorder
 
                                     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 F_OffDate>='" + DateTime.Now + "' order by F_OffDate").Tables[0];
-                                    var resdatetime = dt.Rows[4]["F_OffDate"].ToString();
+                                    DataTable dt = DbHelperSQL.Query("select top 6 F_OffDate from  T_Sys_WorkOFFDays  where F_OffState = 1   and F_OffDate>='" + DateTime.Now + "' order by F_OffDate ").Tables[0];
+                                    var resdatetime = dt.Rows[5]["F_OffDate"].ToString();
                                     if (!string.IsNullOrEmpty(resdatetime))
                                     {
                                         newmodelT_Bus_AssignedInfo.F_LimitTime = DateTime.Parse(resdatetime.Split(' ')[0] + " 23:59:59");//办理时限

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

@@ -233,9 +233,9 @@ namespace CallCenterApi.Interface.Models.Common
                     //调度专员 质检专员可以进行编辑 zhengbingbing 20191017
                     if (code == "ZXLD" || code == "ZJZY")
                         buttons.Add(edit());
-                   
+
                     //中心话务员 坐席班长 管理员
-                    if (code == "ZXHWY" || code == "ZXBZ" || code == "GLY" || code == "DDZG" )
+                    if (code == "ZXHWY" || code == "ZXBZ" || code == "GLY" || code == "DDZG")
                     {
                         buttons.Add(submit());
                         buttons.Add(edit()); buttons.Add(delete());
@@ -247,12 +247,12 @@ namespace CallCenterApi.Interface.Models.Common
                     break;
                 case "1":
                     //质检专员可以进行编辑 zhengbingbing 20191017
-                    if (code == "ZJZY" )
+                    if (code == "ZJZY")
                         buttons.Add(edit());
                     //调度专员 中心领导管理员 管理员
-                    if (code == "ZXLD" || code == "ZXLDGLYGLY" || code == "GLY" || code == "DDZG"|| code == "MTDD")
+                    if (code == "ZXLD" || code == "ZXLDGLYGLY" || code == "GLY" || code == "DDZG" || code == "MTDD")
                     {
-                       
+
                         buttons.Add(edit());
                         buttons.Add(back());// buttons.Add(assign());
                         //buttons.Add(approval());
@@ -269,13 +269,13 @@ namespace CallCenterApi.Interface.Models.Common
                     break;
                 case "2":
                     //二级网络单位 管理员     
-                    if (code == "GLY"||code == "WLDW")
+                    if (code == "GLY" || code == "WLDW")
                     {
                         buttons.Add(receive());
-                      //  buttons.Add(reback());
+                        //  buttons.Add(reback());
                     }
                     //调度专员 中心领导管理员 管理员
-                    if (code == "ZXLD" || code == "ZXLDGLYGLY" || code == "GLY" || code == "DDZG"|| code == "MTDD")
+                    if (code == "ZXLD" || code == "ZXLDGLYGLY" || code == "GLY" || code == "DDZG" || code == "MTDD")
                     {
                         buttons.Add(takeback());
                     }
@@ -284,7 +284,7 @@ namespace CallCenterApi.Interface.Models.Common
                     //调度专员 中心领导管理员 管理员
                     if (code == "ZXLD" || code == "ZXLDGLYGLY" || code == "GLY" || code == "DDZG" || code == "MTDD")
                     {
-                        buttons.Add(auditreback());buttons.Add(turnsee());
+                        buttons.Add(auditreback()); buttons.Add(turnsee());
                     }
                     break;
                 case "4":
@@ -297,7 +297,7 @@ namespace CallCenterApi.Interface.Models.Common
                             buttons.Add(delay());
                             if (ispd == "0" || ispd == "")
                             {
-                                buttons.Add(split()); 
+                                buttons.Add(split());
                             }
                             else
                             {
@@ -310,14 +310,14 @@ namespace CallCenterApi.Interface.Models.Common
                         }
                     }
                     //调度专员 中心领导管理员 管理员
-                    if (code == "ZXLD" || code == "ZXLDGLYGLY" || code == "GLY" || code == "DDZG"|| code == "MTDD")
+                    if (code == "ZXLD" || code == "ZXLDGLYGLY" || code == "GLY" || code == "DDZG" || code == "MTDD")
                     {
                         buttons.Add(takeback());
-                       // buttons.Add(turnsee()); //buttons.Add(oversee());
-                     //   buttons.Add(supervision());
+                        // buttons.Add(turnsee()); //buttons.Add(oversee());
+                        //   buttons.Add(supervision());
                     }
                     //质检专员
-// if (code == "ZJZY" )
+                    // if (code == "ZJZY" )
                     //    buttons.Add(turnsee());
                     //三级网络单位
                     if (code == "EJWLDW")
@@ -337,12 +337,12 @@ namespace CallCenterApi.Interface.Models.Common
                     break;
                 case "5":
                     //调度专员 中心领导管理员 管理员
-                    if (code == "ZXLD" || code == "ZXLDGLYGLY" || code == "GLY" || code == "DDZG"|| code == "MTDD")
+                    if (code == "ZXLD" || code == "ZXLDGLYGLY" || code == "GLY" || code == "DDZG" || code == "MTDD")
                     {
                         buttons.Add(auditdelay());
                     }
                     //三级网络单位
-                    if (code == "EJWLDW" )
+                    if (code == "EJWLDW")
                     {
                         if (ispd == "1")
                         {
@@ -366,30 +366,30 @@ namespace CallCenterApi.Interface.Models.Common
                     //质检专员(ZJZY)
                     if (isproresult != 0)
                     {
-                        if (isproresult==2)
+                        if (isproresult == 2)
                         {
                             if (code == "WLDW" || code == "GLY" || code == "DDZG")
                             {
                                 buttons.Add(feedback());
                             }
                         }
-                        else if (isproresult ==3)
+                        else if (isproresult == 3)
                         {
-                            if (code == "ZJZY" || code == "GLY" || code == "ZXLD" || code == "DDZG" || code == "MTDD" )
+                            if (code == "ZJZY" || code == "GLY" || code == "ZXLD" || code == "DDZG" || code == "MTDD")
                             {
                                 buttons.Add(visit());
-                              //  buttons.Add(modify());
+                                //  buttons.Add(modify());
                             }
                             if (code == "ZXHWY")
                             {
-                                 buttons.Add(visit());
+                                buttons.Add(visit());
                             }
                         }
                         //调度专员 中心领导管理员 管理员
                         //三级网络单位
-                        if (code == "EJWLDW" )
+                        if (code == "EJWLDW")
                         {
-                          
+
                             if (ispd == "2")
                             {
                                 buttons.Add(feedback());
@@ -425,7 +425,7 @@ namespace CallCenterApi.Interface.Models.Common
                     //二级网络单位 管理员
                     if (code == "WLDW" || code == "GLY" || code == "DDZG")
                     {
-                      
+
                         buttons.Add(feedback()); buttons.Add(delay());
                         buttons.Add(split());
 
@@ -433,12 +433,12 @@ namespace CallCenterApi.Interface.Models.Common
 
                     }
                     //调度专员 中心领导管理员 管理员
-                    if (code == "ZXLD" || code == "ZXLDGLYGLY" || code == "GLY" || code == "DDZG"|| code == "MTDD")
+                    if (code == "ZXLD" || code == "ZXLDGLYGLY" || code == "GLY" || code == "DDZG" || code == "MTDD")
                     {
                         buttons.Add(takeback());
                         //buttons.Add(oversee());
-                      //  buttons.Add(turnsee());
-                      //  buttons.Add(supervision());
+                        //  buttons.Add(turnsee());
+                        //  buttons.Add(supervision());
                     }
                     if (code == "EJWLDW")
                     {
@@ -460,10 +460,10 @@ namespace CallCenterApi.Interface.Models.Common
                     break;
                 case "9":
                     //调度专员 中心领导管理员 管理员
-                    if ((code == "ZXLD" || code == "ZXLDGLYGLY" || code == "GLY" || code == "DDZG"|| code == "MTDD"|| code == "ZXHWY") && iszb == "1")
+                    if ((code == "ZXLD" || code == "ZXLDGLYGLY" || code == "GLY" || code == "DDZG" || code == "MTDD" || code == "ZXHWY") && iszb == "1")
                     {
 
-                       // buttons.Add(back());
+                        // buttons.Add(back());
                     }
                     if (code == "ZXLD" || code == "ZXLDGLYGLY" || code == "GLY" || code == "DDZG" || code == "MTDD" || code == "ZXHWY")
                     {
@@ -482,7 +482,7 @@ namespace CallCenterApi.Interface.Models.Common
                     break;
                 case "11":
                     //调度专员 中心领导管理员 管理员
-                    if (code == "ZXLD" || code == "MTDD" || code == "ZXLDGLYGLY" || code == "GLY" || code == "DDZG"|| code == "MTDD")
+                    if (code == "ZXLD" || code == "MTDD" || code == "ZXLDGLYGLY" || code == "GLY" || code == "DDZG" || code == "MTDD")
                     {
                         buttons.Add(reload()); buttons.Add(reject());
                     }
@@ -495,11 +495,15 @@ namespace CallCenterApi.Interface.Models.Common
                     }
                     break;
                 case "13":
-                    if (code == "ZJZY" || code == "GLY" || code == "DDZG")
+                    if (code == "ZJZY" || code == "ZXHWY" || code == "GLY" || code == "DDZG")
                     {
                         buttons.Add(subreload());
                         buttons.Add(end());
                     }
+                    else if (code == "ZXLD" || code == "MTDD")
+                    {
+                        buttons.Add(subreload());
+                    }
                     break;
             }
             //buttons.Add(export());