Przeglądaj źródła

Merge branch 'master' of http://192.168.1.222:3000/zhoufan/RMYY_CallCenter_Api

1550076451 3 lat temu
rodzic
commit
11e20b1c8c
38 zmienionych plików z 972 dodań i 178 usunięć
  1. 43 0
      RMYY_CallCenter_Api.Bll/AddLogBll.cs
  2. 25 5
      RMYY_CallCenter_Api.Dal/T_Car_Operation.cs
  3. 28 8
      RMYY_CallCenter_Api.Dal/T_Car_WorkOrder.cs
  4. 28 6
      RMYY_CallCenter_Api.Dal/T_Con_WorkOrder.cs
  5. 9 5
      RMYY_CallCenter_Api.Dal/T_Cus_Customer.cs
  6. 25 4
      RMYY_CallCenter_Api.Dal/T_Dis_WorkOrderItem.cs
  7. 20 5
      RMYY_CallCenter_Api.Dal/T_FaultRepair_Base.cs
  8. 32 9
      RMYY_CallCenter_Api.Dal/T_FaultRepair_OperationLog.cs
  9. 5 4
      RMYY_CallCenter_Api.Dal/T_FaultRepair_Process.cs
  10. 33 12
      RMYY_CallCenter_Api.Dal/T_IntegratedScheduling_Base.cs
  11. 26 6
      RMYY_CallCenter_Api.Dal/T_IntegratedScheduling_OperationLog.cs
  12. 14 6
      RMYY_CallCenter_Api.Dal/T_Msg_Chat.cs
  13. 22 0
      RMYY_CallCenter_Api.Model/T_Car_Operation.cs
  14. 22 2
      RMYY_CallCenter_Api.Model/T_Car_WorkOrder.cs
  15. 28 0
      RMYY_CallCenter_Api.Model/T_Con_WorkOrder.cs
  16. 7 1
      RMYY_CallCenter_Api.Model/T_Cus_Customer.cs
  17. 27 0
      RMYY_CallCenter_Api.Model/T_Dis_WorkOrderItem.cs
  18. 21 6
      RMYY_CallCenter_Api.Model/T_FaultRepair_Base.cs
  19. 35 4
      RMYY_CallCenter_Api.Model/T_FaultRepair_OperationLog.cs
  20. 12 5
      RMYY_CallCenter_Api.Model/T_FaultRepair_Process.cs
  21. 20 1
      RMYY_CallCenter_Api.Model/T_IntegratedScheduling_Base.cs
  22. 36 4
      RMYY_CallCenter_Api.Model/T_IntegratedScheduling_OperationLog.cs
  23. 8 0
      RMYY_CallCenter_Api.Model/T_Msg_Chat.cs
  24. 2 0
      RMYY_CallCenter_Api.QuartzWorker/PushWorkorder.cs
  25. 11 8
      RMYY_CallCenter_Api/Common/WorkOrderBase.cs
  26. 63 11
      RMYY_CallCenter_Api/Controllers/CarManage/T_Car_WorkOrderController.cs
  27. 134 30
      RMYY_CallCenter_Api/Controllers/FaultRepairController.cs
  28. 1 1
      RMYY_CallCenter_Api/Controllers/GroupClassController.cs
  29. 48 4
      RMYY_CallCenter_Api/Controllers/IndexController.cs
  30. 1 1
      RMYY_CallCenter_Api/Controllers/InfoController.cs
  31. 33 14
      RMYY_CallCenter_Api/Controllers/SchedulingController.cs
  32. 39 6
      RMYY_CallCenter_Api/Controllers/WorkOrder/Con_WorkOrderController.cs
  33. 97 9
      RMYY_CallCenter_Api/Controllers/WorkOrderBaseController.cs
  34. 1 1
      RMYY_CallCenter_Api/Models/Enum/EnumOperatorType.cs
  35. 5 0
      RMYY_CallCenter_Api/Models/Input/ChatInput.cs
  36. 6 0
      RMYY_CallCenter_Api/Models/Input/Con_WorkOrderInput.cs
  37. 2 0
      RMYY_CallCenter_Api/Models/Input/T_FaultRepairBaseinput.cs
  38. 3 0
      RMYY_CallCenter_Api/Models/Input/T_SchedulingBaseInput.cs

+ 43 - 0
RMYY_CallCenter_Api.Bll/AddLogBll.cs

@@ -52,7 +52,50 @@ namespace RMYY_CallCenter_Api.Bll
52 52
             }
53 53
             return res;
54 54
         }
55
+        public long AddLogAboutKey(int woid, int wostate, int type, string content, int itemtype, int opttype, string nextuser, int nextdept, string usercode,int key,string value,string reason ,int F_IsUsed = 0)
56
+        {
57
+
58
+            Model.T_Dis_WorkOrderItem itemModel = new Model.T_Dis_WorkOrderItem();
59
+            #region 
60
+            long res = 0;
61
+            //处理当前工单的记录之前的记录过期
62
+            var itemlast = itembll.GetModelList(" isnull(F_IsUsed,'0')='0' and F_ItemType=" + itemtype + " and  F_WoID=" + woid + " and  (F_CreateUser=" + usercode + " or F_NextUser like '%" + usercode + "%')");
63
+            using (TransactionScope trans = new TransactionScope(TransactionScopeOption.Required, new TimeSpan(0, 10, 0)))
64
+            {
65
+                if (F_IsUsed == 0)
66
+                {
55 67
 
68
+                    if (itemlast.Count > 0)
69
+                    {
70
+                        foreach (var it in itemlast)
71
+                        {
72
+                            it.F_IsUsed = 1;
73
+                            itembll.Update(it);
74
+                        }
75
+                    }
76
+                }
77
+                #endregion
78
+                itemModel.F_WoID = woid;
79
+                itemModel.F_WoState = wostate;
80
+                itemModel.F_WoType = type;
81
+                itemModel.F_ItemType = itemtype;
82
+                itemModel.F_OptType = opttype;
83
+                itemModel.F_OptContent = content;
84
+                itemModel.F_NextUser = nextuser;
85
+                itemModel.F_NextDept = nextdept;
86
+                itemModel.F_IsUsed = F_IsUsed;
87
+                itemModel.F_CreateTime = DateTime.Now;
88
+                itemModel.F_CreateUser = usercode;
89
+
90
+                itemModel.F_AboutKey = key;
91
+                itemModel.F_AboutReason = value;
92
+                itemModel.F_EnterReason = reason;
93
+
94
+                res = itembll.Add(itemModel);
95
+                trans.Complete();
96
+            }
97
+            return res;
98
+        }
56 99
 
57 100
     }
58 101
 }

+ 25 - 5
RMYY_CallCenter_Api.Dal/T_Car_Operation.cs

@@ -47,9 +47,9 @@ namespace RMYY_CallCenter_Api.DAL
47 47
         {
48 48
             StringBuilder strSql = new StringBuilder();
49 49
             strSql.Append("insert into T_Car_Operation(");
50
-            strSql.Append("F_WorkOrderCode,F_Message,F_AssignID,F_CreateTime,F_State,F_CreateUser,F_IsDelete)");
50
+            strSql.Append("F_WorkOrderCode,F_Message,F_AssignID,F_CreateTime,F_State,F_CreateUser,F_IsDelete,F_AboutReason ,F_AboutKey,F_EnterReason)");
51 51
             strSql.Append(" values (");
52
-            strSql.Append("@F_WorkOrderCode,@F_Message,@F_AssignID,@F_CreateTime,@F_State,@F_CreateUser,@F_IsDelete)");
52
+            strSql.Append("@F_WorkOrderCode,@F_Message,@F_AssignID,@F_CreateTime,@F_State,@F_CreateUser,@F_IsDelete,@F_AboutReason ,@F_AboutKey,@F_EnterReason)");
53 53
             strSql.Append(";select @@IDENTITY");
54 54
             SqlParameter[] parameters = {
55 55
                     new SqlParameter("@F_WorkOrderCode", SqlDbType.VarChar,50),
@@ -58,7 +58,10 @@ namespace RMYY_CallCenter_Api.DAL
58 58
                     new SqlParameter("@F_CreateTime", SqlDbType.DateTime),
59 59
                     new SqlParameter("@F_State", SqlDbType.Int,4),
60 60
                     new SqlParameter("@F_CreateUser", SqlDbType.VarChar,50),
61
-                    new SqlParameter("@F_IsDelete", SqlDbType.Int,4)};
61
+                    new SqlParameter("@F_IsDelete", SqlDbType.Int,4),
62
+                new SqlParameter("@F_AboutReason", SqlDbType.NVarChar,50),
63
+                    new SqlParameter("@F_AboutKey", SqlDbType.Int,4),
64
+                    new SqlParameter("@F_EnterReason", SqlDbType.NVarChar,50)};
62 65
             parameters[0].Value = model.F_WorkOrderCode;
63 66
             parameters[1].Value = model.F_Message;
64 67
             parameters[2].Value = model.F_AssignID;
@@ -67,6 +70,10 @@ namespace RMYY_CallCenter_Api.DAL
67 70
             parameters[5].Value = model.F_CreateUser;
68 71
             parameters[6].Value = model.F_IsDelete;
69 72
 
73
+            parameters[7].Value = model.F_AboutReason;
74
+            parameters[8].Value = model.F_AboutKey;
75
+            parameters[9].Value = model.F_EnterReason;
76
+
70 77
             object obj = DbHelperSQL.GetSingle(strSql.ToString(), parameters);
71 78
             if (obj == null)
