Browse Source

添加车公司信息查询地区下拉框

wangh 1 year ago
parent
commit
5ec3b811a4
1 changed files with 32 additions and 21 deletions
  1. 32 21
      OASystem/OASystem.Api/Controllers/ResourceController.cs

+ 32 - 21
OASystem/OASystem.Api/Controllers/ResourceController.cs

@@ -45,31 +45,15 @@ namespace OASystem.API.Controllers
         {
             try
             {
-                if (dto.PortType==1)
-                {
-                    var carDada = _carDataRep.QueryDto<Res_CarData, CarDataView>().ToList();
-                    if (carDada.Count == 0)
-                    {
-                        return Ok(JsonView(false, "暂无数据!"));
-                    }
-                    carDada = carDada.OrderByDescending(s => s.CreateTime).ToList();
-                    return Ok(JsonView(true, "查询成功", carDada));
-                }
-                else if(dto.PortType==2)
+                Result LocalGuide = await _carDataRep.QueryCarData(dto);
+                if (LocalGuide.Code == 0)
                 {
-                    var carDada = _carDataRep.QueryDto<Res_CarData, CarDataView>().ToList();
-                    if (carDada.Count == 0)
-                    {
-                        return Ok(JsonView(false, "暂无数据!"));
-                    }
-                    carDada=carDada.OrderByDescending(s=>s.CreateTime).ToList();
-                    return Ok(JsonView(true, "查询成功", carDada));
+                    return Ok(JsonView(true, "查询成功", LocalGuide.Data));
                 }
                 else
                 {
-                    return Ok(JsonView(false, "暂无数据!"));
+                    return Ok(JsonView(false, LocalGuide.Msg));
                 }
-               
             }
             catch (Exception)
             {
@@ -79,6 +63,33 @@ namespace OASystem.API.Controllers
            
             
         }
+
+        /// <summary>
+        /// 车公司资料下拉框数据
+        /// </summary>
+        /// <returns></returns>
+        [HttpPost]
+        [ProducesResponseType(typeof(JsonView), StatusCodes.Status200OK)]
+        public async Task<IActionResult> QueryCarSelect()
+        {
+            try
+            {
+                var CarData = _carDataRep.QueryDto<Res_CarData, CarDataSelectView>().ToList();
+                if (CarData.Count == 0)
+                {
+                    return Ok(JsonView(false, "暂无数据!"));
+                }
+                CarData.Add(new CarDataSelectView { Id = 0, UnitArea = "全部" });
+                CarData = CarData.Where((x, i) => CarData.FindIndex(z => z.UnitArea == x.UnitArea) == i).ToList();
+                CarData = CarData.OrderBy(x => x.Id).ToList();
+                return Ok(JsonView(true, "查询成功", CarData));
+            }
+            catch (Exception)
+            {
+                return Ok(JsonView(false, "程序错误!"));
+                throw;
+            }
+        }
         /// <summary>
         /// 车公司信息添加
         /// </summary>
@@ -125,7 +136,7 @@ namespace OASystem.API.Controllers
                 throw;
             }
         }
-
+       
         /// <summary>
         /// 车公司信息修改
         /// </summary>