lpf
/
SGGL_SHJ
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

1

This commit is contained in:
高飞 2025-08-01 09:56:48 +08:00
parent 404ab72e55
commit d634dbd732
7 changed files with 194 additions and 131 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
DataBase/版本日志/SGGLDB_V2025-08-01-001-gaofei.sql Normal file
View File

@ -0,0 +1,2 @@
alter table SitePerson_Person add IsCQMSCheck bit null
GO

2
SGGL/BLL/HSSE/SitePerson/SitePerson_PersonService.cs
View File

@ -844,6 +844,7 @@ namespace BLL
Isprint = "0",
States = person.States,
IsSafetyMonitoring = person.IsSafetyMonitoring,
IsCQMSCheck=person.IsCQMSCheck,
};
if (newPerson.WorkPostId == Const.WorkPost_Welder)
@ -925,6 +926,7 @@ namespace BLL
setPersonItemInOut = true;
}
newPerson.IsSafetyMonitoring = person.IsSafetyMonitoring;
newPerson.IsCQMSCheck = person.IsCQMSCheck;
db.SubmitChanges();
if (!setPersonItemInOut)

40
SGGL/BLL/ZHGL/DataSync/CQMSDataService.cs
View File

@ -592,6 +592,7 @@ namespace BLL
var subdivisionalWorksNuTask = CQMSDataService.GetSubdivisionalWorksNumAsync(); //获取分项工程个数
var inspectionLotNumTask = CQMSDataService.GetInspectionLotNumAsync(); //获取检验批个数
var constructSolutionTask = CQMSDataService.GetConstructSolutionAsync(); //施工方案数量
var comprehensiveMajorPlanTask = CQMSDataService.GetComprehensive_MajorPlanApprovalAsync(); //危大工程、超危大工程施工方案数量
var cqmsProblemTask = CQMSDataService.GetCQMSProblemAsync(); //获取企业级、项目级质量问题
var cqmsBranchMajorCheckTask = CQMSDataService.GetBranchMajorCheckAsync(); //获取分支机构质量大检查次数
var cqmsCompanyMajorCheckTask = CQMSDataService.GetCompanyMajorCheckAsync(); //获取企业质量大检查次数
@ -621,7 +622,7 @@ namespace BLL
inspectionEquipmentTask, inspectionPersonTask, inspectionMachineTask,
useNumTask, okNumTask,
singleProjectNumTask, unitProjectNumTask, subProjectNuTask, subdivisionalWorksNuTask, inspectionLotNumTask,
constructSolutionTask,
constructSolutionTask, comprehensiveMajorPlanTask,
cqmsProblemTask, cqmsBranchMajorCheckTask, cqmsCompanyMajorCheckTask,
keyProcessNumTask, keyProcessOKNumTask, specialProcessNumTask, specialProcessOKNumTask, concealedWorksNumTask, concealedWorksOKNumTask,
unitProjectAcceptNumTask, unitProjectAcceptOKNumTask, subProjectAcceptNumTask, subProjectAcceptOKNumTask, subdivisionalWorksAcceptNumTask, subdivisionalWorksAcceptOKNumTask,
@ -651,6 +652,7 @@ namespace BLL
var inspectionLotNum = await inspectionLotNumTask;
var constructSolutionList = await constructSolutionTask;
var comprehensiveMajorPlanList = await comprehensiveMajorPlanTask;
var cqmsProblemList = await cqmsProblemTask;
var cqmsBranchMajorCheckList = await cqmsBranchMajorCheckTask;
var cqmsCompanyMajorCheckList = await cqmsCompanyMajorCheckTask;
@ -692,7 +694,7 @@ namespace BLL
EquipmentInspectionNum = inspectionEquipmentList.Count(),
EquipmentInspectionQualifiedNum = inspectionEquipmentList.Count(),
PersonInspectionNum = inspectionPersonList.Count(),
PersonInspectionQualifiedNum = inspectionPersonList.Where(x => x.ValidityDate == null || (x.ValidityDate.HasValue && x.ValidityDate >= DateTime.Now)).Count(),
PersonInspectionQualifiedNum = inspectionPersonList.Count(),
MachineInspectionNum = inspectionMachineList.Count(),
MachineInspectionQualifiedNum = inspectionMachineList.Where(x => x.IsCheckCertificate == true).Count(),
@ -708,7 +710,7 @@ namespace BLL
ConstructSolutionNum = constructSolutionList.Count(),
ConstructSolutionProjectApproveNum = constructSolutionList.Where(x => x.State == "1").Count(),
ConstructSolutionUnitApproveNum = 0,//
ConstructSolutionUnitApproveNum = comprehensiveMajorPlanList.Count(),
SpecialEquipmentQualityAssuranceSystemNum = qualityAssuranceNum.Count(),
DesignDetailsNum = technicalDisclosePersonList.Sum(x => x.TrainPersonNum),
@ -765,7 +767,7 @@ namespace BLL
EquipmentInspectionNum = inspectionEquipmentList.Count(x => x.ProjectId == projectid),
EquipmentInspectionQualifiedNum = inspectionEquipmentList.Where(x => x.ProjectId == projectid).Count(),
PersonInspectionNum = inspectionPersonList.Count(x => x.ProjectId == projectid),
PersonInspectionQualifiedNum = inspectionPersonList.Where(x => (x.ValidityDate == null || (x.ValidityDate.HasValue && x.ValidityDate >= DateTime.Now)) && x.ProjectId == projectid).Count(),
PersonInspectionQualifiedNum = inspectionPersonList.Count(x => x.ProjectId == projectid),
MachineInspectionNum = inspectionMachineList.Count(x => x.ProjectId == projectid),
MachineInspectionQualifiedNum = inspectionMachineList.Where(x => x.IsCheckCertificate == true && x.ProjectId == projectid).Count(),
MaterialInspectionNum = 0,
@ -780,7 +782,7 @@ namespace BLL
ConstructSolutionNum = constructSolutionList.Count(x => x.ProjectId == projectid),
ConstructSolutionProjectApproveNum = constructSolutionList.Where(x => x.State == "1" && x.ProjectId == projectid).Count(),
ConstructSolutionUnitApproveNum = 0,//
ConstructSolutionUnitApproveNum = comprehensiveMajorPlanList.Count(x => x.ProjectId == projectid),
SpecialEquipmentQualityAssuranceSystemNum = qualityAssuranceNum.Count(x => x.ProjectId == projectid),
DesignDetailsNum = technicalDisclosePersonList.Where(x => x.ProjectId == projectid).Sum(x => x.TrainPersonNum),
@ -1210,10 +1212,10 @@ namespace BLL
/// 获取人员报验
/// </summary>
/// <returns></returns>
public static List<Model.Comprehensive_InspectionPerson> GetComprehensive_InspectionPerson()
public static List<Model.SitePerson_Person> GetComprehensive_InspectionPerson()
{
var result = (from x in Funs.DB.Comprehensive_InspectionPerson
where BeUnderConstructionList.Contains(x.ProjectId) && x.IsOnSite.HasValue && x.IsOnSite == true && x.CompileDate > Const.DtmarkTime
var result = (from x in Funs.DB.SitePerson_Person
where BeUnderConstructionList.Contains(x.ProjectId) && x.IsCQMSCheck.HasValue && x.IsCQMSCheck == true
select x).ToList();
return result;
}
@ -1222,7 +1224,7 @@ namespace BLL
/// 获取人员报验(异步)
/// </summary>
/// <returns></returns>
public static async Task<List<Comprehensive_InspectionPerson>> GetComprehensive_InspectionPersonAsync()
public static async Task<List<SitePerson_Person>> GetComprehensive_InspectionPersonAsync()
{
return await Task.Run(GetComprehensive_InspectionPerson);
}
@ -1423,6 +1425,26 @@ namespace BLL
return await Task.Run(GetConstructSolution);
}
/// <summary>
/// 危大（超危大）工程施工方案数量
/// </summary>
/// <returns></returns>
public static List<Solution_LargerHazard> GetComprehensive_MajorPlanApproval()
{
var result = (from x in Funs.DB.Solution_LargerHazard
where BeUnderConstructionList.Contains(x.ProjectId)
select x).ToList();
return result;
}
/// <summary>
/// 危大（超危大）工程施工方案数量(异步)
/// </summary>
/// <returns></returns>
public static async Task<List<Solution_LargerHazard>> GetComprehensive_MajorPlanApprovalAsync()
{
return await Task.Run(GetComprehensive_MajorPlanApproval);
}
/// <summary>
/// 获取施工技术交底
/// </summary>

