zhoufan 3 anni fa
parent
commit
3ef8b88e91

File diff suppressed because it is too large
+ 62 - 2
CallCenterApi/CallCenterApi.Interface/CallCenterApi.Interface/Controllers/report/WorkOrderReportController.cs


+ 6 - 6
CallCenterApi/CallCenterApi.Interface/CallCenterApi.Interface/Controllers/workorder/WorkOrderController.cs

2118
                                 }
2118
                                 }
2119
                             }
2119
                             }
2120
                         }
2120
                         }
2121
-
2122
-
2123
-
2124
-
2125
                         #endregion
2121
                         #endregion
2126
                     }
2122
                     }
2127
                     else
2123
                     else
12619
                                 
12615
                                 
12620
                                 if (nexttype == 0)
12616
                                 if (nexttype == 0)
12621
                                 {
12617
                                 {
12618
+                                    keyValuePairs.Add("F_Note", "");
12622
                                     keyValuePairs.Add("F_WorkState", 7);
12619
                                     keyValuePairs.Add("F_WorkState", 7);
12623
 
12620
 
12624
                                     modelT_Bus_WorkOrder.F_WorkState = (int)EnumWorkState.visit;//已回访
12621
                                     modelT_Bus_WorkOrder.F_WorkState = (int)EnumWorkState.visit;//已回访
12653
                                     //  modelT_Bus_WorkOrder.F_IsSms = 0;
12650
                                     //  modelT_Bus_WorkOrder.F_IsSms = 0;
12654
                                     keyValuePairs2.Add("F_Identification", 0);
12651
                                     keyValuePairs2.Add("F_Identification", 0);
12655
                                     // modelT_Bus_WorkOrder.F_Identification = 0;
12652
                                     // modelT_Bus_WorkOrder.F_Identification = 0;
12653
+                                    keyValuePairs2.Add("F_Note", "");
12656
                                     workorderBLL.UpdateWorkOrder(modelT_Bus_WorkOrder.F_Id, keyValuePairs2);
12654
                                     workorderBLL.UpdateWorkOrder(modelT_Bus_WorkOrder.F_Id, keyValuePairs2);
12657
                                     #endregion
12655
                                     #endregion
12658
                                     opt = "于" + DateTime.Now
12656
                                     opt = "于" + DateTime.Now
12683
                                         {
12681
                                         {
12684
                                             Dictionary<string, object> keyValuePairs3 = new Dictionary<string, object>();
12682
                                             Dictionary<string, object> keyValuePairs3 = new Dictionary<string, object>();
12685
                                             keyValuePairs3.Add("F_WorkState", (int)EnumWorkState.backaudit);
12683
                                             keyValuePairs3.Add("F_WorkState", (int)EnumWorkState.backaudit);
12684
+                                            keyValuePairs3.Add("F_Note", "");
12686
                                             modelT_Bus_WorkOrder.F_WorkState = (int)EnumWorkState.backaudit;//重办审核
12685
                                             modelT_Bus_WorkOrder.F_WorkState = (int)EnumWorkState.backaudit;//重办审核
12687
                                             if (statistics > 0)
12686
                                             if (statistics > 0)
12688
                                             {
12687
                                             {
12773
                                                 // modelT_Bus_WorkOrder.F_DealUser = "";
12772
                                                 // modelT_Bus_WorkOrder.F_DealUser = "";
12774
                                                 keyValuePairs3.Add("F_DealTime", null);
12773
                                                 keyValuePairs3.Add("F_DealTime", null);
12775
                                                 //   modelT_Bus_WorkOrder.F_DealTime = null;
12774
                                                 //   modelT_Bus_WorkOrder.F_DealTime = null;
12775
+                                                keyValuePairs3.Add("F_Note", "");
12776
                                                 if (workorderBLL.UpdateWorkOrder(modelT_Bus_WorkOrder.F_Id, keyValuePairs3))
12776
                                                 if (workorderBLL.UpdateWorkOrder(modelT_Bus_WorkOrder.F_Id, keyValuePairs3))
12777
                                                 {
12777
                                                 {
12778
                                                     var user = new BLL.T_Sys_UserAccount().GetModelList("F_DeptId in ('" + modelT_Bus_WorkOrder.F_MainDeptId + "') ");
12778
                                                     var user = new BLL.T_Sys_UserAccount().GetModelList("F_DeptId in ('" + modelT_Bus_WorkOrder.F_MainDeptId + "') ");
15550
 
15550
 
15551
                 Model.T_Bus_WorkOrder modelT_Bus_WorkOrder = workorderBLL.GetModel(workorderid);
15551
                 Model.T_Bus_WorkOrder modelT_Bus_WorkOrder = workorderBLL.GetModel(workorderid);
15552
 
15552
 
15553
-                if (modelT_Bus_WorkOrder != null&& modelT_Bus_WorkOrder.F_WorkState== (int)EnumWorkState.visit)
15553
+                if (modelT_Bus_WorkOrder != null && (modelT_Bus_WorkOrder.F_WorkState == (int)EnumWorkState.dealed || modelT_Bus_WorkOrder.F_WorkState == (int)EnumWorkState.visit))
15554
                 {
15554
                 {
15555
                     Dictionary<string, object> keyValuePairs = new Dictionary<string, object>();
15555
                     Dictionary<string, object> keyValuePairs = new Dictionary<string, object>();
15556
                     keyValuePairs.Add("F_Note", modelT_Bus_WorkOrder.F_Note + "|||" + note);
15556
                     keyValuePairs.Add("F_Note", modelT_Bus_WorkOrder.F_Note + "|||" + note);
15588
 
15588
 
15589
                 Model.T_Bus_WorkOrder modelT_Bus_WorkOrder = workorderBLL.GetModel(workorderid);
15589
                 Model.T_Bus_WorkOrder modelT_Bus_WorkOrder = workorderBLL.GetModel(workorderid);
15590
 
15590
 
15591
-                if (modelT_Bus_WorkOrder != null && modelT_Bus_WorkOrder.F_WorkState == (int)EnumWorkState.visit)
15591
+                if (modelT_Bus_WorkOrder != null && (modelT_Bus_WorkOrder.F_WorkState == (int)EnumWorkState.dealed || modelT_Bus_WorkOrder.F_WorkState == (int)EnumWorkState.visit))
15592
                 {
15592
                 {
15593
                     Dictionary<string, object> keyValuePairs = new Dictionary<string, object>();
15593
                     Dictionary<string, object> keyValuePairs = new Dictionary<string, object>();
15594
                     keyValuePairs.Add("F_Note", note);
15594
                     keyValuePairs.Add("F_Note", note);

+ 2 - 0
CallCenterApi/CallCenterApi.Interface/CallCenterApi.Interface/Models/Common/ButtonGroup.cs

521
                             buttons.Add(Audittransfer());
521
                             buttons.Add(Audittransfer());
522
                             buttons.Add(Unsuccessful());
522
                             buttons.Add(Unsuccessful());
523
                             buttons.Add(turnsee());
523
                             buttons.Add(turnsee());
524
+                            buttons.Add(Note());
524
                         }
525
                         }
525
                         if (code == "ZXHWY")
526
                         if (code == "ZXHWY")
526
                         {
527
                         {
531
                             buttons.Add(Audittransfer());
532
                             buttons.Add(Audittransfer());
532
                             buttons.Add(Unsuccessful());
533
                             buttons.Add(Unsuccessful());
533
                             buttons.Add(turnsee());
534
                             buttons.Add(turnsee());
535
+                            buttons.Add(Note());
534
                         }
536
                         }
535
                     }
537
                     }
536
                     break;
538
                     break;