wyw/mh_jy_safe
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'master' of http://121.41.2.71:3000/wyw/mh_jy_safe

Browse Source
This commit is contained in:
wyw 2026-04-09 15:30:16 +08:00
commit cae6ba7cdc
14 changed files with 491753 additions and 73244 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
APT.BaseData.Services/Services/PF/PFApproveCallBackService.cs
View File

@ -12314,7 +12314,7 @@ namespace APT.BaseData.Services.DomainServices
major.APPLY_USER_ID = user.ID;
major.APPLY_DEPARTMENT_ID = user.DEPARTMENT_ID;
major.HIDDEN_REASON = null;
major.CHARGE_USER_ID = null;
major.CHARGE_USER_ID = user.ID;
major.REVIEW_DESCRIPTION = null;
major.REVIEW_RESULT = null;
major.REPORT_DATE = null;
@ -12335,6 +12335,7 @@ namespace APT.BaseData.Services.DomainServices
major.CODE = "YHXH" + DateTime.Now.ToShortDateString().Replace("/", "") + new Random().Next(1, 999);
major.HIDDEN_DESCRIPTION = entity.Nav_Question?.DESCREPTION;
major.NOTICE_CODE = entity.NOTICE_CODE;
major.CHARGE_USER_ID = user.ID;
}
notice = NotificationTaskService.InsertUserNoticeTaskModel("重大事故隐患治理销号表"+ DateTime.Now.ToShortDateString().Replace("/", ""), major.ID, major.ORG_ID, user.ID, user.NAME, DateTime.Now,
DateTime.Now.AddHours(24), (int)FMNoticeTypeEnum.消息, "SK080");

138999
APT.Data.Migrations/Migrations/20260409062518_hmr2026040901.Designer.cs generated Normal file
View File

File diff suppressed because it is too large Load Diff

24
APT.Data.Migrations/Migrations/20260409062518_hmr2026040901.cs Normal file
View File

@ -0,0 +1,24 @@
using Microsoft.EntityFrameworkCore.Migrations;
namespace APT.Data.Migrations.Migrations
{
public partial class hmr2026040901 : Migration
{
protected override void Up(MigrationBuilder migrationBuilder)
{
migrationBuilder.AddColumn<bool>(
name: "IS_SEND",
table: "T_FO_ENTERPRISE_INFORMATION_REGISTRATION",
type: "bit",
nullable: false,
defaultValue: false);
}
protected override void Down(MigrationBuilder migrationBuilder)
{
migrationBuilder.DropColumn(
name: "IS_SEND",
table: "T_FO_ENTERPRISE_INFORMATION_REGISTRATION");
}
}
}

138999
APT.Data.Migrations/Migrations/20260409064539_hmr2026040902.Designer.cs generated Normal file
View File

File diff suppressed because it is too large Load Diff

35
APT.Data.Migrations/Migrations/20260409064539_hmr2026040902.cs Normal file
View File

@ -0,0 +1,35 @@
using Microsoft.EntityFrameworkCore.Migrations;
namespace APT.Data.Migrations.Migrations
{
public partial class hmr2026040902 : Migration
{
protected override void Up(MigrationBuilder migrationBuilder)
{
migrationBuilder.AlterColumn<string>(
name: "COMPANY_DESCRIPTION",
table: "T_FO_ENTERPRISE_INFORMATION_REGISTRATION",
type: "nvarchar(1000)",
maxLength: 1000,
nullable: true,
oldClrType: typeof(string),
oldType: "nvarchar(500)",
oldMaxLength: 500,
oldNullable: true);
}
protected override void Down(MigrationBuilder migrationBuilder)
{
migrationBuilder.AlterColumn<string>(
name: "COMPANY_DESCRIPTION",
table: "T_FO_ENTERPRISE_INFORMATION_REGISTRATION",
type: "nvarchar(500)",
maxLength: 500,
nullable: true,
oldClrType: typeof(string),
oldType: "nvarchar(1000)",
oldMaxLength: 1000,
oldNullable: true);
}
}
}

138999
APT.Data.Migrations/Migrations/20260409070133_hmr2026040903.Designer.cs generated Normal file
View File

File diff suppressed because it is too large Load Diff

31
APT.Data.Migrations/Migrations/20260409070133_hmr2026040903.cs Normal file
View File

