zhanghj/ChengDa_English
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

111

Browse Source
This commit is contained in:
李超
2024-02-27 18:13:26 +08:00
parent 7f67a750c8
commit 6106fb7d9c
33 changed files with 2769 additions and 1820 deletions
Download Patch File Download Diff File Expand all files Collapse all files
SGGL/BLL/API/APIPersonService.cs
+18 -18
View File
@@ -703,24 +703,24 @@ namespace BLL
{
foreach (var item in getPersons)
{
int score = 80;
var sysTestRule = db.Sys_TestRule.FirstOrDefault();
if (sysTestRule != null)
{
if (sysTestRule.PassingScore > 0)
{
score = sysTestRule.PassingScore;
}
}
var getTrainPersonIdList2 = (from x in db.Training_TestRecord
join y in db.Training_TestPlan on x.TestPlanId equals y.TestPlanId
where y.ProjectId == projectId && y.TrainTypeId == trainTypeId && y.States != "3" && x.TestManId == item.PersonId
where x.TestScores > score
select x).FirstOrDefault();
if (getTrainPersonIdList2 != null)
{
continue;
}
//int score = 80;
//var sysTestRule = db.Sys_TestRule.FirstOrDefault();
//if (sysTestRule != null)
//{
// if (sysTestRule.PassingScore > 0)
// {
// score = sysTestRule.PassingScore;
// }
//}
//var getTrainPersonIdList2 = (from x in db.Training_TestRecord
// join y in db.Training_TestPlan on x.TestPlanId equals y.TestPlanId
// where y.ProjectId == projectId && y.TrainTypeId == trainTypeId && y.States != "3" && x.TestManId == item.PersonId
// where x.TestScores > score
// select x).FirstOrDefault();
//if (getTrainPersonIdList2 != null)
//{
// continue;
//}
getTrainPersonList.Add(item);
}
return getTrainPersonList;
SGGL/BLL/API/APIUserService.cs
+1 -1
View File
@@ -102,7 +102,7 @@ namespace BLL
foreach (var role in roleList)
{
if (item.RoleId.IndexOf(role) >= 0)
if (item.RoleId !=null && item.RoleId.IndexOf(role) >= 0)
{
if (!userid.Contains(item.UserId))
{
SGGL/BLL/API/HSSE/APILicenseDataService.cs
+47 -14
View File
@@ -1,4 +1,5 @@
using System;
using Org.BouncyCastle.Utilities.Collections;
using System;
using System.Collections.Generic;
using System.Data;
using System.Data.SqlClient;
@@ -1500,6 +1501,17 @@ namespace BLL
LicenseCode = newItem.LicenseCode,
ApplyUnitId = newItem.ApplyUnitId,
ApplyManId = newItem.ApplyManId,
WorkLeaderId = newItem.WorkLeaderId,
WorkLeaderTel = newItem.WorkLeaderTel,
HasSpecialProgramme=newItem.HasSpecialProgramme,
GasDetectionAttach = newItem.GasDetectionAttach,
OtherAttach = newItem.OtherAttach,
WorkType = newItem.WorkType,
Other1 = newItem.Other1,
Other2 = newItem.Other2,
PossibleHazards = newItem.PossibleHazards,
NeedGasDetection = newItem.NeedGasDetection,
DetectionFrequency = newItem.DetectionFrequency,
ApplyDate = Funs.GetNewDateTime(newItem.ApplyDate),
WorkPalce = newItem.WorkPalce,
FireWatchManId = newItem.FireWatchManId,
@@ -1531,7 +1543,7 @@ namespace BLL
newFireWork.ApplyDate = DateTime.Now;
strLicenseId = newFireWork.FireWorkId = SQLHelper.GetNewID();
newFireWork.OldLicenseId = newItem.OldLicenseId;
newItem.LicenseCode = newFireWork.LicenseCode = CodeRecordsService.ReturnCodeByMenuIdProjectId(Const.ProjectFireWorkMenuId, newFireWork.ProjectId, newFireWork.ApplyUnitId);
newItem.LicenseCode = newFireWork.LicenseCode ="DH"+ CodeRecordsService.ReturnCodeByMenuIdProjectId(Const.ProjectFireWorkMenuId, newFireWork.ProjectId, newFireWork.ApplyUnitId);
db.License_FireWork.InsertOnSubmit(newFireWork);
////增加一条编码记录
CodeRecordsService.InsertCodeRecordsByMenuIdProjectIdUnitIdForApi(Const.ProjectFireWorkMenuId, newFireWork.ProjectId, newFireWork.ApplyUnitId, newFireWork.FireWorkId, newFireWork.ApplyDate);
@@ -1615,7 +1627,7 @@ namespace BLL
newHeightWork.ApplyDate = DateTime.Now;
strLicenseId = newHeightWork.HeightWorkId = SQLHelper.GetNewID();
newHeightWork.OldLicenseId = newItem.OldLicenseId;
newItem.LicenseCode = newHeightWork.LicenseCode = CodeRecordsService.ReturnCodeByMenuIdProjectId(Const.ProjectHeightWorkMenuId, newHeightWork.ProjectId, newHeightWork.ApplyUnitId);
newItem.LicenseCode = newHeightWork.LicenseCode = "GC" + CodeRecordsService.ReturnCodeByMenuIdProjectId(Const.ProjectHeightWorkMenuId, newHeightWork.ProjectId, newHeightWork.ApplyUnitId);
db.License_HeightWork.InsertOnSubmit(newHeightWork);
////增加一条编码记录
@@ -1698,7 +1710,7 @@ namespace BLL
newLimitedSpace.ApplyDate = DateTime.Now;
strLicenseId = newLimitedSpace.LimitedSpaceId = SQLHelper.GetNewID();
newLimitedSpace.OldLicenseId = newItem.OldLicenseId;
newItem.LicenseCode = newLimitedSpace.LicenseCode = CodeRecordsService.ReturnCodeByMenuIdProjectId(Const.ProjectLimitedSpaceMenuId, newLimitedSpace.ProjectId, newLimitedSpace.ApplyUnitId);
newItem.LicenseCode = newLimitedSpace.LicenseCode ="LS"+ CodeRecordsService.ReturnCodeByMenuIdProjectId(Const.ProjectLimitedSpaceMenuId, newLimitedSpace.ProjectId, newLimitedSpace.ApplyUnitId);
db.License_LimitedSpace.InsertOnSubmit(newLimitedSpace);
////增加一条编码记录
CodeRecordsService.InsertCodeRecordsByMenuIdProjectIdUnitIdForApi(Const.ProjectLimitedSpaceMenuId, newLimitedSpace.ProjectId, newLimitedSpace.ApplyUnitId, newLimitedSpace.LimitedSpaceId, newLimitedSpace.ApplyDate);
@@ -1789,7 +1801,7 @@ namespace BLL
newRadialWork.ApplyDate = DateTime.Now;
strLicenseId = newRadialWork.RadialWorkId = SQLHelper.GetNewID();
newRadialWork.OldLicenseId = newItem.OldLicenseId;
newItem.LicenseCode = newRadialWork.LicenseCode = CodeRecordsService.ReturnCodeByMenuIdProjectId(Const.ProjectRadialWorkMenuId, newRadialWork.ProjectId, newRadialWork.ApplyUnitId);
newItem.LicenseCode = newRadialWork.LicenseCode = "SX"+CodeRecordsService.ReturnCodeByMenuIdProjectId(Const.ProjectRadialWorkMenuId, newRadialWork.ProjectId, newRadialWork.ApplyUnitId);
db.License_RadialWork.InsertOnSubmit(newRadialWork);
////增加一条编码记录
CodeRecordsService.InsertCodeRecordsByMenuIdProjectIdUnitIdForApi(Const.ProjectRadialWorkMenuId, newRadialWork.ProjectId, newRadialWork.ApplyUnitId, newRadialWork.RadialWorkId, newRadialWork.ApplyDate);
@@ -1874,7 +1886,7 @@ namespace BLL
newOpenCircuit.ApplyDate = DateTime.Now;
strLicenseId = newOpenCircuit.OpenCircuitId = SQLHelper.GetNewID();
newOpenCircuit.OldLicenseId = newItem.OldLicenseId;
newItem.LicenseCode = newOpenCircuit.LicenseCode = CodeRecordsService.ReturnCodeByMenuIdProjectId(Const.ProjectOpenCircuitMenuId, newOpenCircuit.ProjectId, newOpenCircuit.ApplyUnitId);
newItem.LicenseCode = newOpenCircuit.LicenseCode = "DL"+CodeRecordsService.ReturnCodeByMenuIdProjectId(Const.ProjectOpenCircuitMenuId, newOpenCircuit.ProjectId, newOpenCircuit.ApplyUnitId);
db.License_OpenCircuit.InsertOnSubmit(newOpenCircuit);
////增加一条编码记录
CodeRecordsService.InsertCodeRecordsByMenuIdProjectIdUnitIdForApi(Const.ProjectOpenCircuitMenuId, newOpenCircuit.ProjectId, newOpenCircuit.ApplyUnitId, newOpenCircuit.OpenCircuitId, newOpenCircuit.ApplyDate);
@@ -1942,7 +1954,13 @@ namespace BLL
CloseTime = Funs.GetNewDateTime(newItem.CloseTime),
NextManId = newItem.NextManId,
States = newItem.States,
SignatureUrl = newItem.SignatureUrl
SignatureUrl = newItem.SignatureUrl,
WorkLeaderId= newItem.WorkLeaderId,
OtherAttach=newItem.OtherAttach,
HasSpecialProgramme=newItem.HasSpecialProgramme,
HasDrawing=newItem.HasDrawing,
DrawingDes = newItem.HasDrawing
};
if (newItem.States == Const.State_0)
{
@@ -1955,7 +1973,7 @@ namespace BLL
newBreakGround.ApplyDate = DateTime.Now;
strLicenseId = newBreakGround.BreakGroundId = SQLHelper.GetNewID();
newBreakGround.OldLicenseId = newItem.OldLicenseId;
newItem.LicenseCode = newBreakGround.LicenseCode = CodeRecordsService.ReturnCodeByMenuIdProjectId(Const.ProjectBreakGroundMenuId, newBreakGround.ProjectId, newBreakGround.ApplyUnitId);
newItem.LicenseCode = newBreakGround.LicenseCode ="DT"+ CodeRecordsService.ReturnCodeByMenuIdProjectId(Const.ProjectBreakGroundMenuId, newBreakGround.ProjectId, newBreakGround.ApplyUnitId);
db.License_BreakGround.InsertOnSubmit(newBreakGround);
////增加一条编码记录
CodeRecordsService.InsertCodeRecordsByMenuIdProjectIdUnitIdForApi(Const.ProjectBreakGroundMenuId, newBreakGround.ProjectId, newBreakGround.ApplyUnitId, newBreakGround.BreakGroundId, newBreakGround.ApplyDate);
@@ -2037,7 +2055,7 @@ namespace BLL
newNightWork.ApplyDate = DateTime.Now;
strLicenseId = newNightWork.NightWorkId = SQLHelper.GetNewID();
newNightWork.OldLicenseId = newItem.OldLicenseId;
newItem.LicenseCode = newNightWork.LicenseCode = CodeRecordsService.ReturnCodeByMenuIdProjectId(Const.ProjectNightWorkMenuId, newNightWork.ProjectId, newNightWork.ApplyUnitId);
newItem.LicenseCode = newNightWork.LicenseCode ="YJ"+ CodeRecordsService.ReturnCodeByMenuIdProjectId(Const.ProjectNightWorkMenuId, newNightWork.ProjectId, newNightWork.ApplyUnitId);
db.License_NightWork.InsertOnSubmit(newNightWork);
////增加一条编码记录
CodeRecordsService.InsertCodeRecordsByMenuIdProjectIdUnitIdForApi(Const.ProjectNightWorkMenuId, newNightWork.ProjectId, newNightWork.ApplyUnitId, newNightWork.NightWorkId, newNightWork.ApplyDate);
@@ -2114,6 +2132,10 @@ namespace BLL
CarNum = newItem.CarNum,
OtherMan = newItem.OtherMan,
WatchMan = newItem.WatchMan,
CapacityDes = newItem.CapacityDes,
WorkLeaderId = newItem.WorkLeaderId,
HasSpecialProgramme = newItem.HasSpecialProgramme,
OtherAttach = newItem.OtherAttach,
SignatureUrl = newItem.SignatureUrl
};
if (newItem.States == Const.State_0)
@@ -2127,7 +2149,7 @@ namespace BLL
newLiftingWork.ApplyDate = DateTime.Now;
strLicenseId = newLiftingWork.LiftingWorkId = SQLHelper.GetNewID();
newLiftingWork.OldLicenseId = newItem.OldLicenseId;
newItem.LicenseCode = newLiftingWork.LicenseCode = CodeRecordsService.ReturnCodeByMenuIdProjectId(Const.ProjectLiftingWorkMenuId, newLiftingWork.ProjectId, newLiftingWork.ApplyUnitId);
newItem.LicenseCode = newLiftingWork.LicenseCode = "QZ"+CodeRecordsService.ReturnCodeByMenuIdProjectId(Const.ProjectLiftingWorkMenuId, newLiftingWork.ProjectId, newLiftingWork.ApplyUnitId);
db.License_LiftingWork.InsertOnSubmit(newLiftingWork);
////增加一条编码记录
CodeRecordsService.InsertCodeRecordsByMenuIdProjectIdUnitIdForApi(Const.ProjectLiftingWorkMenuId, newLiftingWork.ProjectId, newLiftingWork.ApplyUnitId, newLiftingWork.LiftingWorkId, newLiftingWork.ApplyDate);
@@ -2197,7 +2219,18 @@ namespace BLL
States = newItem.States,
Electrician = newItem.Electrician,
Tools = newItem.Tools,
SignatureUrl = newItem.SignatureUrl
SignatureUrl = newItem.SignatureUrl,
WorkLeaderId= newItem.WorkLeaderId,
UseTo=newItem.UseTo,
AccessPoint=newItem.AccessPoint,
AccessPointNo = newItem.AccessPointNo,
AccessPointAddress = newItem.AccessPointAddress,
WorkingVoltage = newItem.WorkingVoltage,
ElectricianPhone = newItem.ElectricianPhone,
HasSpecialProgramme = newItem.HasSpecialProgramme,
OtherAttach = newItem.OtherAttach,
EquipmentLoadList = newItem.EquipmentLoadList,
EquipmentLoadDes=newItem.EquipmentLoadDes
};
if (newItem.States == Const.State_0)
@@ -2211,7 +2244,7 @@ namespace BLL
newTempElectricity.ApplyDate = DateTime.Now;
strLicenseId = newTempElectricity.TempElectricityId = SQLHelper.GetNewID();
newTempElectricity.OldLicenseId = newItem.OldLicenseId;
newItem.LicenseCode = newTempElectricity.LicenseCode = CodeRecordsService.ReturnCodeByMenuIdProjectId(Const.ProjectTempElectricityMenuId, newTempElectricity.ProjectId, newTempElectricity.ApplyUnitId);
newItem.LicenseCode = newTempElectricity.LicenseCode ="LD"+ CodeRecordsService.ReturnCodeByMenuIdProjectId(Const.ProjectTempElectricityMenuId, newTempElectricity.ProjectId, newTempElectricity.ApplyUnitId);
db.License_TempElectricity.InsertOnSubmit(newTempElectricity);
////增加一条编码记录
CodeRecordsService.InsertCodeRecordsByMenuIdProjectIdUnitIdForApi(Const.ProjectTempElectricityMenuId, newTempElectricity.ProjectId, newTempElectricity.ApplyUnitId, newTempElectricity.TempElectricityId, newTempElectricity.ApplyDate);
@@ -2296,7 +2329,7 @@ namespace BLL
newPressureTest.ApplyDate = DateTime.Now;
strLicenseId = newPressureTest.PressureTestId = SQLHelper.GetNewID();
newPressureTest.OldLicenseId = newItem.OldLicenseId;
newItem.LicenseCode = newPressureTest.LicenseCode = CodeRecordsService.ReturnCodeByMenuIdProjectId(Const.ProjectPressureTestMenuId, newPressureTest.ProjectId, newPressureTest.ApplyUnitId);
newItem.LicenseCode = newPressureTest.LicenseCode ="SY"+ CodeRecordsService.ReturnCodeByMenuIdProjectId(Const.ProjectPressureTestMenuId, newPressureTest.ProjectId, newPressureTest.ApplyUnitId);
db.License_PressureTest.InsertOnSubmit(newPressureTest);
////增加一条编码记录
CodeRecordsService.InsertCodeRecordsByMenuIdProjectIdUnitIdForApi(Const.ProjectTempElectricityMenuId, newPressureTest.ProjectId, newPressureTest.ApplyUnitId, newPressureTest.PressureTestId, newPressureTest.ApplyDate);
@@ -2384,7 +2417,7 @@ namespace BLL
newJiaBan.ApplyDate = DateTime.Now;
strLicenseId = newJiaBan.JiaBanId = SQLHelper.GetNewID();
newJiaBan.OldLicenseId = newItem.OldLicenseId;
newItem.LicenseCode = newJiaBan.LicenseCode = CodeRecordsService.ReturnCodeByMenuIdProjectId(Const.ProjectJiaBanWorkMenuId, newJiaBan.ProjectId, newJiaBan.ApplyUnitId);
newItem.LicenseCode = newJiaBan.LicenseCode = "JB"+CodeRecordsService.ReturnCodeByMenuIdProjectId(Const.ProjectJiaBanWorkMenuId, newJiaBan.ProjectId, newJiaBan.ApplyUnitId);
db.License_JiaBan.InsertOnSubmit(newJiaBan);
////增加一条编码记录