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

加序号字段

Browse Source
This commit is contained in:
何美荣 2025-10-20 18:00:13 +08:00
parent 46a1ca12d8
commit d0c3a79598
18 changed files with 258512 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

129150
APT.Data.Migrations/Migrations/20251020094230_hmr2025102001.Designer.cs generated Normal file
View File

File diff suppressed because it is too large Load Diff

43
APT.Data.Migrations/Migrations/20251020094230_hmr2025102001.cs Normal file
View File

@ -0,0 +1,43 @@
using Microsoft.EntityFrameworkCore.Migrations;
namespace APT.Data.Migrations.Migrations
{
public partial class hmr2025102001 : Migration
{
protected override void Up(MigrationBuilder migrationBuilder)
{
migrationBuilder.AddColumn<int>(
name: "ROW_NO",
table: "T_SK_ENTERPRISE_LIBRARY_DETAIL_CONTENT_HIDDEN",
type: "int",
nullable: true);
migrationBuilder.AddColumn<int>(
name: "ROW_NO",
table: "T_SK_ENTERPRISE_LIBRARY_DETAIL_CONTENT",
type: "int",
nullable: true);
migrationBuilder.AddColumn<int>(
name: "ROW_NO",
table: "T_SK_ENTERPRISE_LIBRARY_DETAIL",
type: "int",
nullable: true);
}
protected override void Down(MigrationBuilder migrationBuilder)
{
migrationBuilder.DropColumn(
name: "ROW_NO",
table: "T_SK_ENTERPRISE_LIBRARY_DETAIL_CONTENT_HIDDEN");
migrationBuilder.DropColumn(
name: "ROW_NO",
table: "T_SK_ENTERPRISE_LIBRARY_DETAIL_CONTENT");
migrationBuilder.DropColumn(
name: "ROW_NO",
table: "T_SK_ENTERPRISE_LIBRARY_DETAIL");
}
}
}

129159
APT.Data.Migrations/Migrations/20251020095534_hmr2025102002.Designer.cs generated Normal file
View File

File diff suppressed because it is too large Load Diff

43
APT.Data.Migrations/Migrations/20251020095534_hmr2025102002.cs Normal file
View File

@ -0,0 +1,43 @@
using Microsoft.EntityFrameworkCore.Migrations;
namespace APT.Data.Migrations.Migrations
{
public partial class hmr2025102002 : Migration
{
protected override void Up(MigrationBuilder migrationBuilder)
{
migrationBuilder.AddColumn<int>(
name: "ROW_NO",
table: "T_SK_BASIC_LIBRARY_DETAIL_CONTENT_HIDDEN",
type: "int",
nullable: true);
migrationBuilder.AddColumn<int>(
name: "ROW_NO",
table: "T_SK_BASIC_LIBRARY_DETAIL_CONTENT",
type: "int",
nullable: true);
migrationBuilder.AddColumn<int>(
name: "ROW_NO",
table: "T_SK_BASIC_LIBRARY_DETAIL",
type: "int",
nullable: true);
}
protected override void Down(MigrationBuilder migrationBuilder)
{
migrationBuilder.DropColumn(
name: "ROW_NO",
table: "T_SK_BASIC_LIBRARY_DETAIL_CONTENT_HIDDEN");
migrationBuilder.DropColumn(
name: "ROW_NO",
table: "T_SK_BASIC_LIBRARY_DETAIL_CONTENT");
migrationBuilder.DropColumn(
name: "ROW_NO",
table: "T_SK_BASIC_LIBRARY_DETAIL");
}
}
}

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

@ -72082,6 +72082,9 @@ namespace APT.Data.Migrations.Migrations
.IsRequired()
.HasColumnType("uniqueidentifier");
b.Property<int?>("ROW_NO")
.HasColumnType("int");
b.HasKey("ID");
b.HasIndex("BASIC_LIBRARY_ID");
@ -72152,6 +72155,9 @@ namespace APT.Data.Migrations.Migrations
.IsRequired()
.HasColumnType("uniqueidentifier");
b.Property<int?>("ROW_NO")
.HasColumnType("int");
b.HasKey("ID");
b.HasIndex("BASIC_LIBRARY_DETAIL_ID");
@ -72280,6 +72286,9 @@ namespace APT.Data.Migrations.Migrations
.HasMaxLength(500)
.HasColumnType("nvarchar(500)");
b.Property<int?>("ROW_NO")
.HasColumnType("int");
b.HasKey("ID");
b.HasIndex("BASIC_LIBRARY_DETAIL_CONTENT_ID");
@ -74525,6 +74534,9 @@ namespace APT.Data.Migrations.Migrations
.IsRequired()
.HasColumnType("uniqueidentifier");
b.Property<int?>("ROW_NO")
.HasColumnType("int");
b.HasKey("ID");
b.HasIndex("ENTERPRISE_LIBRARY_ID");
@ -74595,6 +74607,9 @@ namespace APT.Data.Migrations.Migrations
.IsRequired()
.HasColumnType("uniqueidentifier");
b.Property<int?>("ROW_NO")
.HasColumnType("int");
b.HasKey("ID");
b.HasIndex("CHECK_CONTENTS_ID");
@ -74794,6 +74809,9 @@ namespace APT.Data.Migrations.Migrations
.HasMaxLength(500)
.HasColumnType("nvarchar(500)");
b.Property<int?>("ROW_NO")
.HasColumnType("int");
b.HasKey("ID");
b.HasIndex("CHECK_QUESTION_ID");

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

@ -13490,6 +13490,8 @@ builder.HasOne(t => t.Nav_CheckType).WithMany().HasForeignKey(t => t.CHECK_TYPE_
builder.Property(t => t.RUNDATA).HasMaxLength(500);
builder.HasOne(t => t.Nav_ProductionUnit).WithMany().HasForeignKey(t => t.PRODUCTION_UNIT_ID).OnDelete(DeleteBehavior.Restrict);
builder.HasOne(t => t.Nav_UserSend).WithMany().HasForeignKey(t => t.USER_ID_SEND).OnDelete(DeleteBehavior.Restrict);
builder.Ignore(t => t.MONTHStr);
builder.Ignore(t => t.DATAStr);
}
}
#endregion
@ -14250,6 +14252,8 @@ builder.HasOne(t => t.Nav_ImgFile).WithMany().HasForeignKey(t => t.IMG_FILE_ID).
base.Configure(builder);
builder.Property(t => t.CODE).HasMaxLength(500);
builder.Property(t => t.NAME).HasMaxLength(500);
builder.Ignore(t => t.MONTHStr);
builder.Ignore(t => t.DATAStr);
}
}
#endregion

5
APT.MS.Domain/Entities/SK/T_SK_BASIC_LIBRARY_DETAIL.cs
View File

@ -42,6 +42,9 @@ namespace APT.MS.Domain.Entities.SK
/// </summary>
[Description("检查内容")]
[FormFieldEdit]
public ICollection<T_SK_BASIC_LIBRARY_DETAIL_CONTENT> Nav_DetailContents { get; set; }
public ICollection<T_SK_BASIC_LIBRARY_DETAIL_CONTENT> Nav_DetailContents { get; set; }
[Description("顺序")]
public int? ROW_NO { get; set; }
}
}

5
APT.MS.Domain/Entities/SK/T_SK_BASIC_LIBRARY_DETAIL_CONTENT.cs
View File

@ -71,6 +71,9 @@ namespace APT.MS.Domain.Entities.SK
/// </summary>
[Description("检查依据")]
[FormFieldEdit]
public ICollection<T_SK_BASIC_LIBRARY_DETAIL_CONTENT_BASIC> Nav_DetailBasics { get; set; }
public ICollection<T_SK_BASIC_LIBRARY_DETAIL_CONTENT_BASIC> Nav_DetailBasics { get; set; }
[Description("顺序")]
public int? ROW_NO { get; set; }
}
}

4
APT.MS.Domain/Entities/SK/T_SK_BASIC_LIBRARY_DETAIL_CONTENT_HIDDEN.cs
View File

