|  | @@ -734,42 +734,42 @@ namespace PMS.NetCore.Controllers
 | 
	
		
			
				|  |  |          }
 | 
	
		
			
				|  |  |  
 | 
	
		
			
				|  |  |        
 | 
	
		
			
				|  |  | -        /// <summary>
 | 
	
		
			
				|  |  | -        /// 获取员工巡更计划
 | 
	
		
			
				|  |  | -        /// </summary>
 | 
	
		
			
				|  |  | -        /// <param name="staffcode"></param>
 | 
	
		
			
				|  |  | -        /// <param name="dateStr"></param>
 | 
	
		
			
				|  |  | -        /// <param name="pageNumber"></param>
 | 
	
		
			
				|  |  | -        /// <param name="pageSize"></param>
 | 
	
		
			
				|  |  | -        /// <returns></returns>
 | 
	
		
			
				|  |  | -        [HttpGet]
 | 
	
		
			
				|  |  | -        [Route("GetEmployeePlanList")]
 | 
	
		
			
				|  |  | -        public JsonResult GetEmployeePlanList(string staffcode, string dateStr, int pageNumber, int pageSize)
 | 
	
		
			
				|  |  | -        {
 | 
	
		
			
				|  |  | -            logger.Info($"【Getfdc_pm_housemeterList】dto:{JsonConvert.SerializeObject(staffcode + "-" + dateStr)}");
 | 
	
		
			
				|  |  | -            var res = new ApiResponse();
 | 
	
		
			
				|  |  | -            try
 | 
	
		
			
				|  |  | -            {
 | 
	
		
			
				|  |  | -                if (dateStr.IsNullOrEmpty())
 | 
	
		
			
				|  |  | -                {
 | 
	
		
			
				|  |  | -                    dateStr = DateTime.Now.ToString("yyyy-MM-dd");
 | 
	
		
			
				|  |  | -                }
 | 
	
		
			
				|  |  | -
 | 
	
		
			
				|  |  | -                var manager = new fdc_pm_inspection_plandetailManager();
 | 
	
		
			
				|  |  | -                var data = manager.GetEmployeePlanList(staffcode, dateStr, pageNumber, pageSize);
 | 
	
		
			
				|  |  | -                res.IsSuccess = true;
 | 
	
		
			
				|  |  | -                logger.Info($"GetEmployeePlanList 输出参数】res:{JsonConvert.SerializeObject(data)}");
 | 
	
		
			
				|  |  | -                res.Data = data;
 | 
	
		
			
				|  |  | -
 | 
	
		
			
				|  |  | -                return Json(res);
 | 
	
		
			
				|  |  | -            }
 | 
	
		
			
				|  |  | -            catch (Exception ex)
 | 
	
		
			
				|  |  | -            {
 | 
	
		
			
				|  |  | -                res.ErrMsg = ex.Message;
 | 
	
		
			
				|  |  | -                res.Code = 500;
 | 
	
		
			
				|  |  | -                return Json(res);
 | 
	
		
			
				|  |  | -            }
 | 
	
		
			
				|  |  | -        }
 | 
	
		
			
				|  |  | +        ///// <summary>
 | 
	
		
			
				|  |  | +        ///// 获取员工巡更计划
 | 
	
		
			
				|  |  | +        ///// </summary>
 | 
	
		
			
				|  |  | +        ///// <param name="staffcode"></param>
 | 
	
		
			
				|  |  | +        ///// <param name="dateStr"></param>
 | 
	
		
			
				|  |  | +        ///// <param name="pageNumber"></param>
 | 
	
		
			
				|  |  | +        ///// <param name="pageSize"></param>
 | 
	
		
			
				|  |  | +        ///// <returns></returns>
 | 
	
		
			
				|  |  | +        //[HttpGet]
 | 
	
		
			
				|  |  | +        //[Route("GetEmployeePlanList")]
 | 
	
		
			
				|  |  | +        //public JsonResult GetEmployeePlanList(string staffcode, string dateStr, int pageNumber, int pageSize)
 | 
	
		
			
				|  |  | +        //{
 | 
	
		
			
				|  |  | +        //    logger.Info($"【Getfdc_pm_housemeterList】dto:{JsonConvert.SerializeObject(staffcode + "-" + dateStr)}");
 | 
	
		
			
				|  |  | +        //    var res = new ApiResponse();
 | 
	
		
			
				|  |  | +        //    try
 | 
	
		
			
				|  |  | +        //    {
 | 
	
		
			
				|  |  | +        //        if (dateStr.IsNullOrEmpty())
 | 
	
		
			
				|  |  | +        //        {
 | 
	
		
			
				|  |  | +        //            dateStr = DateTime.Now.ToString("yyyy-MM-dd");
 | 
	
		
			
				|  |  | +        //        }
 | 
	
		
			
				|  |  | +
 | 
	
		
			
				|  |  | +        //        var manager = new fdc_pm_inspection_plandetailManager();
 | 
	
		
			
				|  |  | +        //        var data = manager.GetEmployeePlanList(staffcode, dateStr, pageNumber, pageSize);
 | 
	
		
			
				|  |  | +        //        res.IsSuccess = true;
 | 
	
		
			
				|  |  | +        //        logger.Info($"GetEmployeePlanList 输出参数】res:{JsonConvert.SerializeObject(data)}");
 | 
	
		
			
				|  |  | +        //        res.Data = data;
 | 
	
		
			
				|  |  | +
 | 
	
		
			
				|  |  | +        //        return Json(res);
 | 
	
		
			
				|  |  | +        //    }
 | 
	
		
			
				|  |  | +        //    catch (Exception ex)
 | 
	
		
			
				|  |  | +        //    {
 | 
	
		
			
				|  |  | +        //        res.ErrMsg = ex.Message;
 | 
	
		
			
				|  |  | +        //        res.Code = 500;
 | 
	
		
			
				|  |  | +        //        return Json(res);
 | 
	
		
			
				|  |  | +        //    }
 | 
	
		
			
				|  |  | +        //}
 | 
	
		
			
				|  |  |  
 | 
	
		
			
				|  |  |  
 | 
	
		
			
				|  |  |  
 |