LiuXin
/
WeiCloud.Fusion
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

修改bug

Browse Source
pull/31/head
刘鑫 3 months ago
parent b909a8d9a6
commit a9367913d1
4 changed files with 120 additions and 151 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 2
      WeiCloud.Fusion/Common.SharedService/Common.Shared.Application/Common.Shared.Application.csproj
  2. 5
      WeiCloud.Fusion/Common.SharedService/Common.Shared.Application/SafetyFirePro/RequestDto/SunPlaceBoardWorkOrderReqDto.cs
  3. 184
      WeiCloud.Fusion/Common.SharedService/Common.Shared.Application/SafetyFirePro/ResponseDto/SunPlaceBoardWorkOrderResDto.cs
  4. 4
      WeiCloud.Fusion/ThirdPartyServices/ThirdPartyServices.DomainService/ShenZhouShengAn/SunPalaceBoardSafetyService.cs

2
WeiCloud.Fusion/Common.SharedService/Common.Shared.Application/Common.Shared.Application.csproj
Unescape View File

@ -7,7 +7,7 @@
</PropertyGroup> </PropertyGroup>
<PropertyGroup> <PropertyGroup>
<PackageId>Common.Shared.Application</PackageId> <PackageId>Common.Shared.Application</PackageId>
<Version>2.9.0</Version> <Version>3.0.0</Version>
<Authors>zrh-lx</Authors> <Authors>zrh-lx</Authors>
<Company>zrh-lx</Company> <!-- 可选 --> <Company>zrh-lx</Company> <!-- 可选 -->
<Description>包含所有公共使用的 DTO、契约、接口模型等，供微服务之间共享使用</Description> <Description>包含所有公共使用的 DTO、契约、接口模型等，供微服务之间共享使用</Description>

5
WeiCloud.Fusion/Common.SharedService/Common.Shared.Application/SafetyFirePro/RequestDto/SunPlaceBoardWorkOrderReqDto.cs
Unescape View File

@ -110,11 +110,6 @@ namespace Common.Shared.Application.SafetyFirePro.RequestDto
/// <remarks>必填项</remarks> /// <remarks>必填项</remarks>
[JsonPropertyName("ubpid")] [JsonPropertyName("ubpid")]
public string? Ubpid { get; set; } public string? Ubpid { get; set; }
/// <summary>
/// 当为1的时候是统计，其他的时候查询列表
/// </summary>
public int? Type { get; set; }
} }
/// <summary> /// <summary>

184
WeiCloud.Fusion/Common.SharedService/Common.Shared.Application/SafetyFirePro/ResponseDto/SunPlaceBoardWorkOrderResDto.cs
Unescape View File

