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

Merge branch 'master' of http://47.104.102.122:3000/lpf/CNCEC_SUBQHSE_WUHUAN

This commit is contained in:
夏菊 2026-04-24 18:54:04 +08:00
parent f388fa5f84 aeb30e8990
commit 73dd18ca2b
21 changed files with 24 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
SGGL/BLL/BaseInfo/InspectionAreaService.cs
View File

@ -26,7 +26,7 @@ namespace BLL
/// <summary>
/// 定义变量
/// </summary>
public static IQueryable<Model.Base_InspectionArea> qq = from x in Funs.DB.Base_InspectionArea orderby x.InspectionAreaCode select x;
//public static IQueryable<Model.Base_InspectionArea> qq = from x in Funs.DB.Base_InspectionArea orderby x.InspectionAreaCode select x;
/// <summary>
/// 获取分页列表
@ -37,7 +37,7 @@ namespace BLL
/// <returns></returns>
public static IEnumerable GetListData(string inspectionAreaName, int startRowIndex, int maximumRows)
{
IQueryable<Model.Base_InspectionArea> q = qq;
IQueryable<Model.Base_InspectionArea> q = from x in Funs.DB.Base_InspectionArea orderby x.InspectionAreaCode select x;
if (!string.IsNullOrEmpty(inspectionAreaName))
{
q = q.Where(e => e.InspectionAreaName.Contains(inspectionAreaName));

4
SGGL/BLL/BaseInfo/PersonManageService.cs
View File

@ -26,7 +26,7 @@ namespace BLL
/// <summary>
/// 定义变量
/// </summary>
public static IQueryable<Model.BS_Welder> qq = from x in Funs.DB.BS_Welder orderby x.WED_Unit, x.WED_Code select x;
// public static IQueryable<Model.BS_Welder> qq = from x in Funs.DB.BS_Welder orderby x.WED_Unit, x.WED_Code select x;
/// <summary>
/// 获取分页列表
@ -39,7 +39,7 @@ namespace BLL
public static IEnumerable getListData(string project, string drpUnitS, string isOnGuard, string txtCodeS, string txtNameS, string txtWorkCodeS, string txtClassS, int startRowIndex, int maximumRows)
{
Model.SGGLDB db = Funs.DB;
IQueryable<Model.BS_Welder> q = qq;
IQueryable<Model.BS_Welder> q = from x in Funs.DB.BS_Welder orderby x.WED_Unit, x.WED_Code select x;
if (!string.IsNullOrEmpty(project))
{
q = q.Where(e => e.ProjectId == project);

4
SGGL/BLL/CQMS/Check/CheckMonthService.cs
View File

@ -23,7 +23,7 @@ namespace BLL
/// <summary>
/// 定义变量
/// </summary>
public static IQueryable<Model.Check_CheckMonth> qq = from x in Funs.DB.Check_CheckMonth orderby x.Months descending select x;
//public static IQueryable<Model.Check_CheckMonth> qq = from x in Funs.DB.Check_CheckMonth orderby x.Months descending select x;
/// <summary>
/// 获取分页列表
@ -36,7 +36,7 @@ namespace BLL
public static IEnumerable GetListData(string projectId, int startRowIndex, int maximumRows)
{
Model.SGGLDB db = Funs.DB;
IQueryable<Model.Check_CheckMonth> q = qq;
IQueryable<Model.Check_CheckMonth> q = from x in Funs.DB.Check_CheckMonth orderby x.Months descending select x;
if (!string.IsNullOrEmpty(projectId))
{
q = q.Where(e => e.ProjectId == projectId);

2
SGGL/BLL/HSSE/Manager/ManagerMonthC/AccidentDesciptionCService.cs
View File

@ -8,7 +8,7 @@ namespace BLL
{
public class AccidentDesciptionCService
{
private static Model.SGGLDB db = Funs.DB;
// private static Model.SGGLDB db = Funs.DB;
/// <summary>
/// 根据月报Id获取事故说明

2
SGGL/BLL/HSSE/Manager/ManagerMonthC/AccidentDesciptionItemCService.cs
View File

@ -8,7 +8,7 @@ namespace BLL
{
public class AccidentDesciptionItemCService
{
private static Model.SGGLDB db = Funs.DB;
//private static Model.SGGLDB db = Funs.DB;
/// <summary>
/// 根据月报Id获取管理绩效数据统计

2
SGGL/BLL/HSSE/Manager/ManagerMonthC/ActivitiesCService.cs
View File

@ -7,7 +7,7 @@ namespace BLL
{
public static class ActivitiesCService
{
private static Model.SGGLDB db = Funs.DB;
//private static Model.SGGLDB db = Funs.DB;
/// <summary>
/// 根据月报Id获取HSSE活动

2
SGGL/BLL/HSSE/Manager/ManagerMonthC/CheckCService.cs
View File

@ -7,7 +7,7 @@ namespace BLL
{
public static class CheckCService
{
private static Model.SGGLDB db = Funs.DB;
//private static Model.SGGLDB db = Funs.DB;
/// <summary>
/// 根据月报Id获取HSSE检查

2
SGGL/BLL/HSSE/Manager/ManagerMonthC/CostInvestmentPlanCService.cs
View File

@ -8,7 +8,7 @@ namespace BLL
{
public static class CostInvestmentPlanCService
{
private static Model.SGGLDB db = Funs.DB;
//private static Model.SGGLDB db = Funs.DB;
/// <summary>
/// 根据月报Id获取HSE费用投入计划

2
SGGL/BLL/HSSE/Manager/ManagerMonthC/EmergencyExercisesCService.cs
View File

@ -7,7 +7,7 @@ namespace BLL
{
public static class EmergencyExercisesCService
{
private static Model.SGGLDB db = Funs.DB;
//private static Model.SGGLDB db = Funs.DB;
/// <summary>
/// 根据月报Id获取应急演练活动

2
SGGL/BLL/HSSE/Manager/ManagerMonthC/EmergencyPlanCService.cs
View File

@ -7,7 +7,7 @@ namespace BLL
{
public static class EmergencyPlanCService
{
private static Model.SGGLDB db = Funs.DB;
//private static Model.SGGLDB db = Funs.DB;
/// <summary>
/// 根据月报Id获取应急预案修编

2
SGGL/BLL/HSSE/Manager/ManagerMonthC/FileManageCService.cs
View File

@ -7,7 +7,7 @@ namespace BLL
{
public class FileManageCService
{
private static Model.SGGLDB db = Funs.DB;
//private static Model.SGGLDB db = Funs.DB;
/// <summary>
/// 根据月报Id获取文件管理信息

2
SGGL/BLL/HSSE/Manager/ManagerMonthC/FiveExpenseCService.cs
View File

@ -7,7 +7,7 @@ namespace BLL
{
public class FiveExpenseCService
{
private static Model.SGGLDB db = Funs.DB;
//private static Model.SGGLDB db = Funs.DB;
/// <summary>
/// 根据月报Id获取五环HSE费用投入

2
SGGL/BLL/HSSE/Manager/ManagerMonthC/HazardCService.cs
View File

@ -7,7 +7,7 @@ namespace BLL
{
public class HazardCService
{
private static Model.SGGLDB db = Funs.DB;
//private static Model.SGGLDB db = Funs.DB;
/// <summary>
/// 根据月报Id获取危险源动态识别及控制

2
SGGL/BLL/HSSE/Manager/ManagerMonthC/ManageDocPlanCService.cs
View File

@ -7,7 +7,7 @@ namespace BLL
{
public static class ManageDocPlanCService
{
private static Model.SGGLDB db = Funs.DB;
//private static Model.SGGLDB db = Funs.DB;
/// <summary>
/// 根据月报Id获取HSE管理文件/方案修编计划

2
SGGL/BLL/HSSE/Manager/ManagerMonthC/MeetingCService.cs
View File

@ -7,7 +7,7 @@ namespace BLL
{
public static class MeetingCService
{
private static Model.SGGLDB db = Funs.DB;
//private static Model.SGGLDB db = Funs.DB;
/// <summary>
/// 根据日报Id获取会议

2
SGGL/BLL/HSSE/Manager/ManagerMonthC/OtherWorkCService.cs
View File

@ -7,7 +7,7 @@ namespace BLL
{
public class OtherWorkCService
{
private static Model.SGGLDB db = Funs.DB;
//private static Model.SGGLDB db = Funs.DB;
/// <summary>
/// 根据月报ID获取其他工作情况列表

2
SGGL/BLL/HSSE/Manager/ManagerMonthC/OtherWorkPlanCService.cs
View File

@ -7,7 +7,7 @@ namespace BLL
{
public static class OtherWorkPlanCService
{
private static Model.SGGLDB db = Funs.DB;
//private static Model.SGGLDB db = Funs.DB;
/// <summary>
/// 根据月报Id获取所有相关其他HSE工作计划

2
SGGL/BLL/HSSE/Manager/ManagerMonthC/ReviewRecordCService.cs
View File

@ -7,7 +7,7 @@ namespace BLL
{
public class ReviewRecordCService
{
private static Model.SGGLDB db = Funs.DB;
//private static Model.SGGLDB db = Funs.DB;
/// <summary>
/// 根据月报Id获取详细审查记录

2
SGGL/BLL/HSSE/Manager/ManagerMonthC/SubExpenseCService.cs
View File

@ -7,7 +7,7 @@ namespace BLL
{
public class SubExpenseCService
{
private static Model.SGGLDB db = Funs.DB;
//private static Model.SGGLDB db = Funs.DB;
/// <summary>
/// 根据月报Id获取所有相关分包商HSE费用投入

2
SGGL/BLL/HSSE/Manager/ManagerMonthC/TrainCService.cs
View File

@ -7,7 +7,7 @@ namespace BLL
{
public static class TrainCService
{
private static Model.SGGLDB db = Funs.DB;
//private static Model.SGGLDB db = Funs.DB;
/// <summary>
/// 根据月报Id获取HSSE培训

2
SGGL/FineUIPro.Web/FineUIPro.Web.csproj
View File

@ -20498,7 +20498,7 @@
</FlavorProperties>
</VisualStudio>
</ProjectExtensions>
<Import Project="$(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v18.0\WebApplications\Microsoft.WebApplication.targets" />
<Import Project="$(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v17.0\WebApplications\Microsoft.WebApplication.targets" />
<!-- To modify your build process, add your task inside one of the targets below and uncomment it.
Other similar extension points exist, see Microsoft.Common.targets.
<Target Name="BeforeBuild">