巡更接口修改

PMS.NetCore/PMS.NetCore.BusinessCore/BaseCore/fdc_pm_inspection_planManager.cs

@@ -189,13 +189,18 @@ namespace PMS.NetCore.BusinessCore.BaseCore
           
 
             Db.BeginTran();
+            List<string> fileNameList = new List<string>();
             try
             {
-               var sql = @$"update fdc_pm_inspection_plandetail set 
+              
+                if(!string.IsNullOrEmpty(model.reamrk))
+                {
+                    var sql = @$"update fdc_pm_inspection_plandetail set 
                         remark='{model.reamrk}' 
                         where autoid={model.autoid}";
 
-                int rows = Db.Ado.ExecuteCommand(sql);
+                    int rows = Db.Ado.ExecuteCommand(sql);
+                }              
 
                 foreach (var item in model.fileList)
                 {
@@ -207,15 +212,24 @@ namespace PMS.NetCore.BusinessCore.BaseCore
                         Db.RollbackTran();
                         return "上传失败";
                     }
-                    string sqlfile = $"insert into Fdc_pm_file values ('ins{model.autoid}','{filename}','{name}')";
+                    fileNameList.Add(filename);                    
+                }
+
+                if(fileNameList.Count>0)
+                {
+                    string attachStr = string.Join(',', fileNameList);
+
+                    string sqlfile = @$"update fdc_pm_inspection_plandetail set 
+                                    attach='{attachStr}' 
+                                    where autoid={model.autoid}";
                     var row = Db.Ado.ExecuteCommand(sqlfile);
-                   
+
                     if (row <= 0)
                     {
                         Db.RollbackTran();
                         return "保存上传文件失败";
                     }
-                }
+                }               
 
                 Db.CommitTran();
                 return "success";
@@ -557,22 +571,34 @@ namespace PMS.NetCore.BusinessCore.BaseCore
         private string getPlanStatus(DateTime plandate, string plantime)
         {
             try
-            {
+            { 
+                DateTime currentTime = DateTime.Now;
                 string[] timeArr = plantime.Split('-');
                 DateTime startTime = Convert.ToDateTime(string.Format("{0} {1}:00", plandate.ToString("yyyy-MM-dd"), timeArr[0]));
                 DateTime endTime = Convert.ToDateTime(string.Format("{0} {1}:00", plandate.ToString("yyyy-MM-dd"), timeArr[1]));
-                DateTime currentTime = DateTime.Now;
-                if (getTimeSpan(currentTime, timeArr[0], timeArr[1]))
+
+                if (currentTime.ToShortDateString() == plandate.ToShortDateString()) //同一天
                 {
-                    return "开始巡逻";
+                    if (getTimeSpan(currentTime, timeArr[0], timeArr[1]))
+                    {
+                        return "开始巡逻";
+                    }
+                    else if (DateTime.Compare(currentTime, endTime) > 0)
+                    {
+
+                        return "已结束";
+                    }
+
+                    return "即将开始";
                 }
-                else if (DateTime.Compare(currentTime, endTime) > 0)
-                {
 
+                if (DateTime.Compare(Convert.ToDateTime(currentTime.ToShortDateString()), Convert.ToDateTime(plandate.ToShortDateString())) > 0)
+                {
                     return "已结束";
-                }
 
+                }
                 return "即将开始";
+
             }
             catch (Exception ex)
             {

PMS.NetCore/PMS.NetCore.Enties/DbModels/fdc_pm_inspection_point.cs

@@ -60,14 +60,7 @@ namespace Sugar.Enties.DbModels
         /// Default:
         /// Nullable:True
         /// </summary>  
-        public string hcode { get; set; }
-
-        /// <summary>
-        /// Desc:是否删除
-        /// Default:
-        /// Nullable:True
-        /// </summary>  
-        public bool isdel { get; set; }
+        public string hcode { get; set; }        
 
         /// <summary>
         /// Desc:创建时间

PMS.NetCore/PMS.NetCore/Controllers/ElectronicInspectionController.cs

@@ -48,7 +48,7 @@ namespace PMS.NetCore.Controllers
         public JsonResult GetPointList()
         {
             var manager = new fdc_pm_inspection_pointManager();
-            var list = manager.GetList(i => !i.isdel).ToList();
+            var list = manager.GetList();
 
             logger.Info("【GetPointList】接口输出：{JsonConvert.SerializeObject(list)}");
 
@@ -73,7 +73,7 @@ namespace PMS.NetCore.Controllers
 
             var point = manger.GetById(model.pointcode);
 
-            if (point != null && !point.isdel)
+            if (point != null )
             {
                 return Json("巡更点已经存在");
             }
@@ -138,7 +138,7 @@ namespace PMS.NetCore.Controllers
             var manger = new fdc_pm_inspection_pointManager();
 
             var point = manger.GetById(model.pointcode);
-            if (point != null && !point.isdel && point.pcode != model.pcode)
+            if (point != null &&  point.pcode != model.pcode)
             {
                 return Json("巡更点已经存在");
             }
@@ -177,9 +177,7 @@ namespace PMS.NetCore.Controllers
             if (model == null)
             {
                 return Json("该巡检点不存在，不能删除");
-            }
-
-            model.isdel = true;
+            }            
             var success = manager.Update(model);
 
             if (success)
@@ -701,7 +699,7 @@ namespace PMS.NetCore.Controllers
         /// <param name="model"></param>
         /// <returns></returns>
         [HttpPost]
-        [Route("PlandetailUpdate")]       
+        [Route("PlandetailUpdate")]
         public JsonResult PlandetailUpdate([FromBody] InspectionParamDTO model)
         {
             var res = new ApiResponse();
@@ -733,43 +731,44 @@ 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")]
+        [AllowAnonymous]
+        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);
+            }
+        }
 
 
 

PMS.NetCore/PMS.NetCore/Controllers/SystemConfigurationController.cs

@@ -1024,6 +1024,7 @@ namespace PMS.NetCore.Controllers
         /// 获取房产资料列表
         /// </summary>
         /// <returns></returns>
+        [AllowAnonymous]
         [HttpPost]
         [Route("GetFdc_pm_houseList")]
         public JsonResult GetFdc_pm_houseList()
@@ -1033,6 +1034,22 @@ namespace PMS.NetCore.Controllers
             logger.Info($"【GetFdc_pm_houseList】list:{JsonConvert.SerializeObject(list)}");
             return Json(list);
         }
+
+        /// <summary>
+        /// 获取房产资料列表
+        /// </summary>
+        /// <returns></returns>
+        [AllowAnonymous]
+        [HttpPost]
+        [Route("GetFdc_pm_houseListByBcode")]
+        public JsonResult GetFdc_pm_houseListByBcode([FromBody] SingleParamDTO dto)
+        {
+            var manager = new fdc_pm_houseManager();
+            var list = manager.GetList(m => m.bcode == dto.value);
+            logger.Info($"【GetFdc_pm_houseList】list:{JsonConvert.SerializeObject(list)}");
+            return Json(list);
+        }
+
         /// <summary>
         /// 获取房产资料实例
         /// </summary>