3
SGGL/FineUIPro.Web/Person/ProjectPersonEdit.aspx
View File

@ -162,13 +162,14 @@
</f:DropDownBox>
</Items>
</f:FormRow>
<f:FormRow ColumnWidths="50% 35% 15%">
<f:FormRow ColumnWidths="50% 30% 10% 10%">
<Items>
<f:DatePicker ID="txtInTime" runat="server" Label="入场时间" ShowRedStar="true" Required="true">
</f:DatePicker>
<f:RadioButtonList ID="rbPersonType" runat="server" Label="人员类型" Readonly="true">
</f:RadioButtonList>
<f:CheckBox runat="server" ID="ckIsSafetyMonitoring" Label="安全监护"></f:CheckBox>
<f:CheckBox runat="server" ID="ckIsCQMSCheck" Label="质量报验"></f:CheckBox>
</Items>
</f:FormRow>
<f:FormRow>

7
SGGL/FineUIPro.Web/Person/ProjectPersonEdit.aspx.cs
View File

@ -382,6 +382,10 @@ namespace FineUIPro.Web.Person
{
this.ckIsSafetyMonitoring.Checked = getProjectPerson.IsSafetyMonitoring.Value;
}
if (getProjectPerson.IsCQMSCheck.HasValue)
{
this.ckIsCQMSCheck.Checked = getProjectPerson.IsCQMSCheck.Value;
}
}
else
{
@ -884,7 +888,8 @@ namespace FineUIPro.Web.Person
OutTime = Funs.GetNewDateTime(this.txtOutTime.Text),
OutResult = this.txtOutResult.Text.Trim(),
States = string.IsNullOrEmpty(this.hdStates.Text) ? Const.ProjectPersonStates_0 : this.hdStates.Text,
IsSafetyMonitoring=this.ckIsSafetyMonitoring.Checked
IsSafetyMonitoring=this.ckIsSafetyMonitoring.Checked,
IsCQMSCheck = this.ckIsCQMSCheck.Checked
};
if (newPerson.States == Const.ProjectPersonStates_2 || newPerson.States == Const.ProjectPersonStates_R)
{

15
SGGL/FineUIPro.Web/Person/ProjectPersonEdit.aspx.designer.cs generated
View File

@ -7,12 +7,10 @@
// </自动生成>
//------------------------------------------------------------------------------
namespace FineUIPro.Web.Person
{
namespace FineUIPro.Web.Person {
public partial class ProjectPersonEdit
{
public partial class ProjectPersonEdit {
/// <summary>
/// _form1 控件。
@ -329,6 +327,15 @@ namespace FineUIPro.Web.Person
/// </remarks>
protected global::FineUIPro.CheckBox ckIsSafetyMonitoring;
/// <summary>
/// ckIsCQMSCheck 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.CheckBox ckIsCQMSCheck;
/// <summary>
/// drpAuditor 控件。
/// </summary>

24
SGGL/Model/Model.cs
View File

@ -238370,6 +238370,8 @@ namespace Model
private System.Nullable<bool> _IsSafetyMonitoring;
private System.Nullable<bool> _IsCQMSCheck;
private EntityRef<Base_Project> _Base_Project;
private EntityRef<Base_Unit> _Base_Unit;
@ -238448,6 +238450,8 @@ namespace Model
partial void OnIsWeldOKChanged();
partial void OnIsSafetyMonitoringChanging(System.Nullable<bool> value);
partial void OnIsSafetyMonitoringChanged();
partial void OnIsCQMSCheckChanging(System.Nullable<bool> value);
partial void OnIsCQMSCheckChanged();
#endregion
public SitePerson_Person()
@ -239105,6 +239109,26 @@ namespace Model
}
}
[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_IsCQMSCheck", DbType="Bit")]
public System.Nullable<bool> IsCQMSCheck
{
get
{
return this._IsCQMSCheck;
}
set
{
if ((this._IsCQMSCheck != value))
{
this.OnIsCQMSCheckChanging(value);
this.SendPropertyChanging();
this._IsCQMSCheck = value;
this.SendPropertyChanged("IsCQMSCheck");
this.OnIsCQMSCheckChanged();
}
}
}
[global::System.Data.Linq.Mapping.AssociationAttribute(Name="FK_SitePerson_Person_Base_Project", Storage="_Base_Project", ThisKey="ProjectId", OtherKey="ProjectId", IsForeignKey=true)]
public Base_Project Base_Project
{