xiufu

RMYY_CallCenter_Api/Common/WorkOrderBase.cs

@@ -263,7 +263,7 @@ namespace RMYY_CallCenter_Api
         /// </summary>
         /// <param name="dt"></param>
         /// <returns></returns>
-        public static DataTable SetOtherField(DataTable dt, MENUENUM menuName,string usercode, int roleId = 0, int type = 0)
+        public static DataTable SetOtherField(DataTable dt, MENUENUM menuName,string usercode, int roleId = 0, int type = 0,int mysubmit=0)
         {
             if (dt.Columns.Contains("Buttons") && dt.Columns.Contains("GapTime") && dt.Columns.Contains("StateName"))
             {
@@ -355,7 +355,7 @@ namespace RMYY_CallCenter_Api
                 //接单人在接单之后，如果该工单类型上设置的“可延期次数”大于0显示“延期”按钮；点击延期按钮进行验证是否超过设定的延期次数，超过提醒“已超过规定延迟次数”
                 int categoryType = 0;
 
-                if (menuName == MENUENUM.工单列表 || menuName == MENUENUM.我的提交)
+                if (menuName == MENUENUM.工单列表 || (menuName == MENUENUM.我的提交 && mysubmit==0))
                 {
                     categoryType = Convert.ToInt32(dr["F_SonType"].ToString());
                 }
@@ -399,8 +399,8 @@ namespace RMYY_CallCenter_Api
 
                     allButtons.Remove(hasButton);
                 }
-                //  我的提交页面，数据有我的提交和我处理的， 只有自己申请的工单 能催单
-                if (menuName== MENUENUM.我的提交)
+                // 工单管理  我的提交页面，数据有我的提交和我处理的， 只有自己申请的工单 能催单
+                if (menuName== MENUENUM.我的提交 && mysubmit == 0)
                 {
                     if (dr["F_Proposer"].ToString() != usercode)
                     {

RMYY_CallCenter_Api/Controllers/FaultRepairController.cs

@@ -1945,6 +1945,17 @@ namespace RMYY_CallCenter_Api.Controllers
 
 
         #region 添加操作记录
+        public bool AddOperatorLogNew(string content, int type, string workordercode,string usercode)
+        {
+            Model.T_FaultRepair_OperationLog model = new Model.T_FaultRepair_OperationLog();
+            model.F_LogContent = content;
+            model.F_OperationTime = DateTime.Now;
+            model.F_OperationType = type;
+            model.F_Operator = usercode;
+            model.F_WorkOrderCode = workordercode;
+            logBll.Add(model);
+            return true;
+        }
         public bool AddOperatorLog(string content, int type, string workordercode)
         {
             Model.T_FaultRepair_OperationLog model = new Model.T_FaultRepair_OperationLog();

RMYY_CallCenter_Api/Controllers/SchedulingController.cs

@@ -802,7 +802,7 @@ namespace RMYY_CallCenter_Api.Controllers
                                                 );
 
 
-                datatable = WorkOrderBase.SetOtherField(datatable, MENUENUM.我的提交,  User.F_UserCode, User.F_RoleId, 2000);
+                datatable = WorkOrderBase.SetOtherField(datatable, MENUENUM.我的提交,  User.F_UserCode, User.F_RoleId, 2000,1);
 
                 var obj = new
                 {
@@ -950,7 +950,20 @@ namespace RMYY_CallCenter_Api.Controllers
 
 
         #region 添加操作记录
-        public  bool AddOperatorLog(string content, int type, string workordercode)
+        public bool AddOperatorLogNew(string content, int type, string workordercode,string usercode)
+        {
+            Model.T_IntegratedScheduling_OperationLog model = new Model.T_IntegratedScheduling_OperationLog();
+            model.F_LogContent = content;
+            model.F_OperationTime = DateTime.Now;
+            model.F_OperationType = type;
+            model.F_Operator = usercode;
+            model.F_WorkOrderCode = workordercode;
+            logBll.Add(model);
+            return true;
+        }
+
+
+        public bool AddOperatorLog(string content, int type, string workordercode)
         {
             Model.T_IntegratedScheduling_OperationLog model = new Model.T_IntegratedScheduling_OperationLog();
             model.F_LogContent = content;

RMYY_CallCenter_Api/Controllers/WorkOrder/WorkCommonController.cs

@@ -217,12 +217,12 @@ namespace RMYY_CallCenter_Api.Controllers.WorkOrder
                     break;
                 case 2000:
                     SchedulingController sc = new SchedulingController();
-                    sc.AddOperatorLog(content, (int)EnumOperatorType.urge, workordercode);
+                    sc.AddOperatorLogNew(content, (int)EnumOperatorType.urge, workordercode,User.F_UserCode);
                     smytype = EnumSmsType.comprehensive ;             
                     break;
                 case 3000:
                     FaultRepairController cc = new FaultRepairController();
-                    cc.AddOperatorLog(content, (int)EnumOperatorType.urge, workordercode);                  
+                    cc.AddOperatorLogNew(content, (int)EnumOperatorType.urge, workordercode,User.F_UserCode);                  
                     smytype = EnumSmsType.repair;
                     break;
                 case 4000: