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

Compare commits

base: wyw:2c325b6040c898f34f84be41096f8896d7766637
Branches Tags
wyw:master
..
compare: wyw:823f20da6ec2347edda40c3d9686594f1704b031
Branches Tags
wyw:master

No commits in common. "2c325b6040c898f34f84be41096f8896d7766637" and "823f20da6ec2347edda40c3d9686594f1704b031" have entirely different histories.
2c325b6040 ... 823f20da6e

7 changed files with 1 additions and 139791 deletions
Show Stats Expand all files Collapse all files

139692
APT.Data.Migrations/Migrations/20260522081608_wyw2026052201.Designer.cs generated
View File

File diff suppressed because it is too large Load Diff

55
APT.Data.Migrations/Migrations/20260522081608_wyw2026052201.cs
View File

@ -1,55 +0,0 @@
using System;
using Microsoft.EntityFrameworkCore.Migrations;
namespace APT.Data.Migrations.Migrations
{
public partial class wyw2026052201 : Migration
{
protected override void Up(MigrationBuilder migrationBuilder)
{
migrationBuilder.AddColumn<DateTime>(
name: "DT_APPROVE",
table: "T_SE_TRAIN_RECORD",
type: "datetime2",
nullable: true);
migrationBuilder.AddColumn<Guid>(
name: "USER_ID_APPROVE",
table: "T_SE_TRAIN_RECORD",
type: "uniqueidentifier",
nullable: true);
migrationBuilder.CreateIndex(
name: "IX_T_SE_TRAIN_RECORD_USER_ID_APPROVE",
table: "T_SE_TRAIN_RECORD",
column: "USER_ID_APPROVE");
migrationBuilder.AddForeignKey(
name: "FK_T_SE_TRAIN_RECORD_T_FM_USER_USER_ID_APPROVE",
table: "T_SE_TRAIN_RECORD",
column: "USER_ID_APPROVE",
principalTable: "T_FM_USER",
principalColumn: "ID",
onDelete: ReferentialAction.Restrict);
}
protected override void Down(MigrationBuilder migrationBuilder)
{
migrationBuilder.DropForeignKey(
name: "FK_T_SE_TRAIN_RECORD_T_FM_USER_USER_ID_APPROVE",
table: "T_SE_TRAIN_RECORD");
migrationBuilder.DropIndex(
name: "IX_T_SE_TRAIN_RECORD_USER_ID_APPROVE",
table: "T_SE_TRAIN_RECORD");
migrationBuilder.DropColumn(
name: "DT_APPROVE",
table: "T_SE_TRAIN_RECORD");
migrationBuilder.DropColumn(
name: "USER_ID_APPROVE",
table: "T_SE_TRAIN_RECORD");
}
}
}

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

@ -76234,9 +76234,6 @@ namespace APT.Data.Migrations.Migrations
b.Property<DateTime?>("CREATE_TIME")
.HasColumnType("datetime2");
b.Property<DateTime?>("DT_APPROVE")
.HasColumnType("datetime2");
b.Property<DateTime?>("DT_SSEND_SIGN")
.HasColumnType("datetime2");
@ -76284,17 +76281,12 @@ namespace APT.Data.Migrations.Migrations
b.Property<int>("TRAIN_COUNT")
.HasColumnType("int");
b.Property<Guid?>("USER_ID_APPROVE")
.HasColumnType("uniqueidentifier");
b.HasKey("ID");
b.HasIndex("NOTIFY_ID");
b.HasIndex("ORG_ID");
b.HasIndex("USER_ID_APPROVE");
b.ToTable("T_SE_TRAIN_RECORD");
});
@ -127208,16 +127200,9 @@ namespace APT.Data.Migrations.Migrations
.OnDelete(DeleteBehavior.Restrict)
.IsRequired();
b.HasOne("APT.BaseData.Domain.Entities.FM.T_FM_USER", "Nav_UserApro")
.WithMany()
.HasForeignKey("USER_ID_APPROVE")
.OnDelete(DeleteBehavior.Restrict);
b.Navigation("Nav_Notify");
b.Navigation("Nav_Org");
b.Navigation("Nav_UserApro");
});
modelBuilder.Entity("APT.MS.Domain.Entities.SE.T_SE_TRAIN_RECORD_FILE", b =>

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

@ -10693,7 +10693,6 @@ builder.Property(t => t.POST_NAME).HasMaxLength(50);
builder.Ignore(t => t.PUBLISH);
builder.Ignore(t => t.IS_OVERTIME);
builder.Property(t => t.REASONCANCLE).HasMaxLength(200);
builder.HasOne(t => t.Nav_UserApro).WithMany().HasForeignKey(t => t.USER_ID_APPROVE).OnDelete(DeleteBehavior.Restrict);
}
}
#endregion

