工单

代码/TVShoppingCallCenter_ZLJ/Controllers/Order/KGOrderController.cs

@@ -59,7 +59,7 @@ namespace TVShoppingCallCenter_ZLJ.Controllers.Order
         /// <param name="input"></param>
         /// <returns></returns>
         [HttpPost("/api/order/getorderlistbykgpage")]
-        public async Task<IActionResult> GetOrderListByKGPage(OrderInput input)
+        public async Task<IActionResult> GetOrderListByKGPage(OrderInput input,int state=-1)
         {
 
             List<IConditionalModel> conModels = new List<IConditionalModel>();
@@ -67,15 +67,15 @@ namespace TVShoppingCallCenter_ZLJ.Controllers.Order
 
 
             conModels.Add(new ConditionalModel() { FieldName = "F_State", ConditionalType = ConditionalType.GreaterThanOrEqual, FieldValue = "-2" });
-
+            
             if (input.F_State > -2)
             {
                 conModels.Add(new ConditionalModel() { FieldName = "F_State", ConditionalType = ConditionalType.Equal, FieldValue = input.F_State.ToString() });
 
             }
-            else
+            if (state == 0)
             {
-                conModels.Add(new ConditionalModel() { FieldName = "F_State", ConditionalType = ConditionalType.NoEqual, FieldValue = "0" });
+                conModels.Add(new ConditionalModel() { FieldName = "F_State", ConditionalType = ConditionalType.GreaterThanOrEqual , FieldValue = "3" });
             }
 
             conModels.Add(new ConditionalCollections()

代码/TVShoppingCallCenter_ZLJ/Controllers/Order/OrderMergeController.cs

@@ -237,14 +237,14 @@ namespace TVShoppingCallCenter_ZLJ.Controllers.Order
         /// <param name="input"></param>
         /// <returns></returns>
         [HttpPost("getordermergebypage")]
-        public async Task<IActionResult> GetOrderMergeByPage(OrderMergeInput input)
+        public async Task<IActionResult> GetOrderMergeByPage(OrderMergeInput input,int state=-1)
         {
 
             #region  拼接条件
 
             Expression<Func<T_Bus_OrderMerge, bool>> eq = a => a.F_AddUser == UserLogin.UserId.ObjToInt();
-
-
+            if (state>-1)
+            eq = eq.And(a => a.F_State !=0);
             if (!string.IsNullOrEmpty(input.F_OrderList))
             {
                 eq = eq.And(a => a.F_OrderList.Contains(input.F_OrderList));

代码/TVShoppingCallCenter_ZLJ/Controllers/Report/GradeController.cs

@@ -20,7 +20,7 @@ namespace TVShoppingCallCenter_ZLJ.Controllers.CallCenter
     /// <summary>
     /// 绩效报表
     /// </summary>
-    [Authorize]
+   // [Authorize]
     [Produces("application/json")]
     [Route("api/[controller]")]
     public class GradeController : BaseController
@@ -159,7 +159,7 @@ namespace TVShoppingCallCenter_ZLJ.Controllers.CallCenter
         /// <param name="id"></param>
         /// <returns></returns>
         [HttpPost("update")]
-        public async Task<IActionResult> Update([FromBody]SysUser_GradeInput input)
+        public async Task<IActionResult> Update([FromBody]T_SysUser_Grade input)
         {
             if (UserLogin.RoleCode == "XS" || UserLogin.RoleCode == "SH" || UserLogin.RoleCode == "KG")
             {
@@ -170,7 +170,7 @@ namespace TVShoppingCallCenter_ZLJ.Controllers.CallCenter
             {
                 return Error("只有有异议绩效才可以编辑修改");
             }
-            ModelConvertHelper<T_SysUser_Grade,SysUser_GradeInput>.ModeToModel(model, input);
+            ModelConvertHelper<T_SysUser_Grade, T_SysUser_Grade>.ModeToModel(model, input);
             model.F_State = 0;
             if (await busGradeRepository.Update(model))
             {