绩效工单列表，二级单位退回三级单位列表问题，督办强制结案

CallCenterApi/CallCenterApi.Interface/CallCenterApi.Interface/Controllers/Login/LoginController.cs

@@ -282,30 +282,9 @@ namespace CallCenterApi.Interface.Controllers
                             Dictionary<string, string> Dic = new Dictionary<string, string>();
                             Dic.Add("F_UserID", dt.Rows[0]["F_UserId"].ToString());
                             Dic.Add("F_UserCode", dt.Rows[0]["F_UserCode"].ToString());
-                            //Dic.Add("F_DeptId", dt.Rows[0]["F_DeptId"].ToString());
-                            //Dic.Add("F_UserName", dt.Rows[0]["F_UserName"].ToString());
-                            //Dic.Add("F_Telephone", dt.Rows[0]["F_Telephone"].ToString());
+                  
                             Dic.Add("F_RoleID", dt.Rows[0]["F_RoleID"].ToString());
-                            //Dic.Add("F_SeatFlag", dt.Rows[0]["F_SeatFlag"].ToString());
-
-                            //if (dt.Rows[0]["F_GroupId"].ToString() != null)
-                            //{
-                            //    Dic.Add("F_GroupId", dt.Rows[0]["F_GroupId"].ToString());
-                            //}
-                            //if (dt.Rows[0]["F_SeatRight"].ToString() != null)
-                            //{
-                            //    Dic.Add("F_SeatRight", dt.Rows[0]["F_SeatRight"].ToString());
-                            //}
-                            //if (!string.IsNullOrEmpty(login.ExtensionPhone))
-                            //{
-                            //    Dic.Add("F_ExtensionNumber", login.ExtensionPhone);
-                            //}
-                            //else
-                            //{
-                            //    Dic.Add("F_ExtensionNumber", "");
-                            //}
-                            //Dic.Add("F_WorkNumber", dt.Rows[0]["F_WorkNumber"].ToString());
-
+                    
                             //CookieUtil.SetCookie("BaseCallCenter_T_User", Dic);
                             //写入登录日志
                             new CallCenterApi.BLL.T_Sys_LoginLogs().Add(new Model.T_Sys_LoginLogs()

CallCenterApi/CallCenterApi.Interface/CallCenterApi.Interface/Controllers/workorder/APPSController.cs

@@ -282,10 +282,15 @@ namespace CallCenterApi.Interface.Controllers.workorder
                 newRow["strCst_Nm"] = orderlist[i].F_CusName.ToString();
                 newRow["strCst_ID"] = orderlist[i].F_Id.ToString();
                 newRow["strWrkOrdr_Ttl"] = orderlist[i].F_ComTitle.ToString();
-                if (!string .IsNullOrEmpty (orderlist[i].F_Content .ToString()))
-                newRow["strWrkOrdr_Dtl_StnDsc"] = orderlist[i].F_Content.ToString();
-                else
                 newRow["strWrkOrdr_Dtl_StnDsc"] = orderlist[i].F_ComContent.ToString();
+                if (orderlist[i].F_InfoSource ==1)
+                {
+                    if (!string.IsNullOrEmpty(orderlist[i].F_Content.ToString()))
+                        newRow["strWrkOrdr_Dtl_StnDsc"] = orderlist[i].F_Content.ToString();
+                        
+                }
+               
+               
 
                 newRow["strFst_SpInf"] = "";
                 newRow["strWrkOrdr_Splmt_Cntnt"] = orderlist[i].F_Result.ToString();
@@ -505,10 +510,19 @@ namespace CallCenterApi.Interface.Controllers.workorder
                 newRow["strWrkOrdr_TpCd"] = orderlist[i].F_InfoSource.ToString();
                 newRow["strWrkOrdr_StCd"] = orderlist[i].F_WorkState.ToString();
                 newRow["strWrkOrdr_Ttl"] = orderlist[i].F_ComTitle.ToString();
-                if (!string .IsNullOrEmpty(orderlist[i].F_Content .ToString()))
-                newRow["strWrkOrdr_Dtl_StnDsc"] = orderlist[i].F_Content.ToString();
-                else
-                    newRow["strWrkOrdr_Dtl_StnDsc"] = orderlist[i].F_ComContent.ToString();
+
+
+
+                newRow["strWrkOrdr_Dtl_StnDsc"] = orderlist[i].F_ComContent.ToString();
+                if (orderlist[i].F_InfoSource == 1)
+                {
+                    if (!string.IsNullOrEmpty(orderlist[i].F_Content.ToString()))
+                        newRow["strWrkOrdr_Dtl_StnDsc"] = orderlist[i].F_Content.ToString();
+
+                }
+
+              
+               
                 newRow["strCrt_Dt_Tm"] = orderlist[i].F_CreateTime.ToString();
                 newRow["strCst_Nm"] = orderlist[i].F_CusName.ToString();
                 newRow["strCst_ID"] = orderlist[i].F_Id.ToString();
@@ -654,10 +668,19 @@ namespace CallCenterApi.Interface.Controllers.workorder
                 newRow["strCst_Nm"] = orderlist[i].F_CusName.ToString();
                 newRow["strCst_ID"] = orderlist[i].F_Id.ToString();
                 newRow["strWrkOrdr_Ttl"] = orderlist[i].F_ComTitle.ToString();
-                if (!string.IsNullOrEmpty(orderlist[i].F_Content.ToString()))
-                    newRow["strWrkOrdr_Dtl_StnDsc"] = orderlist[i].F_Content.ToString();
-                else
-                    newRow["strWrkOrdr_Dtl_StnDsc"] = orderlist[i].F_ComContent.ToString();
+
+                newRow["strWrkOrdr_Dtl_StnDsc"] = orderlist[i].F_ComContent.ToString();
+                if (orderlist[i].F_InfoSource == 1)
+                {
+                    if (!string.IsNullOrEmpty(orderlist[i].F_Content.ToString()))
+                        newRow["strWrkOrdr_Dtl_StnDsc"] = orderlist[i].F_Content.ToString();
+
+                }
+
+
+
+
+             
               
                 newRow["strWrkOrdr_Splmt_Cntnt"] = orderlist[i].F_Result.ToString();
                 newRow["strCrt_Dt_Tm"] = orderlist[i].F_CreateTime.ToString();
@@ -937,10 +960,23 @@ namespace CallCenterApi.Interface.Controllers.workorder
                 newRow["strWrkOrdr_TpCd"] = orderlist[i].F_InfoSource.ToString();
                 newRow["strWrkOrdr_StCd"] = orderlist[i].F_WorkState.ToString();
                 newRow["strWrkOrdr_Ttl"] = orderlist[i].F_ComTitle.ToString();
-                if (!string.IsNullOrEmpty(orderlist[i].F_Content.ToString()))
-                    newRow["strWrkOrdr_Dtl_StnDsc"] = orderlist[i].F_Content.ToString();
-                else
-                    newRow["strWrkOrdr_Dtl_StnDsc"] = orderlist[i].F_ComContent.ToString();
+
+
+
+
+                newRow["strWrkOrdr_Dtl_StnDsc"] = orderlist[i].F_ComContent.ToString();
+                if (orderlist[i].F_InfoSource == 1)
+                {
+                    if (!string.IsNullOrEmpty(orderlist[i].F_Content.ToString()))
+                        newRow["strWrkOrdr_Dtl_StnDsc"] = orderlist[i].F_Content.ToString();
+
+                }
+
+
+
+
+
+               
                
                 newRow["strCrt_Dt_Tm"] = orderlist[i].F_CreateTime.ToString();
                 newRow["strCst_Nm"] = orderlist[i].F_CusName.ToString();
@@ -1368,10 +1404,16 @@ namespace CallCenterApi.Interface.Controllers.workorder
                 newRow["strWrkOrdr_ID"] = orderlist.Rows[i]["F_WorkOrderId"].ToString();
 
                 newRow["strWrkOrdr_Ttl"] = orderlist.Rows[i]["F_ComTitle"].ToString();
-                if (!string.IsNullOrEmpty(orderlist.Rows[i]["F_Content"].ToString()))
-                    newRow["strWrkOrdr_Dtl_StnDsc"] = orderlist.Rows[i]["F_Content"].ToString();
-                else
-                    newRow["strWrkOrdr_Dtl_StnDsc"] = orderlist.Rows[i]["F_ComContent"].ToString();
+
+                newRow["strWrkOrdr_Dtl_StnDsc"] = orderlist.Rows[i]["F_ComContent"].ToString();
+                if (orderlist.Rows[i]["F_InfoSource"].ToString() == "1")
+                {
+                    if (!string.IsNullOrEmpty(orderlist.Rows[i]["F_Content"].ToString()))
+                        newRow["strWrkOrdr_Dtl_StnDsc"] = orderlist.Rows[i]["F_Content"].ToString();
+
+                }
+
+              
                 newRow["strCrt_Dt_Tm"] = orderlist.Rows[i]["F_CreateTime"].ToString();
                 if (!string.IsNullOrEmpty(orderlist.Rows[i]["F_Key"].ToString()))
                 {
@@ -2138,10 +2180,18 @@ namespace CallCenterApi.Interface.Controllers.workorder
                 newRow["strCst_Nm"] = orderlist[i].F_CusName.ToString();
                 newRow["strCst_ID"] = orderlist[i].F_Id.ToString();
                 newRow["strWrkOrdr_Ttl"] = orderlist[i].F_ComTitle.ToString();
-                if (!string.IsNullOrEmpty(orderlist[i].F_Content.ToString()))
-                    newRow["strWrkOrdr_Dtl_StnDsc"] = orderlist[i].F_Content.ToString();
-                else
-                    newRow["strWrkOrdr_Dtl_StnDsc"] = orderlist[i].F_ComContent.ToString();
+
+
+
+                newRow["strWrkOrdr_Dtl_StnDsc"] = orderlist[i].F_ComContent.ToString();
+                if (orderlist[i].F_InfoSource == 1)
+                {
+                    if (!string.IsNullOrEmpty(orderlist[i].F_Content))
+                        newRow["strWrkOrdr_Dtl_StnDsc"] = orderlist[i].F_Content.ToString();
+
+                }
+
+             
             
                 // newRow["strFst_SpInf"] = "";
                 //newRow["strWrkOrdr_Splmt_Cntnt"] = orderlist[i].F_Result.ToString();
@@ -2397,10 +2447,17 @@ namespace CallCenterApi.Interface.Controllers.workorder
                 newRow["strCst_Nm"] = orderlist.Rows[i]["F_CusName"].ToString();
                 newRow["strCst_ID"] = orderlist.Rows[i]["F_Id"].ToString();
                 newRow["strWrkOrdr_Ttl"] = orderlist.Rows[i]["F_ComTitle"].ToString();
-                if (!string.IsNullOrEmpty(orderlist.Rows[i]["F_Content"].ToString()))
-                    newRow["strWrkOrdr_Dtl_StnDsc"] = orderlist.Rows[i]["F_Content"].ToString();
-                else
-                    newRow["strWrkOrdr_Dtl_StnDsc"] = orderlist.Rows[i]["F_ComContent"].ToString();
+
+
+                newRow["strWrkOrdr_Dtl_StnDsc"] = orderlist.Rows[i]["F_ComContent"].ToString();
+                if (orderlist.Rows[i]["F_InfoSource"].ToString() == "1")
+                {
+                    if (!string.IsNullOrEmpty(orderlist.Rows[i]["F_Content"].ToString()))
+                        newRow["strWrkOrdr_Dtl_StnDsc"] = orderlist.Rows[i]["F_Content"].ToString();
+
+                }
+
+               
                 
                 // newRow["strFst_SpInf"] = "";
                 //newRow["strWrkOrdr_Splmt_Cntnt"] = orderlist[i].F_Result.ToString();
@@ -2674,10 +2731,16 @@ namespace CallCenterApi.Interface.Controllers.workorder
                 newRow["strCst_ID"] = orderlist[i].F_Id.ToString();
                 newRow["strWrkOrdr_Ttl"] = orderlist[i].F_ComTitle.ToString();
 
-                if (!string.IsNullOrEmpty(orderlist[i].F_Content.ToString()))
-                    newRow["strWrkOrdr_Dtl_StnDsc"] = orderlist[i].F_Content.ToString();
-                else
-                    newRow["strWrkOrdr_Dtl_StnDsc"] = orderlist[i].F_ComContent.ToString();
+
+
+                newRow["strWrkOrdr_Dtl_StnDsc"] = orderlist[i].F_ComContent.ToString();
+                if (orderlist[i].F_InfoSource == 1)
+                {
+                    if (!string.IsNullOrEmpty(orderlist[i].F_Content))
+                        newRow["strWrkOrdr_Dtl_StnDsc"] = orderlist[i].F_Content.ToString();
+
+                }
+             
                 
                 newRow["strFst_SpInf"] = "";
                 if (orderlist[i].F_IsSms == 1)
@@ -3171,10 +3234,16 @@ namespace CallCenterApi.Interface.Controllers.workorder
                     newRow["strWrkOrdr_StCd"] = "2";
                 newRow["strWrkOrdr_Ttl"] = orderlist.Rows[i]["F_ComTitle"].ToString();
 
-                if (!string.IsNullOrEmpty(orderlist.Rows[i]["F_Content"].ToString()))
-                    newRow["strWrkOrdr_Dtl_StnDsc"] = orderlist.Rows[i]["F_Content"].ToString();
-                else
-                    newRow["strWrkOrdr_Dtl_StnDsc"] = orderlist.Rows[i]["F_ComContent"].ToString();
+
+
+                newRow["strWrkOrdr_Dtl_StnDsc"] = orderlist.Rows[i]["F_ComContent"].ToString();
+                if (orderlist.Rows[i]["F_InfoSource"].ToString() == "1")
+                {
+                    if (!string.IsNullOrEmpty(orderlist.Rows[i]["F_Content"].ToString()))
+                        newRow["strWrkOrdr_Dtl_StnDsc"] = orderlist.Rows[i]["F_Content"].ToString();
+
+                }
+            
               //  newRow["strWrkOrdr_Dtl_StnDsc"] = orderlist.Rows[i]["F_ComContent"].ToString();
                 newRow["strCrt_Dt_Tm"] = orderlist.Rows[i]["F_CreateTime"].ToString();
                 if (strtel.Trim() != "" && strtel != "undefined")
@@ -3567,10 +3636,16 @@ namespace CallCenterApi.Interface.Controllers.workorder
                 else
                     newRow["strWrkOrdr_StCd"] = "2";
                 newRow["strWrkOrdr_Ttl"] = orderlist.Rows[i]["F_ComTitle"].ToString();
-                if (!string .IsNullOrEmpty (orderlist.Rows[i]["F_Content"].ToString()))
-                newRow["strWrkOrdr_Dtl_StnDsc"] = orderlist.Rows[i]["F_Content"].ToString();
-                else
-                    newRow["strWrkOrdr_Dtl_StnDsc"] = orderlist.Rows[i]["F_ComContent"].ToString();
+
+                newRow["strWrkOrdr_Dtl_StnDsc"] = orderlist.Rows[i]["F_ComContent"].ToString();
+                if (orderlist.Rows[i]["F_InfoSource"].ToString() == "1")
+                {
+                    if (!string.IsNullOrEmpty(orderlist.Rows[i]["F_Content"].ToString()))
+                        newRow["strWrkOrdr_Dtl_StnDsc"] = orderlist.Rows[i]["F_Content"].ToString();
+
+                }
+               
+               
                 newRow["strCrt_Dt_Tm"] = orderlist.Rows[i]["F_CreateTime"].ToString();
                 if (strtel.Trim() != "" && strtel != "undefined")
                 {

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

@@ -12880,6 +12880,9 @@ namespace CallCenterApi.Interface.Controllers.workorder
                 Model.T_Bus_Feedback modelT_Bus_Feedback = new BLL.T_Bus_Feedback().GetModel(rebackid);
                 Model.T_Bus_AssignedInfo modelT_Bus_AssignedInfo = assignBLL.GetNewModelByWorkOrderID(workorderid);
 
+
+                Model.T_Bus_AssignedInfo_Next modelAssignedInfo_Next = new BLL .T_Bus_AssignedInfo_Next().GetNewModelByWorkOrderID(workorderid);
+
                 if (modelT_Bus_WorkOrder != null && modelT_Bus_Feedback != null && modelT_Bus_AssignedInfo != null)
                 {
                     //if (modelT_Bus_AssignedInfo.F_CreateUser != User.F_UserCode)
@@ -12931,7 +12934,11 @@ namespace CallCenterApi.Interface.Controllers.workorder
                                 modelT_Bus_WorkOrder.F_WorkState = (int)EnumWorkState.submit;//待交办
                                 workorderBLL.Update(modelT_Bus_WorkOrder);
                                 #endregion
-
+                                if(modelAssignedInfo_Next !=null )
+                                {
+                                    modelAssignedInfo_Next.F_State = 2;
+                                    new BLL.T_Bus_AssignedInfo_Next().Update(modelAssignedInfo_Next);
+                                }
                             }
                             else
                             {
@@ -17462,7 +17469,7 @@ namespace CallCenterApi.Interface.Controllers.workorder
         public ActionResult ForceFinishWorkOrder()
         {
 
-            if (User.F_RoleCode == "ZXLD" || User.F_RoleCode == "ZXHWY" || User.F_RoleCode == "ZXLD" || User.F_RoleCode == "ZXLDGLYGLY" || User.F_RoleCode == "GLY" || User.F_RoleCode == "DDZG" || User.F_RoleCode == "MTDD")
+            if (User.F_RoleCode == "ZXLD" || User.F_RoleCode == "ZXHWY" || User.F_RoleCode == "ZXLD" || User.F_RoleCode == "ZXLDGLYGLY" || User.F_RoleCode == "GLY" || User.F_RoleCode == "DDZG" || User.F_RoleCode == "MTDD" || User.F_RoleCode == "DBZY")
             //if (User.F_RoleCode == "ZJZY" || User.F_RoleCode == "GLY")
             {
                 string workorderid = RequestString.GetFormString("workorderid");
@@ -17487,7 +17494,7 @@ namespace CallCenterApi.Interface.Controllers.workorder
                 if (modelT_Bus_WorkOrder != null)
                 {
                     if (User.F_RoleCode != "GLY" && User.F_RoleCode != "DDZG"
-                        && User.F_RoleCode != "ZXHWY" && User.F_RoleCode != "ZXLD" && User.F_RoleCode != "MTDD")
+                        && User.F_RoleCode != "ZXHWY" && User.F_RoleCode != "ZXLD" && User.F_RoleCode != "MTDD" && User.F_RoleCode != "DBZY")
                     {
                         if (modelT_Bus_AssignedInfo != null && modelT_Bus_AssignedInfo.F_CreateUser != User.F_UserCode)
                         {