@ -688,7 +688,7 @@ namespace Common.Shared.Application.SafetyFirePro.ResponseDto
#region 隐患详情数据 #region 隐患详情数据
/// <summary> /// <summary>
/// 隐患数据主对象 /// 隐患详情根实体（仅包含指定的顶级字段）
/// </summary> /// </summary>
public class HazardDataDto public class HazardDataDto
{ {
@ -696,7 +696,7 @@ namespace Common.Shared.Application.SafetyFirePro.ResponseDto
/// 隐患核查结果信息列表 /// 隐患核查结果信息列表
/// </summary> /// </summary>
[JsonPropertyName("check")] [JsonPropertyName("check")]
public List<HazardCheckResult>? CheckResults { get; set; } public List<HazardCheckItem>? CheckResults { get; set; }
/// <summary> /// <summary>
/// 隐患描述 /// 隐患描述
@ -708,37 +708,37 @@ namespace Common.Shared.Application.SafetyFirePro.ResponseDto
/// 隐患相关风险点信息（如果有） /// 隐患相关风险点信息（如果有）
/// </summary> /// </summary>
[JsonPropertyName("equipment")] [JsonPropertyName("equipment")]
public HazardEquipment? Equipment { get; set; } public HazardEquipmentItem? Equipment { get; set; }
/// <summary> /// <summary>
/// 风险等级信息 /// 风险等级信息
/// </summary> /// </summary>
[JsonPropertyName("risk")] [JsonPropertyName("risk")]
public RiskLevelInfo? Risk { get; set; } public RiskLevelItem? Risk { get; set; }
/// <summary> /// <summary>
/// 风险点责任人信息列表 /// 风险点责任人信息列表
/// </summary> /// </summary>
[JsonPropertyName("users")] [JsonPropertyName("users")]
public List<ResponsiblePerson>? ResponsiblePersons { get; set; } public List<ResponsiblePersonItem>? ResponsiblePersons { get; set; }
/// <summary> /// <summary>
/// 隐患整改及验收信息列表 /// 隐患整改及验收信息列表
/// </summary> /// </summary>
[JsonPropertyName("rectifications")] [JsonPropertyName("rectifications")]
public List<RectificationInfo>? Rectifications { get; set; } public List<RectificationItem>? Rectifications { get; set; }
/// <summary> /// <summary>
/// 隐患发生区域 /// 隐患发生区域
/// </summary> /// </summary>
[JsonPropertyName("region")] [JsonPropertyName("region")]
public RegionInfo? Region { get; set; } public RegionSimpleItem? Region { get; set; }
/// <summary> /// <summary>
/// 隐患上报情况 /// 隐患上报情况
/// </summary> /// </summary>
[JsonPropertyName("register")] [JsonPropertyName("register")]
public HazardRegister? Register { get; set; } public HazardRegisterItem? Register { get; set; }
/// <summary> /// <summary>
/// 隐患状态，0待核查，1待整改，2待验收，3治理完毕，4不是隐患 /// 隐患状态，0待核查，1待整改，2待验收，3治理完毕，4不是隐患
@ -748,21 +748,21 @@ namespace Common.Shared.Application.SafetyFirePro.ResponseDto
} }
/// <summary> /// <summary>
/// 隐患核查结果信息 /// 隐患核查结果单项信息
/// </summary> /// </summary>
public class HazardCheckResult public class HazardCheckItem
{ {
/// <summary> /// <summary>
/// 隐患一级分类信息 /// 隐患一级分类信息（仅含名称）
/// </summary> /// </summary>
[JsonPropertyName("cate")] [JsonPropertyName("cate")]
public CategoryInfo? Category { get; set; } public CategorySimpleItem? Category { get; set; }
/// <summary> /// <summary>
/// 隐患二级分类信息 /// 隐患二级分类信息（仅含名称）
/// </summary> /// </summary>
[JsonPropertyName("cate_sub")] [JsonPropertyName("cate_sub")]
public CategoryInfo? SubCategory { get; set; } public CategorySimpleItem? SubCategory { get; set; }
/// <summary> /// <summary>
/// 核查情况说明 /// 核查情况说明
@ -774,7 +774,7 @@ namespace Common.Shared.Application.SafetyFirePro.ResponseDto
/// 核查时间 /// 核查时间
/// </summary> /// </summary>
[JsonPropertyName("report_time")] [JsonPropertyName("report_time")]
public DateTime ReportTime { get; set; } public string ReportTime { get; set; } = string.Empty; // 用string避免日期格式问题，需转换可改为DateTime?
/// <summary> /// <summary>
/// 核查结果，0待核查，1是隐患，2不是隐患，3提交上级部门核查 /// 核查结果，0待核查，1是隐患，2不是隐患，3提交上级部门核查
@ -786,43 +786,43 @@ namespace Common.Shared.Application.SafetyFirePro.ResponseDto
/// 核查人信息 /// 核查人信息
/// </summary> /// </summary>
[JsonPropertyName("user")] [JsonPropertyName("user")]
public CheckUserInfo? User { get; set; } public CheckUserItem? User { get; set; }
} }
/// <summary> /// <summary>
/// 核查人信息 /// 核查人信息（仅含部门和姓名）
/// </summary> /// </summary>
public class CheckUserInfo public class CheckUserItem
{ {
/// <summary> /// <summary>
/// 核查人部门信息列表 /// 核查人部门信息列表（仅含部门名称）
/// </summary> /// </summary>
[JsonPropertyName("branch")] [JsonPropertyName("branch")]
public List<DepartmentInfo>? Departments { get; set; } public List<DepartmentWrapperItem>? Departments { get; set; }
/// <summary> /// <summary>
/// 核查人额外信息 /// 核查人额外信息（仅含姓名）
/// </summary> /// </summary>
[JsonPropertyName("extras")] [JsonPropertyName("extras")]
public UserExtras? Extras { get; set; } public UserNameItem? Extras { get; set; }
} }
/// <summary> /// <summary>
/// 部门信息 /// 部门信息包装（仅含部门详情）
/// </summary> /// </summary>
public class DepartmentInfo public class DepartmentWrapperItem
{ {
/// <summary> /// <summary>
/// 部门详情 /// 部门详情（仅含名称）
/// </summary> /// </summary>
[JsonPropertyName("branch")] [JsonPropertyName("branch")]
public DepartmentDetail? Branch { get; set; } public DepartmentSimpleItem? Branch { get; set; }
} }
/// <summary> /// <summary>
/// 部门详情 /// 部门简化信息（仅含名称）
/// </summary> /// </summary>
public class DepartmentDetail public class DepartmentSimpleItem
{ {
/// <summary> /// <summary>
/// 部门名称 /// 部门名称
@ -832,9 +832,9 @@ namespace Common.Shared.Application.SafetyFirePro.ResponseDto
} }
/// <summary> /// <summary>
/// 用户额外信息 /// 用户姓名信息（仅含姓名）
/// </summary> /// </summary>
public class UserExtras public class UserNameItem
{ {
/// <summary> /// <summary>
/// 姓名 /// 姓名
@ -844,15 +844,15 @@ namespace Common.Shared.Application.SafetyFirePro.ResponseDto
} }
/// <summary> /// <summary>
/// 隐患相关风险点信息 /// 隐患相关风险点信息（仅含指定字段）
/// </summary> /// </summary>
public class HazardEquipment public class HazardEquipmentItem
{ {
/// <summary> /// <summary>
/// 责任部门 /// 责任部门（仅含名称）
/// </summary> /// </summary>
[JsonPropertyName("branch")] [JsonPropertyName("branch")]
public DepartmentDetail? Branch { get; set; } public DepartmentSimpleItem? Branch { get; set; }
/// <summary> /// <summary>
/// 风险点名称 /// 风险点名称
@ -861,16 +861,16 @@ namespace Common.Shared.Application.SafetyFirePro.ResponseDto
public string Name { get; set; } = string.Empty; public string Name { get; set; } = string.Empty;
/// <summary> /// <summary>
/// 所在区域 /// 所在区域（仅含名称）
/// </summary> /// </summary>
[JsonPropertyName("region")] [JsonPropertyName("region")]
public RegionInfo? Region { get; set; } public RegionSimpleItem? Region { get; set; }
} }
/// <summary> /// <summary>
/// 区域信息 /// 区域简化信息（仅含名称）
/// </summary> /// </summary>
public class RegionInfo public class RegionSimpleItem
{ {
/// <summary> /// <summary>
/// 区域名称 /// 区域名称
@ -880,15 +880,15 @@ namespace Common.Shared.Application.SafetyFirePro.ResponseDto
} }
/// <summary> /// <summary>
/// 风险等级信息 /// 风险等级信息（仅含指定字段）
/// </summary> /// </summary>
public class RiskLevelInfo public class RiskLevelItem
{ {
/// <summary> /// <summary>
/// 责任部门信息 /// 责任部门信息（仅含管控层级）
/// </summary> /// </summary>
[JsonPropertyName("branch")] [JsonPropertyName("branch")]
public RiskBranchInfo? Branch { get; set; } public RiskBranchItem? Branch { get; set; }
/// <summary> /// <summary>
/// 风险等级ID /// 风险等级ID
@ -904,21 +904,21 @@ namespace Common.Shared.Application.SafetyFirePro.ResponseDto
} }
/// <summary> /// <summary>
/// 风险点责任部门信息 /// 风险点责任部门信息（仅含管控层级）
/// </summary> /// </summary>
public class RiskBranchInfo public class RiskBranchItem
{ {
/// <summary> /// <summary>
/// 风险点管控层级 /// 风险点管控层级（仅含名称）
/// </summary> /// </summary>
[JsonPropertyName("branch_level")] [JsonPropertyName("branch_level")]
public LevelInfo? BranchLevel { get; set; } public LevelSimpleItem? BranchLevel { get; set; }
} }
/// <summary> /// <summary>
/// 层级信息 /// 层级简化信息（仅含名称）
/// </summary> /// </summary>
public class LevelInfo public class LevelSimpleItem
{ {
/// <summary> /// <summary>
/// 层级名称（如岗位级） /// 层级名称（如岗位级）
@ -928,45 +928,33 @@ namespace Common.Shared.Application.SafetyFirePro.ResponseDto
} }
/// <summary> /// <summary>
/// 风险点责任人信息 /// 风险点责任人信息（仅含姓名）
/// </summary> /// </summary>
public class ResponsiblePerson public class ResponsiblePersonItem
{ {
/// <summary> /// <summary>
/// 责任人详情 /// 责任人详情（仅含姓名）
/// </summary> /// </summary>
[JsonPropertyName("users")] [JsonPropertyName("users")]
public PersonDetail? Users { get; set; } public UserNameItem? Users { get; set; }
}
/// <summary>
/// 人员详情
/// </summary>
public class PersonDetail
{
/// <summary>
/// 姓名
/// </summary>
[JsonPropertyName("name")]
public string Name { get; set; } = string.Empty;
} }
/// <summary> /// <summary>
/// 隐患整改及验收信息 /// 隐患整改及验收信息（仅含指定字段）
/// </summary> /// </summary>
public class RectificationInfo public class RectificationItem
{ {
/// <summary> /// <summary>
/// 整改责任部门 /// 整改责任部门（仅含名称）
/// </summary> /// </summary>
[JsonPropertyName("branch")] [JsonPropertyName("branch")]
public DepartmentDetail? Branch { get; set; } public DepartmentSimpleItem? Branch { get; set; }
/// <summary> /// <summary>
/// 本次整改验收信息 /// 本次整改验收信息
/// </summary> /// </summary>
[JsonPropertyName("check")] [JsonPropertyName("check")]
public RectificationCheck? Check { get; set; } public RectificationCheckItem? Check { get; set; }
/// <summary> /// <summary>
/// 整改人所选验收人姓名 /// 整改人所选验收人姓名
@ -975,16 +963,16 @@ namespace Common.Shared.Application.SafetyFirePro.ResponseDto
public string CheckUser { get; set; } = string.Empty; public string CheckUser { get; set; } = string.Empty;
/// <summary> /// <summary>
/// 隐患整改图片列表 /// 隐患整改图片列表（仅含名称和路径）
/// </summary> /// </summary>
[JsonPropertyName("file")] [JsonPropertyName("file")]
public List<FileInfo>? Files { get; set; } public List<FileSimpleItem>? Files { get; set; }
/// <summary> /// <summary>
/// 整改完成时间 /// 整改完成时间
/// </summary> /// </summary>
[JsonPropertyName("finish_time")] [JsonPropertyName("finish_time")]
public DateTime FinishTime { get; set; } public string FinishTime { get; set; } = string.Empty; // 用string避免日期格式问题
/// <summary> /// <summary>
/// 整改投入资金（元） /// 整改投入资金（元）
@ -1006,21 +994,21 @@ namespace Common.Shared.Application.SafetyFirePro.ResponseDto
} }
/// <summary> /// <summary>
/// 整改验收信息 /// 整改验收信息（仅含指定字段）
/// </summary> /// </summary>
public class RectificationCheck public class RectificationCheckItem
{ {
/// <summary> /// <summary>
/// 整改验收时间 /// 整改验收时间
/// </summary> /// </summary>
[JsonPropertyName("cend_time")] [JsonPropertyName("cend_time")]
public DateTime CheckEndTime { get; set; } public string CheckEndTime { get; set; } = string.Empty; // 用string避免日期格式问题
/// <summary> /// <summary>
/// 验收图片或文件列表 /// 验收图片或文件列表（仅含名称和路径）
/// </summary> /// </summary>
[JsonPropertyName("file")] [JsonPropertyName("file")]
public List<FileInfo>? Files { get; set; } public List<FileSimpleItem>? Files { get; set; }
/// <summary> /// <summary>
/// 验收意见 /// 验收意见
@ -1032,7 +1020,7 @@ namespace Common.Shared.Application.SafetyFirePro.ResponseDto
/// 验收结果，1通过，2不通过 /// 验收结果，1通过，2不通过
/// </summary> /// </summary>
[JsonPropertyName("status")] [JsonPropertyName("status")]
public string Status { get; set; } = string.Empty; public string Status { get; set; } = string.Empty; // 按你标注的"验收结果"设为string，可根据实际JSON改为int?
/// <summary> /// <summary>
/// 验收人姓名 /// 验收人姓名
@ -1042,9 +1030,9 @@ namespace Common.Shared.Application.SafetyFirePro.ResponseDto
} }
/// <summary> /// <summary>
/// 文件信息 /// 文件简化信息（仅含名称和路径）
/// </summary> /// </summary>
public class FileInfo public class FileSimpleItem
{ {
/// <summary> /// <summary>
/// 文件名称 /// 文件名称
@ -1060,21 +1048,21 @@ namespace Common.Shared.Application.SafetyFirePro.ResponseDto
} }
/// <summary> /// <summary>
/// 隐患上报情况 /// 隐患上报情况（仅含指定字段）
/// </summary> /// </summary>
public class HazardRegister public class HazardRegisterItem
{ {
/// <summary> /// <summary>
/// 隐患一级分类信息 /// 隐患一级分类信息（仅含名称）
/// </summary> /// </summary>
[JsonPropertyName("cate")] [JsonPropertyName("cate")]
public CategoryInfo? Category { get; set; } public CategorySimpleItem? Category { get; set; }
/// <summary> /// <summary>
/// 隐患二级分类信息 /// 隐患二级分类信息（仅含名称）
/// </summary> /// </summary>
[JsonPropertyName("cate_sub")] [JsonPropertyName("cate_sub")]
public CategoryInfo? SubCategory { get; set; } public CategorySimpleItem? SubCategory { get; set; }
/// <summary> /// <summary>
/// 所选核查人姓名 /// 所选核查人姓名
@ -1083,10 +1071,10 @@ namespace Common.Shared.Application.SafetyFirePro.ResponseDto
public string CheckUser { get; set; } = string.Empty; public string CheckUser { get; set; } = string.Empty;
/// <summary> /// <summary>
/// 隐患图片列表 /// 隐患图片列表（仅含名称和路径）
/// </summary> /// </summary>
[JsonPropertyName("file")] [JsonPropertyName("file")]
public List<FileInfo>? Files { get; set; } public List<FileSimpleItem>? Files { get; set; }
/// <summary> /// <summary>
/// 隐患情况描述 /// 隐患情况描述
@ -1095,16 +1083,16 @@ namespace Common.Shared.Application.SafetyFirePro.ResponseDto
public string Infos { get; set; } = string.Empty; public string Infos { get; set; } = string.Empty;
/// <summary> /// <summary>
/// 隐患上报人信息 /// 隐患上报人信息（仅含姓名）
/// </summary> /// </summary>
[JsonPropertyName("user")] [JsonPropertyName("user")]
public ReporterInfo? User { get; set; } public UserNameItem? User { get; set; }
} }
/// <summary> /// <summary>
/// 分类信息 /// 分类简化信息（仅含名称）
/// </summary> /// </summary>
public class CategoryInfo public class CategorySimpleItem
{ {
/// <summary> /// <summary>
/// 分类名称 /// 分类名称
@ -1113,18 +1101,6 @@ namespace Common.Shared.Application.SafetyFirePro.ResponseDto
public string Name { get; set; } = string.Empty; public string Name { get; set; } = string.Empty;
} }
/// <summary>
/// 上报人信息
/// </summary>
public class ReporterInfo
{
/// <summary>
/// 姓名
/// </summary>
[JsonPropertyName("name")]
public string Name { get; set; } = string.Empty;
}
#endregion 隐患详情数据 #endregion 隐患详情数据
#region 危害辨识度数据 #region 危害辨识度数据

4
WeiCloud.Fusion/ThirdPartyServices/ThirdPartyServices.DomainService/ShenZhouShengAn/SunPalaceBoardSafetyService.cs
Unescape View File

@ -540,8 +540,7 @@ namespace ThirdPartyServices.DomainService.ShenZhouShengAn
dto.Ubpid = loginUsers.Data.Ubpid.ToString(); dto.Ubpid = loginUsers.Data.Ubpid.ToString();
List<StatisticsInfoDto> data = []; List<StatisticsInfoDto> data = [];
if (dto.Type == 1)
{
//查询未开始，status=1、2 //查询未开始，status=1、2
int[] statusNot = [1, 2, 3, 4, 6, 7, 8, 11, 12, 13]; int[] statusNot = [1, 2, 3, 4, 6, 7, 8, 11, 12, 13];
@ -599,7 +598,6 @@ namespace ThirdPartyServices.DomainService.ShenZhouShengAn
result.Data = MergeStatistics(data); result.Data = MergeStatistics(data);
} }
}
catch (Exception ex) catch (Exception ex)
{ {
_logger.LogWarning(ex, "GetStatistics接口出错"); _logger.LogWarning(ex, "GetStatistics接口出错");

Write Preview
Loading…
Cancel
Save