代码无效引用清理,试压包资料界面看板修改

This commit is contained in:
2025-10-10 14:33:21 +08:00
parent 87fb529521
commit 55b798135c
933 changed files with 5897 additions and 7541 deletions
@@ -7,7 +7,7 @@ namespace BLL
/// </summary>
public static class AccidentHandleService
{
/// <summary>
/// 根据主键获取HSSE事故(含未遂)处理
@@ -7,7 +7,7 @@ namespace BLL
/// </summary>
public static class AccidentPersonRecordService
{
/// <summary>
/// 根据主键获取HSSE事故(对人员)记录
@@ -9,7 +9,7 @@ namespace BLL
/// </summary>
public static class AccidentReportOtherService
{
/// <summary>
/// 根据主键获取事故调查处理报告
@@ -9,7 +9,7 @@ namespace BLL
/// </summary>
public static class AccidentReportService
{
/// <summary>
/// 根据主键获取事故调查报告
@@ -7,7 +7,7 @@ namespace BLL
/// </summary>
public static class NoFourLetoffService
{
/// <summary>
/// 根据主键获取四不放过
@@ -8,7 +8,7 @@ namespace BLL
/// </summary>
public class Check_CheckColligationDetailService
{
/// <summary>
/// 根据综合检查id获取所有相关明细信息
@@ -8,7 +8,7 @@ namespace BLL
/// </summary>
public class Check_CheckSpecialDetailService
{
/// <summary>
/// 根据专项检查id获取所有相关明细信息
@@ -1,10 +1,8 @@
using FineUIPro;
using NPOI.SS.Formula.Functions;
using System;
using System.Collections;
using System.Collections.Generic;
using System.Linq;
using Model;
namespace BLL
{
@@ -27,7 +25,7 @@ namespace BLL
/// 定义变量
/// </summary>
private static IQueryable<Model.Check_CheckSpecial> getDataLists = from x in Funs.DB.Check_CheckSpecial
select x;
select x;
/// <summary>
/// 列表
@@ -61,13 +59,13 @@ namespace BLL
}
else
{
getDataList = getDataList.Where(e => e.CheckType == checkType || e.CheckType == null );
}
getDataList = getDataList.Where(e => e.CheckType == checkType || e.CheckType == null);
}
}
if (!string.IsNullOrEmpty(checkItemSetId) && checkItemSetId != Const._Null)
{
getDataList = getDataList.Where(e => e.CheckItemSetId == checkItemSetId);
}
}
if (startTime.HasValue)
{
getDataList = getDataList.Where(e => e.CheckTime >= startTime);
@@ -75,7 +73,7 @@ namespace BLL
if (endTime.HasValue)
{
getDataList = getDataList.Where(e => e.CheckTime <= endTime);
}
}
count = getDataList.Count();
if (count == 0)
@@ -89,7 +87,7 @@ namespace BLL
x.CheckSpecialId,
x.CheckTime,
x.CheckSpecialCode,
CheckItemName =Funs.DB.Technique_CheckItemSet .First(y=>y.CheckItemSetId ==x. CheckItemSetId).CheckItemName,
CheckItemName = Funs.DB.Technique_CheckItemSet.First(y => y.CheckItemSetId == x.CheckItemSetId).CheckItemName,
CheckTypeName = x.CheckType == "1" ? "联合检查" : "专项检查",
StatesName = x.States == "2" ? "已完成" : (x.States == "1" ? "待整改" : "待提交"),
};
@@ -3,8 +3,6 @@ using System;
using System.Collections;
using System.Collections.Generic;
using System.Linq;
using System.Web.UI.WebControls;
using Model;
namespace BLL
{
@@ -76,8 +74,8 @@ namespace BLL
getDataList = SortConditionHelper.SortingAndPaging(getDataList, Grid1.SortField, Grid1.SortDirection, Grid1.PageIndex, Grid1.PageSize);
var db1 = Funs.DB;
return from x in getDataList
join y in db1.Base_Project on x.ProjectId equals y.ProjectId
into ps
join y in db1.Base_Project on x.ProjectId equals y.ProjectId
into ps
from y in ps.DefaultIfEmpty()
select new
{
@@ -9,7 +9,7 @@ namespace BLL
/// </summary>
public static class IncentiveNoticeService
{
/// <summary>
/// 根据主键获取奖励通知单
+1 -1
View File
@@ -9,7 +9,7 @@ namespace BLL
/// </summary>
public static class PunishNoticeService
{
/// <summary>
/// 根据主键获取处罚通知单
@@ -1,7 +1,5 @@
using System;
using System.Collections.Generic;
using System.Collections.Generic;
using System.Linq;
using System.Web.UI.WebControls;
namespace BLL
{
@@ -10,7 +8,7 @@ namespace BLL
/// </summary>
public static class CostManageItemService
{
/// <summary>
/// 根据主键删除费用管理明细
+19 -22
View File
@@ -1,13 +1,10 @@
using Model;
using Newtonsoft.Json;
using Newtonsoft.Json.Linq;
using NPOI.SS.UserModel;
using System;
using System.Collections.Generic;
using System.IO;
using System.Linq;
using System.Numerics;
using WIA;
namespace BLL
{
@@ -374,7 +371,7 @@ namespace BLL
}
public static string PushDataToHSE(string projectId, string contractNum,string costManageId)
public static string PushDataToHSE(string projectId, string contractNum, string costManageId)
{
try
{
@@ -384,12 +381,12 @@ namespace BLL
where x.ProjectId == projectId && x.ContractNum == contractNum && x.States == Const.State_2
orderby x.CostManageDate descending
select x;
var projectModel=ProjectService.GetProjectByProjectId(projectId);
var projectModel = ProjectService.GetProjectByProjectId(projectId);
var contractModel = CostManageService.GetCostManageById(costManageId);
//decimal totalAmount = costData.Sum(x => x.SumMoney ?? 0);
var files = new List<object>();
if (contractModel!=null)
{
if (contractModel != null)
{
var url = ConstValue.GetConstByConstText("PU_PUSH_URL")?.ConstValue;
if (string.IsNullOrEmpty(url))
{
@@ -414,16 +411,16 @@ namespace BLL
{
message = "获取Pu系统Token失败,Token为空";
return message;
}
}
Dictionary<string, string> headers = new Dictionary<string, string>();
headers.Add("Authorization", "Bearer " + accessToken);
#region
var getRequestUrl = url + "/pu_api/payCraftAmountToHSE/get";
var getRequestbody= $"{{\"projectNumber\":\"{projectModel.ProjectCode}\",\"contractNo\":\"{contractNum}\"}}";
APICommonService.SaveSysHttpLog("PU_GetPuPayCraftAmount", getRequestUrl, getRequestbody, "Requset");
var getRequestbody = $"{{\"projectNumber\":\"{projectModel.ProjectCode}\",\"contractNo\":\"{contractNum}\"}}";
APICommonService.SaveSysHttpLog("PU_GetPuPayCraftAmount", getRequestUrl, getRequestbody, "Requset");
var getResponse = Funs.RequestPost(getRequestUrl, headers, getRequestbody);
APICommonService.SaveSysHttpLog("PU_GetPuPayCraftAmount", getRequestUrl, getResponse, "Response");
var getResponseStr = JsonConvert.DeserializeObject<JObject>(getResponse);
APICommonService.SaveSysHttpLog("PU_GetPuPayCraftAmount", getRequestUrl, getResponse, "Response");
var getResponseStr = JsonConvert.DeserializeObject<JObject>(getResponse);
if (getResponseStr == null)
{
message = "推送数据到HSE系统失败";
@@ -433,9 +430,9 @@ namespace BLL
{
message = getResponseStr["message"]?.ToString();
return message;
}
var getResponseOutput = JsonConvert.DeserializeObject<List<PuGetApiOutput>>(getResponseStr["data"]?.ToString()) ;
if (getResponseOutput.Any() && getResponseOutput.Count(x=>x.itemNo== costManageId)>0)
}
var getResponseOutput = JsonConvert.DeserializeObject<List<PuGetApiOutput>>(getResponseStr["data"]?.ToString());
if (getResponseOutput.Any() && getResponseOutput.Count(x => x.itemNo == costManageId) > 0)
{
message = "当前费用已推送,无需重复推送!";
return message;
@@ -459,9 +456,9 @@ namespace BLL
itemId= costManageId,
contractNo = contractNum,
amountHSE = contractModel.SumMoney.ToString(),
files = files
}
};
files = files
}
};
var jsonBody = JsonConvert.SerializeObject(puAddApiInputs);
APICommonService.SaveSysHttpLog("PU_AddPuPayCraftAmount", requestUrl, jsonBody, "Requset");
var responseHSE = Funs.RequestPost(requestUrl, headers, jsonBody);
@@ -472,7 +469,7 @@ namespace BLL
message = "推送数据到HSE系统失败";
return message;
}
else if ( string.IsNullOrEmpty(responseHSEStr["code"]?.ToString()))
else if (string.IsNullOrEmpty(responseHSEStr["code"]?.ToString()))
{
message = responseHSE;
return message;
@@ -482,7 +479,7 @@ namespace BLL
message = responseHSEStr["message"]?.ToString();
return message;
}
else
else
{
message = "";
return message;
@@ -534,12 +531,12 @@ namespace BLL
});
continue;//只取第一个文件
}
}
}
}
}
return result;
}
@@ -9,7 +9,7 @@ namespace BLL
/// </summary>
public static class CostSmallDetailItemService
{
/// <summary>
/// 根据主键获取安全费用投入登记明细
@@ -7,7 +7,7 @@ namespace BLL
/// </summary>
public static class CostSmallDetailService
{
/// <summary>
/// 根据主键获取安全费用投入登记
@@ -1,7 +1,5 @@
using System;
using System.Collections.Generic;
using System.Collections.Generic;
using System.Linq;
using WIA;
namespace BLL
{
@@ -27,7 +25,7 @@ namespace BLL
join y in db.Base_CostType on x.CostTypeId equals y.CostTypeId
select new
{
ExpenseId=expenseId,
ExpenseId = expenseId,
SupCostTypeId = y.CostTypeId,
SupCostTypeName = y.CostTypeName,
SupSortIndex = y.CostTypeCode,
+7 -7
View File
@@ -31,7 +31,7 @@ namespace BLL
select x;
if (!string.IsNullOrEmpty(unitId) && unitId != Const._Null)
{
getData = getData.Where(x =>x.UnitId == unitId);
getData = getData.Where(x => x.UnitId == unitId);
}
if (year.HasValue)
{
@@ -69,10 +69,10 @@ namespace BLL
ProjectId = expense.ProjectId,
ExpenseCode = expense.ExpenseCode,
UnitId = expense.UnitId,
ReportDate=expense.ReportDate,
ReportDate = expense.ReportDate,
CreateDate = expense.CreateDate,
States = expense.States,
CompileMan = expense.CompileMan,
CompileMan = expense.CompileMan,
CompileDate = expense.CompileDate,
SortIndex = expense.SortIndex,
Year = expense.Year,
@@ -94,7 +94,7 @@ namespace BLL
{
//newExpense.ProjectId = expense.ProjectId;
newExpense.ExpenseCode = expense.ExpenseCode;
newExpense.UnitId = expense.UnitId;
newExpense.UnitId = expense.UnitId;
newExpense.States = expense.States;
newExpense.Months = expense.Months;
newExpense.ReportDate = expense.ReportDate;
@@ -142,16 +142,16 @@ namespace BLL
/// </summary>
/// <param name="projectId"></param>
/// <param name="Year"></param>
public static void SetSumYearExpense(string projectId,int Year)
public static void SetSumYearExpense(string projectId, int Year)
{
var getYearEx = Funs.DB. CostGoods_Expense.FirstOrDefault(x=>x.ProjectId == projectId && x.Year == Year && x.UnitId == null);
var getYearEx = Funs.DB.CostGoods_Expense.FirstOrDefault(x => x.ProjectId == projectId && x.Year == Year && x.UnitId == null);
if (getYearEx != null)
{
Funs.DB.CostGoods_Expense.DeleteOnSubmit(getYearEx);
Funs.DB.SubmitChanges();
}
var getALLEx=from x in Funs.DB.CostGoods_Expense where x.ProjectId == projectId && x.Year == Year && x.UnitId != null select x;
var getALLEx = from x in Funs.DB.CostGoods_Expense where x.ProjectId == projectId && x.Year == Year && x.UnitId != null select x;
if (getALLEx.Count() > 0)
{
Model.CostGoods_Expense newExpense = new Model.CostGoods_Expense
@@ -5,7 +5,7 @@ namespace BLL
{
public class AccidentCaseItemService
{
/// <summary>
/// 根据常见事故案例明细Id获取事故案例明细
@@ -5,7 +5,7 @@ namespace BLL
{
public class AccidentCaseService
{
/// <summary>
/// 根据主键获取事故伤害及预防
@@ -1,5 +1,4 @@
using System.Linq;
using Model;
namespace BLL
{
@@ -1,6 +1,5 @@
using System.Collections.Generic;
using System.Linq;
using Model;
namespace BLL
{
@@ -8,7 +8,7 @@ namespace BLL
/// </summary>
public static class EduTrain_TrainRecordDetailService
{
/// <summary>
/// 根据教育培训主键获取所有的教育培训明细信息
@@ -9,7 +9,7 @@ namespace BLL
/// </summary>
public static class EduTrain_TrainRecordService
{
/// <summary>
/// 根据教育培训主键获取教育培训信息
@@ -8,7 +8,7 @@ namespace BLL
/// </summary>
public static class EduTrain_TrainTestService
{
/// <summary>
/// 根据教育培训主键获取所有的教育培训明细信息
@@ -1,6 +1,5 @@
using System.Collections.Generic;
using System.Linq;
using Model;
namespace BLL
{
+2 -3
View File
@@ -2,7 +2,6 @@
using System;
using System.Collections;
using System.Linq;
using Model;
namespace BLL
{
@@ -64,7 +63,7 @@ namespace BLL
x.TestEndTime,
x.TestScores,
z.TrainTypeId,
db1.Base_TrainType.First(u=>u.TrainTypeId == z.TrainTypeId).TrainTypeName,
db1.Base_TrainType.First(u => u.TrainTypeId == z.TrainTypeId).TrainTypeName,
z.TrainStartDate,
};
}
@@ -190,7 +189,7 @@ namespace BLL
{
item.TestEndTime = item.TestStartTime.Value.AddMinutes(item.Duration);
item.TestScores = db.Training_TestRecordItem.Where(x => x.TestRecordId == item.TestRecordId).Sum(x => x.SubjectScore) ?? 0;
icount++;
}
db.SubmitChanges();
@@ -5,7 +5,7 @@ namespace BLL
{
public static class TestTrainingItemService
{
/// <summary>
/// 根据主键获取信息
@@ -1,6 +1,5 @@
using System.Collections.Generic;
using System.Linq;
using Model;
namespace BLL
{
@@ -8,7 +8,7 @@ namespace BLL
/// </summary>
public static class TrainTestDBItemService
{
/// <summary>
/// 根据主键删除安全试题库明细信息
+1 -1
View File
@@ -8,7 +8,7 @@ namespace BLL
/// </summary>
public static class TrainTestDBService
{
/// <summary>
/// 根据主键获取安全试题库信息
@@ -5,7 +5,7 @@ namespace BLL
{
public class TrainingItemService
{
/// <summary>
///
@@ -1,6 +1,5 @@
using System.Collections.Generic;
using System.Linq;
using Model;
namespace BLL
{
@@ -1,6 +1,5 @@
using System.Collections.Generic;
using System.Linq;
using Model;
namespace BLL
{
+1 -1
View File
@@ -5,7 +5,7 @@ namespace BLL
{
public class TrainingService
{
/// <summary>
/// 根据上级Id查询所有教育培训主键列的值
@@ -1,6 +1,5 @@
using System.Collections.Generic;
using System.Linq;
using Model;
namespace BLL
{
@@ -9,7 +9,7 @@ namespace BLL
/// </summary>
public static class DrillRecordListService
{
/// <summary>
/// 根据主键获取应急演练
@@ -9,7 +9,7 @@ namespace BLL
/// </summary>
public static class EmergencyListService
{
/// <summary>
/// 根据主键获取应急预案管理
@@ -7,7 +7,7 @@ namespace BLL
/// </summary>
public static class EmergencySupplyService
{
/// <summary>
/// 根据主键获取应急物资管理
@@ -7,7 +7,7 @@ namespace BLL
/// </summary>
public static class EmergencyTeamAndTrainService
{
/// <summary>
/// 根据主键获取应急队伍/培训
@@ -7,7 +7,7 @@ namespace BLL
/// </summary>
public static class EIAReportService
{
/// <summary>
/// 根据主键获取环评报告
@@ -1,9 +1,6 @@
using Model;
using Newtonsoft.Json;
using System;
using System.Collections.Generic;
using System.Linq;
using System.Text;
namespace BLL
{
@@ -7,7 +7,7 @@ namespace BLL
/// </summary>
public static class EnvironmentalEmergencyPlanService
{
/// <summary>
/// 根据主键获取环境事件应急预案
@@ -7,7 +7,7 @@ namespace BLL
/// </summary>
public static class EnvironmentalMonitoringService
{
/// <summary>
/// 根据主键获取环境监测数据
@@ -7,7 +7,7 @@ namespace BLL
/// </summary>
public static class UnexpectedEnvironmentalService
{
/// <summary>
/// 根据主键获取突发环境事件
@@ -8,7 +8,7 @@ namespace BLL
/// </summary>
public static class HSSEMainDutyService
{
/// <summary>
/// 根据主键获取安全主体责任
@@ -7,7 +7,7 @@ namespace BLL
/// </summary>
public static class ServerSafetyInstitutionService
{
/// <summary>
/// 根据主键获取安全制度
@@ -2,7 +2,6 @@
using System.Collections.Generic;
using System.Data;
using System.Linq;
using Model;
namespace BLL
{
@@ -1,13 +1,10 @@
using System;
using System.Collections.Generic;
using System.Linq;
using System.Web.UI.WebControls;
using System.Linq;
namespace BLL
{
public static class ConstructionRiskCheckService
{
/// <summary>
/// 要求主键获取危险清单信息
@@ -1,6 +1,4 @@
using Org.BouncyCastle.Bcpg.Sig;
using System;
using System.Collections.Generic;
using System.Collections.Generic;
using System.Linq;
using System.Web.UI.WebControls;
@@ -1,6 +1,5 @@
using System.Collections.Generic;
using System.Linq;
using Model;
namespace BLL
{
@@ -5,7 +5,7 @@ namespace BLL
{
public static class Hazard_EnvironmentalRiskListService
{
/// <summary>
/// 要求主键获取危险清单信息
@@ -1,6 +1,5 @@
using System;
using System.Linq;
using Model;
namespace BLL
{
@@ -1,8 +1,7 @@
using System.Collections;
using FineUIPro;
using System.Collections;
using System.Collections.Generic;
using System.Linq;
using FineUIPro;
using Model;
namespace BLL
{
@@ -228,7 +227,7 @@ namespace BLL
var returndata = Project_HSSEData_HSSEService.DeleteProjectSecurityRiskData(item.HazardId);
if (returndata.code == 1)
{
}
else
{
@@ -3,7 +3,6 @@ using System;
using System.Collections;
using System.Collections.Generic;
using System.Linq;
using Model;
namespace BLL
{
@@ -8,7 +8,7 @@ namespace BLL
/// </summary>
public static class EquipmentInItemService
{
/// <summary>
/// 根据主键获取特种设备机具入场报批明细信息
@@ -7,7 +7,7 @@ namespace BLL
/// </summary>
public static class EquipmentInService
{
/// <summary>
/// 根据主键获取特种设备机具入场报批
@@ -8,7 +8,7 @@ namespace BLL
/// </summary>
public static class EquipmentOutItemService
{
/// <summary>
/// 根据主键获取特种设备机具出场报批明细
@@ -7,7 +7,7 @@ namespace BLL
/// </summary>
public static class EquipmentOutService
{
/// <summary>
/// 根据主键获取特种设备机具出场报批
@@ -8,7 +8,7 @@ namespace BLL
/// </summary>
public static class EquipmentQualityInItemService
{
/// <summary>
/// 根据主表ID获取明细信息
@@ -7,7 +7,7 @@ namespace BLL
/// </summary>
public static class EquipmentQualityInService
{
/// <summary>
/// 根据主键获取特种设备审批
@@ -8,7 +8,7 @@ namespace BLL
/// </summary>
public static class GeneralEquipmentInItemService
{
/// <summary>
/// 根据主键获取一般设备机具入场报批明细信息
@@ -7,7 +7,7 @@ namespace BLL
/// </summary>
public static class GeneralEquipmentInService
{
/// <summary>
/// 根据主键获取一般设备机具入场报批
@@ -8,7 +8,7 @@ namespace BLL
/// </summary>
public static class GeneralEquipmentOutItemService
{
/// <summary>
/// 根据主键获取一般设备机具出场报批
@@ -7,7 +7,7 @@ namespace BLL
/// </summary>
public static class GeneralEquipmentOutService
{
/// <summary>
/// 根据主键获取一般设备机具出场报批
@@ -4,7 +4,7 @@ namespace BLL
{
public static class ConstructionStandardIdentifyService
{
/// <summary>
/// 根据标准规范辨识主键获取一个标准规范辨识信息
@@ -5,7 +5,7 @@ namespace BLL
{
public static class ConstructionStandardSelectedItemService
{
/// <summary>
/// 根据标准规范辨识Id获取对应所有标准规范项信息
@@ -8,7 +8,7 @@ namespace BLL
/// </summary>
public static class ProjectAccidentCauseReportItemService
{
/// <summary>
/// 职工伤亡事故原因分析报表明细表
@@ -7,7 +7,7 @@ namespace BLL
/// </summary>
public static class ProjectAccidentCauseReportService
{
/// <summary>
/// 职工伤亡事故原因分析报表
@@ -8,7 +8,7 @@ namespace BLL
/// </summary>
public static class ProjectDrillConductedQuarterlyReportItemService
{
/// <summary>
/// 根据主键获取应急演练开展情况季报表明细信息
@@ -7,7 +7,7 @@ namespace BLL
/// </summary>
public static class ProjectDrillConductedQuarterlyReportService
{
/// <summary>
/// 根据主键获取应急演练开展情况季报表
@@ -8,7 +8,7 @@ namespace BLL
/// </summary>
public static class ProjectDrillPlanHalfYearReportItemService
{
/// <summary>
/// 根据主键获取应急演练工作计划半年报明细信息
@@ -7,7 +7,7 @@ namespace BLL
/// </summary>
public static class ProjectDrillPlanHalfYearReportService
{
/// <summary>
/// 根据主键获取应急演练工作计划半年报
@@ -1,8 +1,4 @@
using System;
using System.Collections.Generic;
using System.Linq;
using System.Text;
using System.Threading.Tasks;
using System.Linq;
namespace BLL
{
@@ -33,7 +29,7 @@ namespace BLL
ProjectId = ePSummaryReport.ProjectId,
UnitId = ePSummaryReport.UnitId,
YearId = ePSummaryReport.YearId,
Quarter= ePSummaryReport.Quarter,
Quarter = ePSummaryReport.Quarter,
ResponsiblePerson = ePSummaryReport.ResponsiblePerson,
ResponsiblePersonTel = ePSummaryReport.ResponsiblePersonTel,
ContactPerson = ePSummaryReport.ContactPerson,
@@ -1,7 +1,4 @@
using System;
using System.Collections.Generic;
using System.Linq;
using System.Text;
using System.Linq;
namespace BLL
{
@@ -10,7 +7,7 @@ namespace BLL
/// </summary>
public static class ProjectMillionsMonthlyReportService
{
/// <summary>
/// 根据主键获取企业安全数据统计月报
@@ -7,7 +7,7 @@ namespace BLL
/// </summary>
public static class ProjectSafetyQuarterlyReportService
{
/// <summary>
/// 根据主键获取安全生产数据季报
@@ -1,8 +1,4 @@
using System;
using System.Collections.Generic;
using System.Linq;
using System.Text;
using System.Threading.Tasks;
using System.Linq;
namespace BLL
{
@@ -30,7 +26,7 @@ namespace BLL
Model.InformationProject_WorkSummaryReport newWorkSummaryReport = new Model.InformationProject_WorkSummaryReport
{
WorkSummaryReportId = workSummaryReport.WorkSummaryReportId,
ProjectId=workSummaryReport.ProjectId,
ProjectId = workSummaryReport.ProjectId,
YearId = workSummaryReport.YearId,
UnitId = workSummaryReport.UnitId,
ResponsiblePerson = workSummaryReport.ResponsiblePerson,
@@ -50,8 +46,8 @@ namespace BLL
Countermeasures = workSummaryReport.Countermeasures,
NextYearWorkPlan = workSummaryReport.NextYearWorkPlan,
JobSuggestion = workSummaryReport.JobSuggestion,
CompileMan=workSummaryReport.CompileMan,
CompileDate=workSummaryReport.CompileDate
CompileMan = workSummaryReport.CompileMan,
CompileDate = workSummaryReport.CompileDate
};
Funs.DB.InformationProject_WorkSummaryReport.InsertOnSubmit(newWorkSummaryReport);
Funs.DB.SubmitChanges();
@@ -5,7 +5,7 @@ namespace BLL
{
public class HSSEStandardsListService
{
/// <summary>
/// 根据id查询标准规范信息
@@ -8,7 +8,7 @@ namespace BLL
/// </summary>
public static class LawRegulationListService
{
/// <summary>
/// 根据主键获取法律法规
+1 -1
View File
@@ -8,7 +8,7 @@ namespace BLL
/// </summary>
public static class ManageRuleService
{
/// <summary>
/// 根据主键获取管理规定
+1 -1
View File
@@ -8,7 +8,7 @@ namespace BLL
/// </summary>
public static class RulesRegulationsService
{
/// <summary>
/// 根据主键获取生产规章制度
+1 -1
View File
@@ -7,7 +7,7 @@ namespace BLL
/// </summary>
public static class HSETechnicalService
{
/// <summary>
/// 根据主键获取安全技术交底
+7 -10
View File
@@ -1,10 +1,6 @@
using FineUIPro;
using Model;
using NPOI.SS.Formula.Functions;
using System;
using System.Collections;
using System.Collections.Generic;
using System.ComponentModel;
using System.Linq;
namespace BLL
@@ -28,7 +24,7 @@ namespace BLL
/// 定义变量
/// </summary>
private static IQueryable<Model.License_LicenseManager> getDataLists = from x in Funs.DB.License_LicenseManager
select x;
select x;
/// <summary>
///
@@ -47,7 +43,7 @@ namespace BLL
/// <param name="unitId"></param>
/// <param name="Grid1"></param>
/// <returns></returns>
public static IEnumerable getListData(string projectId, string unitId, DateTime? startTime, DateTime? endTime, string licenseType, string unitId2, Grid Grid1)
public static IEnumerable getListData(string projectId, string unitId, DateTime? startTime, DateTime? endTime, string licenseType, string unitId2, Grid Grid1)
{
IQueryable<Model.License_LicenseManager> getDataList = getDataLists;
if (!string.IsNullOrEmpty(projectId))
@@ -69,11 +65,11 @@ namespace BLL
if (!string.IsNullOrEmpty(licenseType))
{
getDataList = getDataList.Where(e => e.LicenseTypeId == licenseType);
}
}
if (!string.IsNullOrEmpty(unitId2) && unitId2 != Const._Null)
{
getDataList = getDataList.Where(e => e.UnitId == unitId2 );
getDataList = getDataList.Where(e => e.UnitId == unitId2);
}
@@ -99,7 +95,7 @@ namespace BLL
};
}
public static string getFlow(string id,string states)
public static string getFlow(string id, string states)
{
string strrValue = string.Empty;
string name = string.Empty;
@@ -120,7 +116,8 @@ namespace BLL
else if (states == BLL.Const.State_1)
{
strrValue = "审核/审批完成";
} else
}
else
{
strrValue = "待[" + name + "]办理";
}
@@ -9,7 +9,7 @@ namespace BLL
/// </summary>
public static class LicensePublicService
{
/// <summary>
/// 状态下拉框
/// </summary>
@@ -7,7 +7,7 @@ namespace BLL
/// </summary>
public static class CompletionReportService
{
/// <summary>
/// 根据主键获取完工报告
@@ -9,7 +9,7 @@ namespace BLL
/// </summary>
public static class AttendMeetingService
{
/// <summary>
/// 根据主键获取其他会议记录
+1 -1
View File
@@ -7,7 +7,7 @@ namespace BLL
/// </summary>
public static class ClassMeetingService
{
/// <summary>
/// 根据主键获取班前会
+1 -1
View File
@@ -9,7 +9,7 @@ namespace BLL
/// </summary>
public static class MonthMeetingService
{
/// <summary>
/// 根据主键获取安全月例会
@@ -1,8 +1,6 @@
using System;
using System.Collections.Generic;
using System.Linq;
using System.Text;
using System.Threading.Tasks;
namespace BLL
{
@@ -11,7 +9,7 @@ namespace BLL
/// </summary>
public static class SafetyLeaderGroupMeetingService
{
/// <summary>
/// 根据主键获取安全领导小组会议
@@ -9,7 +9,7 @@ namespace BLL
/// </summary>
public static class SpecialMeetingService
{
/// <summary>
/// 根据主键获取专题例会
+1 -1
View File
@@ -9,7 +9,7 @@ namespace BLL
/// </summary>
public static class WeekMeetingService
{
/// <summary>
/// 根据主键获取周例会
@@ -7,7 +7,7 @@ namespace BLL
/// </summary>
public static class HazardDetectionService
{
/// <summary>
/// 根据主键获取危害检测
@@ -7,7 +7,7 @@ namespace BLL
/// </summary>
public static class OccupationalDiseaseAccidentService
{
/// <summary>
/// 根据主键获取职业病事故
@@ -1,9 +1,6 @@
using FineUIPro;
using System;
using System.Collections;
using System.Collections.Generic;
using System.Linq;
using Model;
namespace BLL
{
@@ -26,16 +23,16 @@ namespace BLL
/// 定义变量
/// </summary>
private static IQueryable<Model.SitePerson_Person> getDataLists = from x in Funs.DB.SitePerson_Person
select x;
select x;
/// <summary>
///
/// </summary>
/// <param name="projectId"></param>
/// <param name="personName"></param>
/// <param name="Grid1"></param>
/// <returns></returns>
public static IEnumerable getListData(string projectId, string personName, Grid Grid1)
/// <summary>
///
/// </summary>
/// <param name="projectId"></param>
/// <param name="personName"></param>
/// <param name="Grid1"></param>
/// <returns></returns>
public static IEnumerable getListData(string projectId, string personName, Grid Grid1)
{
var db1 = Funs.DB;
IQueryable<Model.SitePerson_Person> getDataList = from x in db1.SitePerson_Person
@@ -48,14 +45,14 @@ namespace BLL
{
getDataList = getDataList.Where(e => e.PersonName.Contains(personName));
}
count = getDataList.Count();
if (count == 0)
{
return null;
}
getDataList = SortConditionHelper.SortingAndPaging(getDataList, Grid1.SortField, Grid1.SortDirection, Grid1.PageIndex, Grid1.PageSize);
return from x in getDataList
select new
{
@@ -9,7 +9,7 @@ namespace BLL
/// </summary>
public static class EquipmentPersonQualityService
{
/// <summary>
/// 根据主键获取特种设备作业人员资质
@@ -9,7 +9,7 @@ namespace BLL
/// </summary>
public static class EquipmentQualityAuditDetailService
{
/// <summary>
/// 根据主键获取特种设备资质审查明细
@@ -8,7 +8,7 @@ namespace BLL
/// </summary>
public static class EquipmentQualityService
{
/// <summary>
/// 根据主键获取特殊机具设备资质
@@ -9,7 +9,7 @@ namespace BLL
/// </summary>
public static class GeneralEquipmentQualityService
{
/// <summary>
/// 根据主键获取一般机具设备资质
@@ -1,11 +1,8 @@
using System;
using FineUIPro;
using System;
using System.Collections;
using System.Collections.Generic;
using System.Linq;
using Aspose.Words.Lists;
using FineUIPro;
using Org.BouncyCastle.Ocsp;
using System.Collections;
using Model;
namespace BLL
{
@@ -47,7 +44,7 @@ namespace BLL
return null;
}
getDataList = SortConditionHelper.SortingAndPaging(getDataList, Grid1.SortField, Grid1.SortDirection, Grid1.PageIndex, Grid1.PageSize);
return from x in getDataList
select new
{
@@ -181,7 +178,7 @@ namespace BLL
public static void DeleteDataByPersonId(string personId)
{
Model.SGGLDB db = Funs.DB;
var personQuality =from x in Funs.DB.QualityAudit_PersonQuality where x.PersonId == personId select x;
var personQuality = from x in Funs.DB.QualityAudit_PersonQuality where x.PersonId == personId select x;
if (personQuality.Count() > 0)
{
db.QualityAudit_PersonQuality.DeleteAllOnSubmit(personQuality);
@@ -196,7 +193,7 @@ namespace BLL
public static void DeleteData(string id)
{
Model.SGGLDB db = Funs.DB;
var deleteData = db.QualityAudit_PersonQuality.FirstOrDefault(e => e.PersonQualityId == id);
var deleteData = db.QualityAudit_PersonQuality.FirstOrDefault(e => e.PersonQualityId == id);
if (deleteData != null)
{
db.QualityAudit_PersonQuality.DeleteOnSubmit(deleteData);
@@ -7,7 +7,7 @@ namespace BLL
/// </summary>
public static class SafePersonQualityService
{
/// <summary>
/// 根据主键获取安全人员资质
@@ -9,7 +9,7 @@ namespace BLL
/// </summary>
public static class SubUnitQualityAuditDetailService
{
/// <summary>
/// 根据主键获取分包商资质审查明细

Some files were not shown because too many files have changed in this diff Show More