lpf
/
CNCEC_SUBQHSE_WUHUAN
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

1

This commit is contained in:
夏菊 2025-09-28 10:45:28 +08:00
parent ccdd4970f4
commit e8cdc5c4b7
4 changed files with 11 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
SGGL/BLL/JDGL/Check/MonthPlanService.cs
View File

@ -10,7 +10,7 @@ namespace BLL
/// </summary>
public class MonthPlanService
{
public static Model.SGGLDB db = Funs.DB;
//public static Model.SGGLDB db = Funs.DB;
/// <summary>
/// 根据主键获取月度计划情况

9
SGGL/BLL/JDGL/Check/WeekItemService.cs
View File

@ -10,8 +10,6 @@ namespace BLL
/// </summary>
public class WeekItemService
{
public static Model.SGGLDB db = Funs.DB;
/// <summary>
/// 根据主键获取自定义周情况
/// </summary>
@ -19,6 +17,7 @@ namespace BLL
/// <returns></returns>
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
/// <returns></returns>
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
/// <returns></returns>
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);
}
/// <summary>
@ -48,6 +49,7 @@ namespace BLL
/// <param name="WeekItem"></param>
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
/// <param name="WeekItem"></param>
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
/// <param name="WeekId"></param>
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
/// <returns></returns>
public static List<JDGL_WeekItem> 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();
}

2
SGGL/BLL/WebService/CNCECHSSEGetWebService.cs
View File

@ -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))
{

9
SGGL/FineUIPro.Web/JDGL/Check/WeekPlan.aspx
View File

@ -101,13 +101,8 @@
<f:Tab ID="Tab2" Title="下周计划" BodyPadding="5px" Layout="VBox" IconFont="Bookmark" TitleToolTip="下周计划"
runat="server">
<Items>
<f:Grid ID="Grid1" ShowBorder="true" EnableAjax="false" ShowHeader="false" Title="周进度计划" EnableCollapse="true"
runat="server" BoxFlex="1" DataKeyNames="WeekPlanId" AllowCellEditing="true" ForceFit="true" Height="500px"
ClicksToEdit="1" DataIDField="WeekPlanId" AllowSorting="true" SortField="SortIndex"
SortDirection="ASC" EnableColumnLines="true"
PageSize="1000"
AllowFilters="true" EnableTextSelection="True">
<f:Grid ID="Grid1" IsFluid="true" CssClass="blockpanel" ShowBorder="true" ShowHeader="false" runat="server" EnableCollapse="false" Height="500px" PageSize="1000"
DataKeyNames="WeekPlanId" DataIDField="WeekPlanId" EnableColumnLines="true" ForceFit="true" AllowCellEditing="true" ClicksToEdit="1">
<Columns>
<f:TemplateField ColumnID="tfPageIndex" Width="55px" HeaderText="序号" HeaderTextAlign="Center" TextAlign="Center"
EnableLock="true" Locked="False">