Parcourir la source

修改电子巡更接口

yinyafei il y a 2 ans
Parent
commit
9202ff0f2d

+ 2 - 2
PMS.NetCore/PMS.NetCore.BusinessCore/BaseCore/fdc_pm_inspection_planManager.cs

@@ -239,8 +239,8 @@ namespace PMS.NetCore.BusinessCore.BaseCore
             var sql = @$"select b.autoid,a.plandate, a.plantime, b.pointcode
                         from fdc_pm_inspection_employeeplan a 
                         left join fdc_pm_inspection_plandetail b on a.plancode=b.plancode and a.plandate=b.plandate and a.plantime=b.plantime
-                        where userid={model.userId} and pointcode='{model.pointCode}'  and 
-                        getdate()  between  (CONVERT(varchar(100),'2022-05-16',23)+' '+ SUBSTRING(a.plantime,0,6))and (CONVERT(varchar(100),'2022-05-16',23)+' '+ SUBSTRING(a.plantime,7,5))";
+                        where userid={model.userId} and pointcode='{model.pointCode}'  and a.plandate=CONVERT(varchar(100),getdate(),23) and 
+                        getdate()  between  (CONVERT(varchar(100),getdate(),23)+' '+ SUBSTRING(a.plantime,0,6))and (CONVERT(varchar(100),getdate(),23)+' '+ SUBSTRING(a.plantime,7,5))";
 
 
             var planDetailManager = new fdc_pm_inspection_plandetailManager();

+ 36 - 36
PMS.NetCore/PMS.NetCore/Controllers/ElectronicInspectionController.cs

@@ -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);
+        //    }
+        //}
 
 
 

+ 0 - 10
PMS.NetCore/PMS.NetCore/PMS.NetCore.xml

@@ -214,16 +214,6 @@
             <param name="model"></param>
             <returns></returns>
         </member>
-        <member name="M:PMS.NetCore.Controllers.ElectronicInspectionController.GetEmployeePlanList(System.String,System.String,System.Int32,System.Int32)">
-            <summary>
-            获取员工巡更计划
-            </summary>
-            <param name="staffcode"></param>
-            <param name="dateStr"></param>
-            <param name="pageNumber"></param>
-            <param name="pageSize"></param>
-            <returns></returns>
-        </member>
         <member name="M:PMS.NetCore.Controllers.ElectronicInspectionController.GetPlanDetailList(System.String,System.String,System.String)">
             <summary>
             获取巡更路线