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

20260817 积分、扣分

Browse Source
This commit is contained in:
毕文静
2026-08-17 10:43:21 +08:00
parent 9630b5c123
commit 11e9ff62b1
37 changed files with 7022 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files
SGGL/BLL/API/HSSE/APITestRecordService.cs
-1
View File
@@ -1,7 +1,6 @@
using EmitMapper;
using EmitMapper.MappingConfiguration;
using FastReport.Data;
using Microsoft.SqlServer.Dts.Runtime;
using Model;
using System;
using System.Collections.Generic;
SGGL/BLL/BLL.csproj
+3
View File
@@ -254,6 +254,7 @@
<Compile Include="BaseInfo\BaseFactoryService.cs" />
<Compile Include="BaseInfo\CertificateService.cs" />
<Compile Include="BaseInfo\CNProfessionalService.cs" />
<Compile Include="BaseInfo\EnergySettingsService.cs" />
<Compile Include="BaseInfo\QualityProblemClassifyItemService.cs" />
<Compile Include="BaseInfo\QualityProblemClassifyService.cs" />
<Compile Include="BaseInfo\QualityProblemNatureItemService.cs" />
@@ -455,6 +456,8 @@
<Compile Include="DigData\HSEDataCollectService.cs" />
<Compile Include="DoorServer\DoorServerService.cs" />
<Compile Include="DropListService.cs" />
<Compile Include="EnergyReport\EnergyStatisticsService.cs" />
<Compile Include="EnergyReport\EnergyWaterConservationService.cs" />
<Compile Include="GlobalSuppressions.cs" />
<Compile Include="HJGL\BaseInfo\Base_ComponentsService.cs" />
<Compile Include="HJGL\BaseInfo\Base_ConsumablesService.cs" />
SGGL/BLL/BaseInfo/EnergySettingsService.cs
+99
View File
@@ -0,0 +1,99 @@
using Model;
using System;
using System.Collections.Generic;
using System.Linq;
using System.Text;
using System.Threading.Tasks;
namespace BLL
{
/// <summary>
/// 能源设置
/// </summary>
public class EnergySettingsService
{
/// <summary>
/// 根据Id获取能源信息
/// </summary>
/// <param name="energyId"></param>
/// <returns></returns>
public static Model.Base_Energy GetEnergyById(string energyId)
{
return Funs.DB.Base_Energy.FirstOrDefault(e => e.EnergyId == energyId);
}
/// <summary>
/// 添加能源
/// </summary>
/// <param name="energy"></param>
public static void AddEnergy(Model.Base_Energy energy)
{
CNPCDB db = Funs.DB;
Model.Base_Energy newEnergy = new Model.Base_Energy();
newEnergy.EnergyId = energy.EnergyId;
newEnergy.EnergyName = energy.EnergyName;
newEnergy.EnergyUnit = energy.EnergyUnit;
newEnergy.ReferenceCoefficient = energy.ReferenceCoefficient;
db.Base_Energy.InsertOnSubmit(newEnergy);
db.SubmitChanges();
}
/// <summary>
/// 修改能源
/// </summary>
/// <param name="energy"></param>
public static void UpdateEnergy(Model.Base_Energy energy)
{
CNPCDB db = Funs.DB;
Model.Base_Energy newEnergy = db.Base_Energy.FirstOrDefault(e => e.EnergyId == energy.EnergyId);
if (newEnergy != null)
{
newEnergy.EnergyName = energy.EnergyName;
newEnergy.EnergyUnit = energy.EnergyUnit;
newEnergy.ReferenceCoefficient = energy.ReferenceCoefficient;
db.SubmitChanges();
}
}
/// <summary>
/// 根据主键删除能源
/// </summary>
/// <param name="energyId"></param>
public static void DeleteEnergyById(string energyId)
{
CNPCDB db = Funs.DB;
Model.Base_Energy energy = db.Base_Energy.FirstOrDefault(e => e.EnergyId == energyId);
if (energy != null)
{
db.Base_Energy.DeleteOnSubmit(energy);
db.SubmitChanges();
}
}
/// <summary>
/// 获取能源列表信息
/// </summary>
/// <returns></returns>
public static List<Model.Base_Energy> GetEnergyList()
{
return (from x in Funs.DB.Base_Energy orderby x.EnergyName select x).ToList();
}
/// <summary>
/// 获取能源下拉列表项
/// </summary>
/// <param name="dropName"></param>
/// <param name="isShowPlease"></param>
public static void InitEnergyDropDownList(FineUIPro.DropDownList dropName, bool isShowPlease)
{
dropName.DataValueField = "EnergyId";
dropName.DataTextField = "EnergyName";
dropName.DataSource = GetEnergyList();
dropName.DataBind();
if (isShowPlease)
{
Funs.FineUIPleaseSelect(dropName);
}
}
}
}
SGGL/BLL/Common/Const.cs
+37
View File
@@ -58,6 +58,10 @@ namespace BLL
/// N3较大隐患Id
/// </summary>
public const string SafetyNatureIdN3 = "4cd15090-0fb0-4bdf-9a72-3076f90fe5c6";
/// <summary>
/// N4一般隐患
/// </summary>
public const string SafetyNatureIdN4 = "556bf91f-adbe-4af6-8403-a685f893af93";
#endregion
@@ -88,6 +92,24 @@ namespace BLL
#endregion
#region 教材库
/// <summary>
/// 通用安全知识
/// </summary>
public const string CompanyTrainingId1 = "68f99192-d5bd-47e9-998f-d0052c8ef39e";
/// <summary>
/// 知识方法工具
/// </summary>
public const string CompanyTrainingId2 = "74e3f6e6-bd28-4cf2-9b27-d62947a61775";
/// <summary>
/// 岗位基本操作技能
/// </summary>
public const string CompanyTrainingId3 = "c69ab677-e5eb-443b-a778-8c6b1d605dac";
/// <summary>
/// 生产受控管理
/// </summary>
public const string CompanyTrainingId4 = "e10a69e9-af1a-4088-8bcc-71481c59e578";
#endregion
/// <summary>
/// 焊条发放回收纪录
@@ -1795,6 +1817,11 @@ namespace BLL
/// 风险等级
/// </summary>
public const string RiskLevelMenuId = "E4B526CC-805E-4131-8E18-2FFA6871507E";
/// <summary>
/// 能源设置
/// </summary>
public const string EnergyMenuId = "3DBCA999-949F-4B6D-93AE-B785B0D3D0B5";
#endregion
#region 质量基础信息
@@ -1859,6 +1886,7 @@ namespace BLL
/// 项目地图
/// </summary>
public const string ProjectProjectMapMenuId = "F266456A-991F-45A3-BCD6-CF2515D71E39";
#endregion
@@ -3481,6 +3509,15 @@ namespace BLL
#endregion
#region 报表管理
/// <summary>
/// 节能节水
/// </summary>
public const string EnergyWaterConservationMenuId = "CCA0E136-9AC7-4A14-BC1F-20758A99E88E";
/// <summary>
/// 能源统计
/// </summary>
public const string EnergyStatisticsMenuId = "D4541B37-7876-40D8-A48B-AEF8FCDAEE9F";
/// <summary>
///
SGGL/BLL/EnergyReport/EnergyStatisticsService.cs
+90
View File
@@ -0,0 +1,90 @@
using Model;
using NPOI.HSSF.EventUserModel;
using System;
using System.Collections.Generic;
using System.Linq;
using System.Text;
using System.Threading.Tasks;
namespace BLL
{
/// <summary>
/// 能源统计
/// </summary>
public class EnergyStatisticsService
{
/// <summary>
/// 根据主键获取能源统计
/// </summary>
/// <param name="energyStatisticsId"></param>
/// <returns></returns>
public static Model.EnergyReport_EnergyStatistics GetEnergyStatisticsById(string energyStatisticsId)
{
return Funs.DB.EnergyReport_EnergyStatistics.FirstOrDefault(e => e.EnergyStatisticsId == energyStatisticsId);
}
/// <summary>
/// 添加能源统计
/// </summary>
/// <param name="energyStatistics"></param>
public static void AddEnergyStatistics(Model.EnergyReport_EnergyStatistics energyStatistics)
{
CNPCDB db = Funs.DB;
Model.EnergyReport_EnergyStatistics newEnergyStatistics = new EnergyReport_EnergyStatistics();
newEnergyStatistics.EnergyStatisticsId = energyStatistics.EnergyStatisticsId;
newEnergyStatistics.ProjectId = energyStatistics.ProjectId;
newEnergyStatistics.UnitId = energyStatistics.UnitId;
newEnergyStatistics.ReportDate = energyStatistics.ReportDate;
newEnergyStatistics.EnergyId = energyStatistics.EnergyId;
newEnergyStatistics.Consumption = energyStatistics.Consumption;
newEnergyStatistics.Amount = energyStatistics.Amount;
newEnergyStatistics.UnitPrice = energyStatistics.UnitPrice;
newEnergyStatistics.ConversionUnit = energyStatistics.ConversionUnit;
newEnergyStatistics.ConvertedQuantity = energyStatistics.ConvertedQuantity;
newEnergyStatistics.TCE = energyStatistics.TCE;
newEnergyStatistics.CompileMan = energyStatistics.CompileMan;
newEnergyStatistics.CompileDate = energyStatistics.CompileDate;
db.EnergyReport_EnergyStatistics.InsertOnSubmit(newEnergyStatistics);
db.SubmitChanges();
}
/// <summary>
/// 修改
/// </summary>
/// <param name="energyStatistics"></param>
public static void UpdateEnergyStatistics(Model.EnergyReport_EnergyStatistics energyStatistics)
{
CNPCDB db = Funs.DB;
Model.EnergyReport_EnergyStatistics newEnergyStatistics = db.EnergyReport_EnergyStatistics.FirstOrDefault(e => e.EnergyStatisticsId == energyStatistics.EnergyStatisticsId);
if (newEnergyStatistics != null)
{
newEnergyStatistics.ProjectId = energyStatistics.ProjectId;
newEnergyStatistics.UnitId = energyStatistics.UnitId;
newEnergyStatistics.ReportDate = energyStatistics.ReportDate;
newEnergyStatistics.EnergyId = energyStatistics.EnergyId;
newEnergyStatistics.Consumption = energyStatistics.Consumption;
newEnergyStatistics.Amount = energyStatistics.Amount;
newEnergyStatistics.UnitPrice = energyStatistics.UnitPrice;
newEnergyStatistics.ConversionUnit = energyStatistics.ConversionUnit;
newEnergyStatistics.ConvertedQuantity = energyStatistics.ConvertedQuantity;
newEnergyStatistics.TCE = energyStatistics.TCE;
db.SubmitChanges();
}
}
/// <summary>
/// 根据主键删除能源统计
/// </summary>
/// <param name="energyStatisticsId"></param>
public static void DeleteEnergyStatisticsById(string energyStatisticsId)
{
CNPCDB db = Funs.DB;
Model.EnergyReport_EnergyStatistics energyStatistics = db.EnergyReport_EnergyStatistics.FirstOrDefault(e => e.EnergyStatisticsId == energyStatisticsId);
if (energyStatistics != null)
{
db.EnergyReport_EnergyStatistics.DeleteOnSubmit(energyStatistics);
db.SubmitChanges();
}
}
}
}
SGGL/BLL/EnergyReport/EnergyWaterConservationService.cs
+95
View File
@@ -0,0 +1,95 @@
using FastReport.Wizards;
using System;
using System.Collections.Generic;
using System.Linq;
using System.Text;
using System.Threading.Tasks;
namespace BLL
{
/// <summary>
/// 节能节水目标指标
/// </summary>
public class EnergyWaterConservationService
{
/// <summary>
/// 根据主键获取节能节水指标
/// </summary>
/// <param name="energyWaterConservationId"></param>
/// <returns></returns>
public static Model.EnergyReport_EnergyWaterConservation GetEnergyWaterConservationById(string energyWaterConservationId)
{
return Funs.DB.EnergyReport_EnergyWaterConservation.FirstOrDefault(e => e.EnergyWaterConservationId == energyWaterConservationId);
}
/// <summary>
/// 添加
/// </summary>
/// <param name="energyWaterConservation"></param>
public static void AddEnergyWaterConservation(Model.EnergyReport_EnergyWaterConservation energyWaterConservation)
{
Model.CNPCDB db = Funs.DB;
Model.EnergyReport_EnergyWaterConservation newEnwa = new Model.EnergyReport_EnergyWaterConservation();
newEnwa.EnergyWaterConservationId = energyWaterConservation.EnergyWaterConservationId;
newEnwa.ProjectId = energyWaterConservation.ProjectId;
newEnwa.EnergySavingIndex = energyWaterConservation.EnergySavingIndex;
newEnwa.WaterSavingIndex = energyWaterConservation.WaterSavingIndex;
newEnwa.EnergySavingSchemes = energyWaterConservation.EnergySavingSchemes;
newEnwa.WaterSavingSchemes = energyWaterConservation.WaterSavingSchemes;
newEnwa.SelfEvaluation = energyWaterConservation.SelfEvaluation;
newEnwa.Summary = energyWaterConservation.Summary;
newEnwa.SupportingDocuments = energyWaterConservation.SupportingDocuments;
newEnwa.ActualEnergySaving = energyWaterConservation.ActualEnergySaving;
newEnwa.ActualWaterSaving = energyWaterConservation.ActualWaterSaving;
newEnwa.EnergySavingCompletionRate = energyWaterConservation.EnergySavingCompletionRate;
newEnwa.WaterSavingCompletionRate = energyWaterConservation.WaterSavingCompletionRate;
newEnwa.CompileMan = energyWaterConservation.CompileMan;
newEnwa.CompileDate = energyWaterConservation.CompileDate;
newEnwa.Remarks = energyWaterConservation.Remarks;
db.EnergyReport_EnergyWaterConservation.InsertOnSubmit(newEnwa);
db.SubmitChanges();
}
/// <summary>
/// 修改
/// </summary>
/// <param name="energyWaterConservation"></param>
public static void UpdateEnergyWaterConservation(Model.EnergyReport_EnergyWaterConservation energyWaterConservation)
{
Model.CNPCDB db = Funs.DB;
Model.EnergyReport_EnergyWaterConservation newEnwa = db.EnergyReport_EnergyWaterConservation.FirstOrDefault(e => e.EnergyWaterConservationId == energyWaterConservation.EnergyWaterConservationId);
if (newEnwa != null)
{
newEnwa.ProjectId = energyWaterConservation.ProjectId;
newEnwa.EnergySavingIndex = energyWaterConservation.EnergySavingIndex;
newEnwa.WaterSavingIndex = energyWaterConservation.WaterSavingIndex;
newEnwa.EnergySavingSchemes = energyWaterConservation.EnergySavingSchemes;
newEnwa.WaterSavingSchemes = energyWaterConservation.WaterSavingSchemes;
newEnwa.SelfEvaluation = energyWaterConservation.SelfEvaluation;
newEnwa.Summary = energyWaterConservation.Summary;
newEnwa.SupportingDocuments = energyWaterConservation.SupportingDocuments;
newEnwa.ActualEnergySaving = energyWaterConservation.ActualEnergySaving;
newEnwa.ActualWaterSaving = energyWaterConservation.ActualWaterSaving;
newEnwa.EnergySavingCompletionRate = energyWaterConservation.EnergySavingCompletionRate;
newEnwa.WaterSavingCompletionRate = energyWaterConservation.WaterSavingCompletionRate;
newEnwa.Remarks = energyWaterConservation.Remarks;
db.SubmitChanges();
}
}
/// <summary>
/// 根据主键删除节能节水目标指标
/// </summary>
/// <param name="energyWaterConservationId"></param>
public static void DeleteEnergyWaterConservationById(string energyWaterConservationId)
{
Model.CNPCDB db = Funs.DB;
Model.EnergyReport_EnergyWaterConservation newEnwa = db.EnergyReport_EnergyWaterConservation.FirstOrDefault(e => e.EnergyWaterConservationId == energyWaterConservationId);
if (newEnwa != null)
{
db.EnergyReport_EnergyWaterConservation.DeleteOnSubmit(newEnwa);
db.SubmitChanges();
}
}
}
}
SGGL/BLL/HSSE/EduTrain/TrainingTaskService.cs
+1 -2
View File
@@ -1,5 +1,4 @@
using Microsoft.SqlServer.Dts.Runtime;
using System;
using System;
using System.Collections.Generic;
using System.Linq;
using System.Text;
SGGL/BLL/InformationProject/ConstructionLogNewService.cs
-1
View File
@@ -1,5 +1,4 @@
using FineUIPro;
using Microsoft.SqlServer.Dts.Runtime;
using System;
using System.Collections;
using System.Collections.Generic;
SGGL/BLL/Score/ScoreFlowLogService.cs
+48 -8
View File
@@ -1,4 +1,5 @@
using Model;
using System;
using System.Collections.Generic;
using System.Linq;
@@ -43,9 +44,33 @@ namespace BLL
/// <param name="IdentityCard"></param>
/// <param name="year"></param>
/// <returns></returns>
public static Model.ScoreFlowLog GetScoreFlowLogByIdentityCard(string IdentityCard, int year)
public static Model.ScoreFlowLog GetScoreFlowLogByIdentityCard(string IdentityCard, int year, DateTime compileDate)
{
return Funs.DB.ScoreFlowLog.Where(e => e.IdentityCard == IdentityCard && e.Year == year).OrderByDescending(x => x.CompileDate).FirstOrDefault();
return Funs.DB.ScoreFlowLog.Where(e => e.IdentityCard == IdentityCard && e.Year == year && e.CompileDate <= compileDate).OrderByDescending(x => x.CompileDate).FirstOrDefault();
}
/// <summary>
/// 根据数据来源id获取人员计分流水
/// </summary>
/// <param name="IdentityCard"></param>
/// <param name="year"></param>
/// <param name="dataSourceId"></param>
/// <returns></returns>
public static Model.ScoreFlowLog GetScoreFlowLogByDataSourceId(string IdentityCard, int year, string dataSourceId)
{
return Funs.DB.ScoreFlowLog.FirstOrDefault(e => e.IdentityCard == IdentityCard && e.Year == year && e.DataSourceId == dataSourceId);
}
/// <summary>
/// 根据时间获取比当前年份的人员比时间后的数据
/// </summary>
/// <param name="IdentityCard"></param>
/// <param name="year"></param>
/// <param name="compliedate"></param>
/// <returns></returns>
public static List<Model.ScoreFlowLog> GetScoreFlowLogByCompileDate(string IdentityCard, int year, DateTime compliedate)
{
return (from x in Funs.DB.ScoreFlowLog where x.IdentityCard == IdentityCard && x.Year == year && x.CompileDate > compliedate select x).ToList();
}
/// <summary>
@@ -74,6 +99,8 @@ namespace BLL
newModel.CompileDate = model.CompileDate;
newModel.CompileMan = model.CompileMan;
newModel.CompileManId = model.CompileManId;
newModel.DataSourceId = model.DataSourceId;
newModel.CheckDate = model.CheckDate;
Funs.DB.ScoreFlowLog.InsertOnSubmit(newModel);
Funs.DB.SubmitChanges();
}
@@ -88,9 +115,9 @@ namespace BLL
if (newModel != null)
{
//newModel.Id = model.Id;
//newModel.Year = model.Year;
//newModel.IdentityCard = model.IdentityCard;
//newModel.UserName = model.UserName;
newModel.Year = model.Year;
newModel.IdentityCard = model.IdentityCard;
newModel.UserName = model.UserName;
newModel.Type = model.Type;
newModel.Score = model.Score;
newModel.CurrentScore = model.CurrentScore;
@@ -103,9 +130,11 @@ namespace BLL
newModel.UnitName = model.UnitName;
newModel.ProjectName = model.ProjectName;
newModel.Remark = model.Remark;
newModel.CompileDate = model.CompileDate;
newModel.CompileMan = model.CompileMan;
newModel.CompileManId = model.CompileManId;
//newModel.CompileDate = model.CompileDate;
//newModel.CompileMan = model.CompileMan;
//newModel.CompileManId = model.CompileManId;
newModel.DataSourceId = model.DataSourceId;
newModel.CheckDate = model.CheckDate;
Funs.DB.SubmitChanges();
}
}
@@ -127,5 +156,16 @@ namespace BLL
//BLL.LogService.AddSys_Log(opUser, model.Id, model.Id, BLL.Const.ProjectScoreFlowLogMenuId, BLL.Const.BtnDelete);
}
}
public static void DeleteScoreFlowLogByDataSourceId(string IdentityCard, int year, string dataSourceId)
{
var db = Funs.DB;
Model.ScoreFlowLog model = db.ScoreFlowLog.FirstOrDefault(x => x.IdentityCard == IdentityCard && x.Year == year && x.DataSourceId == dataSourceId);
if (model != null)
{
db.ScoreFlowLog.DeleteOnSubmit(model);
db.SubmitChanges();
}
}
}
}
SGGL/BLL/Score/ScoreUserService.cs
+45 -4
View File
@@ -1,4 +1,7 @@
using Model;
using NPOI.SS.UserModel;
using System;
using System.Collections.Generic;
using System.Linq;
namespace BLL
@@ -29,6 +32,23 @@ namespace BLL
return Funs.DB.ScoreUser.Where(e => e.IdentityCard == IdentityCard && e.Year == year).OrderByDescending(x => x.CompileDate).FirstOrDefault();
}
/// <summary>
/// 根据数据来源id获取人员计分记录
/// </summary>
/// <param name="IdentityCard"></param>
/// <param name="year"></param>
/// <param name="dataSourceId"></param>
/// <returns></returns>
public static Model.ScoreUser GetScoreUserByDataSourceId(string IdentityCard, int year, string dataSourceId)
{
return Funs.DB.ScoreUser.FirstOrDefault(e => e.IdentityCard == IdentityCard && e.Year == year && e.DataSourceId == dataSourceId);
}
public static List<Model.ScoreUser> GetScoreUserByCompileDate(string IdentityCard, int year, DateTime compliedate)
{
return (from x in Funs.DB.ScoreUser where x.IdentityCard == IdentityCard && x.Year == year && x.CompileDate > compliedate select x).ToList();
}
/// <summary>
/// 增加人员得分
/// </summary>
@@ -42,6 +62,8 @@ namespace BLL
newModel.UserName = model.UserName;
newModel.Score = model.Score;
newModel.CompileDate = model.CompileDate;
newModel.DataSourceId = model.DataSourceId;
newModel.CheckDate = model.CheckDate;
Funs.DB.ScoreUser.InsertOnSubmit(newModel);
Funs.DB.SubmitChanges();
}
@@ -56,11 +78,13 @@ namespace BLL
if (newModel != null)
{
//newModel.Id = model.Id;
//newModel.Year = model.Year;
//newModel.IdentityCard = model.IdentityCard;
//newModel.UserName = model.UserName;
newModel.Year = model.Year;
newModel.IdentityCard = model.IdentityCard;
newModel.UserName = model.UserName;
newModel.Score = model.Score;
newModel.CompileDate = model.CompileDate;
//newModel.CompileDate = model.CompileDate;
newModel.DataSourceId = model.DataSourceId;
newModel.CheckDate = model.CheckDate;
Funs.DB.SubmitChanges();
}
}
@@ -80,5 +104,22 @@ namespace BLL
db.SubmitChanges();
}
}
/// <summary>
/// 根据数据来源Id删除人员得分记录
/// </summary>
/// <param name="IdentityCard"></param>
/// <param name="year"></param>
/// <param name="dataSourceId"></param>
public static void DeleteScoreUserByDataSourceId(string IdentityCard, int year, string dataSourceId)
{
var db = Funs.DB;
Model.ScoreUser model = db.ScoreUser.FirstOrDefault(e => e.IdentityCard == IdentityCard && e.Year == year && e.DataSourceId == dataSourceId);
if (model != null)
{
db.ScoreUser.DeleteOnSubmit(model);
db.SubmitChanges();
}
}
}
}