@ -0,0 +1,31 @@
using Microsoft.EntityFrameworkCore.Migrations;
namespace APT.Data.Migrations.Migrations
{
public partial class hmr2026040903 : Migration
{
protected override void Up(MigrationBuilder migrationBuilder)
{
migrationBuilder.AlterColumn<int>(
name: "ACCEPT_RESULTE",
table: "T_SK_HIDDEN_DANGER_RECTIFY_RECORD",
type: "int",
nullable: true,
oldClrType: typeof(int),
oldType: "int");
}
protected override void Down(MigrationBuilder migrationBuilder)
{
migrationBuilder.AlterColumn<int>(
name: "ACCEPT_RESULTE",
table: "T_SK_HIDDEN_DANGER_RECTIFY_RECORD",
type: "int",
nullable: false,
defaultValue: 0,
oldClrType: typeof(int),
oldType: "int",
oldNullable: true);
}
}
}

9
APT.Data.Migrations/Migrations/MigrationContextModelSnapshot.cs
View File

@ -32961,8 +32961,8 @@ namespace APT.Data.Migrations.Migrations
.HasColumnType("decimal(18,2)");
b.Property<string>("COMPANY_DESCRIPTION")
.HasMaxLength(500)
.HasColumnType("nvarchar(500)");
.HasMaxLength(1000)
.HasColumnType("nvarchar(1000)");
b.Property<string>("COMPANY_NAME")
.HasMaxLength(50)
@ -32996,6 +32996,9 @@ namespace APT.Data.Migrations.Migrations
b.Property<bool>("IS_DELETED")
.HasColumnType("bit");
b.Property<bool>("IS_SEND")
.HasColumnType("bit");
b.Property<int?>("METHOD")
.HasColumnType("int");
@ -82114,7 +82117,7 @@ namespace APT.Data.Migrations.Migrations
.HasMaxLength(500)
.HasColumnType("nvarchar(500)");
b.Property<int>("ACCEPT_RESULTE")
b.Property<int?>("ACCEPT_RESULTE")
.HasColumnType("int");
b.Property<Guid?>("ACCEPT_USER_ID")

2
APT.MS.Data/Mapping/T4/T4Map.cs
View File

@ -1243,7 +1243,7 @@ builder.Property(t => t.NAME).HasMaxLength(50);
builder.Property(t => t.TYPE).HasMaxLength(50);
builder.Property(t => t.ALLOW_NO).HasMaxLength(50);
builder.Property(t => t.SAFE_ALLOW_NO).HasMaxLength(50);
builder.Property(t => t.COMPANY_DESCRIPTION).HasMaxLength(500);
builder.Property(t => t.COMPANY_DESCRIPTION).HasMaxLength(1000);
builder.Ignore(t => t.PUBLISH);
}
}

5
APT.MS.Domain/Entities/FO/T_FO_ENTERPRISE_INFORMATION_REGISTRATION.cs
View File

@ -100,7 +100,7 @@ namespace APT.MS.Domain.Entities.FO
[Description("公司简介")]
[FormFieldEdit]
[DataFieldLength(500)]
[DataFieldLength(1000)]
public string COMPANY_DESCRIPTION { get; set; }
[Description("营业执照附件")]
[FormFieldEdit]
@ -123,5 +123,8 @@ namespace APT.MS.Domain.Entities.FO
[Description("是否发布")]
[DataFieldIngore]
public string PUBLISH { get; set; }
[Description("是否已提醒")]
public bool IS_SEND { get; set; } = false;
}
}

2
APT.MS.Domain/Entities/SK/T_SK_HIDDEN_DANGER_RECTIFY_RECORD.cs
View File

@ -230,7 +230,7 @@ namespace APT.MS.Domain.Entities.SK
/// 验收结论
/// </summary>
[Description("验收结论")]
public SKAcceptResultEnum ACCEPT_RESULTE { get; set; }
public SKAcceptResultEnum? ACCEPT_RESULTE { get; set; }
/// <summary>
/// 验收意见

5
APT.MicroApi/APT.PP.WebApi/Controllers/Api/FOController.cs
View File