22
APT.MS.Domain/Entities/SC/SE/61T_SE_TRAIN_RECORD.cs
View File

@ -1,5 +1,4 @@
using APT.BaseData.Domain.Entities.FM;
using APT.BaseData.Domain.Enums;
using APT.BaseData.Domain.Enums;
using APT.Infrastructure.Core;
using APT.MS.Domain.Enums;
using System;
@ -86,24 +85,5 @@ namespace APT.MS.Domain.Entities.SE
[DataFieldLength(200)]
public string REASONCANCLE { get; set; }
/// <summary>
/// 审阅人
/// </summary>
[Description("审阅人")]
[DataFieldForeignKey("Nav_UserApro")]
public Guid? USER_ID_APPROVE { get; set; }
/// <summary>
/// 审阅导航
/// </summary>
[Description("审阅导航")]
public T_FM_USER Nav_UserApro { get; set; }
/// <summary>
/// 审阅时间
/// </summary>
[Description("审阅时间")]
public DateTime? DT_APPROVE { get; set; }
}
}

4
APT.MicroApi/APT.SC.WebApi/Controllers/Api/SEController/1SESafeSurveyController.cs
View File

@ -545,10 +545,6 @@ namespace APT.SC.WebApi.Controllers.Api.SE
}
for (int i = 0; i < points.Count; i++)
{
if (paper.Nav_Test == null)
{
continue;
}
if (paper.Nav_Test.Nav_Points.Find(p => p.POINT_ID.Value == points[i].ID) != null)
{
Rows[idx].COL[i, 0]++;

3
APT.MicroApi/APT.SC.WebApi/Controllers/Api/SEController/6SETrainRecordController.cs
View File

@ -1212,7 +1212,6 @@ namespace APT.SC.WebApi.Controllers.Api.SE
if (chargeUser != null)
{
sendNotice.Add(NotificationTaskService.InsertUserNoticeTaskModel("培训记录完成待审阅-" + data.Nav_Notify.NAME, data.ID, entity.ORG_ID, chargeUser.ID, chargeUser.NAME, DateTime.Now, DateTime.Now.AddDays(2), 1, "SE017_SHOWPRINT"));
entity.USER_ID_APPROVE = chargeUser.ID;
}
}
@ -1525,7 +1524,6 @@ namespace APT.SC.WebApi.Controllers.Api.SE
if (chargeUser != null)
{
sendNotices = NotificationTaskService.InsertUserNoticeTaskModel("培训记录完成待审阅-" + record.Nav_Notify.NAME, record.ID, record.ORG_ID, chargeUser.ID, chargeUser.NAME, DateTime.Now, DateTime.Now.AddDays(2), 1, "SE017_SHOWPRINT");
record.USER_ID_APPROVE = chargeUser.ID;
}
//record.Nav_Notify = null;//不能加加了会报错的样子
}
@ -1955,7 +1953,6 @@ namespace APT.SC.WebApi.Controllers.Api.SE
if (data.STATUS == SETrainRecordStatus.审阅中)
{
data.STATUS = SETrainRecordStatus.归档;
data.DT_APPROVE = DateTime.Now;
finishNotice = NotificationTaskService.GetTaskFinishModel(Guid.Parse(filter.Parameter1));
//20230308触发转训
var Nav_TrainUserList = data.Nav_Notify.Nav_TrainUserList;