fix:升级

This commit is contained in:
geh
2025-06-19 19:23:01 +08:00
parent 0cb37e2c02
commit 7aa8baadbb
111 changed files with 14465 additions and 1480 deletions
@@ -0,0 +1,245 @@
using System;
using System.Collections.Generic;
using System.Linq;
using System.Text;
namespace Model
{
public class Hazard_HazardRegisterItem
{
/// <summary>
/// 巡检ID
/// </summary>
public string HazardRegisterId
{
get;
set;
}
/// <summary>
/// 来源单位Id
/// </summary>
public string SourceUnitId
{
get;
set;
}
/// <summary>
/// 编制日期
/// </summary>
public DateTime? RegisterDate
{
get;
set;
}
/// <summary>
/// 问题描述
/// </summary>
public string RegisterDef
{
get;
set;
}
/// <summary>
/// 整改措施 -反馈
/// </summary>
public string Rectification
{
get;
set;
}
/// <summary>
/// 区域名称
/// </summary>
public string WorkAreaName
{
get;
set;
}
/// <summary>
/// 责任单位-名称
/// </summary>
public string ResponsibilityUnitName
{
get;
set;
}
/// <summary>
/// 责任单位-社会信用码
/// </summary>
public string ResponsibilityUnitCollCropCode
{
get;
set;
}
/// <summary>
/// 风险等级
/// </summary>
public string Risk_Level
{
get;
set;
}
/// <summary>
/// 项目ID
/// </summary>
public string ProjectId
{
get;
set;
}
/// <summary>
/// 项目名称
/// </summary>
public string ProjectName
{
get;
set;
}
/// <summary>
/// 状态
/// </summary>
public string States
{
get;
set;
}
/// <summary>
/// 状态名称
/// </summary>
public string StatesStr
{
get;
set;
}
/// <summary>
///责任人 -名称
/// </summary>
public string ResponsibilityManName
{
get;
set;
}
/// <summary>
/// 检查人姓名
/// </summary>
public string CheckManName
{
get;
set;
}
/// <summary>
/// 检查时间
/// </summary>
public DateTime? CheckTime
{
get;
set;
}
/// <summary>
/// 整改期限
/// </summary>
public DateTime? RectificationPeriod
{
get;
set;
}
/// <summary>
/// 整改前照片
/// </summary>
public string ImageUrl
{
get;
set;
}
/// <summary>
///整改前照片附件字节
/// </summary>
public List<byte[]> ImageUrlFileContext
{
get;
set;
}
/// <summary>
/// 整改后照片
/// </summary>
public string RectificationImageUrl
{
get;
set;
}
/// <summary>
///整改后照片附件字节
/// </summary>
public List<byte[]> RectificationImageUrlFileContext
{
get;
set;
}
/// <summary>
/// 整改时间
/// </summary>
public DateTime? RectificationTime
{
get;
set;
}
/// <summary>
/// 确认人名称
/// </summary>
public string ConfirmManName
{
get;
set;
}
/// <summary>
/// 确认时间
/// </summary>
public DateTime? ConfirmDate
{
get;
set;
}
/// <summary>
/// 复检问题描述
/// </summary>
public string HandleIdea
{
get;
set;
}
/// <summary>
/// 处罚金额
/// </summary>
public int CutPayment
{
get;
set;
}
/// <summary>
/// 巡检类型(D-日 W-周 M-月)
/// </summary>
public string CheckCycle
{
get;
set;
}
/// <summary>
/// 问题类型名称
/// </summary>
public string RegisterTypesName
{
get;
set;
}
/// <summary>
/// 整改要求
/// </summary>
public string Requirements
{
get;
set;
}
}
}
@@ -0,0 +1,159 @@
using System;
namespace Model
{
public class LargeEngineeringItem
{
//// <summary>
/// 主键ID
/// </summary>
public string Id { get; set; }
/// <summary>
/// 来源单位Id
/// </summary>
public string SourceUnitId
{
get;
set;
}
/// <summary>
/// 项目ID
/// </summary>
public string ProjectId
{
get;
set;
}
/// <summary>
/// 责任单位-社会信用码
/// </summary>
public string CollCropCode
{
get;
set;
}
/// <summary>
/// 数据日期
/// </summary>
public DateTime? DataDate
{
get;
set;
}
/// <summary>
/// 附件路径
/// </summary>
public string AttachFile
{
get;
set;
}
/// <summary>
/// 方案名称
/// </summary>
public string HazardName
{
get;
set;
}
/// <summary>
/// 类型
/// </summary>
public string TypeName
{
get;
set;
}
/// <summary>
/// 超危大工程
/// </summary>
public bool? IsSuperLargerHazard
{
get;
set;
}
/// <summary>
/// 专家论证
/// </summary>
public bool? IsArgument
{
get;
set;
}
/// <summary>
/// 地点
/// </summary>
public string Address
{
get;
set;
}
/// <summary>
/// 描述
/// </summary>
public string Descriptions
{
get;
set;
}
/// <summary>
/// 培训人数
/// </summary>
public int? TrainPersonNum
{
get;
set;
}
/// <summary>
/// 培训人数
/// </summary>
public int? OperativesNum
{
get;
set;
}
/// <summary>
/// 编制时间
/// </summary>
public DateTime? RecordTime
{
get;
set;
}
/// <summary>
/// 预计施工时间
/// </summary>
public DateTime? ExpectedTime
{
get;
set;
}
/// <summary>
/// 状态(0 已取消 1 未开始 2 作业中 3 已完工 )
/// </summary>
public string States
{
get;
set;
}
/// <summary>
/// 状态字符串(0 已取消 1 未开始 2 作业中 3 已完工 )
/// </summary>
public string StatesStr
{
get;
set;
}
}
}
@@ -0,0 +1,147 @@
using System;
namespace Model
{
public class ProjectLicenseItem
{
//// <summary>
/// 主键ID
/// </summary>
public string Id { get; set; }
/// <summary>
/// 来源单位Id
/// </summary>
public string SourceUnitId
{
get;
set;
}
/// <summary>
/// 项目ID
/// </summary>
public string ProjectId
{
get;
set;
}
/// <summary>
/// 责任单位-社会信用码
/// </summary>
public string CollCropCode
{
get;
set;
}
/// <summary>
/// 数据日期
/// </summary>
public DateTime? DataDate
{
get;
set;
}
/// <summary>
/// 附件路径
/// </summary>
public string AttachFile
{
get;
set;
}
/// <summary>
/// 许可证编号
/// </summary>
public string LicenseManagerCode
{
get;
set;
}
/// <summary>
/// 申请单位id
/// </summary>
public string UnitId
{
get;
set;
}
/// <summary>
/// 申请单位名称
/// </summary>
public string UnitName
{
get;
set;
}
/// <summary>
/// 类型名称
/// </summary>
public string LicenseTypeName
{
get;
set;
}
/// <summary>
/// 单位类型名称
/// </summary>
public string UnitTypeName
{
get;
set;
}
/// <summary>
/// 是否高风险作业
/// </summary>
public bool? IsHighRisk
{
get;
set;
}
/// <summary>
/// 单位工程
/// </summary>
public string WorkAreaName
{
get;
set;
}
/// <summary>
/// 申请日期
/// </summary>
public DateTime? CompileDate
{
get;
set;
}
/// <summary>
/// 开始时间
/// </summary>
public DateTime? StartDate
{
get;
set;
}
/// <summary>
/// 结束时间
/// </summary>
public DateTime? EndDate
{
get;
set;
}
/// <summary>
/// 状态
/// </summary>
public string WorkStatesStr
{
get;
set;
}
}
}
@@ -0,0 +1,188 @@
using System;
namespace Model
{
public class ProjectSecurityRiskItem
{
//// <summary>
/// 主键ID
/// </summary>
public string Id { get; set; }
/// <summary>
/// 来源单位Id
/// </summary>
public string SourceUnitId
{
get;
set;
}
/// <summary>
/// 项目ID
/// </summary>
public string ProjectId
{
get;
set;
}
/// <summary>
/// 责任单位-社会信用码
/// </summary>
public string CollCropCode
{
get;
set;
}
/// <summary>
/// 数据日期
/// </summary>
public DateTime? DataDate
{
get;
set;
}
/// <summary>
/// 附件路径
/// </summary>
public string AttachFile
{
get;
set;
}
/// <summary>
/// 单位工程
/// </summary>
public string WorkAreaName
{
get;
set;
}
/// <summary>
/// 工作阶段
/// </summary>
public string WorkStageName
{
get;
set;
}
/// <summary>
/// 危险源类别
/// </summary>
public string SupHazardListType
{
get;
set;
}
/// <summary>
/// 危险源项
/// </summary>
public string HazardListType
{
get;
set;
}
/// <summary>
/// 危险源代码
/// </summary>
public string Hazard
{
get;
set;
}
/// <summary>
/// 危险因素明细
/// </summary>
public string HazardItems
{
get;
set;
}
/// <summary>
/// 缺陷类型
/// </summary>
public string DefectsType
{
get;
set;
}
/// <summary>
/// 可能导致的事故
/// </summary>
public string MayLeadAccidents
{
get;
set;
}
/// <summary>
/// 辅助方法
/// </summary>
public string HelperMethod
{
get;
set;
}
/// <summary>
/// 危险评价(L)
/// </summary>
public decimal? HazardJudge_L
{
get;
set;
}
/// <summary>
/// 危险评价(E)
/// </summary>
public decimal? HazardJudge_E
{
get;
set;
}
/// <summary>
/// 危险评价(C)
/// </summary>
public decimal? HazardJudge_C
{
get;
set;
}
/// <summary>
/// 危险评价(D)
/// </summary>
public decimal? HazardJudge_D
{
get;
set;
}
/// <summary>
/// 危险级别
/// </summary>
public int? RiskLevel
{
get;
set;
}
/// <summary>
/// 危险级别
/// </summary>
public string RiskLevelName
{
get;
set;
}
/// <summary>
/// 控制措施
/// </summary>
public string ControlMeasures
{
get;
set;
}
}
}
@@ -0,0 +1,163 @@
using System;
namespace Model{
public class QCRegistrationItem
{
//// <summary>
/// 主键ID
/// </summary>
public string Id { get; set; }
/// <summary>
/// 来源单位Id
/// </summary>
public string SourceUnitId
{
get;
set;
}
/// <summary>
/// 项目ID
/// </summary>
public string ProjectId
{
get;
set;
}
/// <summary>
/// 责任单位-社会信用码
/// </summary>
public string CollCropCode
{
get;
set;
}
/// <summary>
/// 数据日期
/// </summary>
public DateTime? DataDate
{
get;
set;
}
/// <summary>
/// 附件文件路径
/// </summary>
public string AttachFile
{
get;
set;
}
/// <summary>
/// 编号
/// </summary>
public string Code
{
get;
set;
}
/// <summary>
/// 名称
/// </summary>
public string Name
{
get;
set;
}
/// <summary>
/// 编制人
/// </summary>
public string CompileManName
{
get;
set;
}
/// <summary>
/// 编制时间
/// </summary>
public DateTime? CompileDate
{
get;
set;
}
/// <summary>
/// 所属公司
/// </summary>
public string UnitName
{
get;
set;
}
/// <summary>
/// 所属公司社会统一信用代码
/// </summary>
public string UnitCollCropCode
{
get;
set;
}
/// <summary>
/// 课题
/// </summary>
public string Subjects
{
get;
set;
}
/// <summary>
/// 过程
/// </summary>
public string Process
{
get;
set;
}
/// <summary>
/// 成果
/// </summary>
public string Achievement
{
get;
set;
}
/// <summary>
/// 奖项名称
/// </summary>
public string AwardName
{
get;
set;
}
/// <summary>
/// 奖项类型
/// </summary>
public string AwardType
{
get;
set;
}
/// <summary>
/// 获奖等级(1-国家、2-省部、3-企业)
/// </summary>
public string AwardLevel
{
get;
set;
}
/// <summary>
/// 颁奖单位
/// </summary>
public string AwardingUnit
{
get;
set;
}
}
}
@@ -0,0 +1,132 @@
using System;
namespace Model
{
public class QualityProblemItem
{
//// <summary>
/// 主键ID
/// </summary>
public string Id { get; set; }
/// <summary>
/// 来源单位Id
/// </summary>
public string SourceUnitId
{
get;
set;
}
/// <summary>
/// 项目ID
/// </summary>
public string ProjectId
{
get;
set;
}
/// <summary>
/// 责任单位-社会信用码
/// </summary>
public string CollCropCode
{
get;
set;
}
/// <summary>
/// 数据日期
/// </summary>
public DateTime? DataDate
{
get;
set;
}
/// <summary>
/// 巡检日期
/// </summary>
public DateTime? CheckDate
{
get;
set;
}
/// <summary>
/// 单位工程名称
/// </summary>
public string UnitWorkName
{
get;
set;
}
/// <summary>
/// 施工单位
/// </summary>
public string UnitName
{
get;
set;
}
/// <summary>
/// 专业
/// </summary>
public string ProfessionalName
{
get;
set;
}
/// <summary>
/// 问题类别
/// </summary>
public string QuestionType
{
get;
set;
}
/// <summary>
/// 整改前图片路径
/// </summary>
public string ImageUrl
{
get;
set;
}
/// <summary>
/// 整改后图片路径
/// </summary>
public string RectificationImageUrl
{
get;
set;
}
/// <summary>
/// 部位
/// </summary>
public string CheckSite
{
get;
set;
}
/// <summary>
/// 状态(1已整改-待复查验收 2已闭环 3超期未整改 4 待整改)
/// </summary>
public string States
{
get;
set;
}
/// <summary>
/// 状态(1已整改-待复查验收 2已闭环 3超期未整改 4 待整改)
/// </summary>
public string StatesStr
{
get;
set;
}
}
}
@@ -0,0 +1,82 @@
using System;
namespace Model
{
public class SuperviseCheckReportDetailItem
{
//// <summary>
/// 主键ID
/// </summary>
public string Id { get; set; }
/// <summary>
/// 来源单位Id
/// </summary>
public string SourceUnitId
{
get;
set;
}
/// <summary>
/// 项目ID
/// </summary>
public string ProjectId
{
get;
set;
}
/// <summary>
/// 责任单位-社会信用码
/// </summary>
public string CollCropCode
{
get;
set;
}
/// <summary>
/// 数据日期
/// </summary>
public DateTime? DataDate
{
get;
set;
}
/// <summary>
/// 附件路径
/// </summary>
public string AttachFile
{
get;
set;
}
/// <summary>
/// 申请单位id
/// </summary>
public string UnitId
{
get;
set;
}
/// <summary>
/// 申请单位名称
/// </summary>
public string UnitName
{
get;
set;
}
public string SuperviseCheckReportId { get; set; }
public string RectifyItemId { get; set; }
public bool? IsSelected { get; set; }
public string HazardSourcePoint { get; set; }
public string RiskAnalysis { get; set; }
public string RiskPrevention { get; set; }
public string SimilarRisk { get; set; }
public string RectifyName { get; set; }
public string RectifyCode { get; set; }
}
}
@@ -0,0 +1,87 @@
using System;
using System.Collections.Generic;
namespace Model
{
public class SuperviseCheckReportItem
{
//// <summary>
/// 主键ID
/// </summary>
public string Id { get; set; }
/// <summary>
/// 来源单位Id
/// </summary>
public string SourceUnitId
{
get;
set;
}
/// <summary>
/// 项目ID
/// </summary>
public string ProjectId
{
get;
set;
}
/// <summary>
/// 责任单位-社会信用码
/// </summary>
public string CollCropCode
{
get;
set;
}
/// <summary>
/// 数据日期
/// </summary>
public DateTime? DataDate
{
get;
set;
}
/// <summary>
/// 附件路径
/// </summary>
public string AttachFile
{
get;
set;
}
/// <summary>
/// 申请单位id
/// </summary>
public string UnitId
{
get;
set;
}
/// <summary>
/// 申请单位名称
/// </summary>
public string UnitName
{
get;
set;
}
public string SuperviseCheckReportCode { get; set; }
public DateTime? CheckDate { get; set; }
public string CheckTeam { get; set; }
public string CheckType { get; set; }
public string CheckTypeName { get; set; }
public string CheckMainType { get; set; }
public string CheckMainTypeName { get; set; }
public string CheckUnitId { get; set; }
public string CheckUnitName { get; set; }
public List<SuperviseCheckReportDetailItem> SuperviseCheckReportDetail { get; set; }
}
}
File diff suppressed because it is too large Load Diff
+9
View File
@@ -136,10 +136,12 @@
<Compile Include="APIItem\HJGL\HotProcessHardItem.cs" />
<Compile Include="APIItem\HJGL\NDETrustItem.cs" />
<Compile Include="APIItem\HJGL\WeldJointItem.cs" />
<Compile Include="APIItem\HSSE\Hazard_HazardRegisterItem.cs" />
<Compile Include="APIItem\HSSE\Hazard_RealTimeItem.cs" />
<Compile Include="APIItem\HSSE\HSEDiaryItem.cs" />
<Compile Include="APIItem\HSSE\HSSE_Hazard_HazardRegisterDto.cs" />
<Compile Include="APIItem\HSSE\IncentiveNoticeItem.cs" />
<Compile Include="APIItem\HSSE\LargeEngineeringItem.cs" />
<Compile Include="APIItem\HSSE\LicenseDataItem.cs" />
<Compile Include="APIItem\HSSE\LicenseItem.cs" />
<Compile Include="APIItem\HSSE\GoodsManageItem.cs" />
@@ -154,6 +156,10 @@
<Compile Include="APIItem\HSSE\PersonItem.cs" />
<Compile Include="APIItem\HSSE\PersonQualityItem.cs" />
<Compile Include="APIItem\HSSE\PictureItem.cs" />
<Compile Include="APIItem\HSSE\ProjectLicenseItem.cs" />
<Compile Include="APIItem\HSSE\ProjectSecurityRiskItem.cs" />
<Compile Include="APIItem\HSSE\QCRegistrationItem.cs" />
<Compile Include="APIItem\HSSE\QualityProblemItem.cs" />
<Compile Include="APIItem\HSSE\RectifyNoticesDto.cs" />
<Compile Include="APIItem\HSSE\ReEvaluator.cs" />
<Compile Include="APIItem\HSSE\RoutingInspectionItem.cs" />
@@ -217,6 +223,8 @@
<Compile Include="APIItem\SHHSE\NewSYHSEDataItem.cs" />
<Compile Include="APIItem\SHHSE\NewSYHSEDataRealTimeDeviceItem.cs" />
<Compile Include="APIItem\SHHSE\NewSYHSEDataRiskControlItem.cs" />
<Compile Include="APIItem\SuperviseCheckReportDetailItem.cs" />
<Compile Include="APIItem\SuperviseCheckReportItem.cs" />
<Compile Include="APIItem\SYHSEItem.cs" />
<Compile Include="APIItem\SYHSE\DataBaseItem.cs" />
<Compile Include="APIItem\SYHSE\DataEnvironmentProtectionItem.cs" />
@@ -346,6 +354,7 @@
<Compile Include="SpTDesktopItem.cs" />
<Compile Include="Sys_UserDto.cs" />
<Compile Include="ZHGL\DataSync\CHCheckItemOutput.cs" />
<Compile Include="ZHGL\DataSync\LicenseHSETechnicalOutput.cs" />
<Compile Include="ZHGL\DataSync\WBSBreakdownProjectOutput.cs" />
<Compile Include="ZHGL\DataSync\WelderOutput.cs" />
<Compile Include="ZHGL\DataSync\WeldDineOutput.cs" />
@@ -11,6 +11,10 @@
/// </summary>
public string ProjectId { get; set; }
/// <summary>
/// 项目来源单位id
/// </summary>
public string ProjectFromUnitId { get; set; }
/// <summary>
/// 项目编码
/// </summary>
public string ProjectCode { get; set; }
+12 -1
View File
@@ -37,7 +37,14 @@ namespace Model
public int? ProblemNotCompletedNum { get; set; }
public int? ProblemNum { get; set; }
public string ProblemRate { get; set; }
public int? UnitCheckNum { get; set; }
public int? UnitCheckClosedNum { get; set; }
public int? UnitCheckNotClosedNum { get; set; }
public int? BranchCheckNum { get; set; }
public int? BranchCheckClosedNum { get; set; }
public int? BranchCheckNotClosedNum { get; set; }
public int? ProjectPersonNum { get; set; }
public int? ProjectSubPersonNum { get; set; }
public string ReportDate { get; set; }
public int? SingleProjectNum { get; set; }
public int? SNum { get; set; }
@@ -47,6 +54,9 @@ namespace Model
public int? SubdivisionalWorksNum { get; set; }
public int? SubProjectNum { get; set; }
public int? TechnicalDisclosePersonNum { get; set; }
public int? ComprehensiveConTechnologyDisclosureNum { get; set; }
public int? ComprehensiveConTechnologyDisclosurePersonNum { get; set; }
public int? ComprehensiveReviewDrawingsNum { get; set; }
public int? TrainPersonNum { get; set; }
public string UnitId { get; set; }
public int? UnitProjectNum { get; set; }
@@ -73,6 +83,7 @@ namespace Model
public int? SubProjectAcceptOKNum { get; set; }
public int? SubdivisionalWorksAcceptNum { get; set; }
public int? SubdivisionalWorksAcceptOKNum { get; set; }
public int? InspectionMachineNum { get; set; }
public int? InspectionMachineQualifiedNum { get; set; }
}
}
+14 -2
View File
@@ -19,17 +19,26 @@ namespace Model
/// </summary>
public partial class HsseDataItem
{
public int? BranchLeadShiftCheckNum { get; set; }
public int? BranchComprehensiveCheckNum { get; set; }
public int? BranchSpecialCheckNum { get; set; }
public int? BeUnderConstructionNum { get; set; }
public int? BranchFullTimeNum { get; set; }
public int? BranchInspectorGeneralNum { get; set; }
public int? BranchComprehensivePlanNum { get; set; }
public int? BranchSpecialPlanNum { get; set; }
public int? BranchOnSiteDisposalPlan { get; set; }
public int? CertificateANum { get; set; }
public int? CertificateBNum { get; set; }
public int? CertificateCNum { get; set; }
public int? QualityPersonNum { get; set; }
public string CollCropCode { get; set; }
public int? CompanyComprehensiveCheckNum { get; set; }
public int? CompanyComprehensivePlanNum { get; set; }
public int? CompanyDrillNum { get; set; }
public int? CompanyDrillPersonNum { get; set; }
public int? BranchDrillNum { get; set; }
public int? BranchDrillPersonNum { get; set; }
public int? CompanyLeadShiftCheckNum { get; set; }
public int? CompanyOnSiteDisposalPlan { get; set; }
@@ -69,8 +78,9 @@ namespace Model
public int? ProjectComprehensivePlanNum { get; set; }
public int? ProjectDrillNum { get; set; }
public int? ProjectDrillPersonNum { get; set; }
public int? ProjectFullTimeNum { get; set; }
public int? ProjectSubFullTimeNum { get; set; }
public int? ProjectInspectorGeneralNum { get; set; }
public int? ProjectLeadShiftCheckNum { get; set; }
public int? ProjectMajorCheckNum { get; set; }
@@ -91,7 +101,7 @@ namespace Model
public int? SpecialEquipmentNum { get; set; }
public int? SpecialOperationTrainNum { get; set; }
public int? HseTechnicalNum { get; set; }
public int? EnvironmentalTrainNum { get; set; }
public int? SpecialSeriousAccidentNum { get; set; }
public int? SpecialTrainNum { get; set; }
@@ -104,6 +114,8 @@ namespace Model
public int? TrainPersonNum { get; set; }
public string UnitId { get; set; }
public int? UseEquipmentNum { get; set; }
public int? OperativesNum { get; set; }
public int? SuperOperativesNum { get; set; }
public List<HSSEDataHiddenDangerDetailItem> HiddenDangerDetailItems { get; set; }
}
@@ -1,6 +1,6 @@
namespace Model
{
public class LargeEngineeringOutput : BaseEntities
public class LargeEngineeringOutput:BaseEntities
{
/// <summary>
/// 危大工程审批完成数
@@ -42,5 +42,13 @@
/// 超危大工程论证个数
/// </summary>
public int SuperArgumentNum { get; set; }
/// <summary>
/// 危大工程作业人员数
/// </summary>
public int OperativesNum { get; set; }
/// <summary>
/// 超危大工程作业人员数
/// </summary>
public int SuperOperativesNum { get; set; }
}
}
@@ -0,0 +1,14 @@
using System;
namespace Model
{
/// <summary>
/// 安全技术交底
/// </summary>
public class LicenseHSETechnicalOutput : BaseEntities
{
public string HSETechnicalCode { get; set; }
public string WorkContents { get; set; }
}
}
@@ -25,5 +25,10 @@
/// 电话
/// </summary>
public string Phone { get; set; }
/// <summary>
/// 是否本部人员
/// </summary>
public bool IsOffice { get; set; }
}
}