Sfoglia il codice sorgente

修改调度单一操作

yuqian 7 anni fa
parent
commit
d085fcca40

+ 14 - 3
CallCenterApi/CallCenterApi.Interface/CallCenterApi.Interface/Controllers/IndexController.cs

@@ -412,11 +412,22 @@ namespace CallCenterApi.Interface.Controllers
412 412
             {
413 413
                 int[] sts = { 1, 3, 5, 7 };
414 414
 
415
-                string sql = "select F_WorkState as state,count(1) con from T_Bus_WorkOrder where F_IsDelete=0 and F_WorkState in (1,3,5,7) "
416
-                    + " group by F_WorkState order by F_WorkState";
415
+                string sql = "select F_WorkState as state,count(1) con from T_Bus_WorkOrder where F_IsDelete=0 and F_WorkState in (3,5,7) and "
416
+                    + "F_WorkOrderId in (select F_WorkOrderId from T_Bus_AssignedInfo where F_State=1 and F_IsDelete=0 and F_CreateUser='" 
417
+                    + userModel.F_UserCode + "')  group by F_WorkState order by F_WorkState";
417 418
 
418 419
                 var dt = DbHelperSQL.Query(sql).Tables[0];
419
-                var obj = sts.Select(p => {
420
+                DataRow dr = dt.NewRow();
421
+                dr["state"] = 1;
422
+                string sqlcon = "select count(1) from T_Bus_WorkOrder where F_IsDelete=0 and F_WorkState=1 and (F_WorkOrderId in "
423
+                    + "(select F_WorkOrderId from T_Bus_AssignedInfo where F_State=1 and F_IsDelete=0 and F_CreateUser='"
424
+                    + userModel.F_UserCode + "') or (select F_WorkOrderId from T_Bus_AssignedInfo where F_State=1 and F_IsDelete=0 "
425
+                    + "and T_Bus_AssignedInfo.F_WorkOrderId = T_Bus_WorkOrder.F_WorkOrderId ) is null)";
426
+                dr["con"] = DbHelperSQL.GetSingle(sqlcon).ToString();
427
+
428
+                dt.Rows.InsertAt(dr, 0);
429
+                var obj = sts.Select(p =>
430
+                {
420 431
                     var list = dt.Select(" state=" + p);
421 432
                     return new
422 433
                     {

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

@@ -687,6 +687,12 @@ namespace CallCenterApi.Interface.Controllers.workorder
687 687
                                 sql += ")";
688 688
                             }
689 689
                         }
690
+                        else
691
+                        {
692
+                            sql += " and (F_WorkOrderId in (select F_WorkOrderId from T_Bus_AssignedInfo where F_State = 1 and F_IsDelete = 0 "
693
+                                + "and F_CreateUser = '" + userModel.F_UserCode + "') or (select F_WorkOrderId from T_Bus_AssignedInfo where"
694
+                                + " F_State = 1 and F_IsDelete = 0and T_Bus_AssignedInfo.F_WorkOrderId = T_Bus_WorkOrder.F_WorkOrderId) is null)";
695
+                        }
690 696
                     }
691 697
                     else
692 698
                     {