111

RMYY_CallCenter_Api.DB/DbHelperSQL.cs

@@ -678,9 +678,14 @@ namespace RMYY_CallCenter_Api.DB
                     try
                     {
                         PrepareCommand(cmd, connection, null, SQLString, cmdParms);
-                        int rows = cmd.ExecuteNonQuery();
-                        cmd.Parameters.Clear();
-                        return rows;
+                      
+                            int rows = cmd.ExecuteNonQuery();
+                            cmd.Parameters.Clear();
+                            return rows;
+                        
+                       
+                        
+                       
                     }
                     catch (System.Data.SqlClient.SqlException e)
                     {

RMYY_CallCenter_Api.Dal/T_Wo_CommonBase.cs

@@ -33,7 +33,7 @@ namespace RMYY_CallCenter_Api.DAL
 					new SqlParameter("@F_Type", SqlDbType.Int,4),
 					new SqlParameter("@F_SonType", SqlDbType.Int,4),
 					new SqlParameter("@F_Content", SqlDbType.Text),
-					new SqlParameter("@F_Proposer", SqlDbType.Int,4),
+					new SqlParameter("@F_Proposer", SqlDbType.NVarChar,50),
 					new SqlParameter("@F_ProposerDept", SqlDbType.Int,4),
 					new SqlParameter("@F_DealUser", SqlDbType.Int,4),
 					new SqlParameter("@F_DealDept", SqlDbType.Int,4),
@@ -103,7 +103,7 @@ namespace RMYY_CallCenter_Api.DAL
 					new SqlParameter("@F_Type", SqlDbType.Int,4),
 					new SqlParameter("@F_SonType", SqlDbType.Int,4),
 					new SqlParameter("@F_Content", SqlDbType.Text),
-					new SqlParameter("@F_Proposer", SqlDbType.Int,4),
+					new SqlParameter("@F_Proposer", SqlDbType.NVarChar,50),
 					new SqlParameter("@F_ProposerDept", SqlDbType.Int,4),
 					new SqlParameter("@F_DealUser", SqlDbType.Int,4),
 					new SqlParameter("@F_DealDept", SqlDbType.Int,4),

RMYY_CallCenter_Api/Controllers/CarManage/T_Car_WorkOrderController.cs

@@ -566,8 +566,14 @@ namespace RMYY_CallCenter_Api.Controllers.CarManage
                     else
                         return Success("没有查询到此工单信息");
                 case 1://工单流程
-                      var modellist = new BLL.T_Car_Operation().GetModelList($"F_WorkOrderCode='{WorkOrderCode}'");
-                        return Success("获取成功", modellist);
+                       // var modellist = new BLL.T_Car_Operation().GetModelList($"F_WorkOrderCode='{WorkOrderCode}'");
+                    string sqllog = "select  dbo.GetUserNameUserCode(F_CreateUser) username,F_ID,F_WorkOrderCode,F_Message,F_AssignID,F_CreateTime,F_State,F_CreateUser,F_IsDelete,F_AboutReason ,F_AboutKey,F_EnterReason from T_Car_Operation where F_WorkOrderCode='" + WorkOrderCode + "'";
+
+                    DataTable dtlog = DbHelperSQL.Query(sqllog).Tables[0];
+
+                    return Success("获取工单流程成功", dtlog);
+
+                //    return Success("获取成功", modellist);
                 case 2://评价详情
                     var Evaluate = new BLL.T_Car_Evaluate().GetModelList($"F_WorkOrderCode='{WorkOrderCode}'");
                     return Success("获取成功", Evaluate);

RMYY_CallCenter_Api/Controllers/FaultRepairController.cs

@@ -1310,7 +1310,7 @@ namespace RMYY_CallCenter_Api.Controllers
 
 
                     case 3://工单流程
-                        var sqllog = "select *,[dbo].[GetUserName](F_Operator) username from T_FaultRepair_OperationLog where F_WorkOrderCode = '" + strworkorderid + "' " + " order by F_OperationId desc";
+                        var sqllog = "select *,[dbo].[GetUserNameUserCode](F_Operator) username from T_FaultRepair_OperationLog where F_WorkOrderCode = '" + strworkorderid + "' " + " order by F_OperationId desc";
 
                         DataTable dtlog = DbHelperSQL.Query(sqllog).Tables[0];
 
@@ -1401,7 +1401,7 @@ namespace RMYY_CallCenter_Api.Controllers
         public ActionResult Transfer(string WorkOrderCode, string ToUserCode, int type = 0)
         {
             Model.T_FaultRepair_Base model = baseBll.GetModel(WorkOrderCode);
-            if (model != null && model.F_Maintenancer == User.F_UserCode)
+            if (model != null && model.F_MaintenanceDept == User.F_DeptId.ToString()) 
             {
                 if (type == 0)
                 {
@@ -2220,7 +2220,7 @@ namespace RMYY_CallCenter_Api.Controllers
             Model.T_Sys_UserAccount ua = new Bll.T_Sys_UserAccount().GetModelList(sql).FirstOrDefault();
             if (ua != null)
             {
-                return ua.F_UserName;
+                return ua.F_UserName + "(" + usercode + ")";
 
             }
 

RMYY_CallCenter_Api/Controllers/SchedulingController.cs

@@ -130,7 +130,7 @@ namespace RMYY_CallCenter_Api.Controllers
                    
 
                     case 1://工单流程
-                        var sqllog = "select *,[dbo].[GetUserName](F_Operator) username from T_IntegratedScheduling_OperationLog where F_WorkOrderCode = '" + strworkorderid + "' " + " order by F_OperationId desc";
+                        var sqllog = "select *,[dbo].[GetUserNameUserCode](F_Operator) username from T_IntegratedScheduling_OperationLog where F_WorkOrderCode = '" + strworkorderid + "' " + " order by F_OperationId desc";
 
                         DataTable dtlog = DbHelperSQL.Query(sqllog).Tables[0];
 
@@ -1204,7 +1204,7 @@ namespace RMYY_CallCenter_Api.Controllers
             Model.T_Sys_UserAccount ua = new Bll.T_Sys_UserAccount().GetModelList(sql).FirstOrDefault();
             if (ua != null)
             {
-                return ua.F_UserName;
+                return ua.F_UserName+"("+usercode+")";
 
             }
 

RMYY_CallCenter_Api/Controllers/WorkOrder/Con_WorkOrderController.cs

@@ -112,7 +112,7 @@ namespace RMYY_CallCenter_Api.Controllers
                         return Success("获取成功", dtbase);
                       
                     case 1://工单流程
-                        var sqllog = "select * from T_Dis_WorkOrderItem where F_WoID = '" + model.F_ID  + "' " + " order by F_ID desc";
+                        var sqllog = "select *,dbo.GetUserNameUserCode(F_CreateUser) username from T_Dis_WorkOrderItem where F_WoID = '" + model.F_ID  + "' " + " order by F_ID desc";
 
                         DataTable dtlog = DbHelperSQL.Query(sqllog).Tables[0];
                         return Success("获取成功", dtlog);

RMYY_CallCenter_Api/Controllers/WorkOrder/WorkCommonController.cs

@@ -343,7 +343,11 @@ namespace RMYY_CallCenter_Api.Controllers.WorkOrder
 
             if (urgetype == 1)
             {
-                touserlist.Add(ordermodel.F_DealUser.Value.ToString());
+                if (ordermodel.F_DealUser!=null)
+                {
+                    touserlist.Add(ordermodel.F_DealUser.Value.ToString());
+
+                }
             }
             else if (urgetype == 2)
             {