diff --git a/SGGL/BLL/JDGL/Check/MonthPlanService.cs b/SGGL/BLL/JDGL/Check/MonthPlanService.cs index f5e1cc5b..35b0e1f6 100644 --- a/SGGL/BLL/JDGL/Check/MonthPlanService.cs +++ b/SGGL/BLL/JDGL/Check/MonthPlanService.cs @@ -10,7 +10,7 @@ namespace BLL /// public class MonthPlanService { - public static Model.SGGLDB db = Funs.DB; + //public static Model.SGGLDB db = Funs.DB; /// /// 根据主键获取月度计划情况 diff --git a/SGGL/BLL/JDGL/Check/WeekItemService.cs b/SGGL/BLL/JDGL/Check/WeekItemService.cs index ca2335f4..ef9df543 100644 --- a/SGGL/BLL/JDGL/Check/WeekItemService.cs +++ b/SGGL/BLL/JDGL/Check/WeekItemService.cs @@ -10,8 +10,6 @@ namespace BLL /// public class WeekItemService { - public static Model.SGGLDB db = Funs.DB; - /// /// 根据主键获取自定义周情况 /// @@ -19,6 +17,7 @@ namespace BLL /// public static Model.JDGL_WeekItem GetWeekItemById(string WeekId) { + Model.SGGLDB db = Funs.DB; return db.JDGL_WeekItem.FirstOrDefault(e => e.WeekId == WeekId); } @@ -30,6 +29,7 @@ namespace BLL /// public static Model.JDGL_WeekItem GetWeekItemByProjectIdAndWeekNo(string ProjectId, int WeekNo) { + Model.SGGLDB db = Funs.DB; return db.JDGL_WeekItem.FirstOrDefault(e => e.ProjectId == ProjectId && e.WeekNo == WeekNo); } @@ -40,6 +40,7 @@ namespace BLL /// public static Model.JDGL_WeekItem GetWeekItemByDateNow(string ProjectId) { + Model.SGGLDB db = Funs.DB; return db.JDGL_WeekItem.FirstOrDefault(e => e.ProjectId == ProjectId && e.StartDate < DateTime.Now && e.EndDate > DateTime.Now); } /// @@ -48,6 +49,7 @@ namespace BLL /// public static void AddWeekItem(Model.JDGL_WeekItem WeekItem) { + Model.SGGLDB db = Funs.DB; Model.JDGL_WeekItem newWeekItem = new Model.JDGL_WeekItem { WeekId = WeekItem.WeekId, @@ -68,6 +70,7 @@ namespace BLL /// public static void UpdateWeekItem(Model.JDGL_WeekItem WeekItem) { + Model.SGGLDB db = Funs.DB; Model.JDGL_WeekItem newWeekItem = db.JDGL_WeekItem.FirstOrDefault(e => e.WeekId == WeekItem.WeekId); if (newWeekItem != null) { @@ -86,6 +89,7 @@ namespace BLL /// public static void DeleteWeekItemById(string WeekId) { + Model.SGGLDB db = Funs.DB; var q = (from x in db.JDGL_WeekItem where x.WeekId == WeekId select x).FirstOrDefault(); if (q != null) { @@ -102,6 +106,7 @@ namespace BLL /// public static List GetWeekItemList(string ProjectId) { + Model.SGGLDB db = Funs.DB; return (from x in db.JDGL_WeekItem where x.ProjectId == ProjectId orderby x.WeekNo descending select x).ToList(); } diff --git a/SGGL/BLL/WebService/CNCECHSSEGetWebService.cs b/SGGL/BLL/WebService/CNCECHSSEGetWebService.cs index feef0f01..4948157e 100644 --- a/SGGL/BLL/WebService/CNCECHSSEGetWebService.cs +++ b/SGGL/BLL/WebService/CNCECHSSEGetWebService.cs @@ -62,7 +62,7 @@ namespace BLL }; var pushContent = JsonConvert.SerializeObject(upCheckReport.ToList()); - ErrLogInfo.WriteLog($"【集团检查整改上报数据】:{pushContent}"); + //ErrLogInfo.WriteLog($"【集团检查整改上报数据】:{pushContent}"); var strJosn = APIGetHttpService.Http(baseurl, "Post", contenttype, newToken, pushContent); if (!string.IsNullOrEmpty(strJosn)) { diff --git a/SGGL/FineUIPro.Web/JDGL/Check/WeekPlan.aspx b/SGGL/FineUIPro.Web/JDGL/Check/WeekPlan.aspx index d05fb336..423f5fa2 100644 --- a/SGGL/FineUIPro.Web/JDGL/Check/WeekPlan.aspx +++ b/SGGL/FineUIPro.Web/JDGL/Check/WeekPlan.aspx @@ -101,13 +101,8 @@ - - +