[FE API] 各分表查詢通能 初步完成
This commit is contained in:
		
							parent
							
								
									78d73cc11a
								
							
						
					
					
						commit
						58aad75319
					
				@ -999,6 +999,20 @@ namespace FrontendWebApi.ApiControllers
 | 
				
			|||||||
        [Route("api/ElectricList_keke")]
 | 
					        [Route("api/ElectricList_keke")]
 | 
				
			||||||
        public async Task<ActionResult<ApiResult<List<HydroMeterOutput>>>> ElectricList_keke([FromBody] HydroMeterInput input)
 | 
					        public async Task<ActionResult<ApiResult<List<HydroMeterOutput>>>> ElectricList_keke([FromBody] HydroMeterInput input)
 | 
				
			||||||
        {
 | 
					        {
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					            //switch (input.Mode)
 | 
				
			||||||
 | 
					            //{
 | 
				
			||||||
 | 
					            //    case HydroMeterInputSearchMode.All:
 | 
				
			||||||
 | 
					            //        break;
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					            //    case HydroMeterInputSearchMode.Custom: break;
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					            //    default: 
 | 
				
			||||||
 | 
					                    
 | 
				
			||||||
 | 
					            //        break;
 | 
				
			||||||
 | 
					                    
 | 
				
			||||||
 | 
					            //}   
 | 
				
			||||||
 | 
					
 | 
				
			||||||
            ApiResult<List<HydroMeterOutput>> apiResult = new ApiResult<List<HydroMeterOutput>>(jwt_str);
 | 
					            ApiResult<List<HydroMeterOutput>> apiResult = new ApiResult<List<HydroMeterOutput>>(jwt_str);
 | 
				
			||||||
            if (!jwtlife)
 | 
					            if (!jwtlife)
 | 
				
			||||||
            {
 | 
					            {
 | 
				
			||||||
@ -1031,8 +1045,8 @@ namespace FrontendWebApi.ApiControllers
 | 
				
			|||||||
                //Console.WriteLine(previousYear.ToString("yyyy-MM")); // 2022-08
 | 
					                //Console.WriteLine(previousYear.ToString("yyyy-MM")); // 2022-08
 | 
				
			||||||
                //Console.WriteLine(previousMonth.ToString("yyyy-MM")); // 2023-07
 | 
					                //Console.WriteLine(previousMonth.ToString("yyyy-MM")); // 2023-07
 | 
				
			||||||
 | 
					
 | 
				
			||||||
                var startTime = start.ToString("yyyy-MM"); // 查詢月份的去年 (去年同月)
 | 
					                var startTime = start.ToString("yyyy-MM") + "-01"; // 查詢月份的去年 (去年同月)
 | 
				
			||||||
                var endTime = end.ToString("yyyy-MM"); // 查詢月份的上個月
 | 
					                var endTime = end.ToString("yyyy-MM") + "-01"; // 查詢月份的上個月
 | 
				
			||||||
                var lastYear = previousYear.ToString("yyyy-MM");
 | 
					                var lastYear = previousYear.ToString("yyyy-MM");
 | 
				
			||||||
                var lastMonth = previousMonth.ToString("yyyy-MM");
 | 
					                var lastMonth = previousMonth.ToString("yyyy-MM");
 | 
				
			||||||
                var searchTime = input.startTime; // 欲查詢的月份
 | 
					                var searchTime = input.startTime; // 欲查詢的月份
 | 
				
			||||||
 | 
				
			|||||||
@ -16,6 +16,15 @@ namespace FrontendWebApi.Models
 | 
				
			|||||||
        public string startTime { get; set; }
 | 
					        public string startTime { get; set; }
 | 
				
			||||||
        public string endTime { get; set; }
 | 
					        public string endTime { get; set; }
 | 
				
			||||||
        public decimal? price { get; set; }
 | 
					        public decimal? price { get; set; }
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					        public HydroMeterInputSearchMode Mode { get; set; } = HydroMeterInputSearchMode.All;
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					    }
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					    
 | 
				
			||||||
 | 
					    public enum HydroMeterInputSearchMode: int { 
 | 
				
			||||||
 | 
					        All = 0,
 | 
				
			||||||
 | 
					        Custom = 1,
 | 
				
			||||||
    }
 | 
					    }
 | 
				
			||||||
 | 
					
 | 
				
			||||||
    public class HydroMeterOutput
 | 
					    public class HydroMeterOutput
 | 
				
			||||||
 | 
				
			|||||||
		Loading…
	
		Reference in New Issue
	
	Block a user