@ -56,6 +56,8 @@ namespace APT.MS.Domain.Entities.SK
/// 顺序
/// </summary>
[Description("顺序")]
public int? NUM { get; set; }
public int? NUM { get; set; }
[Description("顺序")]
public int? ROW_NO { get; set; }
}
}

3
APT.MS.Domain/Entities/SK/T_SK_ENTERPRISE_LIBRARY_DETAIL.cs
View File

@ -47,5 +47,8 @@ namespace APT.MS.Domain.Entities.SK
[Description("检查内容")]
[FormFieldEdit]
public ICollection<T_SK_ENTERPRISE_LIBRARY_DETAIL_CONTENT> Nav_DetailContents { get; set; }
[Description("顺序")]
public int? ROW_NO { get; set; }
}
}

3
APT.MS.Domain/Entities/SK/T_SK_ENTERPRISE_LIBRARY_DETAIL_CONTENT.cs
View File

@ -104,5 +104,8 @@ namespace APT.MS.Domain.Entities.SK
[DataFieldIngore]
public string RISK_NAME { get; set; }
[Description("顺序")]
public int? ROW_NO { get; set; }
}
}

8
APT.MS.Domain/Entities/SK/T_SK_ENTERPRISE_LIBRARY_DETAIL_CONTENT_HIDDEN.cs
View File

@ -54,6 +54,12 @@ namespace APT.MS.Domain.Entities.SK
/// 顺序
/// </summary>
[Description("顺序")]
public int? NUM { get; set; }
public int? NUM { get; set; }
/// <summary>
/// 顺序
/// </summary>
[Description("顺序")]
public int? ROW_NO { get; set; }
}
}

7
APT.MS.Domain/Entities/SK/T_SK_PLAN_SET.cs
View File

@ -152,7 +152,10 @@ namespace APT.MS.Domain.Entities.SK
/// 接收人
/// </summary>
[Description("接收人")]
public virtual T_FM_USER Nav_UserSend { get; set; }
public virtual T_FM_USER Nav_UserSend { get; set; }
[DataFieldIngore]
public string MONTHStr { get; set; }
[DataFieldIngore]
public string DATAStr { get; set; }
}
}

7
APT.MS.Domain/Entities/SK/T_SK_TIME_SET.cs
View File

@ -73,6 +73,11 @@ namespace APT.MS.Domain.Entities.SK
[Description("启用标志")]
[FormFieldTable]
[FormFieldEdit]
public FMEnableStatusEnum ENABLE_STATUS { get; set; }
public FMEnableStatusEnum ENABLE_STATUS { get; set; }
[DataFieldIngore]
public string MONTHStr { get; set; }
[DataFieldIngore]
public string DATAStr { get; set; }
}
}

7
APT.MicroApi/APT.SK.WebApi/Controllers/Api/BasicLibraryController.cs
View File

@ -53,7 +53,8 @@ namespace APT.SK.WebApi.Controllers
foreach (var item3 in item2.Nav_DetailHiddens)
{
item3.ORG_ID = entity.ORG_ID;
item3.BASIC_LIBRARY_DETAIL_CONTENT_ID = item2.ID;
item3.BASIC_LIBRARY_DETAIL_CONTENT_ID = item2.ID;
item3.NUM = (item3.NUM == 0 || item3.NUM == null) ? item3.ROW_NO : item3.NUM;
hiddenList.Add(item3);
}
}
@ -69,13 +70,15 @@ namespace APT.SK.WebApi.Controllers
item2.ORG_ID = entity.ORG_ID;
item2.BASIC_LIBRARY_DETAIL_ID = item.ID;
item2.Nav_DetailHiddens = null;
item2.Nav_DetailBasics = null;
item2.Nav_DetailBasics = null;
item2.NUM = (item2.NUM == 0 || item2.NUM == null) ? item2.ROW_NO : item2.NUM;
contentList.Add(item2);
}
}
item.ORG_ID = entity.ORG_ID;
item.BASIC_LIBRARY_ID = entity.ID;
item.Nav_DetailContents = null;
item.NUM = (item.NUM == 0 || item.NUM == null) ? item.ROW_NO : item.NUM;
}
}
List<Guid> libraryIds = new List<Guid>();