@ -2208,7 +2208,7 @@ namespace APT.PP.WebApi.Controllers.Api.PP
//找安全总监
var user = this.GetEntity<T_FM_USER>(t => t.ENABLE_STATUS == 0 && t.Nav_ApproveRole!=null && t.Nav_ApproveRole.NAME.Contains("安全总监"));
//找营业期限或者采矿许可证有效期或者安全生产许可证有效期到期前3个月的数据
var infos = this.GetEntities<T_FO_ENTERPRISE_INFORMATION_REGISTRATION>(t =>(t.WORK_END_DATE!=null&& t.WORK_END_DATE < dtThree) || (t.ALLOW_END_DATE != null && t.ALLOW_END_DATE < dtThree) || (t.SAFE_ALLOW_END_DATE != null && t.SAFE_ALLOW_END_DATE < dtThree), new BaseFilter(filter.OrgId));
var infos = this.GetEntities<T_FO_ENTERPRISE_INFORMATION_REGISTRATION>(t =>(t.WORK_END_DATE!=null&& t.WORK_END_DATE < dtThree) || (t.ALLOW_END_DATE != null && t.ALLOW_END_DATE < dtThree) || (t.SAFE_ALLOW_END_DATE != null && t.SAFE_ALLOW_END_DATE < dtThree) && t.IS_SEND == false, new BaseFilter(filter.OrgId));
if (user != null && infos != null && infos.Any() && dt.Hour == 8)//每小时跑批，只在8点触发
{
foreach (var item in infos)
@ -2229,10 +2229,13 @@ namespace APT.PP.WebApi.Controllers.Api.PP
var notice = NotificationTaskService.InsertUserNoticeTaskModel(msg, item.ID, item.ORG_ID, user.ID, user.NAME, DateTime.Now,
DateTime.Now.AddDays(2), (int)FMNoticeTypeEnum.今日提醒, "PF135");
notices.Add(notice);
item.IS_SEND = true;
}
}
UnifiedCommit(() =>
{
if (infos != null && infos.Any())
BantchSaveEntityNoCommit(infos);
if (notices != null && notices.Any())
BantchSaveEntityNoCommit(notices);
});

147874
APT.MicroApi/APT.SC.WebApi/Controllers/Api/T4/T4Control.cs
View File

File diff suppressed because it is too large Load Diff

10
APT.MicroApi/APT.SK.WebApi/Controllers/Api/MajorAccidentHazardManageController.cs
View File

@ -111,6 +111,8 @@ namespace APT.SK.WebApi.Controllers.Api
T_FM_NOTIFICATION_TASK task = null;
T_SK_HIDDEN_DANGER_RECTIFY_RECORD record = null;
var recordFileIds = new List<Guid>();
var approveIds = new List<Guid>();
var approveDetailIds = new List<Guid>();
if (entity.PUBLISH != null && entity.PUBLISH.Equals("SaveAndNotify"))
{
//同意销号触发审批
@ -151,11 +153,13 @@ namespace APT.SK.WebApi.Controllers.Api
record.STATUS = PFStandardStatus.Rejected;
record.ACCEPT_DATE = null;
record.ACCEPT_OPINION = null;
record.ACCEPT_USER_ID = null;
record.ACCEPT_RESULTE = null;
record.RECTIFICATION_DESCRIPTION = null;
record.RECTIFICATION_MONEY = null;
record.COMPLETE_DATE = null;
recordFileIds = this.GetEntities<T_SK_HIDDEN_DANGER_RECTIFY_RECORD_PHOTOB>(t => t.HIDDEN_DANGER_RECTIFY_RECORD_ID == record.ID, new BaseFilter(entity.ORG_ID)).Select(m => m.ID).ToList();
approveIds = this.GetEntities<T_PF_APPROVE>(t => t.DATA_ID!=null && t.DATA_ID == record.ID, new BaseFilter(entity.ORG_ID)).Select(m => m.ID).ToList();
approveDetailIds = this.GetEntities<T_PF_APPROVE_DETAIL>(t => t.APPROVE_ID!=null && approveIds.Contains(t.APPROVE_ID), new BaseFilter(entity.ORG_ID)).Select(m => m.ID).ToList();
if (record.IMPLEMENT_USER_ID != null)
{
var user = this.GetEntity<T_FM_USER>(t => t.ID == record.IMPLEMENT_USER_ID);
@ -206,6 +210,10 @@ namespace APT.SK.WebApi.Controllers.Api
UpdateEntityNoCommit(record);
if (recordFileIds != null && recordFileIds.Any())
this.BantchDeleteEntityNoCommit<T_SK_HIDDEN_DANGER_RECTIFY_RECORD_PHOTOB>(recordFileIds);
if (approveDetailIds != null && approveDetailIds.Any())
this.BantchDeleteEntityNoCommit<T_PF_APPROVE_DETAIL>(approveDetailIds);
if (approveIds != null && approveIds.Any())
this.BantchDeleteEntityNoCommit<T_PF_APPROVE>(approveIds);
});
return true;
});