|
|
@@ -181,7 +181,7 @@ namespace CallCenterApi.Interface.Controllers.workorder
|
|
181
|
181
|
else if (strstate.Trim() == ((int)EnumWorkState.finish).ToString())
|
|
182
|
182
|
sql += " and F_WorkState in (" + (int)EnumWorkState.finish + "," + (int)EnumWorkState.closed + ") ";
|
|
183
|
183
|
else
|
|
184
|
|
- sql += " and F_WorkState = '" + strstate.Trim() + "' ";
|
|
|
184
|
+ sql += " and F_WorkState in( " + strstate.Trim() + ") ";
|
|
185
|
185
|
|
|
186
|
186
|
}
|
|
187
|
187
|
if (strtab == "2")
|
|
|
@@ -597,8 +597,9 @@ namespace CallCenterApi.Interface.Controllers.workorder
|
|
597
|
597
|
var recount = reminds.Where(r => r.F_WorkOrderId.Equals(dr["F_WorkOrderId"].ToString())).Count();
|
|
598
|
598
|
var butt = buttons.Find(c => c.key == ButtonGroup.turnsee().key);
|
|
599
|
599
|
|
|
600
|
|
- if (userModel.F_RoleCode.ToUpper() == "GLY" || userModel.F_RoleCode.ToUpper() == "ZXLD")
|
|
|
600
|
+ if (userModel.F_RoleCode.ToUpper() == "GLY" || userModel.F_RoleCode.ToUpper() == "ZXLD" )
|
|
601
|
601
|
{
|
|
|
602
|
+ if(dr["F_WorkState"].ToString()=="0"|| dr["F_WorkState"].ToString()=="1")
|
|
602
|
603
|
buttons.Add(ButtonGroup.delete());
|
|
603
|
604
|
}
|
|
604
|
605
|
|
|
|
@@ -7565,23 +7566,22 @@ namespace CallCenterApi.Interface.Controllers.workorder
|
|
7565
|
7566
|
{
|
|
7566
|
7567
|
if (id <= 0)
|
|
7567
|
7568
|
return Error("请输入正确编号");
|
|
7568
|
|
- var istrue = new BLL.T_Bus_WorkOrder().Exists(workorderid);
|
|
7569
|
|
- if (istrue)
|
|
|
7569
|
+ if (workorderBLL.Exists(workorderid))
|
|
7570
|
7570
|
return Error("工单编号重复");
|
|
7571
|
7571
|
if (string.IsNullOrEmpty(time))
|
|
7572
|
7572
|
return Error("请选择年份");
|
|
7573
|
7573
|
DateTime times = DateTime.Now ;
|
|
7574
|
7574
|
try
|
|
7575
|
7575
|
{
|
|
7576
|
|
- times = DateTime.Parse(time + DateTime.Now.ToString("MM-dd HH:mm:ss"));
|
|
|
7576
|
+ times = DateTime.Parse(time + DateTime.Now.ToString("-MM-dd HH:mm:ss"));
|
|
7577
|
7577
|
}
|
|
7578
|
7578
|
catch
|
|
7579
|
7579
|
{
|
|
7580
|
7580
|
return Error("请输入正确年份");
|
|
7581
|
7581
|
}
|
|
7582
|
|
-
|
|
7583
|
|
- modelT_Bus_WorkOrder.F_WorkOrderId = workorderBLL.GetNewWorkOrderID
|
|
7584
|
|
- (DbHelperSQL.GetSingle($"exec [GetNewWorkOrderIdByYear1] '{id}','{times.ToString ("yyyy-MM-dd HH:mm:ss")}'").ToString());
|
|
|
7582
|
+
|
|
|
7583
|
+ modelT_Bus_WorkOrder.F_WorkOrderId =
|
|
|
7584
|
+ DbHelperSQL.GetSingle($"exec [GetNewWorkOrderIdByYear1] '{id}','{times.ToString("yyyy-MM-dd HH:mm:ss")}'").ToString();
|
|
7585
|
7585
|
|
|
7586
|
7586
|
}
|
|
7587
|
7587
|
else
|
|
|
@@ -9431,7 +9431,7 @@ namespace CallCenterApi.Interface.Controllers.workorder
|
|
9431
|
9431
|
if (!string.IsNullOrEmpty(title))
|
|
9432
|
9432
|
modelT_Bus_WorkOrder.F_ComTitle = title;
|
|
9433
|
9433
|
if (!string.IsNullOrEmpty(keys))
|
|
9434
|
|
- modelT_Bus_WorkOrder.F_Key = keys;
|
|
|
9434
|
+ modelT_Bus_WorkOrder.F_ComContent = keys;
|
|
9435
|
9435
|
|
|
9436
|
9436
|
workorderBLL.Update(modelT_Bus_WorkOrder);
|
|
9437
|
9437
|
#endregion
|
|
|
@@ -9506,7 +9506,7 @@ namespace CallCenterApi.Interface.Controllers.workorder
|
|
9506
|
9506
|
if (!string.IsNullOrEmpty(title))
|
|
9507
|
9507
|
modelT_Bus_WorkOrder1.F_ComTitle = title;
|
|
9508
|
9508
|
if (!string.IsNullOrEmpty(keys))
|
|
9509
|
|
- modelT_Bus_WorkOrder1.F_Key = keys;
|
|
|
9509
|
+ modelT_Bus_WorkOrder1.F_ComContent = keys;
|
|
9510
|
9510
|
modelT_Bus_WorkOrder1.F_WorkOrderId = whorkorderid +"-"+ son;
|
|
9511
|
9511
|
modelT_Bus_WorkOrder1.F_MainWorkOrderId = modelT_Bus_WorkOrder.F_WorkOrderId;
|
|
9512
|
9512
|
modelT_Bus_WorkOrder1.F_Id = workorderBLL.Add(modelT_Bus_WorkOrder1);
|
|
|
@@ -9759,7 +9759,7 @@ namespace CallCenterApi.Interface.Controllers.workorder
|
|
9759
|
9759
|
if (!string.IsNullOrEmpty(title))
|
|
9760
|
9760
|
modelT_Bus_WorkOrder1.F_ComTitle = title;
|
|
9761
|
9761
|
if (!string.IsNullOrEmpty(keys))
|
|
9762
|
|
- modelT_Bus_WorkOrder1.F_Key = keys;
|
|
|
9762
|
+ modelT_Bus_WorkOrder1.F_ComContent = keys;
|
|
9763
|
9763
|
|
|
9764
|
9764
|
modelT_Bus_WorkOrder1.F_Id = workorderBLL.Add(modelT_Bus_WorkOrder1);
|
|
9765
|
9765
|
|
|
|
@@ -15271,12 +15271,60 @@ namespace CallCenterApi.Interface.Controllers.workorder
|
|
15271
|
15271
|
modelT_Bus_WorkOrder.F_DeleteUser= userModel.F_UserCode;
|
|
15272
|
15272
|
modelT_Bus_WorkOrder.F_DeleteTime = DateTime.Now;
|
|
15273
|
15273
|
|
|
|
15274
|
+ //办理过程
|
|
|
15275
|
+ var Operation = new BLL.T_Bus_Operation().GetModelList($"F_WorkOrderId='{modelT_Bus_WorkOrder.F_WorkOrderId }'");
|
|
|
15276
|
+ foreach (var cg in Operation)
|
|
|
15277
|
+ {
|
|
|
15278
|
+ cg.F_IsDelete = 1;
|
|
|
15279
|
+ cg.F_DeleteTime = DateTime.Now;
|
|
|
15280
|
+ new BLL.T_Bus_Operation().Update(cg);
|
|
|
15281
|
+ }
|
|
|
15282
|
+
|
|
|
15283
|
+ //办理过程
|
|
|
15284
|
+ var AssignedInfo = new BLL.T_Bus_AssignedInfo ().GetModelList($"F_WorkOrderId='{modelT_Bus_WorkOrder.F_WorkOrderId }'");
|
|
|
15285
|
+ foreach (var cg in AssignedInfo)
|
|
|
15286
|
+ {
|
|
|
15287
|
+ cg.F_IsDelete = 1;
|
|
|
15288
|
+ cg.F_DeleteUser = userModel.F_UserCode;
|
|
|
15289
|
+ cg.F_DeleteTime = DateTime.Now;
|
|
|
15290
|
+ new BLL.T_Bus_AssignedInfo().Update(cg);
|
|
|
15291
|
+ }
|
|
|
15292
|
+ var AssignedInfo_Next = new BLL.T_Bus_AssignedInfo_Next ().GetModelList($"F_WorkOrderId='{modelT_Bus_WorkOrder.F_WorkOrderId }'");
|
|
|
15293
|
+ foreach (var cg in AssignedInfo_Next)
|
|
|
15294
|
+ {
|
|
|
15295
|
+ cg.F_IsDelete = 1;
|
|
|
15296
|
+ cg.F_DeleteUser = userModel.F_UserCode;
|
|
|
15297
|
+ cg.F_DeleteTime = DateTime.Now;
|
|
|
15298
|
+ new BLL.T_Bus_AssignedInfo_Next().Update(cg);
|
|
|
15299
|
+ }
|
|
|
15300
|
+ var Bus_Feedback = new BLL.T_Bus_Feedback ().GetModelList($"F_WorkOrderId='{modelT_Bus_WorkOrder.F_WorkOrderId }'");
|
|
|
15301
|
+ foreach (var cg in Bus_Feedback)
|
|
|
15302
|
+ {
|
|
|
15303
|
+ cg.F_IsDelete = 1;
|
|
|
15304
|
+ cg.F_DeleteUser = userModel.F_UserCode;
|
|
|
15305
|
+ cg.F_DeleteTime = DateTime.Now;
|
|
|
15306
|
+ new BLL.T_Bus_Feedback().Update(cg);
|
|
|
15307
|
+ }
|
|
|
15308
|
+ var Bus_Feedback_Next = new BLL.T_Bus_Feedback_Next().GetModelList($"F_WorkOrderId='{modelT_Bus_WorkOrder.F_WorkOrderId }'");
|
|
|
15309
|
+ foreach (var cg in Bus_Feedback_Next)
|
|
|
15310
|
+ {
|
|
|
15311
|
+ cg.F_IsDelete = 1;
|
|
|
15312
|
+ cg.F_DeleteUser = userModel.F_UserCode;
|
|
|
15313
|
+ cg.F_DeleteTime = DateTime.Now;
|
|
|
15314
|
+ new BLL.T_Bus_Feedback_Next().Update(cg);
|
|
|
15315
|
+ }
|
|
|
15316
|
+ var Bus_DelayTime = new BLL.T_Bus_DelayTime ().GetModelList($"F_WorkOrderId='{modelT_Bus_WorkOrder.F_WorkOrderId }'");
|
|
|
15317
|
+ foreach (var cg in Bus_DelayTime)
|
|
|
15318
|
+ {
|
|
|
15319
|
+ cg.F_IsDelete = 1;
|
|
|
15320
|
+ cg.F_DeleteUser = userModel.F_UserCode;
|
|
|
15321
|
+ cg.F_DeleteTime = DateTime.Now;
|
|
|
15322
|
+ new BLL.T_Bus_DelayTime().Update(cg);
|
|
|
15323
|
+ }
|
|
15274
|
15324
|
|
|
15275
|
15325
|
var str = modelT_Bus_WorkOrder.F_WorkOrderId.Split('】');
|
|
15276
|
15326
|
if (str != null && str.Length > 0)
|
|
15277
|
15327
|
modelT_Bus_WorkOrder.F_WorkOrderId = $"【{str[1]}-作废-{DateTime.Now.ToString("yyyyMMdd")}】";
|
|
15278
|
|
-
|
|
15279
|
|
-
|
|
15280
|
15328
|
workorderBLL.Update(modelT_Bus_WorkOrder);
|
|
15281
|
15329
|
#endregion
|
|
15282
|
15330
|
|