liyuanyuan il y a 3 ans
Parent
commit
68d8b4b4d2

+ 8 - 3
RMYY_CallCenter_Api.DB/DbHelperSQL.cs

@@ -678,9 +678,14 @@ namespace RMYY_CallCenter_Api.DB
678 678
                     try
679 679
                     {
680 680
                         PrepareCommand(cmd, connection, null, SQLString, cmdParms);
681
-                        int rows = cmd.ExecuteNonQuery();
682
-                        cmd.Parameters.Clear();
683
-                        return rows;
681
+                      
682
+                            int rows = cmd.ExecuteNonQuery();
683
+                            cmd.Parameters.Clear();
684
+                            return rows;
685
+                        
686
+                       
687
+                        
688
+                       
684 689
                     }
685 690
                     catch (System.Data.SqlClient.SqlException e)
686 691
                     {

+ 2 - 2
RMYY_CallCenter_Api.Dal/T_Wo_CommonBase.cs

@@ -33,7 +33,7 @@ namespace RMYY_CallCenter_Api.DAL
33 33
 					new SqlParameter("@F_Type", SqlDbType.Int,4),
34 34
 					new SqlParameter("@F_SonType", SqlDbType.Int,4),
35 35
 					new SqlParameter("@F_Content", SqlDbType.Text),
36
-					new SqlParameter("@F_Proposer", SqlDbType.Int,4),
36
+					new SqlParameter("@F_Proposer", SqlDbType.NVarChar,50),
37 37
 					new SqlParameter("@F_ProposerDept", SqlDbType.Int,4),
38 38
 					new SqlParameter("@F_DealUser", SqlDbType.Int,4),
39 39
 					new SqlParameter("@F_DealDept", SqlDbType.Int,4),
@@ -103,7 +103,7 @@ namespace RMYY_CallCenter_Api.DAL
103 103
 					new SqlParameter("@F_Type", SqlDbType.Int,4),
104 104
 					new SqlParameter("@F_SonType", SqlDbType.Int,4),
105 105
 					new SqlParameter("@F_Content", SqlDbType.Text),
106
-					new SqlParameter("@F_Proposer", SqlDbType.Int,4),
106
+					new SqlParameter("@F_Proposer", SqlDbType.NVarChar,50),
107 107
 					new SqlParameter("@F_ProposerDept", SqlDbType.Int,4),
108 108
 					new SqlParameter("@F_DealUser", SqlDbType.Int,4),
109 109
 					new SqlParameter("@F_DealDept", SqlDbType.Int,4),

+ 8 - 2
RMYY_CallCenter_Api/Controllers/CarManage/T_Car_WorkOrderController.cs

@@ -566,8 +566,14 @@ namespace RMYY_CallCenter_Api.Controllers.CarManage
566 566
                     else
567 567
                         return Success("没有查询到此工单信息");
568 568
                 case 1://工单流程
569
-                      var modellist = new BLL.T_Car_Operation().GetModelList($"F_WorkOrderCode='{WorkOrderCode}'");
570
-                        return Success("获取成功", modellist);
569
+                       // var modellist = new BLL.T_Car_Operation().GetModelList($"F_WorkOrderCode='{WorkOrderCode}'");
570
+                    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 + "'";
571
+
572
+                    DataTable dtlog = DbHelperSQL.Query(sqllog).Tables[0];
573
+
574
+                    return Success("获取工单流程成功", dtlog);
575
+
576
+                //    return Success("获取成功", modellist);
571 577
                 case 2://评价详情
572 578
                     var Evaluate = new BLL.T_Car_Evaluate().GetModelList($"F_WorkOrderCode='{WorkOrderCode}'");
573 579
                     return Success("获取成功", Evaluate);

+ 3 - 3
RMYY_CallCenter_Api/Controllers/FaultRepairController.cs

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

+ 2 - 2
RMYY_CallCenter_Api/Controllers/SchedulingController.cs

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

+ 1 - 1
RMYY_CallCenter_Api/Controllers/WorkOrder/Con_WorkOrderController.cs

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

+ 5 - 1
RMYY_CallCenter_Api/Controllers/WorkOrder/WorkCommonController.cs

@@ -343,7 +343,11 @@ namespace RMYY_CallCenter_Api.Controllers.WorkOrder
343 343
 
344 344
             if (urgetype == 1)
345 345
             {
346
-                touserlist.Add(ordermodel.F_DealUser.Value.ToString());
346
+                if (ordermodel.F_DealUser!=null)
347
+                {
348
+                    touserlist.Add(ordermodel.F_DealUser.Value.ToString());
349
+
350
+                }
347 351
             }
348 352
             else if (urgetype == 2)
349 353
             {