72 79
             {
@@ -172,7 +179,7 @@ namespace RMYY_CallCenter_Api.DAL
172 179
         {
173 180
 
174 181
             StringBuilder strSql = new StringBuilder();
175
-            strSql.Append("select  top 1 F_ID,F_WorkOrderCode,F_Message,F_AssignID,F_CreateTime,F_State,F_CreateUser,F_IsDelete from T_Car_Operation ");
182
+            strSql.Append("select  top 1 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 ");
176 183
             strSql.Append(" where F_ID=@F_ID");
177 184
             SqlParameter[] parameters = {
178 185
                     new SqlParameter("@F_ID", SqlDbType.Int,4)
@@ -232,6 +239,19 @@ namespace RMYY_CallCenter_Api.DAL
232 239
                 {
233 240
                     model.F_IsDelete = int.Parse(row["F_IsDelete"].ToString());
234 241
                 }
242
+                if (row["F_EnterReason"] != null)
243
+                {
244
+                    model.F_EnterReason = row["F_EnterReason"].ToString();
245
+                }
246
+
247
+                if (row["F_AboutReason"] != null)
248
+                {
249
+                    model.F_AboutReason = row["F_AboutReason"].ToString();
250
+                }
251
+                if (row["F_AboutKey"] != null && row["F_AboutKey"].ToString() != "")
252
+                {
253
+                    model.F_AboutKey = int.Parse(row["F_AboutKey"].ToString());
254
+                }
235 255
             }
236 256
             return model;
237 257
         }
@@ -242,7 +262,7 @@ namespace RMYY_CallCenter_Api.DAL
242 262
         public DataSet GetList(string strWhere)
243 263
         {
244 264
             StringBuilder strSql = new StringBuilder();
245
-            strSql.Append("select F_ID,F_WorkOrderCode,F_Message,F_AssignID,F_CreateTime,F_State,F_CreateUser,F_IsDelete ");
265
+            strSql.Append("select F_ID,F_WorkOrderCode,F_Message,F_AssignID,F_CreateTime,F_State,F_CreateUser,F_IsDelete,F_AboutReason ,F_AboutKey,F_EnterReason ");
246 266
             strSql.Append(" FROM T_Car_Operation ");
247 267
             if (strWhere.Trim() != "")
248 268
             {

Plik diff jest za duży
+ 28 - 8
RMYY_CallCenter_Api.Dal/T_Car_WorkOrder.cs


Plik diff jest za duży
+ 28 - 6
RMYY_CallCenter_Api.Dal/T_Con_WorkOrder.cs


+ 9 - 5
RMYY_CallCenter_Api.Dal/T_Cus_Customer.cs

@@ -38,9 +38,9 @@ namespace RMYY_CallCenter_Api.Dal
38 38
         {
39 39
             StringBuilder strSql = new StringBuilder();
40 40
             strSql.Append("insert into T_Cus_Customer(");
41
-            strSql.Append("F_CustomerName,F_CustomerCode,F_Layer,F_Province,F_City,F_County,F_Address,F_Telephone,F_Mobile,F_Fax,F_Email,F_PostCode,F_Sex,F_IdCard,F_CreateBy,F_CreatedOn,F_ModifyBy,F_ModifiedOn,F_DeleteFlag,F_DeleteBy,F_DeleteOn,F_Remark,F_AboutLinkMan)");
41
+            strSql.Append("F_CustomerName,F_CustomerCode,F_Layer,F_Province,F_City,F_County,F_Address,F_Telephone,F_Mobile,F_Fax,F_Email,F_PostCode,F_Sex,F_IdCard,F_CreateBy,F_CreatedOn,F_ModifyBy,F_ModifiedOn,F_DeleteFlag,F_DeleteBy,F_DeleteOn,F_Remark,F_AboutLinkMan,F_RelationShip)");
42 42
             strSql.Append(" values (");
43
-            strSql.Append("@F_CustomerName,@F_CustomerCode,@F_Layer,@F_Province,@F_City,@F_County,@F_Address,@F_Telephone,@F_Mobile,@F_Fax,@F_Email,@F_PostCode,@F_Sex,@F_IdCard,@F_CreateBy,@F_CreatedOn,@F_ModifyBy,@F_ModifiedOn,@F_DeleteFlag,@F_DeleteBy,@F_DeleteOn,@F_Remark,@F_AboutLinkMan)");
43
+            strSql.Append("@F_CustomerName,@F_CustomerCode,@F_Layer,@F_Province,@F_City,@F_County,@F_Address,@F_Telephone,@F_Mobile,@F_Fax,@F_Email,@F_PostCode,@F_Sex,@F_IdCard,@F_CreateBy,@F_CreatedOn,@F_ModifyBy,@F_ModifiedOn,@F_DeleteFlag,@F_DeleteBy,@F_DeleteOn,@F_Remark,@F_AboutLinkMan,@F_RelationShip)");
44 44
             strSql.Append(";select @@IDENTITY");
45 45
             SqlParameter[] parameters = {
46 46
                     new SqlParameter("@F_CustomerName", SqlDbType.NVarChar,200),
@@ -65,8 +65,10 @@ namespace RMYY_CallCenter_Api.Dal
65 65
                     new SqlParameter("@F_DeleteBy", SqlDbType.VarChar,50),
66 66
                     new SqlParameter("@F_DeleteOn", SqlDbType.DateTime),
67 67
                     new SqlParameter("@F_Remark", SqlDbType.NText),
68
-                      new SqlParameter("@F_AboutLinkMan", SqlDbType.VarChar,100)
69
-                    
68
+                      new SqlParameter("@F_AboutLinkMan", SqlDbType.VarChar,100),
69
+                       new SqlParameter("@F_RelationShip", SqlDbType.NVarChar,50)
70
+                      
71
+
70 72
             };
71 73
             parameters[0].Value = model.F_CustomerName;
72 74
             parameters[1].Value = model.F_CustomerCode;
@@ -91,7 +93,9 @@ namespace RMYY_CallCenter_Api.Dal
91 93
             parameters[20].Value = model.F_DeleteOn;
92 94
             parameters[21].Value = model.F_Remark;
93 95
             parameters[22].Value = model.F_AboutLinkMan;
94
-            
96
+            parameters[23].Value = model.F_RelationShip; 
97
+
98
+
95 99
             object obj = DbHelperSQL.GetSingle(strSql.ToString(), parameters);
96 100
             if (obj == null)
97 101
             {

+ 25 - 4
RMYY_CallCenter_Api.Dal/T_Dis_WorkOrderItem.cs

@@ -41,9 +41,9 @@ namespace RMYY_CallCenter_Api.Dal
41 41
         {
42 42
             StringBuilder strSql = new StringBuilder();
43 43
             strSql.Append("insert into T_Dis_WorkOrderItem(");
44
-            strSql.Append("F_WoID,F_WoType,F_WoState,F_ItemType,F_OptType,F_OptContent,F_NextUser,F_NextUserName,F_NexUserPhon,F_NextUserTalkie,F_NextDept,F_IsUsed,F_CreateUser,F_CreateTime)");
44
+            strSql.Append("F_WoID,F_WoType,F_WoState,F_ItemType,F_OptType,F_OptContent,F_NextUser,F_NextUserName,F_NexUserPhon,F_NextUserTalkie,F_NextDept,F_IsUsed,F_CreateUser,F_CreateTime,F_AboutReason ,F_AboutKey,F_EnterReason)");
45 45
             strSql.Append(" values (");
46
-            strSql.Append("@F_WoID,@F_WoType,@F_WoState,@F_ItemType,@F_OptType,@F_OptContent,@F_NextUser,@F_NextUserName,@F_NexUserPhon,@F_NextUserTalkie,@F_NextDept,@F_IsUsed,@F_CreateUser,@F_CreateTime)");
46
+            strSql.Append("@F_WoID,@F_WoType,@F_WoState,@F_ItemType,@F_OptType,@F_OptContent,@F_NextUser,@F_NextUserName,@F_NexUserPhon,@F_NextUserTalkie,@F_NextDept,@F_IsUsed,@F_CreateUser,@F_CreateTime,@F_AboutReason ,@F_AboutKey,@F_EnterReason)");
47 47
             strSql.Append(";select @@IDENTITY");
48 48
             SqlParameter[] parameters = {
49 49
                     new SqlParameter("@F_WoID", SqlDbType.BigInt,8),
@@ -59,7 +59,10 @@ namespace RMYY_CallCenter_Api.Dal
59 59
                     new SqlParameter("@F_NextDept", SqlDbType.Int,4),
60 60
                     new SqlParameter("@F_IsUsed", SqlDbType.Int,4),
61 61
                     new SqlParameter("@F_CreateUser", SqlDbType.VarChar,50),
62
-                    new SqlParameter("@F_CreateTime", SqlDbType.DateTime)};
62
+                    new SqlParameter("@F_CreateTime", SqlDbType.DateTime),
63
+             new SqlParameter("@F_AboutReason", SqlDbType.NVarChar,50),
64
+                    new SqlParameter("@F_AboutKey", SqlDbType.Int,4),
65
+                    new SqlParameter("@F_EnterReason", SqlDbType.NVarChar,50)};
63 66
             parameters[0].Value = model.F_WoID;
64 67
             parameters[1].Value = model.F_WoType;
65 68
             parameters[2].Value = model.F_WoState;
@@ -75,6 +78,11 @@ namespace RMYY_CallCenter_Api.Dal
75 78
             parameters[12].Value = model.F_CreateUser;
76 79
             parameters[13].Value = model.F_CreateTime;
77 80
 
81
+
82
+            parameters[14].Value = model.F_AboutReason;
83
+            parameters[15].Value = model.F_AboutKey;
84
+            parameters[16].Value = model.F_EnterReason;
85
+
78 86
             object obj = DbHelperSQL.GetSingle(strSql.ToString(), parameters);
79 87
             if (obj == null)
80 88
             {
@@ -201,7 +209,7 @@ namespace RMYY_CallCenter_Api.Dal
201 209
         {
202 210
 
203 211
             StringBuilder strSql = new StringBuilder();
204
-            strSql.Append("select  top 1 F_ID,F_WoID,F_WoType,F_WoState,F_ItemType,F_OptType,F_OptContent,F_NextUser,F_NextUserName,F_NexUserPhon,F_NextUserTalkie,F_NextDept,F_IsUsed,F_CreateUser,F_CreateTime from T_Dis_WorkOrderItem ");
212
+            strSql.Append("select  top 1 F_ID,F_WoID,F_WoType,F_WoState,F_ItemType,F_OptType,F_OptContent,F_NextUser,F_NextUserName,F_NexUserPhon,F_NextUserTalkie,F_NextDept,F_IsUsed,F_CreateUser,F_CreateTime, F_AboutReason ,F_AboutKey,F_EnterReason from T_Dis_WorkOrderItem ");
205 213
             strSql.Append(" where F_ID=@F_ID");
206 214
             SqlParameter[] parameters = {
207 215
                     new SqlParameter("@F_ID", SqlDbType.BigInt)
@@ -229,6 +237,19 @@ namespace RMYY_CallCenter_Api.Dal
229 237
             RMYY_CallCenter_Api.Model.T_Dis_WorkOrderItem model = new RMYY_CallCenter_Api.Model.T_Dis_WorkOrderItem();
230 238
             if (row != null)
231 239
             {
240
+                if (row["F_EnterReason"] != null)
241
+                {
242
+                    model.F_EnterReason = row["F_EnterReason"].ToString();
243
+                }
244
+
245
+                if (row["F_AboutReason"] != null)
246
+                {
247
+                    model.F_AboutReason = row["F_AboutReason"].ToString();
248
+                }
249
+                if (row["F_AboutKey"] != null && row["F_AboutKey"].ToString() != "")
250
+                {
251
+                    model.F_AboutKey = int.Parse(row["F_AboutKey"].ToString());
252
+                }
232 253
                 if (row["F_ID"] != null && row["F_ID"].ToString() != "")
233 254
                 {
234 255
                     model.F_ID = long.Parse(row["F_ID"].ToString());

+ 20 - 5
RMYY_CallCenter_Api.Dal/T_FaultRepair_Base.cs

@@ -186,6 +186,8 @@ namespace RMYY_CallCenter_Api.DAL
186 186
             strSql.Append("F_AssignUser=@F_AssignUser,");
187 187
             strSql.Append("F_ReplayCount=@F_ReplayCount,");
188 188
             strSql.Append("MYD=@MYD,");
189
+            strSql.Append("F_AcceptTime=@F_AcceptTime,");
190
+            strSql.Append("F_EmergencyTypes=@F_EmergencyTypes,");
189 191
             strSql.Append("F_ConfirmEquip=@F_ConfirmEquip");
190 192
             
191 193
 
@@ -228,6 +230,8 @@ namespace RMYY_CallCenter_Api.DAL
228 230
                     new SqlParameter("@F_AssignUser", SqlDbType.NVarChar,100) ,
229 231
                   new SqlParameter("@F_ReplayCount", SqlDbType.Int,4),
230 232
                   new SqlParameter("@MYD", SqlDbType.Int,4),
233
+                   new SqlParameter("@F_AcceptTime", SqlDbType.DateTime),
234
+                    new SqlParameter("@F_EmergencyTypes", SqlDbType.NVarChar,50) ,
231 235
 
232 236
                   new SqlParameter("@F_ConfirmEquip", SqlDbType.Int,4)
233 237
 
@@ -271,7 +275,9 @@ namespace RMYY_CallCenter_Api.DAL
271 275
             parameters[31].Value = model.F_AssignUser;
272 276
             parameters[32].Value = model.F_ReplayCount;
273 277
             parameters[33].Value = model.MYD;
274
-            parameters[34].Value = model.F_ConfirmEquip;
278
+            parameters[34].Value = model.F_AcceptTime;
279
+            parameters[35].Value = model.F_EmergencyTypes;
280
+            parameters[36].Value = model.F_ConfirmEquip;
275 281
 
276 282
 
277 283
             int rows=DbHelperSQL.ExecuteSql(strSql.ToString(),parameters);
@@ -336,7 +342,7 @@ namespace RMYY_CallCenter_Api.DAL
336 342
 		{
337 343
 			
338 344
 			StringBuilder strSql=new StringBuilder();
339
-			strSql.Append("select  top 1 F_WorkOrderId,F_WorkOrderCode,F_Applicant,F_ApplicationDept,F_Applicantsphone,F_Phone,F_WorkOrderCategory,F_Content,F_PlaceOfRepair,F_WorkOrderState,F_Maintenancer,F_MaintenanceDept,F_AssignTime,F_Endtime,F_UpdateTime,F_Deadline,F_CreateUser,F_CreateTime,F_CreateUserDept,F_File,F_ReturnNum,F_InternalWorkOrderCode,F_ExternalWorkOrderCode,F_IsDelete,F_IsStop,F_ReplayCount from T_FaultRepair_Base ");
345
+			strSql.Append("select  top 1 *  from T_FaultRepair_Base ");
340 346
 			strSql.Append(" where F_WorkOrderCode=@F_WorkOrderId");
341 347
 			SqlParameter[] parameters = {
342 348
 					new SqlParameter("@F_WorkOrderId", SqlDbType.VarChar)
@@ -408,7 +414,12 @@ namespace RMYY_CallCenter_Api.DAL
408 414
 				{
409 415
 					model.F_Maintenancer=row["F_Maintenancer"].ToString();
410 416
 				}
411
-				if(row["F_MaintenanceDept"]!=null)
417
+
418
+                if (row["F_EmergencyTypes"] != null)
419
+                {
420
+                    model.F_EmergencyTypes = row["F_EmergencyTypes"].ToString();
421
+                }
422
+                if (row["F_MaintenanceDept"]!=null)
412 423
 				{
413 424
 					model.F_MaintenanceDept=row["F_MaintenanceDept"].ToString();
414 425
 				}
@@ -420,7 +431,11 @@ namespace RMYY_CallCenter_Api.DAL
420 431
 				{
421 432
 					model.F_Endtime=DateTime.Parse(row["F_Endtime"].ToString());
422 433
 				}
423
-				if(row["F_UpdateTime"]!=null && row["F_UpdateTime"].ToString()!="")
434
+                if (row["F_AcceptTime"] != null && row["F_AcceptTime"].ToString() != "")
435
+                {
436
+                    model.F_AcceptTime = DateTime.Parse(row["F_AcceptTime"].ToString());
437
+                }
438
+                if (row["F_UpdateTime"]!=null && row["F_UpdateTime"].ToString()!="")
424 439
 				{
425 440
 					model.F_UpdateTime=DateTime.Parse(row["F_UpdateTime"].ToString());
426 441
 				}
@@ -485,7 +500,7 @@ namespace RMYY_CallCenter_Api.DAL
485 500
 		public DataSet GetList(string strWhere)
486 501
 		{
487 502
 			StringBuilder strSql=new StringBuilder();
488
-			strSql.Append("select F_WorkOrderId,F_WorkOrderCode,F_Applicant,F_ApplicationDept,F_Applicantsphone,F_Phone,F_WorkOrderCategory,F_Content,F_PlaceOfRepair,F_WorkOrderState,F_Maintenancer,F_MaintenanceDept,F_AssignTime,F_Endtime,F_UpdateTime,F_Deadline,F_CreateUser,F_CreateTime,F_CreateUserDept,F_File,F_ReturnNum,F_InternalWorkOrderCode,F_ExternalWorkOrderCode,F_IsDelete ,F_IsStop,F_ReplayCount");
503
+			strSql.Append("select *");
489 504
 			strSql.Append(" FROM T_FaultRepair_Base ");
490 505
 			if(strWhere.Trim()!="")
491 506
 			{

+ 32 - 9
RMYY_CallCenter_Api.Dal/T_FaultRepair_OperationLog.cs

@@ -63,9 +63,9 @@ namespace RMYY_CallCenter_Api.DAL
63 63
 		{
64 64
 			StringBuilder strSql=new StringBuilder();
65 65
 			strSql.Append("insert into T_FaultRepair_OperationLog(");
66
-			strSql.Append("F_WorkOrderCode,F_Operator,F_LogContent,F_OperationType,F_OperationTime,F_UpdateTime,F_Isdelete)");
66
+			strSql.Append("F_WorkOrderCode,F_Operator,F_LogContent,F_OperationType,F_OperationTime,F_UpdateTime,F_Isdelete,  F_AboutReason ,F_AboutKey,F_EnterReason)");
67 67
 			strSql.Append(" values (");
68
-			strSql.Append("@F_WorkOrderCode,@F_Operator,@F_LogContent,@F_OperationType,@F_OperationTime,@F_UpdateTime,@F_Isdelete)");
68
+			strSql.Append("@F_WorkOrderCode,@F_Operator,@F_LogContent,@F_OperationType,@F_OperationTime,@F_UpdateTime,@F_Isdelete,  @F_AboutReason ,@F_AboutKey,@F_EnterReason)");
69 69
 			strSql.Append(";select @@IDENTITY");
70 70
 			SqlParameter[] parameters = {
71 71
 					new SqlParameter("@F_WorkOrderCode", SqlDbType.NVarChar,100),
@@ -74,7 +74,13 @@ namespace RMYY_CallCenter_Api.DAL
74 74
 					new SqlParameter("@F_OperationType", SqlDbType.Int,4),
75 75
 					new SqlParameter("@F_OperationTime", SqlDbType.DateTime),
76 76
 					new SqlParameter("@F_UpdateTime", SqlDbType.DateTime),
77
-					new SqlParameter("@F_Isdelete", SqlDbType.Int,4)};
77
+					new SqlParameter("@F_Isdelete", SqlDbType.Int,4),
78
+
79
+    
80
+                    new SqlParameter("@F_AboutReason", SqlDbType.NVarChar,50),
81
+                    new SqlParameter("@F_AboutKey", SqlDbType.Int,4),
82
+                    new SqlParameter("@F_EnterReason", SqlDbType.NVarChar,50)
83
+            };
78 84
 			parameters[0].Value = model.F_WorkOrderCode;
79 85
 			parameters[1].Value = model.F_Operator;
80 86
 			parameters[2].Value = model.F_LogContent;
@@ -83,7 +89,10 @@ namespace RMYY_CallCenter_Api.DAL
83 89
 			parameters[5].Value = model.F_UpdateTime;
84 90
 			parameters[6].Value = model.F_Isdelete;
85 91
 
86
-			object obj = DbHelperSQL.GetSingle(strSql.ToString(),parameters);
92
+            parameters[7].Value = model.F_AboutReason;
93
+            parameters[8].Value = model.F_AboutKey;
94
+            parameters[9].Value = model.F_EnterReason;
95
+            object obj = DbHelperSQL.GetSingle(strSql.ToString(),parameters);
87 96
 			if (obj == null)
88 97
 			{
89 98
 				return 0;
@@ -188,7 +197,7 @@ namespace RMYY_CallCenter_Api.DAL
188 197
 		{
189 198
 			
190 199
 			StringBuilder strSql=new StringBuilder();
191
-			strSql.Append("select  top 1 F_OperationId,F_WorkOrderCode,F_Operator,F_LogContent,F_OperationType,F_OperationTime,F_UpdateTime,F_Isdelete from T_FaultRepair_OperationLog ");
200
+			strSql.Append("select  top 1 F_OperationId,F_WorkOrderCode,F_Operator,F_LogContent,F_OperationType,F_OperationTime,F_UpdateTime,F_Isdelete from T_FaultRepair_OperationLog, F_AboutReason ,F_AboutKey,F_EnterReason ");
192 201
 			strSql.Append(" where F_OperationId=@F_OperationId");
193 202
 			SqlParameter[] parameters = {
194 203
 					new SqlParameter("@F_OperationId", SqlDbType.Int,4)
@@ -245,10 +254,24 @@ namespace RMYY_CallCenter_Api.DAL
245 254
 					model.F_UpdateTime=DateTime.Parse(row["F_UpdateTime"].ToString());
246 255
 				}
247 256
 				if(row["F_Isdelete"]!=null && row["F_Isdelete"].ToString()!="")
248
-				{
249
-					model.F_Isdelete=int.Parse(row["F_Isdelete"].ToString());
250
-				}
251
-			}
257
+                {
258
+                    model.F_Isdelete = int.Parse(row["F_Isdelete"].ToString());
259
+                }
260
+
261
+                if (row["F_EnterReason"] != null)
262
+                {
263
+                    model.F_EnterReason = row["F_EnterReason"].ToString();
264
+                }
265
+                if (row["F_AboutReason"] != null)
266
+                {
267
+                    model.F_AboutReason = row["F_AboutReason"].ToString();
268
+                }
269
+                if (row["F_AboutKey"] != null && row["F_AboutKey"].ToString() != "")
270
+                {
271
+                    model.F_AboutKey = int.Parse(row["F_AboutKey"].ToString());
272
+                }
273
+
274
+            }
252 275
 			return model;
253 276
 		}
254 277
 

+ 5 - 4
RMYY_CallCenter_Api.Dal/T_FaultRepair_Process.cs

@@ -63,9 +63,9 @@ namespace RMYY_CallCenter_Api.DAL
63 63
 		{
64 64
 			StringBuilder strSql=new StringBuilder();
65 65
 			strSql.Append("insert into T_FaultRepair_Process(");
66
-			strSql.Append("F_WorkOrderCode,F_Maintenancer,F_MaintenanceDept,F_ProcessingTime,F_Result,F_File,F_ReturnReason,F_Isdelete,F_UpdateTime,F_DealType,F_IsInvolvedEquip,F_ExceptionType)");
66
+			strSql.Append("F_WorkOrderCode,F_Maintenancer,F_MaintenanceDept,F_ProcessingTime,F_Result,F_File,F_ReturnReason,F_Isdelete,F_UpdateTime,F_DealType,F_IsInvolvedEquip,F_ExceptionType,F_FinishType)");
67 67
 			strSql.Append(" values (");
68
-			strSql.Append("@F_WorkOrderCode,@F_Maintenancer,@F_MaintenanceDept,@F_ProcessingTime,@F_Result,@F_File,@F_ReturnReason,@F_Isdelete,@F_UpdateTime,@F_DealType,@F_IsInvolvedEquip,@F_ExceptionType)");
68
+			strSql.Append("@F_WorkOrderCode,@F_Maintenancer,@F_MaintenanceDept,@F_ProcessingTime,@F_Result,@F_File,@F_ReturnReason,@F_Isdelete,@F_UpdateTime,@F_DealType,@F_IsInvolvedEquip,@F_ExceptionType,@F_FinishType)");
69 69
 			strSql.Append(";select @@IDENTITY");
70 70
 			SqlParameter[] parameters = {
71 71
 					new SqlParameter("@F_WorkOrderCode", SqlDbType.NVarChar,100),
@@ -79,7 +79,8 @@ namespace RMYY_CallCenter_Api.DAL
79 79
 					new SqlParameter("@F_UpdateTime", SqlDbType.DateTime),
80 80
 new SqlParameter("@F_DealType", SqlDbType.Int,4),
81 81
 new SqlParameter("@F_IsInvolvedEquip", SqlDbType.NVarChar,500),
82
-new SqlParameter("@F_ExceptionType", SqlDbType.Int,4)
82
+new SqlParameter("@F_ExceptionType", SqlDbType.Int,4),
83
+new SqlParameter("@F_FinishType", SqlDbType.NVarChar,500)
83 84
 
84 85
 
85 86
 
@@ -96,7 +97,7 @@ new SqlParameter("@F_ExceptionType", SqlDbType.Int,4)
96 97
             parameters[9].Value = model.F_DealType;
97 98
             parameters[10].Value = model.F_IsInvolvedEquip;
98 99
             parameters[11].Value = model.F_ExceptionType;
99
-            
100
+            parameters[12].Value = model.F_FinishType;
100 101
 
101 102
             object obj = DbHelperSQL.GetSingle(strSql.ToString(),parameters);
102 103
 			if (obj == null)

+ 33 - 12
RMYY_CallCenter_Api.Dal/T_IntegratedScheduling_Base.cs

@@ -64,9 +64,9 @@ namespace RMYY_CallCenter_Api.DAL
64 64
 		{
65 65
 			StringBuilder strSql=new StringBuilder();
66 66
 			strSql.Append("insert into T_IntegratedScheduling_Base(");
67
-			strSql.Append("F_WorkOrderCode,F_WorkOrderCategory,F_Content,F_Applicant,F_ApplicationDept,F_Phone,F_Location,F_ToPlace,F_WorkOrderState,F_DealMan,F_DealDept,F_ReplayCount,F_RemindCount,F_CallId,F_CallRecordId,F_AssignTime,F_AssignUser,F_Endtime,F_Deadline,F_UpdateTime,F_CreateTime,F_CreateUser,F_CreateUserDept,F_File,F_IsDelete,F_LeaveRecordId,F_CFNum)");
67
+			strSql.Append("F_WorkOrderCode,F_WorkOrderCategory,F_Content,F_Applicant,F_ApplicationDept,F_Phone,F_Location,F_ToPlace,F_WorkOrderState,F_DealMan,F_DealDept,F_ReplayCount,F_RemindCount,F_CallId,F_CallRecordId,F_AssignTime,F_AssignUser,F_Endtime,F_Deadline,F_UpdateTime,F_CreateTime,F_CreateUser,F_CreateUserDept,F_File,F_IsDelete,F_LeaveRecordId,F_CFNum,F_EmergencyTypes)");
68 68
 			strSql.Append(" values (");
69
-			strSql.Append("@F_WorkOrderCode,@F_WorkOrderCategory,@F_Content,@F_Applicant,@F_ApplicationDept,@F_Phone,@F_Location,@F_ToPlace,@F_WorkOrderState,@F_DealMan,@F_DealDept,@F_ReplayCount,@F_RemindCount,@F_CallId,@F_CallRecordId,@F_AssignTime,@F_AssignUser,@F_Endtime,@F_Deadline,@F_UpdateTime,@F_CreateTime,@F_CreateUser,@F_CreateUserDept,@F_File,@F_IsDelete,@F_LeaveRecordId,@F_CFNum)");
69
+			strSql.Append("@F_WorkOrderCode,@F_WorkOrderCategory,@F_Content,@F_Applicant,@F_ApplicationDept,@F_Phone,@F_Location,@F_ToPlace,@F_WorkOrderState,@F_DealMan,@F_DealDept,@F_ReplayCount,@F_RemindCount,@F_CallId,@F_CallRecordId,@F_AssignTime,@F_AssignUser,@F_Endtime,@F_Deadline,@F_UpdateTime,@F_CreateTime,@F_CreateUser,@F_CreateUserDept,@F_File,@F_IsDelete,@F_LeaveRecordId,@F_CFNum,@F_EmergencyTypes)");
70 70
 			strSql.Append(";select @@IDENTITY");
71 71
 			SqlParameter[] parameters = {
72 72
 					new SqlParameter("@F_WorkOrderCode", SqlDbType.NVarChar,100),
@@ -96,7 +96,8 @@ namespace RMYY_CallCenter_Api.DAL
96 96
 					new SqlParameter("@F_IsDelete", SqlDbType.Int,4),
97 97
                     
98 98
                     new SqlParameter("@F_LeaveRecordId", SqlDbType.Int,4),
99
-                    new SqlParameter("@F_CFNum", SqlDbType.Int,4)
99
+                 new SqlParameter("@F_EmergencyTypes", SqlDbType.NVarChar,50),   
100
+            new SqlParameter("@F_CFNum", SqlDbType.Int,4)
100 101
             };
101 102
 			parameters[0].Value = model.F_WorkOrderCode;
102 103
 			parameters[1].Value = model.F_WorkOrderCategory;
@@ -124,7 +125,9 @@ namespace RMYY_CallCenter_Api.DAL
124 125
 			parameters[23].Value = model.F_File;
125 126
 			parameters[24].Value = model.F_IsDelete;
126 127
             parameters[25].Value = model.F_LeaveRecordId;
127
-            parameters[26].Value = model.F_CFNum;
128
+            parameters[26].Value = model.F_EmergencyTypes;
129
+
130
+            parameters[27].Value = model.F_CFNum;
128 131
 
129 132
             object obj = DbHelperSQL.GetSingle(strSql.ToString(),parameters);
130 133
 			if (obj == null)
@@ -170,6 +173,8 @@ namespace RMYY_CallCenter_Api.DAL
170 173
 			strSql.Append("F_IsDelete=@F_IsDelete,");
171 174
             strSql.Append("F_Score=@F_Score,");
172 175
             strSql.Append("MYD=@MYD,");
176
+            strSql.Append("F_AcceptTime=@F_AcceptTime,");
177
+            strSql.Append("F_EmergencyTypes=@F_EmergencyTypes,");
173 178
             strSql.Append("F_CFNum=@F_CFNum");
174 179
             
175 180
 
@@ -204,7 +209,9 @@ namespace RMYY_CallCenter_Api.DAL
204 209
 					new SqlParameter("@F_IsDelete", SqlDbType.Int,4),
205 210
                     new SqlParameter("@F_Score", SqlDbType.Int,4),
206 211
                        new SqlParameter("@MYD", SqlDbType.Int,4),
207
-                    
212
+                    new SqlParameter("@F_AcceptTime", SqlDbType.DateTime),
213
+                      new SqlParameter("@F_EmergencyTypes", SqlDbType.NVarChar,50) ,
214
+
208 215
                     new SqlParameter("@F_CFNum", SqlDbType.Int,4),
209 216
                     
210 217
 
@@ -236,9 +243,13 @@ namespace RMYY_CallCenter_Api.DAL
236 243
 			parameters[24].Value = model.F_IsDelete;
237 244
 
238 245
             parameters[25].Value = model.F_Score;
239
-            parameters[26].Value = model.MYD; 
240
-            parameters[27].Value = model.F_CFNum;
241
-            parameters[28].Value = model.F_WorkOrderId;
246
+            parameters[26].Value = model.MYD;
247
+            parameters[27].Value = model.F_AcceptTime;
248
+            parameters[28].Value = model.F_EmergencyTypes;
249
+
250
+
251
+            parameters[29].Value = model.F_CFNum;
252
+            parameters[30].Value = model.F_WorkOrderId;
242 253
 
243 254
 			int rows=DbHelperSQL.ExecuteSql(strSql.ToString(),parameters);
244 255
 			if (rows > 0)
@@ -302,7 +313,7 @@ namespace RMYY_CallCenter_Api.DAL
302 313
 		{
303 314
 			
304 315
 			StringBuilder strSql=new StringBuilder();
305
-			strSql.Append("select  top 1 F_WorkOrderId,F_WorkOrderCode,F_WorkOrderCategory,F_Content,F_Applicant,F_ApplicationDept,F_Phone,F_Location,F_ToPlace,F_WorkOrderState,F_DealMan,F_DealDept,F_ReplayCount,F_RemindCount,F_CallId,F_CallRecordId,F_AssignTime,F_AssignUser,F_Endtime,F_Deadline,F_UpdateTime,F_CreateTime,F_CreateUser,F_CreateUserDept,F_File,F_IsDelete ,F_LeaveRecordId from T_IntegratedScheduling_Base ");
316
+			strSql.Append("select  top 1 *  from T_IntegratedScheduling_Base ");
306 317
 			strSql.Append(" where F_WorkOrderCode=@F_WorkOrderCode");
307 318
 			SqlParameter[] parameters = {
308 319
 					new SqlParameter("@F_WorkOrderCode",SqlDbType.NVarChar,100)
@@ -334,7 +345,13 @@ namespace RMYY_CallCenter_Api.DAL
334 345
 				{
335 346
 					model.F_WorkOrderId=int.Parse(row["F_WorkOrderId"].ToString());
336 347
 				}
337
-				if(row["F_WorkOrderCode"]!=null)
348
+
349
+                if (row["F_EmergencyTypes"] != null)
350
+                {
351
+                    model.F_EmergencyTypes = row["F_EmergencyTypes"].ToString();
352
+                }
353
+
354
+                if (row["F_WorkOrderCode"]!=null)
338 355
 				{
339 356
 					model.F_WorkOrderCode=row["F_WorkOrderCode"].ToString();
340 357
 				}
@@ -404,7 +421,11 @@ namespace RMYY_CallCenter_Api.DAL
404 421
 				{
405 422
 					model.F_AssignUser=row["F_AssignUser"].ToString();
406 423
 				}
407
-				if(row["F_Endtime"]!=null && row["F_Endtime"].ToString()!="")
424
+                if (row["F_AcceptTime"] != null && row["F_AcceptTime"].ToString() != "")
425
+                {
426
+                    model.F_AcceptTime = DateTime.Parse(row["F_AcceptTime"].ToString());
427
+                }
428
+                if (row["F_Endtime"]!=null && row["F_Endtime"].ToString()!="")
408 429
 				{
409 430
 					model.F_Endtime=DateTime.Parse(row["F_Endtime"].ToString());
410 431
 				}
@@ -452,7 +473,7 @@ namespace RMYY_CallCenter_Api.DAL
452 473
 		public DataSet GetList(string strWhere)
453 474
 		{
454 475
 			StringBuilder strSql=new StringBuilder();
455
-			strSql.Append("select F_WorkOrderId,F_WorkOrderCode,F_WorkOrderCategory,F_Content,F_Applicant,F_ApplicationDept,F_Phone,F_Location,F_ToPlace,F_WorkOrderState,F_DealMan,F_DealDept,F_ReplayCount,F_RemindCount,F_CallId,F_CallRecordId,F_AssignTime,F_AssignUser,F_Endtime,F_Deadline,F_UpdateTime,F_CreateTime,F_CreateUser,F_CreateUserDept,F_File,F_IsDelete,F_LeaveRecordId ");
476
+			strSql.Append("select *");
456 477
 			strSql.Append(" FROM T_IntegratedScheduling_Base ");
457 478
 			if(strWhere.Trim()!="")
458 479
 			{

+ 26 - 6
RMYY_CallCenter_Api.Dal/T_IntegratedScheduling_OperationLog.cs

@@ -63,9 +63,9 @@ namespace RMYY_CallCenter_Api.DAL
63 63
 		{
64 64
 			StringBuilder strSql=new StringBuilder();
65 65
 			strSql.Append("insert into T_IntegratedScheduling_OperationLog(");
66
-			strSql.Append("F_WorkOrderCode,F_Operator,F_LogContent,F_OperationType,F_OperationTime,F_UpdateTime,F_Isdelete)");
66
+			strSql.Append("F_WorkOrderCode,F_Operator,F_LogContent,F_OperationType,F_OperationTime,F_UpdateTime,F_Isdelete,   F_AboutReason ,F_AboutKey,F_EnterReason)");
67 67
 			strSql.Append(" values (");
68
-			strSql.Append("@F_WorkOrderCode,@F_Operator,@F_LogContent,@F_OperationType,@F_OperationTime,@F_UpdateTime,@F_Isdelete)");
68
+			strSql.Append("@F_WorkOrderCode,@F_Operator,@F_LogContent,@F_OperationType,@F_OperationTime,@F_UpdateTime,@F_Isdelete,@F_AboutReason ,@F_AboutKey,@F_EnterReason)");
69 69
 			strSql.Append(";select @@IDENTITY");
70 70
 			SqlParameter[] parameters = {
71 71
 					new SqlParameter("@F_WorkOrderCode", SqlDbType.NVarChar,100),
@@ -74,7 +74,11 @@ namespace RMYY_CallCenter_Api.DAL
74 74
 					new SqlParameter("@F_OperationType", SqlDbType.Int,4),
75 75
 					new SqlParameter("@F_OperationTime", SqlDbType.DateTime),
76 76
 					new SqlParameter("@F_UpdateTime", SqlDbType.DateTime),
77
-					new SqlParameter("@F_Isdelete", SqlDbType.Int,4)};
77
+					new SqlParameter("@F_Isdelete", SqlDbType.Int,4),
78
+
79
+    new SqlParameter("@F_AboutReason", SqlDbType.NVarChar,50),
80
+                    new SqlParameter("@F_AboutKey", SqlDbType.Int,4),
81
+                    new SqlParameter("@F_EnterReason", SqlDbType.NVarChar,50)};
78 82
 			parameters[0].Value = model.F_WorkOrderCode;
79 83
 			parameters[1].Value = model.F_Operator;
80 84
 			parameters[2].Value = model.F_LogContent;
@@ -82,8 +86,11 @@ namespace RMYY_CallCenter_Api.DAL
82 86
 			parameters[4].Value = model.F_OperationTime;
83 87
 			parameters[5].Value = model.F_UpdateTime;
84 88
 			parameters[6].Value = model.F_Isdelete;
89
+            parameters[7].Value = model.F_AboutReason;
90
+            parameters[8].Value = model.F_AboutKey;
91
+            parameters[9].Value = model.F_EnterReason;
85 92
 
86
-			object obj = DbHelperSQL.GetSingle(strSql.ToString(),parameters);
93
+            object obj = DbHelperSQL.GetSingle(strSql.ToString(),parameters);
87 94
 			if (obj == null)
88 95
 			{
89 96
 				return 0;
@@ -188,7 +195,7 @@ namespace RMYY_CallCenter_Api.DAL
188 195
 		{
189 196
 			
190 197
 			StringBuilder strSql=new StringBuilder();
191
-			strSql.Append("select  top 1 F_OperationId,F_WorkOrderCode,F_Operator,F_LogContent,F_OperationType,F_OperationTime,F_UpdateTime,F_Isdelete from T_IntegratedScheduling_OperationLog ");
198
+			strSql.Append("select  top 1 F_OperationId,F_WorkOrderCode,F_Operator,F_LogContent,F_OperationType,F_OperationTime,F_UpdateTime,F_Isdelete,    F_AboutReason ,F_AboutKey,F_EnterReason from T_IntegratedScheduling_OperationLog ");
192 199
 			strSql.Append(" where F_OperationId=@F_OperationId");
193 200
 			SqlParameter[] parameters = {
194 201
 					new SqlParameter("@F_OperationId", SqlDbType.Int,4)
@@ -248,7 +255,20 @@ namespace RMYY_CallCenter_Api.DAL
248 255
 				{
249 256
 					model.F_Isdelete=int.Parse(row["F_Isdelete"].ToString());
250 257
 				}
251
-			}
258
+                if (row["F_EnterReason"] != null)
259
+                {
260
+                    model.F_EnterReason = row["F_EnterReason"].ToString();
261
+                }
262
+
263
+                if (row["F_AboutReason"] != null)
264
+                {
265
+                    model.F_AboutReason = row["F_AboutReason"].ToString();
266
+                }
267
+                if (row["F_AboutKey"] != null && row["F_AboutKey"].ToString() != "")
268
+                {
269
+                    model.F_AboutKey = int.Parse(row["F_AboutKey"].ToString());
270
+                }
271
+            }
252 272
 			return model;
253 273
 		}
254 274
 

+ 14 - 6
RMYY_CallCenter_Api.Dal/T_Msg_Chat.cs

@@ -47,9 +47,9 @@ namespace RMYY_CallCenter_Api.Dal
47 47
         {
48 48
             StringBuilder strSql = new StringBuilder();
49 49
             strSql.Append("insert into T_Msg_Chat(");
50
-            strSql.Append("Content,VoiceUrl,CreateDate,FromUserId,ToUserId,ToRoleId,IsToAll,IsDelete)");
50
+            strSql.Append("Content,VoiceUrl,CreateDate,FromUserId,ToUserId,ToRoleId,IsToAll,IsDelete,Files)");
51 51
             strSql.Append(" values (");
52
-            strSql.Append("@Content,@VoiceUrl,@CreateDate,@FromUserId,@ToUserId,@ToRoleId,@IsToAll,@IsDelete)");
52
+            strSql.Append("@Content,@VoiceUrl,@CreateDate,@FromUserId,@ToUserId,@ToRoleId,@IsToAll,@IsDelete,@Files)");
53 53
             strSql.Append(";select @@IDENTITY");
54 54
             SqlParameter[] parameters = {
55 55
                     new SqlParameter("@Content", SqlDbType.NText),
@@ -59,7 +59,10 @@ namespace RMYY_CallCenter_Api.Dal
59 59
                     new SqlParameter("@ToUserId", SqlDbType.Int,4),
60 60
                     new SqlParameter("@ToRoleId", SqlDbType.Int,4),
61 61
                     new SqlParameter("@IsToAll", SqlDbType.Int,4),
62
-                    new SqlParameter("@IsDelete", SqlDbType.Int,4)};
62
+                    new SqlParameter("@IsDelete", SqlDbType.Int,4),
63
+                      new SqlParameter("@Files", SqlDbType.NVarChar,100)
64
+                    
65
+            };
63 66
             parameters[0].Value = model.Content;
64 67
             parameters[1].Value = model.VoiceUrl;
65 68
             parameters[2].Value = model.CreateDate;
@@ -68,7 +71,7 @@ namespace RMYY_CallCenter_Api.Dal
68 71
             parameters[5].Value = model.ToRoleId;
69 72
             parameters[6].Value = model.IsToAll;
70 73
             parameters[7].Value = model.IsDelete;
71
-
74
+            parameters[8].Value = model.Files;
72 75
             object obj = DbHelperSQL.GetSingle(strSql.ToString(), parameters);
73 76
             if (obj == null)
74 77
             {
@@ -177,7 +180,7 @@ namespace RMYY_CallCenter_Api.Dal
177 180
         {
178 181
 
179 182
             StringBuilder strSql = new StringBuilder();
180
-            strSql.Append("select  top 1 Id,Content,VoiceUrl,CreateDate,FromUserId,ToUserId,ToRoleId,IsToAll,IsDelete from T_Msg_Chat ");
183
+            strSql.Append("select  top 1 Id,Content,VoiceUrl,CreateDate,FromUserId,ToUserId,ToRoleId,IsToAll,Files,IsDelete from T_Msg_Chat ");
181 184
             strSql.Append(" where Id=@Id");
182 185
             SqlParameter[] parameters = {
183 186
                     new SqlParameter("@Id", SqlDbType.Int,4)
@@ -213,6 +216,11 @@ namespace RMYY_CallCenter_Api.Dal
213 216
                 {
214 217
                     model.Content = row["Content"].ToString();
215 218
                 }
219
+                
220
+ if (row["Files"] != null)
221
+                {
222
+                    model.Files = row["Files"].ToString();
223
+                }
216 224
                 if (row["VoiceUrl"] != null)
217 225
                 {
218 226
                     model.VoiceUrl = row["VoiceUrl"].ToString();
@@ -251,7 +259,7 @@ namespace RMYY_CallCenter_Api.Dal
251 259
         public DataSet GetList(string strWhere)
252 260
         {
253 261
             StringBuilder strSql = new StringBuilder();
254
-            strSql.Append("select Id,Content,VoiceUrl,CreateDate,FromUserId,ToUserId,ToRoleId,IsToAll,IsDelete ");
262
+            strSql.Append("select Id,Content,VoiceUrl,CreateDate,FromUserId,ToUserId,ToRoleId,IsToAll,IsDelete ,Files");
255 263
             strSql.Append(" FROM T_Msg_Chat ");
256 264
             if (strWhere.Trim() != "")
257 265
             {

+ 22 - 0
RMYY_CallCenter_Api.Model/T_Car_Operation.cs

@@ -18,6 +18,28 @@ namespace RMYY_CallCenter_Api.Model
18 18
         private int? _f_state;
19 19
         private string _f_createuser;
20 20
         private int? _f_isdelete;
21
+        private string _f_aboutreason;
22
+        private int? _f_aboutkey;
23
+        private string _f_enterreason;
24
+        //1、返修 2、挂起、3、退单、延时 相关的原因
25
+        public string F_AboutReason
26
+        {
27
+            set { _f_aboutreason = value; }
28
+            get { return _f_aboutreason; }
29
+        }
30
+        /// <summary>
31
+        /// 返修 2、挂起、3、退单、延时 原因的 key,这个是字典的key
32
+        /// </summary>
33
+        public int? F_AboutKey
34
+        {
35
+            set { _f_aboutkey = value; }
36
+            get { return _f_aboutkey; }
37
+        }
38
+        public string F_EnterReason
39
+        {
40
+            set { _f_enterreason = value; }
41
+            get { return _f_enterreason; }
42
+        }
21 43
         /// <summary>
22 44
         /// 
23 45
         /// </summary>

+ 22 - 2
RMYY_CallCenter_Api.Model/T_Car_WorkOrder.cs

@@ -43,11 +43,23 @@ namespace RMYY_CallCenter_Api.Model
43 43
         private string _f_assistman;
44 44
         private int? _f_isassist = 0;
45 45
         private DateTime? _f_finishtime;
46
+        private DateTime? _f_accepttime;
46 47
         private int? _f_carid;
47 48
         private string _f_assistmanname;
48 49
         private int? _f_myd;
49 50
         private int? _f_urgecount;
51
+        private string _f_emergencytypes;
52
+        // 所有工单类型增加紧急字段,为单选(一般、紧急),默认为一般
50 53
 
54
+
55
+        public string F_EmergencyTypes
56
+
57
+        {
58
+            set { _f_emergencytypes = value; }
59
+
60
+            get { return _f_emergencytypes; }
61
+
62
+        }
51 63
         public int? MYD
52 64
         {
53 65
             set { _f_myd = value; }
@@ -275,13 +287,19 @@ namespace RMYY_CallCenter_Api.Model
275 287
             get { return _f_isassist; }
276 288
         }
277 289
         /// <summary>
278
-        /// 完成时间
290
+        /// 评价完成时间
279 291
         /// </summary>
280 292
         public DateTime? F_FinishTime
281 293
         {
282 294
             set { _f_finishtime = value; }
283 295
             get { return _f_finishtime; }
284 296
         }
297
+        //接单时间
298
+        public DateTime? F_AcceptTime
299
+        {
300
+            set { _f_accepttime = value; }
301
+            get { return _f_accepttime; }
302
+        }
285 303
         /// <summary>
286 304
         /// 用车时间
287 305
         /// </summary>
@@ -317,7 +335,7 @@ namespace RMYY_CallCenter_Api.Model
317 335
             get;set;
318 336
         }
319 337
         /// <summary>
320
-        /// 目的地时间
338
+        /// 到达目的地时间
321 339
         /// </summary>
322 340
         public DateTime? F_EndTime
323 341
         {
@@ -362,6 +380,8 @@ namespace RMYY_CallCenter_Api.Model
362 380
         public string F_TypeName { get; set; }
363 381
 
364 382
         public string HosName { get; set; }
383
+        public string SpendTime { get; set; }
384
+
365 385
         public string F_ProposerDeptName { get; set; }
366 386
         public string F_CarName { get; set; }
367 387
         public string StateName { set; get; }

+ 28 - 0
RMYY_CallCenter_Api.Model/T_Con_WorkOrder.cs

@@ -108,6 +108,27 @@ namespace RMYY_CallCenter_Api.Model
108 108
             get { return _f_callrecordid; }
109 109
         }
110 110
 
111
+        private DateTime? _f_accepttime;
112
+
113
+        public string _f_spendtime;
114
+        private string _f_emergencytypes;
115
+        // 所有工单类型增加紧急字段,为单选(一般、紧急),默认为一般
116
+
117
+
118
+        public string F_EmergencyTypes
119
+
120
+        {
121
+            set { _f_emergencytypes = value; }
122
+
123
+            get { return _f_emergencytypes; }
124
+
125
+        }
126
+
127
+        public DateTime? F_AcceptTime
128
+        {
129
+            set { _f_accepttime = value; }
130
+            get { return _f_accepttime; }
131
+        }
111 132
 
112 133
 
113 134
         /// <summary>
@@ -592,6 +613,13 @@ namespace RMYY_CallCenter_Api.Model
592 613
             get { return _f_typename3; }
593 614
         }
594 615
 
616
+        public string SpendTime
617
+        {
618
+            set { _f_spendtime = value; }
619
+            get { return _f_spendtime; }
620
+        }
621
+
622
+
595 623
         public string  ComplaintSourceName
596 624
         {
597 625
             set { _f_complaintsourcename = value; }

+ 7 - 1
RMYY_CallCenter_Api.Model/T_Cus_Customer.cs

@@ -35,7 +35,7 @@ namespace RMYY_CallCenter_Api.Model
35 35
         private string _remark;
36 36
 
37 37
         private string _aboutlinkman;
38
-
38
+        private string _relationship;
39 39
         public string F_AboutLinkMan
40 40
         {
41 41
             set { _aboutlinkman = value; }
@@ -228,6 +228,12 @@ namespace RMYY_CallCenter_Api.Model
228 228
             set { _remark = value; }
229 229
             get { return _remark; }
230 230
         }
231
+
232
+        public string F_RelationShip
233
+        {
234
+            set { _relationship = value; }
235
+            get { return _relationship; }
236
+        }
231 237
         #endregion Model
232 238
 
233 239
     }

+ 27 - 0
RMYY_CallCenter_Api.Model/T_Dis_WorkOrderItem.cs

@@ -30,6 +30,33 @@ namespace RMYY_CallCenter_Api.Model
30 30
         private int? _f_isused = 0;
31 31
         private string _f_createuser;
32 32
         private DateTime? _f_createtime;
33
+
34
+        private string _f_aboutreason;
35
+        private int? _f_aboutkey;
36
+        private string _f_enterreason;
37
+
38
+
39
+
40
+        //1、返修 2、挂起、3、退单、延时 相关的原因
41
+        public string F_AboutReason
42
+        {
43
+            set { _f_aboutreason = value; }
44
+            get { return _f_aboutreason; }
45
+        }
46
+        /// <summary>
47
+        /// 返修 2、挂起、3、退单、延时 原因的 key,这个是字典的key
48
+        /// </summary>
49
+        public int? F_AboutKey
50
+        {
51
+            set { _f_aboutkey = value; }
52
+            get { return _f_aboutkey; }
53
+        }
54
+        public string F_EnterReason
55
+        {
56
+            set { _f_enterreason = value; }
57
+            get { return _f_enterreason; }
58
+        }
59
+
33 60
         /// <summary>
34 61
         /// 工单记录ID
35 62
         /// </summary>

+ 21 - 6
RMYY_CallCenter_Api.Model/T_FaultRepair_Base.cs

@@ -39,7 +39,10 @@ namespace RMYY_CallCenter_Api.Model
39 39
 		private string _f_maintenancer;
40 40
 		private string _f_maintenancedept;
41 41
 		private DateTime? _f_assigntime;
42
-		private DateTime? _f_endtime;
42
+
43
+        private DateTime? _f_accepttime;
44
+
45
+        private DateTime? _f_endtime;
43 46
 		private DateTime? _f_updatetime;
44 47
 		private DateTime? _f_deadline;
45 48
 		private string _f_createuser;
@@ -63,7 +66,14 @@ namespace RMYY_CallCenter_Api.Model
63 66
 
64 67
         private int f_confirmequip = 0;
65 68
 
66
-        
69
+        private string _f_emergencytypes;
70
+       // 所有工单类型增加紧急字段,为单选(一般、紧急),默认为一般
71
+        public string  F_EmergencyTypes
72
+        {
73
+            set { _f_emergencytypes = value; }
74
+            get { return _f_emergencytypes; }
75
+        }
76
+
67 77
         /// <summary>
68 78
         /// 默认=0,需要确认耗材=1 ,已确认耗材=2
69 79
         /// </summary>
@@ -242,10 +252,15 @@ namespace RMYY_CallCenter_Api.Model
242 252
 			set{ _f_assigntime=value;}
243 253
 			get{return _f_assigntime;}
244 254
 		}
245
-		/// <summary>
246
-		/// 
247
-		/// </summary>
248
-		public DateTime? F_Endtime
255
+        public DateTime? F_AcceptTime
256
+        {
257
+            set { _f_accepttime = value; }
258
+            get { return _f_accepttime; }
259
+        }
260
+        /// <summary>
261
+        /// 
262
+        /// </summary>
263
+        public DateTime? F_Endtime
249 264
 		{
250 265
 			set{ _f_endtime=value;}
251 266
 			get{return _f_endtime;}

+ 35 - 4
RMYY_CallCenter_Api.Model/T_FaultRepair_OperationLog.cs

@@ -34,10 +34,41 @@ namespace RMYY_CallCenter_Api.Model
34 34
 		private DateTime? _f_operationtime= DateTime.Now;
35 35
 		private DateTime? _f_updatetime;
36 36
 		private int? _f_isdelete=0;
37
-		/// <summary>
38
-		/// 
39
-		/// </summary>
40
-		public int F_OperationId
37
+
38
+
39
+        private string _f_aboutreason;
40
+        private int? _f_aboutkey;
41
+        private string _f_enterreason;
42
+
43
+       
44
+
45
+        //1、返修 2、挂起、3、退单、延时 相关的原因
46
+        public string F_AboutReason
47
+        {
48
+            set { _f_aboutreason = value; }
49
+            get { return _f_aboutreason; }
50
+        }
51
+        /// <summary>
52
+        /// 返修 2、挂起、3、退单、延时 原因的 key,这个是字典的key
53
+        /// </summary>
54
+        public int? F_AboutKey
55
+        {
56
+            set { _f_aboutkey = value; }
57
+            get { return _f_aboutkey; }
58
+        }
59
+        public string F_EnterReason
60
+        {
61
+            set { _f_enterreason = value; }
62
+            get { return _f_enterreason; }
63
+        }
64
+
65
+
66
+
67
+
68
+        /// <summary>
69
+        /// 
70
+        /// </summary>
71
+        public int F_OperationId
41 72
 		{
42 73
 			set{ _f_operationid=value;}
43 74
 			get{return _f_operationid;}

+ 12 - 5
RMYY_CallCenter_Api.Model/T_FaultRepair_Process.cs

@@ -34,7 +34,7 @@ namespace RMYY_CallCenter_Api.Model
34 34
 		private string _f_result;
35 35
 		private string _f_file;
36 36
 		private string _f_returnreason;
37
-      
37
+        private string _f_finishtype;
38 38
         private int  _f_dealtype;
39 39
         private int? _f_isdelete=0;
40 40
 		private DateTime? _f_updatetime;
@@ -102,10 +102,17 @@ namespace RMYY_CallCenter_Api.Model
102 102
 			set{ _f_workordercode=value;}
103 103
 			get{return _f_workordercode;}
104 104
 		}
105
-		/// <summary>
106
-		/// 
107
-		/// </summary>
108
-		public string F_Maintenancer
105
+       //报修工单完工时增加处理方式:“远程”、“现场”,默认现场,另外工单详情中需要显示该字段信息
106
+        public string F_FinishType
107
+        {
108
+            set { _f_finishtype = value; }
109
+            get { return _f_finishtype; }
110
+        }
111
+        
112
+        /// <summary>
113
+        /// 
114
+        /// </summary>
115
+        public string F_Maintenancer
109 116
 		{
110 117
 			set{ _f_maintenancer=value;}
111 118
 			get{return _f_maintenancer;}

+ 20 - 1
RMYY_CallCenter_Api.Model/T_IntegratedScheduling_Base.cs

@@ -45,7 +45,8 @@ namespace RMYY_CallCenter_Api.Model
45 45
 		private DateTime? _f_assigntime;
46 46
 		private string _f_assignuser;
47 47
 		private DateTime? _f_endtime;
48
-		private DateTime? _f_deadline;
48
+        private DateTime? _f_accepttime;
49
+        private DateTime? _f_deadline;
49 50
 		private DateTime? _f_updatetime;
50 51
 		private DateTime? _f_createtime;
51 52
 		private string _f_createuser;
@@ -56,6 +57,24 @@ namespace RMYY_CallCenter_Api.Model
56 57
         private int? _f_score;
57 58
         private int? _f_myd;
58 59
         private int? _f_cfnum;
60
+        private string _f_emergencytypes;
61
+        // 所有工单类型增加紧急字段,为单选(一般、紧急),默认为一般
62
+
63
+
64
+        public string  F_EmergencyTypes
65
+
66
+        {
67
+            set { _f_emergencytypes = value; }
68
+
69
+            get { return _f_emergencytypes; }
70
+
71
+        }
72
+
73
+        public DateTime? F_AcceptTime
74
+        {
75
+            set { _f_accepttime = value; }
76
+            get { return _f_accepttime; }
77
+        }
59 78
 
60 79
         public int? F_CFNum
61 80
         {

+ 36 - 4
RMYY_CallCenter_Api.Model/T_IntegratedScheduling_OperationLog.cs

@@ -34,10 +34,42 @@ namespace RMYY_CallCenter_Api.Model
34 34
 		private DateTime? _f_operationtime;
35 35
 		private DateTime? _f_updatetime;
36 36
 		private int? _f_isdelete;
37
-		/// <summary>
38
-		/// 
39
-		/// </summary>
40
-		public int F_OperationId
37
+
38
+        private string _f_aboutreason;
39
+        private int? _f_aboutkey;
40
+        private string _f_enterreason;
41
+
42
+
43
+
44
+        //1、返修 2、挂起、3、退单、延时 相关的原因的value
45
+        public string F_AboutReason
46
+        {
47
+            set { _f_aboutreason = value; }
48
+            get { return _f_aboutreason; }
49
+        }
50
+        /// <summary>
51
+        /// 返修 2、挂起、3、退单、延时 原因的 key,这个是字典的key
52
+        /// </summary>
53
+        public int? F_AboutKey
54
+        {
55
+            set { _f_aboutkey = value; }
56
+            get { return _f_aboutkey; }
57
+        }
58
+        /// <summary>
59
+        /// 手动输入的 选了其他输入的
60
+        /// </summary>
61
+        public string F_EnterReason
62
+        {
63
+            set { _f_enterreason = value; }
64
+            get { return _f_enterreason; }
65
+        }
66
+
67
+
68
+
69
+        /// <summary>
70
+        /// 
71
+        /// </summary>
72
+        public int F_OperationId
41 73
 		{
42 74
 			set{ _f_operationid=value;}
43 75
 			get{return _f_operationid;}

+ 8 - 0
RMYY_CallCenter_Api.Model/T_Msg_Chat.cs

@@ -20,6 +20,14 @@ namespace RMYY_CallCenter_Api.Model
20 20
         private int? _toroleid;
21 21
         private int? _istoall;
22 22
         private int? _isdelete;
23
+        private string _files;
24
+
25
+        public string Files
26
+        {
27
+            set { _files = value; }
28
+            get { return _files; }
29
+        }
30
+
23 31
         /// <summary>
24 32
         /// Id
25 33
         /// </summary>

+ 2 - 0
RMYY_CallCenter_Api.QuartzWorker/PushWorkorder.cs

@@ -30,6 +30,8 @@ namespace RMYY_CallCenter_Api.QuartzWorker
30 30
             string Dataur3 = web.DownloadString(api + "T_Car_WorkOrder/Evaluate");
31 31
             string Dataur4 = web.DownloadString(api + "InternalMessages/DingTalkGetMessage");
32 32
             string Dataur5 = web.DownloadString(api + "FaultRepair/AutoSendOverTimeMsg");
33
+            string  Dataur6 = web.DownloadString(api + "FaultRepair/AutoChangeDealMan");
34
+            
33 35
 
34 36
 
35 37
         }

+ 11 - 8
RMYY_CallCenter_Api/Common/WorkOrderBase.cs

@@ -402,7 +402,7 @@ namespace RMYY_CallCenter_Api
402 402
                 #region 故障报修  报修列表页面,如果已经挂起,所有的按钮删除,只留下处理人的完成按钮;挂起的工单 其他页面没有按钮
403 403
                 if (menuName == MENUENUM.报修列表)
404 404
                 {
405
-                    if (dr["F_IsStop"] != null && Convert.ToInt32(dr["F_IsStop"].ToString()) == 1)
405
+                    if (dr["F_IsStop"] != null && Convert.ToInt32(dr["F_IsStop"].ToString()) == 1 && (Convert.ToInt32( dr["F_Status"].ToString())<3 || Convert.ToInt32(dr["F_Status"].ToString()) ==6))
406 406
                     {
407 407
                         var hasButton = allButtons.Where(p => p.value == "完成").FirstOrDefault();
408 408
                         allButtons.Clear();
@@ -411,12 +411,15 @@ namespace RMYY_CallCenter_Api
411 411
                         
412 412
                     }
413 413
                 }
414
-                else if (thisTypeId == 3000)
414
+                else if (thisTypeId == 3000   && menuName == MENUENUM.我的提交)
415 415
                 {
416
-                    if (dr["F_IsStop"] != null && Convert.ToInt32(dr["F_IsStop"].ToString()) == 1)
417
-                    {                       
416
+                    if (dr["F_IsStop"] != null && Convert.ToInt32(dr["F_IsStop"].ToString()) == 1 && Convert.ToInt32(dr["F_Status"].ToString()) ==3 )
417
+                    {
418
+                        var hasButton = allButtons.Where(p => p.value == "评价").FirstOrDefault();
418 419
                         allButtons.Clear();
419
-                      
420
+                        if (hasButton != null)
421
+                        { allButtons.Add(hasButton); }
422
+
420 423
                     }
421 424
                 }
422 425
                 #endregion
@@ -512,11 +515,11 @@ namespace RMYY_CallCenter_Api
512 515
             {
513 516
                 typeIdArray = new List<int> { -1,0, 1, 2, 3, 4, 5, 6 };
514 517
             }
515
-            else if (type == 1000)
518
+            else if (type == 1000) //业务咨询
516 519
             {
517 520
                 typeIdArray = new List<int> { 0, 0, 1, 2, -1, 10, -1, -1,3,4,7 };
518 521
             }
519
-            else if (type == 2000)
522
+            else if (type == 2000)//综合调度
520 523
             {
521 524
                 typeIdArray = new List<int> { -1, 0, 1, 2, 3, 4 };
522 525
                  
@@ -544,7 +547,7 @@ namespace RMYY_CallCenter_Api
544 547
                     strArr = new List<string> { "待提交", "待派单", "待接单", "已接单", "待评价", "已完成", "已完成","已接单","已退回","办理中","待回访" }; break;
545 548
                 case MENUENUM.工单列表:
546 549
                     if(type==3000)
547
-                        strArr = new List<string> { "待提交", "待派单", "待查收", "待完成", "已处理", "异常完结", "已完结", "待完成" };
550
+                        strArr = new List<string> { "待提交", "待派单", "待接单", "待完成", "已处理", "异常完结", "已完结", "待完成" };
548 551
                     else
549 552
                     strArr = new List<string> { "待提交", "待派单", "待接单", "待完成", "已处理", "已完成", "已完成", "已接单", "已退回", "办理中", "待回访" }; break;
550 553
                 case MENUENUM.报修列表:

+ 63 - 11
RMYY_CallCenter_Api/Controllers/CarManage/T_Car_WorkOrderController.cs

@@ -339,7 +339,7 @@ namespace RMYY_CallCenter_Api.Controllers.CarManage
339 339
         /// <returns></returns>
340 340
         public ActionResult AddWorkOrder(int type,int hosid,string content,   
341 341
             int detpid,string startplace,string endplace,string needman,string phon,
342
-            int cartype,string remark,  string source,string usertime,int birth,string callid ="",int LeaveRecordId=0)
342
+            int cartype,string remark, string EmergencyTypes, string source,string usertime,int birth,string callid ="",int LeaveRecordId=0)
343 343
         {
344 344
             if (User!=null)
345 345
             {
@@ -378,6 +378,7 @@ namespace RMYY_CallCenter_Api.Controllers.CarManage
378 378
                 model.F_State = (int)EnumWorkOrderState.neworder;//0
379 379
                 model.F_CreateUser = User.F_UserCode;
380 380
                 model.F_IsDel = 0;
381
+                model.F_EmergencyTypes = EmergencyTypes;
381 382
                 if ( LeaveRecordId> 0)
382 383
 
383 384
                 {
@@ -428,7 +429,7 @@ namespace RMYY_CallCenter_Api.Controllers.CarManage
428 429
         /// <returns></returns>
429 430
         public ActionResult UpdateWorkOrder(string WorkOrderCode, 
430 431
             string usertime,string content, int type,int hosid, int detpid, string startplace, string endplace,
431
-            string needman,string needmanName, string phon,int birth, int cartype, string remark)
432
+            string needman,string needmanName,string EmergencyTypes, string phon,int birth, int cartype, string remark)
432 433
         {
433 434
             int userId = 1;
434 435
             if (userId != 0)
@@ -467,6 +468,7 @@ namespace RMYY_CallCenter_Api.Controllers.CarManage
467 468
                 model.F_Remark = remark;//备注
468 469
                 model.F_State = 0;
469 470
                 model.F_Birth = birth;
471
+                model.F_EmergencyTypes = EmergencyTypes;
470 472
                 #endregion
471 473
                 bool n = orderbll.Update(model);
472 474
                 if (n)
@@ -515,7 +517,7 @@ namespace RMYY_CallCenter_Api.Controllers.CarManage
515 517
         /// <returns></returns>
516 518
         public ActionResult GetModelDetail(string WorkOrderCode, int type=0,int orderid=0)
517 519
         {
518
-           
520
+
519 521
             switch (type)
520 522
             {
521 523
                 case 0:
@@ -530,6 +532,24 @@ namespace RMYY_CallCenter_Api.Controllers.CarManage
530 532
                         model.F_CarName = new Bll.T_Sys_DictionaryValue().GetModel(model.F_CarType.Value)?.F_Name ?? "";
531 533
                         model.StateName = GetDescriptionOriginal(model.F_State.ToString());
532 534
                         string urgecount = DbHelperSQL.GetSingle("select F_urgecount from[T_Wo_CommonBase] where F_WoCode ='" + WorkOrderCode + "'").ToString();
535
+                        if (model.F_EndTime == null || model.F_AcceptTime==null)
536
+                        {
537
+                            model.SpendTime = "";
538
+                        }
539
+                        else
540
+                        {
541
+                            string strspend = "";
542
+                            TimeSpan ts = model.F_EndTime.Value - model.F_AcceptTime.Value;
543
+                            if (ts.Days != 0)
544
+                            {
545
+                                strspend += ts.Days + "天";
546
+                            }
547
+                            strspend += ts.Hours + "时";
548
+                            strspend += ts.Minutes + "分";
549
+                            strspend += ts.Seconds + "秒";
550
+                            model.SpendTime = strspend;
551
+                        }
552
+
533 553
                         if (!string.IsNullOrEmpty(urgecount))
534 554
                         {
535 555
                             model.F_UrgeCount = Convert.ToInt32(urgecount);
@@ -782,6 +802,7 @@ namespace RMYY_CallCenter_Api.Controllers.CarManage
782 802
                 if (model.F_DriverCode != User.F_UserCode)
783 803
                     return Error("无此操作权限!");
784 804
                 model.F_State = (int)EnumWorkOrderState.receive;//已接单待完成
805
+                
785 806
                 if (new BLL.T_Car_AssignWorkOrder().Update(model))
786 807
                 {
787 808
                  
@@ -795,6 +816,7 @@ namespace RMYY_CallCenter_Api.Controllers.CarManage
795 816
                         foreach (var it in modellist)
796 817
                         {
797 818
                             it .F_State = (int)EnumWorkOrderState.receive;//已接单待完成
819
+                            it.F_AcceptTime = DateTime.Now;//接单时间
798 820
                             AddOperation(deptname + User.F_UserName + "(" + User.F_UserCode + ")" + "接单", User.F_UserCode, model.F_State.Value,
799 821
                           it.F_WorkOrderCode, model.F_ID );
800 822
                             orderbll.Update(it);
@@ -815,7 +837,7 @@ namespace RMYY_CallCenter_Api.Controllers.CarManage
815 837
         /// </summary>
816 838
         /// <param name="orderid"></param>
817 839
         /// <returns></returns>
818
-        public ActionResult BackWorkOrder(int orderid,string reason)
840
+        public ActionResult BackWorkOrder(int orderid,string reason,int key,string value)
819 841
         {
820 842
             if (User != null)
821 843
             {
@@ -826,8 +848,11 @@ namespace RMYY_CallCenter_Api.Controllers.CarManage
826 848
                     return Error("无此操作权限!");
827 849
                 model.F_State = (int)EnumWorkOrderState.reback;//已退回
828 850
                 string reasonmessage = "";
829
-                if (!string.IsNullOrEmpty(reason))
830
-                    reasonmessage = ",原因:" + reason;
851
+                reasonmessage = ",原因:" + value;
852
+                if (!string.IsNullOrEmpty(reason)) { 
853
+
854
+                    reasonmessage = reasonmessage +","+ reason;
855
+                }
831 856
                 if (new BLL.T_Car_AssignWorkOrder().Update(model))
832 857
                 {
833 858
                     var carmodel = carbll.GetModel(model.F_CarId.Value);
@@ -851,11 +876,12 @@ namespace RMYY_CallCenter_Api.Controllers.CarManage
851 876
                             it.F_ControlManCode = "";
852 877
                             it.F_ControlManName = "";
853 878
                             it.F_State = (int)EnumWorkOrderState.neworder;//退回待分配
854
-                            AddOperation(deptname + User.F_UserName + "(" + User.F_UserCode + ")" + "退单"+ reasonmessage, User.F_UserCode, model.F_State.Value,
855
-                        it.F_WorkOrderCode, model.F_ID);
879
+                            it.F_AcceptTime = null;
880
+                            AddOperationAboutKey(deptname + User.F_UserName + "(" + User.F_UserCode + ")" + "退单"+ reasonmessage, User.F_UserCode, model.F_State.Value,
881
+                        it.F_WorkOrderCode, model.F_ID,key,value,reason);
856 882
                           if (  orderbll.Update(it))
857 883
                             {
858
-                                msg.AddInternalMessagesInfo("您有工单被退回", "您有工单被退回"+"工单编号:" + it.F_WorkOrderCode, model.F_CreateUser 
884
+                                msg.AddInternalMessagesInfo("您有工单被退回", "您有工单被退回"+"工单编号:" + it.F_WorkOrderCode+ reasonmessage, model.F_CreateUser 
859 885
                                     , User.F_UserCode, EnumSmsType.car
860 886
                       , 0, it.F_WorkOrderCode );
861 887
                             }
@@ -1142,7 +1168,7 @@ namespace RMYY_CallCenter_Api.Controllers.CarManage
1142 1168
                         if (evabll.Add(evamodel) > 0)
1143 1169
                         {
1144 1170
                             model.F_State =10;
1145
-                            model.F_EndTime = DateTime.Now;
1171
+                            model.F_FinishTime = DateTime.Now;
1146 1172
                             model.MYD = 0;
1147 1173
                             orderbll.Update(model);
1148 1174
                             AddOperation(SX + "小时评价自动评价了工单", "", model.F_State.Value,
@@ -1185,7 +1211,7 @@ namespace RMYY_CallCenter_Api.Controllers.CarManage
1185 1211
                 if (evabll.Add(evamodel) > 0)
1186 1212
                 {
1187 1213
                     model.F_State = 10;
1188
-                    model.F_EndTime = DateTime.Now;
1214
+                    model.F_FinishTime = DateTime.Now;
1189 1215
                     
1190 1216
                     if(orderbll.Update(model))
1191 1217
                     {
@@ -1339,5 +1365,31 @@ namespace RMYY_CallCenter_Api.Controllers.CarManage
1339 1365
             return n;
1340 1366
         }
1341 1367
 
1368
+           /// <summary>
1369
+        /// 添加操作记录
1370
+        /// </summary>
1371
+        /// <param name="message"></param>
1372
+        /// <param name="user"></param>
1373
+        /// <param name="state"></param>
1374
+        /// <param name="WorkOrderCode"></param>
1375
+        /// <param name="assignid"></param>
1376
+        /// <returns></returns>
1377
+        public int  AddOperationAboutKey(string message,string user,int state,string WorkOrderCode,int assignid,int key,string value,string reason)
1378
+        {
1379
+            Model.T_Car_Operation oper = new Model.T_Car_Operation();
1380
+            oper.F_Message = message;
1381
+            oper.F_CreateUser = user;
1382
+            oper.F_IsDelete = 0;
1383
+            oper.F_State = state;
1384
+            oper.F_WorkOrderCode = WorkOrderCode;
1385
+            oper.F_AssignID = assignid;
1386
+            oper.F_CreateTime = DateTime.Now;
1387
+            oper.F_AboutKey = key;
1388
+            oper.F_AboutReason = value;
1389
+            oper.F_EnterReason = reason;
1390
+            int n = new BLL.T_Car_Operation().Add(oper);
1391
+            return n;
1392
+        }
1393
+
1342 1394
     }
1343 1395
 }

+ 134 - 30
RMYY_CallCenter_Api/Controllers/FaultRepairController.cs

@@ -19,6 +19,8 @@ namespace RMYY_CallCenter_Api.Controllers
19 19
 {
20 20
     public class FaultRepairController : BaseController
21 21
     {
22
+        private Bll.T_Sys_GroupClass gcBll = new Bll.T_Sys_GroupClass();
23
+
22 24
         private BLL.T_IntegratedScheduling_Base basescheBll = new BLL.T_IntegratedScheduling_Base();
23 25
         private BLL.T_FaultRepair_Base baseBll = new BLL.T_FaultRepair_Base();
24 26
         private BLL.T_FaultRepair_Evaluate evaBll = new BLL.T_FaultRepair_Evaluate();
@@ -132,6 +134,7 @@ namespace RMYY_CallCenter_Api.Controllers
132 134
             model.F_PlaceOfRepair = input.PlaceOfRepair;
133 135
             model.F_File = input.File;
134 136
             model.F_WorkOrderCode = DateTime.Now.ToString("yyyyMMddHHmmssfff");//工单编号
137
+            model.F_EmergencyTypes = input.EmergencyTypes;
135 138
             string message = "";
136 139
             var dicvalue = new Model.T_Sys_GongDan();
137 140
             dicvalue = new Bll.T_Sys_GongDan().GetModel(Convert.ToInt32(model.F_WorkOrderCategory));
@@ -323,6 +326,7 @@ namespace RMYY_CallCenter_Api.Controllers
323 326
             model.F_Content = input.Content;
324 327
             model.F_PlaceOfRepair = input.PlaceOfRepair;
325 328
             model.F_File = input.File;
329
+            model.F_EmergencyTypes = input.EmergencyTypes;
326 330
             //  bool addassignlog = false;
327 331
 
328 332
             //综合保障中心没有直接结束的按钮
@@ -418,7 +422,7 @@ namespace RMYY_CallCenter_Api.Controllers
418 422
                     {
419 423
                         model.F_Maintenancer = User.F_UserCode;
420 424
                     }
421
-
425
+                    model.F_AcceptTime = DateTime.Now;
422 426
                     model.F_WorkOrderState = (int)EnumFaultRepairWorkOrderState.dealing;
423 427
                     baseBll.Update(model);
424 428
                     AddOperatorLog("查收了工单", (int)EnumOperatorType.check, model.F_WorkOrderCode);
@@ -434,9 +438,15 @@ namespace RMYY_CallCenter_Api.Controllers
434 438
         }
435 439
 
436 440
         //处理人退单  
437
-        public ActionResult BackWorkOrder(string WorkOrderCode, string BackReason)
441
+        public ActionResult BackWorkOrder(string WorkOrderCode, string BackReason ,int key, string value)
438 442
         {
439 443
             Model.T_FaultRepair_Base model = baseBll.GetModel(WorkOrderCode);
444
+            string s = ",退回原因:" + value  ;
445
+            if (!string.IsNullOrEmpty(BackReason))
446
+            {
447
+                s =s+ "," + BackReason;
448
+            }
449
+
440 450
             if (model != null)
441 451
             {
442 452
                 if (model.F_MaintenanceDept == User.F_DeptId.ToString())
@@ -449,14 +459,12 @@ namespace RMYY_CallCenter_Api.Controllers
449 459
                     model.F_AssignUser = "";
450 460
                     model.F_UpdateTime = DateTime.Now;
451 461
                     model.F_Deadline = null;
452
-
462
+                    model.F_AcceptTime = null;
453 463
                     baseBll.Update(model);
454
-                    string s = "";
455
-                    if (!string.IsNullOrEmpty(BackReason))
456
-                    {
457
-                        s += ",退回原因:" + BackReason;
458
-                    }
459
-                    AddOperatorLog("退回了工单" + s, (int)EnumOperatorType.back, model.F_WorkOrderCode);
464
+                    
465
+
466
+                    
467
+                    AddOperatorLogAboutKey("退回了工单" + s, (int)EnumOperatorType.back, model.F_WorkOrderCode,value,key,BackReason);
460 468
                     msg.AddInternalMessagesInfo("您有工单被退回", "您有工单被退回" + "工单编号:" + model.F_WorkOrderCode+s, assignuser
461 469
                                  , User.F_UserCode, EnumSmsType.repair
462 470
                    , 0, model.F_WorkOrderCode);
@@ -476,7 +484,7 @@ namespace RMYY_CallCenter_Api.Controllers
476 484
         //维修员能看见当前部门的所有的工单 ,对于所有的工单都能去处理
477 485
         //处理完成 、异常完结  Type=0 正常完成  Type=1异常完结  判断是不是返修的工单
478 486
         //点击正常完成的时候添加“是否涉及设备,是否涉及设备点击是,出现下拉框可多选设备,选择之后可输入对应的数量和价格
479
-        public ActionResult DealWorkOrder(string WorkOrderCode, int Type, string Result, string File, List<Model.T_InvolvedEquip_RepairProcess> equipmodellist, int ExceptionType = 0, int IsInvolvedEquip = 0)
487
+        public ActionResult DealWorkOrder(string WorkOrderCode, int Type, string Result, string File, string finishtype,List<Model.T_InvolvedEquip_RepairProcess> equipmodellist, int ExceptionType = 0, int IsInvolvedEquip = 0)
480 488
         {
481 489
             Model.T_FaultRepair_Base model = baseBll.GetModel(WorkOrderCode);
482 490
 
@@ -499,7 +507,7 @@ namespace RMYY_CallCenter_Api.Controllers
499 507
                     if (dt != null && dt.Rows.Count > 0)
500 508
                     {
501 509
                         int procid = Convert.ToInt32(dt.Rows[0]["F_ProcessId"].ToString());
502
-                        string updatesql = "UPDATE T_FaultRepair_Process set  F_ProcessingTime=GETDATE() ,F_Result='" + Result + "' ,F_File='" + File + "',F_Maintenancer='" + User.F_UserCode + "',F_MaintenanceDept='" + User.F_DeptId + "',F_DealType='" + (int)EnumFaultRepairDealType.normal + "', F_IsInvolvedEquip='" + IsInvolvedEquip + "'  where F_ProcessId='" + procid + "'";
510
+                        string updatesql = "UPDATE T_FaultRepair_Process set  F_ProcessingTime=GETDATE() ,  F_FinishType='"+finishtype+"',F_Result='" + Result + "' ,F_File='" + File + "',F_Maintenancer='" + User.F_UserCode + "',F_MaintenanceDept='" + User.F_DeptId + "',F_DealType='" + (int)EnumFaultRepairDealType.normal + "', F_IsInvolvedEquip='" + IsInvolvedEquip + "'  where F_ProcessId='" + procid + "'";
503 511
                         int updateid = DbHelperSQL.ExecuteSql(updatesql);
504 512
                         if (IsInvolvedEquip == 1)
505 513
                         {
@@ -530,6 +538,7 @@ namespace RMYY_CallCenter_Api.Controllers
530 538
                         {
531 539
                             if (model.F_IsStop != 1)
532 540
                             { model.F_Endtime = DateTime.Now; }
541
+
533 542
                             baseBll.Update(model);
534 543
                             msg.AddInternalMessagesInfo("您提交的工单已处理完毕,请及时进行评价", "您提交的工单已处理完毕,请及时进行评价" + "工单编号:" + model.F_WorkOrderCode, model.F_Applicant, User.F_UserCode, EnumSmsType.repair
535 544
                , 0, model.F_WorkOrderCode);
@@ -551,7 +560,7 @@ namespace RMYY_CallCenter_Api.Controllers
551 560
                     promodel.F_File = File;
552 561
                     promodel.F_WorkOrderCode = WorkOrderCode;
553 562
                     promodel.F_IsInvolvedEquip = IsInvolvedEquip;//0 是否 1 是 是
554
-
563
+                    promodel.F_FinishType = finishtype; //报修工单完工时增加处理方式:“远程”、“现场”,默认现场,另外工单详情中需要显示该字段信息
555 564
 
556 565
                     promodel.F_DealType = (int)EnumFaultRepairDealType.normal;
557 566
 
@@ -616,7 +625,7 @@ namespace RMYY_CallCenter_Api.Controllers
616 625
 
617 626
                         //  promodel.F_ExceptionType = ExceptionType;
618 627
                         int procid = Convert.ToInt32(dt.Rows[0]["F_ProcessId"].ToString());
619
-                        string updatesql = "UPDATE T_FaultRepair_Process set  F_ProcessingTime=GETDATE() ,F_Result='" + Result + "' ,F_File='" + File + "',F_UpdateTime= GETDATE(),dealtype='" + dealtype + "' ,F_ExceptionType='" + ExceptionType + "'  where F_ProcessId='" + procid + "'";
628
+                        string updatesql = "UPDATE T_FaultRepair_Process set  F_ProcessingTime=GETDATE() , F_FinishType='"+finishtype+"',F_Result='" + Result + "' ,F_File='" + File + "',F_UpdateTime= GETDATE(),dealtype='" + dealtype + "' ,F_ExceptionType='" + ExceptionType + "'  where F_ProcessId='" + procid + "'";
620 629
                         if (DbHelperSQL.ExecuteSql(updatesql) > 0)
621 630
                         {
622 631
                             if (model.F_IsStop != 1)
@@ -639,6 +648,7 @@ namespace RMYY_CallCenter_Api.Controllers
639 648
                     promodel.F_WorkOrderCode = WorkOrderCode;
640 649
                     promodel.F_ExceptionType = ExceptionType;
641 650
                     promodel.F_DealType = dealtype;
651
+                    promodel.F_FinishType = finishtype;
642 652
                     if (dealBll.Add(promodel) > 0)
643 653
                     {
644 654
                         if (model.F_IsStop != 1)
@@ -1118,7 +1128,7 @@ namespace RMYY_CallCenter_Api.Controllers
1118 1128
                     case 0:
1119 1129
                         //基本信息
1120 1130
                         #region
1121
-                        string sql = "select *,[dbo].[GetUserName](F_Applicant) applicantname , (select F_urgecount from [T_Wo_CommonBase] where F_WoCode='"+ strworkorderid + "') F_UrgeCount from T_FaultRepair_Base where F_WorkOrderCode='" + strworkorderid + "'";
1131
+                        string sql = "select *,[dbo].[GetUserName](F_Applicant) applicantname ,(case when F_Endtime= null then '' else dbo.GetConvertSecond(DATEDIFF(s,F_accepttime,F_endtime)) end) SpendTime,(select F_urgecount from [T_Wo_CommonBase] where F_WoCode='" + strworkorderid + "') F_UrgeCount from T_FaultRepair_Base where F_WorkOrderCode='" + strworkorderid + "'";
1122 1132
                         DataTable dtbase = DbHelperSQL.Query(sql).Tables[0];
1123 1133
                         dtbase.Columns.Add("FileUrl", typeof(object));
1124 1134
                         dtbase.Columns.Add("StateName");
@@ -1804,9 +1814,15 @@ namespace RMYY_CallCenter_Api.Controllers
1804 1814
 
1805 1815
         // 返修 是申请人提交的返修
1806 1816
         //退回至维修部门班组长(角色),如果没有该角色退回到原来的处理人
1807
-        public ActionResult ReturnWorkOrder(string WorkOrderCode, string ReturnReason)
1817
+        public ActionResult ReturnWorkOrder(string WorkOrderCode, string ReturnReason,int key,string value)
1808 1818
         {
1809 1819
             Model.T_FaultRepair_Base model = baseBll.GetModel(WorkOrderCode);
1820
+
1821
+            string str = "";
1822
+            if (!string.IsNullOrEmpty(ReturnReason))
1823
+            {
1824
+                str = "," + ReturnReason;
1825
+            }
1810 1826
             if (model != null && model.F_ApplicationDept.Trim() == User.F_DeptId.ToString())
1811 1827
             {
1812 1828
                 //判断返工是不是规定的时间内,工单状态是已完结的工单
@@ -1819,11 +1835,12 @@ namespace RMYY_CallCenter_Api.Controllers
1819 1835
                     promodel.F_Isdelete = 0;
1820 1836
                     promodel.F_MaintenanceDept = User.F_DeptId.ToString();// model.F_MaintenanceDept;
1821 1837
                     promodel.F_Maintenancer = User.F_UserCode;// model.F_Maintenancer;
1822
-                    promodel.F_ReturnReason = ReturnReason;
1838
+                    promodel.F_ReturnReason =value+ ReturnReason;
1823 1839
                     promodel.F_WorkOrderCode = WorkOrderCode;
1824 1840
                     if (dealBll.Add(promodel) > 0)
1825 1841
                     {
1826
-                        AddOperatorLog("提交了返工", (int)EnumOperatorType.submitreturn, WorkOrderCode);
1842
+                       
1843
+                        AddOperatorLogAboutKey("提交了返工,原因:"+value+ str, (int)EnumOperatorType.submitreturn, WorkOrderCode,value,key,ReturnReason);
1827 1844
 
1828 1845
                         string sql = " select top 1 F_UserCode from T_Sys_UserAccount where F_RoleId in (select F_RoleId from T_Sys_Role where F_RoleCode = 'WXBZZ')";
1829 1846
 
@@ -1833,11 +1850,8 @@ namespace RMYY_CallCenter_Api.Controllers
1833 1850
                             model.F_Maintenancer = usercode;
1834 1851
                         }
1835 1852
 
1836
-                        string s = "";
1837
-                        if (!string.IsNullOrEmpty(ReturnReason))
1838
-                        {
1839
-                            s = ",返修原因:" + ReturnReason;
1840
-                        }
1853
+                        string s  = ",返修原因:" +value+ str;
1854
+                         
1841 1855
 
1842 1856
                         model.F_WorkOrderState = (int)EnumFaultRepairWorkOrderState.dealing;
1843 1857
                         model.F_ReturnNum += model.F_ReturnNum + 1;
@@ -2023,6 +2037,23 @@ namespace RMYY_CallCenter_Api.Controllers
2023 2037
             return true;
2024 2038
         }
2025 2039
 
2040
+
2041
+        public bool AddOperatorLogAboutKey(string content, int type, string workordercode,string value,int key,string enterreason)
2042
+        {
2043
+            Model.T_FaultRepair_OperationLog model = new Model.T_FaultRepair_OperationLog();
2044
+            model.F_LogContent = content;
2045
+            model.F_OperationTime = DateTime.Now;
2046
+            model.F_OperationType = type;
2047
+            model.F_Operator = User.F_UserCode;
2048
+            model.F_WorkOrderCode = workordercode;
2049
+            model.F_AboutKey = key;
2050
+            model.F_AboutReason = value;
2051
+            model.F_EnterReason = enterreason;
2052
+            logBll.Add(model);
2053
+            return true;
2054
+        }
2055
+
2056
+
2026 2057
         public void AddAddlog(string workordercode)
2027 2058
         {
2028 2059
             AddOperatorLog("创建报修工单", (int)EnumOperatorType.add, workordercode);
@@ -2044,8 +2075,20 @@ namespace RMYY_CallCenter_Api.Controllers
2044 2075
 
2045 2076
         }
2046 2077
 
2078
+        [AllowAnonymous]
2079
+        public bool AddAutoAssignlog(string workordercode, string dept, string maintenancer)
2080
+        {
2081
+            Model.T_FaultRepair_OperationLog model = new Model.T_FaultRepair_OperationLog();
2082
+            model.F_LogContent = "超过十分钟未接单,自动指派工单给" + GetDeptModel(dept) + "部门" + GetUserModel(maintenancer);
2083
+            model.F_OperationTime = DateTime.Now;
2084
+            model.F_OperationType = (int)EnumOperatorType.assign;
2085
+            model.F_Operator = "";
2086
+            model.F_WorkOrderCode = workordercode;
2087
+            logBll.Add(model);
2088
+            return true;
2089
+        }
2047 2090
 
2048
-
2091
+   
2049 2092
         #endregion
2050 2093
 
2051 2094
 
@@ -2269,7 +2312,7 @@ namespace RMYY_CallCenter_Api.Controllers
2269 2312
 
2270 2313
 
2271 2314
         //挂起
2272
-        public ActionResult HangUp(string workordercode)
2315
+        public ActionResult HangUp(string workordercode, int key, string value,  string reason)
2273 2316
         {
2274 2317
 
2275 2318
             Model.T_FaultRepair_Base model = baseBll.GetModel(workordercode);
@@ -2281,7 +2324,12 @@ namespace RMYY_CallCenter_Api.Controllers
2281 2324
             model.F_StopTime = DateTime.Now;
2282 2325
             model.F_Endtime = DateTime.Now;
2283 2326
             baseBll.Update(model);
2284
-            AddOperatorLog(User.F_UserCode + "挂起了工单", (int)EnumOperatorType.hangup, model.F_WorkOrderCode);
2327
+            string str = "";
2328
+            if (!string.IsNullOrEmpty(reason))
2329
+            {
2330
+                str = "," + reason;
2331
+            }
2332
+            AddOperatorLogAboutKey(User.F_UserCode + "挂起了工单,原因:"+value+ str, (int)EnumOperatorType.hangup, model.F_WorkOrderCode,value,key, reason);
2285 2333
             return Success("挂起成功");
2286 2334
         }
2287 2335
 
@@ -2470,15 +2518,17 @@ namespace RMYY_CallCenter_Api.Controllers
2470 2518
         //延期
2471 2519
         //接单人在接单之后,如果该工单类型上设置的“可延期次数”大于0显示“延期”按钮;点击延期按钮进行验证是否超过设定的延期次数,超过提醒“已超过规定延迟次数”
2472 2520
         //操作流程记录延期
2473
-        public ActionResult frReplay(string workordercode, string days, string type, string workordercategory,string reason)
2521
+        public ActionResult frReplay(string workordercode, string days, string type, string workordercategory,string reason,int key, string value)
2474 2522
         {
2475 2523
             Model.T_Sys_GongDan gdmodel = gdbll.GetModel(Convert.ToInt32(workordercategory));
2476 2524
             Model.T_Wo_CommonBase model = cbbll.GetModel(workordercode);
2477
-            string strreason = "";
2525
+
2478 2526
             if (!string.IsNullOrEmpty(reason))
2479 2527
             {
2480
-                strreason = ",原因:" + reason;
2528
+                reason = "," + reason;
2481 2529
             }
2530
+            string strreason  = ",原因:"+value+  reason;
2531
+            
2482 2532
 
2483 2533
             if (gdmodel.F_CanReplayCount > 0)
2484 2534
             {
@@ -2495,7 +2545,7 @@ namespace RMYY_CallCenter_Api.Controllers
2495 2545
                         cwbll.Update(cwmodel);
2496 2546
                        
2497 2547
 
2498
-                        var itemid = Addlogbll.AddLog(cwmodel.F_ID, 0, 0, User.F_UserName + "(" + User.F_UserCode + ")" + "给工单延期" + days + "h"+ strreason, (int)EnumItemType.Delay, 14, "", 0, User.F_UserCode);
2548
+                        var itemid = Addlogbll.AddLogAboutKey(cwmodel.F_ID, 0, 0, User.F_UserName + "(" + User.F_UserCode + ")" + "给工单延期" + days + "h"+ strreason, (int)EnumItemType.Delay, 14, "", 0, User.F_UserCode,key,value, reason);
2499 2549
                     }
2500 2550
                     //故障报工单延期修
2501 2551
                     if (type == "3000")
@@ -2616,6 +2666,60 @@ namespace RMYY_CallCenter_Api.Controllers
2616 2666
             return returnname.ToString();
2617 2667
         }
2618 2668
 
2619
-      
2669
+
2670
+        /// <summary>
2671
+        /// 基建后勤类型,10分钟内未接单转派给基建和后勤保障部的值班人员(根据排班表)
2672
+        /// </summary>
2673
+        /// <returns></returns>
2674
+        public ActionResult AutoChangeDealMan()
2675
+        {
2676
+            string sql = " select F_GDId from T_Sys_GongDan where F_Name='基建后勤类'";
2677
+            int gdid =Convert.ToInt32( DbHelperSQL.GetSingle(sql));
2678
+
2679
+
2680
+         
2681
+            if (gdid > 0)
2682
+            {
2683
+                string allgd = "  select * from T_FaultRepair_Base where F_accepttime is null and   DATEDIFF(MINUTE, F_AssignTime, GETDATE()) > 10 and        F_WorkOrderCategory in (select * from dbo.getvalueid('" + gdid + "'))";
2684
+
2685
+                DataTable dt = DbHelperSQL.Query(allgd).Tables[0];
2686
+                if (dt != null && dt.Rows.Count > 0)
2687
+                {
2688
+                    string sqldept = " select F_DeptId from T_Sys_Department where F_DeptCode='HQBZ'";
2689
+
2690
+                    int deptid = Convert.ToInt32(DbHelperSQL.GetSingle(sqldept));
2691
+                    List<Model.T_Sys_GroupClass> modellist = new List<Model.T_Sys_GroupClass>();
2692
+                    if (deptid > 0)
2693
+                    {
2694
+                          modellist = gcBll.GetModelList("F_IsDelete = 0   and F_Date = CONVERT(varchar, GETDATE(), 120)  and F_ClassCode in (select F_Id from t_sys_class where F_IsDelete = 0 and CONVERT(varchar, GETDATE(), 108) between F_InTime and F_OutTime and F_DeptId = '" + deptid + "')");                 
2695
+                    }
2696
+
2697
+                    foreach (DataRow item in dt.Rows)
2698
+                    {
2699
+                     Model.T_FaultRepair_Base frmodel=    baseBll.GetModel(item["F_WorkOrderCode"].ToString());
2700
+                        if (modellist.Count > 0)
2701
+                        {
2702
+                           var  shaixuanlist = modellist.Where(x => x.F_UserCode != frmodel.F_Maintenancer).ToList();
2703
+                            if (shaixuanlist.Count > 0)
2704
+                            {
2705
+                                frmodel.F_AssignTime = DateTime.Now;
2706
+                                frmodel.F_Maintenancer = shaixuanlist.First().F_UserCode;
2707
+                                frmodel.F_MaintenanceDept = deptid.ToString();
2708
+                                baseBll.Update(frmodel);
2709
+
2710
+                                AddAutoAssignlog(item["F_WorkOrderCode"].ToString(), deptid.ToString(), frmodel.F_Maintenancer);
2711
+
2712
+                            }
2713
+
2714
+                        }
2715
+
2716
+                    }
2717
+                }
2718
+                return Success("执行成功");
2719
+
2720
+            }
2721
+            return Error("基建后勤类型不存在");
2722
+        }
2723
+
2620 2724
     }
2621 2725
 }

+ 1 - 1
RMYY_CallCenter_Api/Controllers/GroupClassController.cs

@@ -408,7 +408,7 @@ namespace RMYY_CallCenter_Api.Controllers
408 408
             {
409 409
                 string sql = "    select F_UserCode,dbo.GetUserName(F_UserCode) username,F_Date from  T_Sys_GroupClass where F_IsDelete=0   and F_Date = CONVERT(varchar, GETDATE(), 120)  and F_ClassCode in ( select F_Id from t_sys_class where F_IsDelete = 0 and CONVERT(varchar, GETDATE(),108) between F_InTime and F_OutTime and F_DeptId ='"+deptid+"' )  ";
410 410
 
411
-                 var dt=   DbHelperSQL.Query("sql").Tables[0];
411
+                 var dt=   DbHelperSQL.Query(sql).Tables[0];
412 412
                 return Success("根据部门获取值班人员数据成功", dt);
413 413
             }
414 414
 

+ 48 - 4
RMYY_CallCenter_Api/Controllers/IndexController.cs

@@ -19,6 +19,7 @@ namespace RMYY_CallCenter_Api.Controllers
19 19
         private Bll.T_Msg_Chat bllchat = new Bll.T_Msg_Chat();
20 20
         private Bll.T_Msg_Chat_Map bllmap = new Bll.T_Msg_Chat_Map();
21 21
         private readonly Bll.T_Sys_UserAccount userAccount = new Bll.T_Sys_UserAccount();
22
+       private Bll.T_Sys_SystemConfig configBll = new Bll.T_Sys_SystemConfig();
22 23
         // GET: Index
23 24
         /// <summary>
24 25
         /// 获取当前用户
@@ -411,6 +412,18 @@ namespace RMYY_CallCenter_Api.Controllers
411 412
             return Success("获取成功", dt);
412 413
         }
413 414
 
415
+        public DataTable GetFileData(string ids, string prefix)
416
+        {
417
+            DataTable dt = DbHelperSQL.Query("select * from T_Sys_Accessories WITH(NOLOCK) where F_FileId in (" + ids + ")").Tables[0];
418
+
419
+            foreach (DataRow dr in dt.Rows)
420
+            {
421
+                dr["F_FileUrl"] = prefix + dr["F_FileUrl"].ToString();
422
+            }
423
+
424
+            return dt;
425
+        }
426
+
414 427
         /// <summary>
415 428
         /// 即时聊天 - 获取最新通讯(获取双方记录【聊天】)
416 429
         /// </summary>
@@ -440,12 +453,30 @@ namespace RMYY_CallCenter_Api.Controllers
440 453
                     sql += " and b.CreateDate > '" + start + "' ";
441 454
                 }
442 455
                 //查询(聊天记录)
443
-                string sql1 = "SELECT a.Id,a.FromUserId,a.Content,a.IsToAll,a.CreateDate,c.F_UserName FROM dbo.T_Msg_Chat a RIGHT JOIN dbo.T_Msg_Chat_Map b ON b.ChatId = a.Id LEFT JOIN dbo.T_Sys_UserAccount c ON c.F_UserId = a.FromUserId WHERE " + sql + " ORDER BY a.CreateDate ASC";
456
+                string sql1 = "SELECT a.Id,a.FromUserId,a.Content,a.Files,a.IsToAll,a.CreateDate,c.F_UserName FROM dbo.T_Msg_Chat a RIGHT JOIN dbo.T_Msg_Chat_Map b ON b.ChatId = a.Id LEFT JOIN dbo.T_Sys_UserAccount c ON c.F_UserId = a.FromUserId WHERE " + sql + " ORDER BY a.CreateDate ASC";
444 457
                 dt = DbHelperSQL.Query(sql1).Tables[0];
445 458
                 recordCount = dt.Rows.Count;
446 459
 
447
-                //修改(设置已读)
448
-                string sqlwhere = " ISNULL(IsRead,0) = 0 ";
460
+
461
+                dt.Columns.Add("FileUrl", typeof(object));
462
+            
463
+               var configfj = configBll.GetModelList(" F_ParamCode='FileUrlPath' ").FirstOrDefault();
464
+
465
+                foreach (DataRow dr in dt.Rows)
466
+                {
467
+                  
468
+                    if (configfj != null && !string.IsNullOrEmpty(dr["Files"].ToString()))
469
+                    {
470
+                        dr["FileUrl"] = GetFileData(dr["Files"].ToString(), configfj.F_ParamValue);
471
+                    }
472
+                }
473
+
474
+
475
+
476
+
477
+
478
+                    //修改(设置已读)
479
+               string sqlwhere = " ISNULL(IsRead,0) = 0 ";
449 480
                 if (fromuserId > 0)
450 481
                 {
451 482
                     sqlwhere += " and FromUserId = " + fromuserId + " ";
@@ -564,6 +595,7 @@ namespace RMYY_CallCenter_Api.Controllers
564 595
             model.ToUserId = input.ToUserId;
565 596
             model.ToRoleId = input.ToRoleId;
566 597
             model.CreateDate = DateTime.Now;
598
+            model.Files = input.Files;
567 599
             //如果用户和角色都为0,则发送所有人
568 600
             if (input.ToUserId == 0 && input.ToRoleId == 0)
569 601
             {
@@ -640,9 +672,21 @@ namespace RMYY_CallCenter_Api.Controllers
640 672
                 sql += " and ISNULL(b.IsRead,0) = " + isread + " ";
641 673
             }
642 674
             //查询(聊天记录)
643
-            string sql1 = "SELECT TOP " + top + " a.Id,b.FromUserId,b.ToUserId,a.Content,a.IsToAll,a.CreateDate,b.IsRead,c.F_UserName,c.F_RoleId,c.F_Sex,c.F_See FROM dbo.T_Msg_Chat a RIGHT JOIN dbo.T_Msg_Chat_Map b ON b.ChatId = a.Id LEFT JOIN dbo.T_Sys_UserAccount c ON c.F_UserId = a.FromUserId WHERE " + sql + " ORDER BY a.CreateDate ASC";
675
+            string sql1 = "SELECT TOP " + top + " a.Id,b.FromUserId,b.ToUserId,a.Content,a.Files,a.IsToAll,a.CreateDate,b.IsRead,c.F_UserName,c.F_RoleId,c.F_Sex,c.F_See FROM dbo.T_Msg_Chat a RIGHT JOIN dbo.T_Msg_Chat_Map b ON b.ChatId = a.Id LEFT JOIN dbo.T_Sys_UserAccount c ON c.F_UserId = a.FromUserId WHERE " + sql + " ORDER BY a.CreateDate ASC";
644 676
             dt = DbHelperSQL.Query(sql1).Tables[0];
645 677
             recordCount = dt.Rows.Count;
678
+            dt.Columns.Add("FileUrl", typeof(object));
679
+
680
+            var configfj = configBll.GetModelList(" F_ParamCode='FileUrlPath' ").FirstOrDefault();
681
+
682
+            foreach (DataRow dr in dt.Rows)
683
+            {
684
+
685
+                if (configfj != null && !string.IsNullOrEmpty(dr["Files"].ToString()))
686
+                {
687
+                    dr["FileUrl"] = GetFileData(dr["Files"].ToString(), configfj.F_ParamValue);
688
+                }
689
+            }
646 690
 
647 691
             var obj = new
648 692
             {

+ 1 - 1
RMYY_CallCenter_Api/Controllers/InfoController.cs

@@ -183,7 +183,7 @@ namespace RMYY_CallCenter_Api.Controllers
183 183
             var date = DateTime.Now;
184 184
 
185 185
 
186
-            string sqlhw = "       select a. F_GDID F_Type , a.F_Name,(SELECT COUNT(1) FROM T_Car_WorkOrder WHERE   F_IsDel=0 AND F_Typ in( select F_GDId  from [dbo].[GetValueId](a.F_GDID))  " +
186
+            string sqlhw = "       select a. F_GDID F_Type , a.F_Name,(SELECT COUNT(1) FROM T_Car_WorkOrder WHERE   F_IsDel=0 AND F_Type in( select F_GDId  from [dbo].[GetValueId](a.F_GDID))  " +
187 187
                 "    AND datediff(day , F_CreateTime  , getdate())= 0) COUNT    from T_Sys_Gongdan a" +
188 188
                 "     where F_ParentID = 4000 AND F_IsDelete = 0   ";
189 189
             DataTable dthw = DbHelperSQL.Query(sqlhw).Tables[0];

Plik diff jest za duży
+ 33 - 14
RMYY_CallCenter_Api/Controllers/SchedulingController.cs


+ 39 - 6
RMYY_CallCenter_Api/Controllers/WorkOrder/Con_WorkOrderController.cs

@@ -411,6 +411,27 @@ namespace RMYY_CallCenter_Api.Controllers
411 411
                 model.typename1 = tybll.GetModel(Convert.ToInt32(model.F_type1))?.F_Name ?? "";
412 412
                 model.typename2 = tybll.GetModel(Convert.ToInt32(model.F_type2))?.F_Name ?? "";
413 413
                 model.typename3 = tybll.GetModel(Convert.ToInt32(model.F_type3))?.F_Name ?? "";
414
+
415
+                //花费时长
416
+                if (model.F_HandleTime == null || model.F_AcceptTime == null)
417
+                {
418
+                    model.SpendTime = "";
419
+                }
420
+                else
421
+                {
422
+                    string strspend = "";
423
+                    TimeSpan ts = model.F_HandleTime.Value - model.F_AcceptTime.Value;
424
+                    if (ts.Days != 0)
425
+                    {
426
+                        strspend += ts.Days + "天";
427
+                    }
428
+                    strspend += ts.Hours + "时";
429
+                    strspend += ts.Minutes + "分";
430
+                    strspend += ts.Seconds + "秒";
431
+                    model.SpendTime = strspend;
432
+                }
433
+
434
+
414 435
                 model.ComplaintSourceName = dvBll.GetModel(Convert.ToInt32(model.F_ComplaintSource))?.F_Name ??"";
415 436
                     if (model != null)
416 437
                     {
@@ -531,7 +552,18 @@ namespace RMYY_CallCenter_Api.Controllers
531 552
                         Bll.T_Call_CallRecords callbll = new Bll.T_Call_CallRecords();
532 553
                         Model.T_Call_CallRecords  callmodel=callbll.GetModelByCallId(model.F_CallID);
533 554
                         model.F_Satisfaction = callmodel.MYD;
534
-                    }                 
555
+                    }
556
+                    //业务咨询工单添加用户信息
557
+                    Model.T_Cus_Customer cusmodel = new Model.T_Cus_Customer();
558
+                    Bll.T_Cus_Customer cusbll = new Bll.T_Cus_Customer();
559
+                    cusmodel.F_Address = input.F_Address;
560
+                    cusmodel.F_Telephone = input.F_Phon;
561
+                    cusmodel.F_Sex = input.F_Sex==0?"男":"女";
562
+                    cusmodel.F_CustomerName = input.F_Customer;
563
+                    cusmodel.F_AboutLinkMan = input.F_FullName;//患者姓名
564
+                    cusmodel.F_IdCard = input.F_IdCard;
565
+                    cusmodel.F_RelationShip = input.F_Relationship;//与患者关系
566
+                    cusbll.Add(cusmodel);
535 567
 
536 568
                     int n = orderbll.Add(model);
537 569
                     if (n > 0)
@@ -813,7 +845,7 @@ namespace RMYY_CallCenter_Api.Controllers
813 845
             model.F_ComplaintSource = input.F_ComplaintSource;
814 846
 
815 847
             model.F_ServiceItems = input.F_ServiceItems;//服务项目
816
-            
848
+            model.F_EmergencyTypes = input.EmergencyTypes;
817 849
         
818 850
                 model.F_Address = input.F_Address;//地区
819 851
                 model.F_FirstCheckHospital = input.F_FirstCheckHospital;//首次检查医院
@@ -1501,6 +1533,7 @@ namespace RMYY_CallCenter_Api.Controllers
1501 1533
             {
1502 1534
                 #region 处理工单
1503 1535
                 model.F_State = wostate;//已接单待处理
1536
+                model.F_AcceptTime = DateTime.Now;
1504 1537
                 model.F_HandleBy = nowUser.F_UserCode;//已接单待处理
1505 1538
                 orderbll.Update(model);
1506 1539
                 #endregion
@@ -1686,7 +1719,7 @@ namespace RMYY_CallCenter_Api.Controllers
1686 1719
         /// </summary>
1687 1720
         /// <param name="WorkOrderCode"></param>
1688 1721
         /// <returns></returns>
1689
-        public ActionResult BackWorkOrder(string WorkOrderCode,string reason)
1722
+        public ActionResult BackWorkOrder(string WorkOrderCode,string reason,int key,string value)
1690 1723
         {
1691 1724
             if (User != null)
1692 1725
             {
@@ -1715,7 +1748,7 @@ namespace RMYY_CallCenter_Api.Controllers
1715 1748
 
1716 1749
                     }
1717 1750
 
1718
-                    var res = BackWO(User, wmodel, reason);
1751
+                    var res = BackWO(User, wmodel, reason,key,value);
1719 1752
                     if (res)
1720 1753
                         return Success("退单成功");
1721 1754
                     else
@@ -1731,7 +1764,7 @@ namespace RMYY_CallCenter_Api.Controllers
1731 1764
         /// <summary>
1732 1765
         /// 退回工单
1733 1766
         /// </summary>
1734
-        public bool BackWO(Model.T_Sys_UserAccount nowUser, Model.T_Con_WorkOrder model,string reason)
1767
+        public bool BackWO(Model.T_Sys_UserAccount nowUser, Model.T_Con_WorkOrder model,string reason,int key, string value)
1735 1768
         {
1736 1769
             #region 工单处理
1737 1770
             var opt = "退单";
@@ -1752,7 +1785,7 @@ namespace RMYY_CallCenter_Api.Controllers
1752 1785
                 reasonmessage = ",原因:" + reason;
1753 1786
             }
1754 1787
             var content = deptname + nowUser.F_UserName + "(" + nowUser.F_UserCode + ")" + opt+ reasonmessage;
1755
-            var itemid = logbll.AddLog((int)model.F_ID, (int)model.F_type1, wostate, content, (int)EnumItemType.deal, optbut, "", 0, nowUser.F_UserCode);
1788
+            var itemid = logbll.AddLogAboutKey((int)model.F_ID, (int)model.F_type1, wostate, content, (int)EnumItemType.deal, optbut, "", 0, nowUser.F_UserCode,key,value,reason);
1756 1789
             if (itemid > 0)
1757 1790
             {
1758 1791
                 #region 处理工单

+ 97 - 9
RMYY_CallCenter_Api/Controllers/WorkOrderBaseController.cs

@@ -9,6 +9,8 @@ using System.Web;
9 9
 using System.Web.Mvc;
10 10
 using System.Reflection;
11 11
 using RMYY_CallCenter_Api.Models.Dto;
12
+using RMYY_CallCenter_Api.DB;
13
+
12 14
 namespace RMYY_CallCenter_Api.Controllers
13 15
 {
14 16
     public class WorkOrderBaseController : BaseController
@@ -100,11 +102,7 @@ namespace RMYY_CallCenter_Api.Controllers
100 102
             //return
101 103
             //    Error("无操作权限!");
102 104
         }
103
-        /// <summary>
104
-        /// 获取科室人员信息
105
-        /// </summary>
106
-        /// <param name="deptid"></param>
107
-        /// <returns></returns>
105
+
108 106
         public ActionResult GetPerson(int deptid = 0)
109 107
         {
110 108
             string sql = "";
@@ -124,17 +122,107 @@ namespace RMYY_CallCenter_Api.Controllers
124 122
                 message = "成功",
125 123
                 rows = ua.Select(p => new
126 124
                 {
127
-                   
125
+
128 126
                     usercode = p.F_UserCode,
129 127
                     username = p.F_UserName,
130
-                    usertelphone=p.F_Telephone,
131
-                    userworkphone=p.F_WorkPhone
132
-                    
128
+                    usertelphone = p.F_Telephone,
129
+                    userworkphone = p.F_WorkPhone
130
+
133 131
                 })
134 132
             };
135 133
             return Content(obj.ToJson());
136 134
         }
137 135
 
136
+
137
+      
138
+        /// <summary>
139
+        /// 获取科室人员信息
140
+        /// </summary>
141
+        /// <param name="deptid"></param>
142
+        /// <returns></returns>
143
+        public ActionResult GetPersonByDeptId(int deptid = 0)
144
+        {
145
+            string sql = "";
146
+            if (deptid != 0)
147
+            {
148
+                var dmodel = deptbll.GetModel(deptid);
149
+                if (dmodel != null)
150
+                {
151
+                    sql = "F_DeptId=" + deptid;
152
+                    sql += "and F_EnableFlag=1";
153
+                }
154
+            }
155
+
156
+            if (deptid > 0)
157
+            {
158
+                Bll.T_Sys_GroupClass gcbll = new Bll.T_Sys_GroupClass();
159
+                List<Model.T_Sys_GroupClass> grouplist = gcbll.GetModelList(" F_IsDelete=0   and F_Date = CONVERT(varchar, GETDATE(), 120)  and F_ClassCode in ( select F_Id from t_sys_class where F_IsDelete = 0 and CONVERT(varchar, GETDATE(),108) between F_InTime and F_OutTime and F_DeptId ='" + deptid + "' )");
160
+
161
+                if (grouplist.Count > 0)
162
+                {
163
+                    var obj = new
164
+                    {
165
+                        state = "success",
166
+                        message = "成功",
167
+                        rows = grouplist.Select(p => new
168
+                        {
169
+
170
+                            usercode = p.F_UserCode,
171
+                            username = GetUserModel( p.F_UserCode)
172
+
173
+                        })
174
+                    };
175
+                    return Content(obj.ToJson());
176
+                }
177
+                else
178
+                {
179
+                    var ua = userbll.GetModelList(sql);
180
+                    var obj = new
181
+                    {
182
+                        state = "success",
183
+                        message = "成功",
184
+                        rows = ua.Select(p => new
185
+                        {
186
+
187
+                            usercode = p.F_UserCode,
188
+                            username = p.F_UserName 
189
+                        })
190
+                    };
191
+                    return Content(obj.ToJson());
192
+                }
193
+
194
+
195
+              
196
+            }
197
+
198
+            return Error("deptid要大于0");
199
+
200
+          
201
+    
202
+        }
203
+
204
+        public string GetUserModel(string usercode = "")
205
+        {
206
+            string sql = " 1=1 ";
207
+
208
+            if (!string.IsNullOrWhiteSpace(usercode))
209
+            {
210
+                sql += " and F_UserCode='" + usercode + "'";
211
+            }
212
+            if (string.IsNullOrEmpty(usercode))
213
+                return "";
214
+
215
+            Model.T_Sys_UserAccount ua = new Bll.T_Sys_UserAccount().GetModelList(sql).FirstOrDefault();
216
+            if (ua != null)
217
+            {
218
+                return ua.F_UserName;
219
+
220
+            }
221
+
222
+            return "";
223
+
224
+        }
225
+
138 226
         /// <summary>
139 227
         /// 获取转运人
140 228
         /// </summary>

+ 1 - 1
RMYY_CallCenter_Api/Models/Enum/EnumOperatorType.cs

@@ -32,7 +32,7 @@ namespace RMYY_CallCenter_Api.Models.Enum
32 32
         [Description("异常完结")]
33 33
         exceptionended,
34 34
 
35
-        [Description("异常完结")]
35
+        [Description("返修")]
36 36
         submitreturn,
37 37
             [Description("转派")]
38 38
          transfer ,

+ 5 - 0
RMYY_CallCenter_Api/Models/Input/ChatInput.cs

@@ -7,6 +7,11 @@ namespace RMYY_CallCenter_Api.Models.Input
7 7
 {
8 8
     public class ChatInput
9 9
     {
10
+
11
+        /// <summary>
12
+        /// 附件内容
13
+        /// </summary>
14
+               public string Files { get; set; }
10 15
         /// <summary>
11 16
         /// Id
12 17
         /// </summary>

+ 6 - 0
RMYY_CallCenter_Api/Models/Input/Con_WorkOrderInput.cs

@@ -11,6 +11,12 @@ namespace RMYY_CallCenter_Api.Models.Input
11 11
         /// <summary>
12 12
         /// 工单ID
13 13
         /// </summary>
14
+
15
+        public string EmergencyTypes
16
+
17
+        {
18
+            get; set;
19
+        }
14 20
         public int F_ID
15 21
         {
16 22
             get; set;

+ 2 - 0
RMYY_CallCenter_Api/Models/Input/T_FaultRepairBaseinput.cs

@@ -13,6 +13,8 @@ namespace RMYY_CallCenter_Api.Models.Input
13 13
 
14 14
         public string  CallId { get; set; }
15 15
 
16
+        public string  EmergencyTypes { get; set; }
17
+
16 18
         public string WorkOrderCode { get; set; }
17 19
         /// <summary>
18 20
         /// 申请人

+ 3 - 0
RMYY_CallCenter_Api/Models/Input/T_SchedulingBaseInput.cs

@@ -13,6 +13,9 @@ namespace RMYY_CallCenter_Api.Models.Input
13 13
 
14 14
         public string  CallId { get; set; }
15 15
 
16
+        public string EmergencyTypes { get; set; }
17
+
18
+
16 19
         public string WorkOrderCode { get; set; }
17 20
         /// <summary>
18 21
         /// 申请人