6
APT.MicroApi/APT.SK.WebApi/Controllers/Api/EnterpriseLibraryController.cs
View File

@ -199,7 +199,7 @@ namespace APT.SK.WebApi.Controllers.Api
de.ENTERPRISE_LIBRARY_ID = entity.ID;
de.MEASURES_NAME = item.MEASURES_NAME;
de.EMERGENCY = item.EMERGENCY;
de.NUM = item.NUM;
de.NUM = (item.NUM == 0 || item.NUM == null) ? item.ROW_NO : item.NUM;
libraryDetail.Add(de);
if (item.Nav_DetailContents != null && item.Nav_DetailContents.Any())
{
@ -213,7 +213,7 @@ namespace APT.SK.WebApi.Controllers.Api
con.CHECK_CONTENT = item2.CHECK_CONTENT;
con.CHECK_BASIC = item2.CHECK_BASIC;
con.CHECK_STANDARD = item2.CHECK_STANDARD;
con.NUM = item2.NUM;
con.NUM = (item2.NUM == 0 || item2.NUM == null) ? item2.ROW_NO : item2.NUM;
contentList.Add(con);
if (item2.Nav_DetailHiddens != null && item2.Nav_DetailHiddens.Any())
{
@ -227,7 +227,7 @@ namespace APT.SK.WebApi.Controllers.Api
hi.HIDDEN_DESCRIPTION = item3.HIDDEN_DESCRIPTION;
hi.HIDDEN_LEVEL = item3.HIDDEN_LEVEL;
hi.RECTIFICATION_MEASURES = item3.RECTIFICATION_MEASURES;
hi.NUM = item3.NUM;
hi.NUM =(item3.NUM ==0 || item3.NUM == null)?item3.ROW_NO:item3.NUM;
hiddenList.Add(hi);
}
}

25
APT.MicroApi/APT.SK.WebApi/Controllers/Api/PlanSetController.cs
View File

@ -68,6 +68,31 @@ namespace APT.SK.WebApi.Controllers.Api
});
return true;
});
}
/// <summary>
/// 排序分页查询数据
/// </summary>
/// <param name="pageFilter">分页过滤实体</param>
/// <returns></returns>
[HttpPost, Route("SKOrderPaged")]
public PagedActionResult<T_SK_PLAN_SET> SKOrderPaged([FromBody] KeywordPageFilter pageFilter)
{
var result = this.GetOrderPageEntities<T_SK_PLAN_SET>(null, pageFilter);
if (result != null && result.Data != null && result.Data.Any())
{
result.Data.ForEach(t =>
{
if (t.MONTH == null || t.MONTH == 0)
{
t.MONTHStr = "--";
}
if (t.DATA == null || t.DATA == 0)
{
t.DATAStr = "--";
}
});
}
return result;
}
}
}

27
APT.MicroApi/APT.SK.WebApi/Controllers/Api/TimeSetController.cs
View File

@ -4,6 +4,7 @@ using APT.MS.Domain.Enums;
using APT.MS.Domain.Enums.SK;
using APT.Utility;
using Microsoft.AspNetCore.Mvc;
using System.Linq;
namespace APT.SK.WebApi.Controllers.Api
{
@ -62,6 +63,32 @@ namespace APT.SK.WebApi.Controllers.Api
});
return true;
});
}
/// <summary>
/// 排序分页查询数据
/// </summary>
/// <param name="pageFilter">分页过滤实体</param>
/// <returns></returns>
[HttpPost, Route("SKOrderPaged")]
public PagedActionResult<T_SK_TIME_SET> SKOrderPaged([FromBody] KeywordPageFilter pageFilter)
{
var result = this.GetOrderPageEntities<T_SK_TIME_SET>(null, pageFilter);
if (result != null && result.Data != null && result.Data.Any())
{
result.Data.ForEach(t =>
{
if (t.MONTH == null || t.MONTH == 0)
{
t.MONTHStr = "--";
}
if (t.DATA == null || t.DATA == 0)
{
t.DATAStr = "--";
}
});
}
return result;
}
}
}