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-06-11 13:51:47 +08:00
commit 0d0c0de720
20 changed files with 140090 additions and 145 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -11640,6 +11640,7 @@ namespace APT.BaseData.Services.DomainServices
record.CHECK_TIME = entity.CHECK_TIME != null ? entity.CHECK_TIME : DateTime.Now;
record.NOTICE_CODE = entity.NOTICE_CODE;
record.RECTIFICATION_MEASURES = hidDescrip?.DEMAND;
record.REMARK = detail.REMARK;
records.Add(record);
if (detail.Nav_ReportDetailFiles != null && detail.Nav_ReportDetailFiles.Any())
{
@ -11721,6 +11722,7 @@ namespace APT.BaseData.Services.DomainServices
record.CHECK_TIME = entity.CHECK_TIME != null ? entity.CHECK_TIME : DateTime.Now;
record.NOTICE_CODE = entity.NOTICE_CODE;
record.RECTIFICATION_MEASURES = hidDescrip?.DEMAND;
record.REMARK = detail.REMARK;
records.Add(record);
if (detail.Nav_ReportDetailFiles != null && detail.Nav_ReportDetailFiles.Any())
{
@ -11822,7 +11824,8 @@ namespace APT.BaseData.Services.DomainServices
noticeDetail.HIDDEN_PLACE = detail.HIDDEN_PLACE;
noticeDetail.RECITIFY_TIME = detail.RECITIFY_TIME;
noticeDetail.RECITIFY_USER_ID = detail.RECITIFY_USER_ID;
noticeDetail.RECTIFICATION_MEASURES = hidDescrip?.DEMAND;
noticeDetail.RECTIFICATION_MEASURES = hidDescrip?.DEMAND;
noticeDetail.REMARK = detail.REMARK;
noticeDetails.Add(noticeDetail);
if (detail.Nav_ReportDetailFiles != null && detail.Nav_ReportDetailFiles.Any())
{
@ -12084,7 +12087,8 @@ namespace APT.BaseData.Services.DomainServices
record.IMPLEMENT_USER_ID = entity.RECITIFY_USER_ID;
record.ACCEPT_USER_ID = acceptUser?.ID;
record.RECTIFICATION_MEASURES = hidDescrip?.DEMAND;
record.NOTICE_CODE = entity.NOTICE_CODE;
record.NOTICE_CODE = entity.NOTICE_CODE;
record.REMARK = entity.REMARK;
if (photos != null && photos.Any())
{
foreach (var item in photos)
@ -12150,6 +12154,7 @@ namespace APT.BaseData.Services.DomainServices
record.ACCEPT_USER_ID = acceptUser?.ID;
record.RECTIFICATION_MEASURES = hidDescrip?.DEMAND;
record.NOTICE_CODE = entity.NOTICE_CODE;
record.REMARK = entity.REMARK;
if (photos != null && photos.Any())
{
foreach (var item in photos)
@ -12241,6 +12246,7 @@ namespace APT.BaseData.Services.DomainServices
noticeDetail.HIDDEN_PLACE = entity.HIDDEN_PLACE;
noticeDetail.RECITIFY_TIME = entity.RECITIFY_TIME;
noticeDetail.RECITIFY_USER_ID = entity.RECITIFY_USER_ID;
noticeDetail.REMARK = entity.REMARK;
noticeDetails.Add(noticeDetail);
if (photos != null && photos.Any())
{
@ -14792,12 +14798,16 @@ namespace APT.BaseData.Services.DomainServices
var approveTemp = this.GetEntity<T_PF_APPROVE_TEMP>(t => t.FORM_CODE == "SK041" && t.ENABLE_STATUS == (int)FMEnableStatusEnum.启用 && t.PARAM == param, "Nav_ApproveTempDetails.Nav_ApproveRole");
if (approveTemp != null && approveTemp.Nav_ApproveTempDetails != null && approveTemp.Nav_ApproveTempDetails.Any())
{
var approveDetailLast = approveTemp.Nav_ApproveTempDetails.OrderByDescending(t => t.NUM).FirstOrDefault();
var loginUser = users.FirstOrDefault(t => t.ID == APT.Infrastructure.Api.AppContext.CurrentSession.UserID.Value);
if (approveDetailLast.APPROVE_ROLE_ID == loginUser.APPROVE_ROLE_ID)
var approveDetailFirst = approveTemp.Nav_ApproveTempDetails.OrderBy(t => t.NUM).FirstOrDefault();
var loginUser = users.FirstOrDefault(t => t.ID == APT.Infrastructure.Api.AppContext.CurrentSession.UserID.Value);
if (approveDetailFirst.APPROVE_ROLE_ID == loginUser.APPROVE_ROLE_ID)
{
approveTemp.Nav_ApproveTempDetails.Remove(approveDetailFirst);
}
if(approveTemp.Nav_ApproveTempDetails.Count() == 0)
{
result.STATUS = PFStandardStatus.Archived;
var resultDetailTemps = resultDetails.Where(t => t.MARK != SKMarkEnum.Auto).ToList();
var resultDetailTemps = resultDetails.Where(t => (t.MARK == SKMarkEnum.Add && t.ENABLE_STATUS == SKEnableStatusEnum.Yes) || (t.MARK != SKMarkEnum.Add)).ToList();
if (user != null && resultDetailTemps != null && resultDetailTemps.Any())
{
var productionIds = resultDetailTemps.Where(t => t.PRODUCTION_UNIT_ID != null).Select(m=>m.PRODUCTION_UNIT_ID).Distinct().ToList();
@ -15139,7 +15149,7 @@ namespace APT.BaseData.Services.DomainServices
List<T_SK_DOUBLE_PREVENT_MECHANISM_DETAIL_MEASURES_CONTENT_POST> douContentPosts = new List<T_SK_DOUBLE_PREVENT_MECHANISM_DETAIL_MEASURES_CONTENT_POST>();
//List<T_SK_DOUBLE_PREVENT_MECHANISM_DETAIL_MEASURES_CONTENT_DEPART> douContentDepartPosts = new List<T_SK_DOUBLE_PREVENT_MECHANISM_DETAIL_MEASURES_CONTENT_DEPART>();
List<T_SK_DOUBLE_PREVENT_MECHANISM_DETAIL_MEASURES_CONTENT_HIDDEN> douContentHiddenss = new List<T_SK_DOUBLE_PREVENT_MECHANISM_DETAIL_MEASURES_CONTENT_HIDDEN>();
var entityDetails = sumDetails.Where(t => t.MARK != SKMarkEnum.Auto).ToList();
var entityDetails = sumDetails.Where(t => (t.MARK == SKMarkEnum.Add && t.ENABLE_STATUS == SKEnableStatusEnum.Yes) || (t.MARK != SKMarkEnum.Add)).ToList();
if (entity.APPLY_USER_ID != null && entityDetails != null && entityDetails.Any())
{
var sumDetailIds = entityDetails.Select(t => t.ID).ToList();

139715
APT.Data.Migrations/Migrations/20260609083642_hmr2026060901.Designer.cs generated Normal file
View File

File diff suppressed because it is too large Load Diff

68
APT.Data.Migrations/Migrations/20260609083642_hmr2026060901.cs Normal file
View File

@ -0,0 +1,68 @@
using Microsoft.EntityFrameworkCore.Migrations;
namespace APT.Data.Migrations.Migrations
{
public partial class hmr2026060901 : Migration
{
protected override void Up(MigrationBuilder migrationBuilder)
{
migrationBuilder.AddColumn<string>(
name: "REMARK",
table: "T_SK_SECURITY_INSPECTION_RECORD_SUMMARY_DETAIL",
type: "nvarchar(200)",
maxLength: 200,
nullable: true);
migrationBuilder.AddColumn<string>(
name: "REMARK",
table: "T_SK_SECURITY_INSPECTION_RECORD_DETAIL",
type: "nvarchar(200)",
maxLength: 200,
nullable: true);
migrationBuilder.AddColumn<string>(
name: "REMARK",
table: "T_SK_HIDDEN_DANGER_REPORT_DETAIL",
type: "nvarchar(200)",
maxLength: 200,
nullable: true);
migrationBuilder.AddColumn<string>(
name: "REMARK",
table: "T_SK_HIDDEN_DANGER_RECTIFY_NOTICE_DETAIL",
type: "nvarchar(200)",
maxLength: 200,
nullable: true);
migrationBuilder.AddColumn<string>(
name: "REMARK",
table: "T_SK_HIDDEN_DANGER_CONFIRM",
type: "nvarchar(200)",
maxLength: 200,
nullable: true);
}
protected override void Down(MigrationBuilder migrationBuilder)
{
migrationBuilder.DropColumn(
name: "REMARK",
table: "T_SK_SECURITY_INSPECTION_RECORD_SUMMARY_DETAIL");
migrationBuilder.DropColumn(
name: "REMARK",
table: "T_SK_SECURITY_INSPECTION_RECORD_DETAIL");
migrationBuilder.DropColumn(
name: "REMARK",
table: "T_SK_HIDDEN_DANGER_REPORT_DETAIL");
migrationBuilder.DropColumn(
name: "REMARK",
table: "T_SK_HIDDEN_DANGER_RECTIFY_NOTICE_DETAIL");
migrationBuilder.DropColumn(
name: "REMARK",
table: "T_SK_HIDDEN_DANGER_CONFIRM");
}
}
}

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

@ -81734,6 +81734,10 @@ namespace APT.Data.Migrations.Migrations
.HasMaxLength(500)
.HasColumnType("nvarchar(500)");
b.Property<string>("REMARK")
.HasMaxLength(200)
.HasColumnType("nvarchar(200)");
b.Property<Guid?>("RISK_AREA_ID")
.HasColumnType("uniqueidentifier");
@ -82486,6 +82490,10 @@ namespace APT.Data.Migrations.Migrations
.HasMaxLength(500)
.HasColumnType("nvarchar(500)");
b.Property<string>("REMARK")
.HasMaxLength(200)
.HasColumnType("nvarchar(200)");
b.Property<Guid?>("RISK_AREA_ID")
.HasColumnType("uniqueidentifier");
@ -83428,6 +83436,10 @@ namespace APT.Data.Migrations.Migrations
b.Property<Guid?>("RECITIFY_USER_ID")
.HasColumnType("uniqueidentifier");
b.Property<string>("REMARK")
.HasMaxLength(200)
.HasColumnType("nvarchar(200)");
b.Property<Guid?>("RISK_AREA_ID")
.HasColumnType("uniqueidentifier");
@ -89194,6 +89206,10 @@ namespace APT.Data.Migrations.Migrations
.IsRequired()
.HasColumnType("uniqueidentifier");
b.Property<string>("REMARK")
.HasMaxLength(200)
.HasColumnType("nvarchar(200)");
b.Property<Guid?>("RISK_AREA_ID")
.HasColumnType("uniqueidentifier");
@ -89698,6 +89714,10 @@ namespace APT.Data.Migrations.Migrations
.IsRequired()
.HasColumnType("uniqueidentifier");
b.Property<string>("REMARK")
.HasMaxLength(200)
.HasColumnType("nvarchar(200)");
b.Property<Guid?>("RISK_AREA_ID")
.HasColumnType("uniqueidentifier");

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

@ -13941,6 +13941,7 @@ builder.Property(t => t.ApplyDepartmentName).HasMaxLength(50);
builder.Property(t => t.ApplyPostName).HasMaxLength(50);
builder.Property(t => t.HIDDEN_REASON).HasMaxLength(200);
builder.Property(t => t.NOTICE_CODE).HasMaxLength(50);
builder.Property(t => t.REMARK).HasMaxLength(200);
}
}
#endregion
@ -14086,6 +14087,7 @@ builder.HasOne(t => t.Nav_ImplementUser).WithMany().HasForeignKey(t => t.IMPLEME
builder.HasOne(t => t.Nav_AcceptUser).WithMany().HasForeignKey(t => t.ACCEPT_USER_ID).OnDelete(DeleteBehavior.Restrict);
builder.Ignore(t => t.Nav_DetailContents);
builder.Property(t => t.HIDDEN_REASON).HasMaxLength(200);
builder.Property(t => t.REMARK).HasMaxLength(200);
}
}
#endregion
@ -14266,6 +14268,7 @@ builder.HasOne(t => t.Nav_RecitifyUser).WithMany().HasForeignKey(t => t.RECITIFY
builder.Ignore(t => t.STATUS);
builder.Ignore(t => t.Nav_DetailContents);
builder.Property(t => t.HIDDEN_REASON).HasMaxLength(200);
builder.Property(t => t.REMARK).HasMaxLength(200);
}
}
#endregion
@ -15373,6 +15376,7 @@ builder.Property(t => t.HIDDEN_DESCRIPTION).HasMaxLength(500);
builder.Property(t => t.HIDDEN_PLACE).HasMaxLength(500);
builder.Ignore(t => t.Nav_DetailContents);
builder.Property(t => t.HIDDEN_REASON).HasMaxLength(200);
builder.Property(t => t.REMARK).HasMaxLength(200);
}
}
#endregion
@ -15467,6 +15471,7 @@ builder.Property(t => t.HIDDEN_PLACE).HasMaxLength(500);
builder.Ignore(t => t.Nav_DetailContents);
builder.Property(t => t.HIDDEN_REASON).HasMaxLength(200);
builder.Ignore(t => t.STATUS);
builder.Property(t => t.REMARK).HasMaxLength(200);
}
}
#endregion

6
APT.MS.Domain/Entities/SK/T_SK_HIDDEN_DANGER_CONFIRM.cs
View File

@ -237,6 +237,10 @@ namespace APT.MS.Domain.Entities.SK
[Description("检查通知编号")]
[DataFieldLength(50)]
public string NOTICE_CODE { get; set; }
public string NOTICE_CODE { get; set; }
[Description("备注")]
[DataFieldLength(200)]
public string REMARK { get; set; }
}
}

6
APT.MS.Domain/Entities/SK/T_SK_HIDDEN_DANGER_RECTIFY_NOTICE_DETAIL.cs
View File

@ -178,6 +178,10 @@ namespace APT.MS.Domain.Entities.SK
public string HIDDEN_REASON { get; set; }
[Description("导航：隐患原因")]
public virtual ICollection<T_SK_HIDDEN_DANGER_RECTIFY_NOTICE_DETAIL_REASON> Nav_RectifyDetailReasons { get; set; }
public virtual ICollection<T_SK_HIDDEN_DANGER_RECTIFY_NOTICE_DETAIL_REASON> Nav_RectifyDetailReasons { get; set; }
[Description("备注")]
[DataFieldLength(200)]
public string REMARK { get; set; }
}
}

6
APT.MS.Domain/Entities/SK/T_SK_HIDDEN_DANGER_REPORT_DETAIL.cs
View File

@ -172,6 +172,10 @@ namespace APT.MS.Domain.Entities.SK
[DataFieldLength(200)]
public string HIDDEN_REASON { get; set; }
[Description("导航：隐患原因")]
public virtual ICollection<T_SK_HIDDEN_DANGER_REPORT_DETAIL_REASON> Nav_ReportDetailReasons { get; set; }
public virtual ICollection<T_SK_HIDDEN_DANGER_REPORT_DETAIL_REASON> Nav_ReportDetailReasons { get; set; }
[Description("备注")]
[DataFieldLength(200)]
public string REMARK { get; set; }
}
}

6
APT.MS.Domain/Entities/SK/T_SK_SECURITY_INSPECTION_RECORD_DETAIL.cs
View File

@ -157,6 +157,10 @@ namespace APT.MS.Domain.Entities.SK
/// 导航属性：隐患原因
/// </summary>
[Description("导航：隐患原因")]
public virtual ICollection<T_SK_SECURITY_INSPECTION_RECORD_DETAIL_REASON> Nav_CheckRecordDetailReasons { get; set; }
public virtual ICollection<T_SK_SECURITY_INSPECTION_RECORD_DETAIL_REASON> Nav_CheckRecordDetailReasons { get; set; }
[Description("备注")]
[DataFieldLength(200)]
public string REMARK { get; set; }
}
}

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

@ -151,6 +151,9 @@ namespace APT.MS.Domain.Entities.SK
public PFStandardStatus? STATUS { get; set; }
[Description("导航：隐患原因")]
public virtual ICollection<T_SK_SECURITY_INSPECTION_RECORD_SUMMARY_DETAIL_REASON> Nav_CheckRecordDetailReasons { get; set; }
public virtual ICollection<T_SK_SECURITY_INSPECTION_RECORD_SUMMARY_DETAIL_REASON> Nav_CheckRecordDetailReasons { get; set; }
[Description("备注")]
[DataFieldLength(200)]
public string REMARK { get; set; }
}
}

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

@ -706,10 +706,11 @@ namespace APT.PP.WebApi.Controllers.Api.PP
var teamPostIdAll = teamUsers.Where(i => i.Nav_Person.POST_ID != null).Select(i => i.Nav_Person.Nav_Post.ID).Distinct().ToList();
var teamPostAll = teamUsers.Where(i => i.Nav_Person.POST_ID != null).Select(i => i.Nav_Person.Nav_Post).ToList();
var is_handover = false;
//判断is_handover,true的话记录下个班班组的id
if (shiftClass != null && shiftClass.Nav_DepartmentCalendarConfig != null && shiftClass.Nav_DepartmentCalendarConfig.IS_HANDOVER)
{
is_handover = true;
var nextClassTemp = shiftClassListAll.FirstOrDefault(t => t.DEPARTMENT_ID == shiftClass.DEPARTMENT_ID && t.START_TIME >= shiftClass.END_TIME && t.Nav_DepartmentCalendarConfig.IS_HANDOVER == true && t.Nav_DepartmentCalendarConfig.CALENDAR_ID == shiftClass.Nav_DepartmentCalendarConfig.CALENDAR_ID);
if (nextClassTemp != null)
{
@ -756,6 +757,7 @@ namespace APT.PP.WebApi.Controllers.Api.PP
currentClassRecord.CLASS_TEAM_ID = (Guid)shiftClass.TEAM_ID;
currentClassRecord.SUPPLIES_STATUS = (int)FOShiftRecordStatusEnum.正常;
currentClassRecord.SUPPLIES_USED = (int)WFDisableStatusEnum.是;
currentClassRecord.IS_HANDOVER = is_handover;
listRecord.Add(currentClassRecord);
foreach (var post in postUsers)
{
@ -822,10 +824,11 @@ namespace APT.PP.WebApi.Controllers.Api.PP
var teamPostIdAll = teamUsers.Where(i => i.Nav_Person.POST_ID != null).Select(i => i.Nav_Person.Nav_Post.ID).Distinct().ToList();
var teamPostAll = teamUsers.Where(i => i.Nav_Person.POST_ID != null).Select(i => i.Nav_Person.Nav_Post).ToList();
var is_handover = false;
//判断is_handover,true的话记录下个班班组的id
if (shiftClass != null && shiftClass.Nav_DepartmentCalendarConfig != null && shiftClass.Nav_DepartmentCalendarConfig.IS_HANDOVER)
{
{
is_handover = true;
var nextClassTemp = shiftClassListAll.FirstOrDefault(t => t.DEPARTMENT_ID == shiftClass.DEPARTMENT_ID && t.START_TIME >= shiftClass.END_TIME && t.Nav_DepartmentCalendarConfig.IS_HANDOVER == true && t.Nav_DepartmentCalendarConfig.CALENDAR_ID == shiftClass.Nav_DepartmentCalendarConfig.CALENDAR_ID);
if (nextClassTemp != null)
{
@ -871,7 +874,8 @@ namespace APT.PP.WebApi.Controllers.Api.PP
currentClassRecord.NEXT_CLASS_TEAM_ID = nextClassID;
currentClassRecord.CLASS_TEAM_ID = (Guid)shiftClass.TEAM_ID;
currentClassRecord.SUPPLIES_STATUS = (int)FOShiftRecordStatusEnum.正常;
currentClassRecord.SUPPLIES_USED = (int)WFDisableStatusEnum.是;
currentClassRecord.SUPPLIES_USED = (int)WFDisableStatusEnum.是;
currentClassRecord.IS_HANDOVER = is_handover;
listRecord.Add(currentClassRecord);
foreach (var post in postUsers)
{

65
APT.MicroApi/APT.PP.WebApi/Controllers/Api/SKController.cs
View File

@ -1141,7 +1141,7 @@ namespace APT.PP.WebApi.Controllers.Api
plan.APPLY_DEPARTMENT_ID = userInfo.DEPARTMENT_ID;
plan.APPLY_USER_ID = userInfo.ID;
plan.YEAR = DateTime.Now.Year.ToString();
plan.START_DATE = DateTime.Now;
//plan.START_DATE = DateTime.Now;
//plan.END_DATE = dtEnd;
plan.ISAUTO = true;
plans.Add(plan);
@ -1857,8 +1857,29 @@ namespace APT.PP.WebApi.Controllers.Api
}
i++;
}
//var departTypes = departTemps.Select(t => t.DEPARTMENT_TYPE).Distinct().ToList();
//var typeList = ""; var nameList = ""; var postList = "";
//int j = 1;
//foreach (var type in departTypes)
//{
// var typeTemp = j + "、" + Enum.GetName(typeof(FMDepartmentType), type);
// typeList = typeList + temp;
// var departNames = departTemps.Where(t=>t.DEPARTMENT_TYPE == type).Select(t => t.NAME).Distinct().ToList();
// var nameTemp = j + "、" + string.Join(",", departNames);
// nameList = nameList + nameTemp;
// var departTempIds = departTemps.Where(t => t.DEPARTMENT_TYPE == type).Select(t => t.ID).Distinct().ToList();
// var postTempIds = users.Where(t => departTempIds.Contains((Guid)t.DEPARTMENT_ID) && t.Nav_Person != null).Select(m => m.Nav_Person.POST_ID).Distinct().ToList();
// var postTemps = userPosts.Where(t => postTempIds.Contains(t.ID)).Select(m => m.NAME).Distinct().ToList();
// var postTemp = j + "、" + string.Join(",", postTemps);
// postList = postList + postTemp;
// j++;
//}
//ideDetail.DEPARTMENT_TYPE = typeList;
//ideDetail.IDENTIFY_DEPARTMENT = nameList;
//ideDetail.IDENTIFY_POST = postList;
}
}
resultDetails.Add(ideDetail);
}
}
@ -2025,6 +2046,26 @@ namespace APT.PP.WebApi.Controllers.Api
}
i++;
}
//var departTypes = departTemps.Select(t => t.DEPARTMENT_TYPE).Distinct().ToList();
//var typeList = ""; var nameList = ""; var postList = "";
//int j = 1;
//foreach (var type in departTypes)
//{
// var typeTemp = j + "、" + Enum.GetName(typeof(FMDepartmentType), type);
// typeList = typeList + temp;
// var departNames = departTemps.Where(t => t.DEPARTMENT_TYPE == type).Select(t => t.NAME).Distinct().ToList();
// var nameTemp = j + "、" + string.Join(",", departNames);
// nameList = nameList + nameTemp;
// var departTempIds = departTemps.Where(t => t.DEPARTMENT_TYPE == type).Select(t => t.ID).Distinct().ToList();
// var postTempIds = users.Where(t => departTempIds.Contains((Guid)t.DEPARTMENT_ID) && t.Nav_Person != null).Select(m => m.Nav_Person.POST_ID).Distinct().ToList();
// var postTemps = userPosts.Where(t => postTempIds.Contains(t.ID)).Select(m => m.NAME).Distinct().ToList();
// var postTemp = j + "、" + string.Join(",", postTemps);
// postList = postList + postTemp;
// j++;
//}
//ideDetail.DEPARTMENT_TYPE = typeList;
//ideDetail.IDENTIFY_DEPARTMENT = nameList;
//ideDetail.IDENTIFY_POST = postList;
}
}
resultDetails.Add(ideDetail);
@ -2231,7 +2272,27 @@ namespace APT.PP.WebApi.Controllers.Api
}
i++;
}
}
//var departTypes = departTemps.Select(t => t.DEPARTMENT_TYPE).Distinct().ToList();
//var typeList = ""; var nameList = ""; var postList = "";
//int j = 1;
//foreach (var type in departTypes)
//{
// var typeTemp = j + "、" + Enum.GetName(typeof(FMDepartmentType), type);
// typeList = typeList + temp;
// var departNames = departTemps.Where(t => t.DEPARTMENT_TYPE == type).Select(t => t.NAME).Distinct().ToList();
// var nameTemp = j + "、" + string.Join(",", departNames);
// nameList = nameList + nameTemp;
// var departTempIds = departTemps.Where(t => t.DEPARTMENT_TYPE == type).Select(t => t.ID).Distinct().ToList();
// var postTempIds = users.Where(t => departTempIds.Contains((Guid)t.DEPARTMENT_ID) && t.Nav_Person != null).Select(m => m.Nav_Person.POST_ID).Distinct().ToList();
// var postTemps = userPosts.Where(t => postTempIds.Contains(t.ID)).Select(m => m.NAME).Distinct().ToList();
// var postTemp = j + "、" + string.Join(",", postTemps);
// postList = postList + postTemp;
// j++;
//}
//ideDetail.DEPARTMENT_TYPE = typeList;
//ideDetail.IDENTIFY_DEPARTMENT = nameList;
//ideDetail.IDENTIFY_POST = postList;
}
}
resultDetails.Add(ideDetail);
}

2
APT.MicroApi/APT.SK.WebApi/Controllers/Api/DoublePreventMechanismController.cs
View File

@ -441,7 +441,7 @@ namespace APT.SK.WebApi.Controllers.Api
{
var detailIds = details.Select(t => t.ID).ToList();
var departs = this.GetEntities<T_SK_DOUBLE_PREVENT_MECHANISM_DETAIL_DEPART>(t => detailIds.Contains(t.DOUBLE_PREVENT_MECHANISM_DETAIL_ID), new BaseFilter(filter.OrgId), "Nav_Department", "Nav_DepartDetails.Nav_Post");
var posts = this.GetEntities<T_SK_DOUBLE_PREVENT_MECHANISM_DETAIL_POST>(t => detailIds.Contains(t.DOUBLE_PREVENT_MECHANISM_DETAIL_ID), new BaseFilter(filter.OrgId), "Nav_Department", "Nav_User");
var posts = this.GetEntities<T_SK_DOUBLE_PREVENT_MECHANISM_DETAIL_POST>(t => detailIds.Contains(t.DOUBLE_PREVENT_MECHANISM_DETAIL_ID), new BaseFilter(filter.OrgId), "Nav_Department.Nav_User");
var measures = this.GetEntities<T_SK_DOUBLE_PREVENT_MECHANISM_DETAIL_MEASURES>(t => detailIds.Contains(t.DOUBLE_PREVENT_MECHANISM_DETAIL_ID), new BaseFilter(filter.OrgId));
//, "Nav_DetailMeasureContents.Nav_DetailMeasureContentBasics.Nav_Law",
// "Nav_DetailMeasureContents.Nav_Contents", "Nav_DetailMeasureContents.Nav_DetailMeasureContentPosts.Nav_Department",

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

@ -675,6 +675,7 @@ namespace APT.SK.WebApi.Controllers.Api
pageFilter.Include.Add("Nav_RiskName");
pageFilter.Include.Add("Nav_Details");
pageFilter.Include.Add("Nav_ProductionUnit");
pageFilter.Include.Add("Nav_Posts");
pageFilter.SelectField.Add("Nav_ProductionUnit.NAME");
pageFilter.SelectField.Add("Nav_Details.NUM");
pageFilter.SelectField.Add("Nav_Details.MEASURES_NAME");

2
APT.MicroApi/APT.SK.WebApi/Controllers/Api/HiddenDangerRectifyNoticeController.cs
View File

@ -380,6 +380,7 @@ namespace APT.SK.WebApi.Controllers.Api
record.CHECK_TYPE_ID = entity.CHECK_TYPE_ID;
record.CHECK_TIME = entity.CHECK_TIME;
record.CHECK_PERSON = detail.CHECK_PERSON;
record.REMARK = detail.REMARK;
records.Add(record);
if (detail.Nav_RectifyDetailFiles != null && detail.Nav_RectifyDetailFiles.Any())
{
@ -632,6 +633,7 @@ namespace APT.SK.WebApi.Controllers.Api
record.CHECK_TIME = notice.CHECK_TIME;
record.NOTICE_CODE = notice.NOTICE_CODE;
record.CHECK_PERSON = detail.CHECK_PERSON;
record.REMARK = detail.REMARK;
records.Add(record);
if (detail.Nav_RectifyDetailFiles != null && detail.Nav_RectifyDetailFiles.Any())
{

5
APT.MicroApi/APT.SK.WebApi/Controllers/Api/RiskEvaluationController.cs
View File

@ -137,7 +137,8 @@ namespace APT.SK.WebApi.Controllers.Api
de.SCOREE_ID = item.SCOREE_ID;
de.SCOREC_ID = item.SCOREC_ID;
de.EVALUATE_SCORE = item.EVALUATE_SCORE;
if (item.SCOREL_ID == null || item.SCOREE_ID == null || item.SCOREC_ID == null)
de.EVALUATE_LEVEL = item.EVALUATE_LEVEL;
if ((item.SCOREL_ID == null || item.SCOREE_ID == null || item.SCOREC_ID == null) && item.ENABLE_STATUS == SKEnableStatusEnum.Yes)
{
throw new Exception("第" + item.NUM + "行，LEC都不能为空");
}
@ -348,7 +349,7 @@ namespace APT.SK.WebApi.Controllers.Api
{
var detailIds = details.Select(t => t.ID).ToList();
var measures = this.GetEntities<T_SK_RISK_EVALUATION_DETAIL_MEASURE>(t => detailIds.Contains(t.RISK_EVALUATION_DETAIL_ID), new BaseFilter(filter.OrgId));
var departs = this.GetEntities<T_SK_RISK_EVALUATION_DETAIL_DEPART>(t => detailIds.Contains(t.RISK_EVALUATION_DETAIL_ID), new BaseFilter(filter.OrgId), "Nav_Department", "Nav_User");
var departs = this.GetEntities<T_SK_RISK_EVALUATION_DETAIL_DEPART>(t => detailIds.Contains(t.RISK_EVALUATION_DETAIL_ID), new BaseFilter(filter.OrgId), "Nav_Department.Nav_User");
var posts = this.GetEntities<T_SK_RISK_EVALUATION_DETAIL_POST>(t => detailIds.Contains(t.RISK_EVALUATION_DETAIL_ID), new BaseFilter(filter.OrgId), "Nav_Department", "Nav_PostDetails.Nav_Post");
foreach (var detail in details)
{

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

@ -82,7 +82,13 @@ namespace APT.SK.WebApi.Controllers.Api
de.TYPE_ID = item.TYPE_ID;
de.ENABLE_STATUS = item.ENABLE_STATUS;
de.MARK = item.MARK;
de.EMERGENCY = item.EMERGENCY;
de.EMERGENCY = item.EMERGENCY;
de.ENTERPRISE_LIBRARY_ID = item.ENTERPRISE_LIBRARY_ID;
de.SCOREL_ID = item.SCOREL_ID;
de.SCOREE_ID = item.SCOREE_ID;
de.SCOREC_ID = item.SCOREC_ID;
de.EVALUATE_SCORE = item.EVALUATE_SCORE;
de.EVALUATE_LEVEL = item.EVALUATE_LEVEL;
if (item.Nav_DetailMeasures != null && item.Nav_DetailMeasures.Any())
{
foreach (var mm in item.Nav_DetailMeasures)
@ -254,7 +260,7 @@ namespace APT.SK.WebApi.Controllers.Api
{
var detailIds = details.Select(t => t.ID).ToList();
var measures = this.GetEntities<T_SK_RISK_EVALUATION_SUMMARY_DETAIL_MEASURE>(t => detailIds.Contains(t.RISK_EVALUATION_SUMMARY_DETAIL_ID), new BaseFilter(filter.OrgId));
var departs = this.GetEntities<T_SK_RISK_EVALUATION_SUMMARY_DETAIL_DEPART>(t => detailIds.Contains(t.RISK_EVALUATION_SUMMARY_DETAIL_ID), new BaseFilter(filter.OrgId), "Nav_Department", "Nav_User");
var departs = this.GetEntities<T_SK_RISK_EVALUATION_SUMMARY_DETAIL_DEPART>(t => detailIds.Contains(t.RISK_EVALUATION_SUMMARY_DETAIL_ID), new BaseFilter(filter.OrgId), "Nav_Department.Nav_User");
var posts = this.GetEntities<T_SK_RISK_EVALUATION_SUMMARY_DETAIL_POST>(t => detailIds.Contains(t.RISK_EVALUATION_SUMMARY_DETAIL_ID), new BaseFilter(filter.OrgId), "Nav_Department", "Nav_PostDetails.Nav_Post");
foreach (var detail in details)
{

259
APT.MicroApi/APT.SK.WebApi/Controllers/Api/SecurityInspectionNoticeController.cs
View File

@ -1831,7 +1831,7 @@ namespace APT.SK.WebApi.Controllers.Api
start.CODE = "SK006_SHOWPRINT";
start.USER_NAME = checkUser.NAME;
start.NAME = "安全检查通知";
start.DEAL_DATE = check.STATUS == PFStandardStatus.Draft ? null : check.MODIFY_TIME;
start.DEAL_DATE = check.STATUS == PFStandardStatus.Draft ? null : check.CREATE_TIME;
start.CREATE_TIME = check.CREATE_TIME;
start.STATUS = check.STATUS == PFStandardStatus.Close ? 15 : check.STATUS == PFStandardStatus.Draft ? 0 : 5;
noticeLog.logList.Add(start);
@ -1908,7 +1908,7 @@ namespace APT.SK.WebApi.Controllers.Api
start1.CODE = "SK006_SHOWPRINT";
start1.USER_NAME = item.USER_NAME;
start1.NAME = "安全检查通知确认";
start1.DEAL_DATE = item.NOTICE_STATUS == 4 ? item.MODIFY_TIME : item.TASK_DT;
start1.DEAL_DATE = item.NOTICE_STATUS == 4 ? item.MODIFY_TIME : (item.TASK_DT == DateTime.MinValue ? item.MODIFY_TIME : item.TASK_DT);
start1.CREATE_TIME = item.CREATE_TIME;
start1.STATUS = item.NOTICE_STATUS == 1 ? 5 : item.NOTICE_STATUS == 2 ? 10 : item.NOTICE_STATUS == 4 ? 15 : (item.NOTICE_STATUS == 0 && item.TASK_ENDDT >= DateTime.Now) ? 16 : (item.TASK_ENDDT < DateTime.Now && item.NOTICE_STATUS == 0) ? 20 : 0;
noticeLog.logList.Add(start1);
@ -1924,7 +1924,7 @@ namespace APT.SK.WebApi.Controllers.Api
start1.CODE = "SK006_SHOWPRINT";
start1.USER_NAME = item.USER_NAME;
start1.NAME = "安全检查通知确认";
start1.DEAL_DATE = item.NOTICE_STATUS == 4 ? item.MODIFY_TIME : item.TASK_DT;
start1.DEAL_DATE = item.NOTICE_STATUS == 4 ? item.MODIFY_TIME : (item.TASK_DT == DateTime.MinValue ? item.MODIFY_TIME : item.TASK_DT);
start1.CREATE_TIME = item.CREATE_TIME;
start1.STATUS = item.NOTICE_STATUS == 1 ? 5 : item.NOTICE_STATUS == 2 ? 10 : item.NOTICE_STATUS == 4 ? 15 : (item.NOTICE_STATUS == 0 && item.TASK_ENDDT >= DateTime.Now) ? 16 : (item.TASK_ENDDT < DateTime.Now && item.NOTICE_STATUS == 0) ? 20 : 0;
noticeLog.logList.Add(start1);
@ -1997,37 +1997,37 @@ namespace APT.SK.WebApi.Controllers.Api
start.CREATE_TIME = temp1.CREATE_TIME;
start.STATUS = temp1.NOTICE_STATUS == 1 ? 5 : temp1.NOTICE_STATUS == 2 ? 10 : temp1.NOTICE_STATUS == 4 ? 15 : (temp1.NOTICE_STATUS == 0 && temp1.TASK_ENDDT >= DateTime.Now) ? 16 : (temp1.TASK_ENDDT < DateTime.Now && temp1.NOTICE_STATUS == 0) ? 20 : 0;
recordLog.logList.Add(start);
var record = safeRecords.FirstOrDefault(t => t.ID == temp1.SOURCE_DATA_ID);
if (record != null)
{
var recordUser = users.FirstOrDefault(t => t.ID == record.APPLY_USER_ID);
//归档
if (record.STATUS == PFStandardStatus.Archived || record.STATUS == PFStandardStatus.Close)
{
OperateLogList start1 = new OperateLogList();
start1.ID = temp1.SOURCE_DATA_ID;
start1.CODE = "SK010_SHOWPRINT";
start1.USER_NAME = recordUser.NAME;
start1.NAME = "安全检查记录归档";
start1.DEAL_DATE = record.MODIFY_TIME;
start1.CREATE_TIME = record.CREATE_TIME;
start1.STATUS = 5;
recordLog.logList.Add(start1);
//var record = safeRecords.FirstOrDefault(t => t.ID == temp1.SOURCE_DATA_ID);
//if (record != null)
//{
// var recordUser = users.FirstOrDefault(t => t.ID == record.APPLY_USER_ID);
// //归档
// if (record.STATUS == PFStandardStatus.Archived || record.STATUS == PFStandardStatus.Close)
// {
// OperateLogList start1 = new OperateLogList();
// start1.ID = temp1.SOURCE_DATA_ID;
// start1.CODE = "SK010_SHOWPRINT";
// start1.USER_NAME = recordUser.NAME;
// start1.NAME = "安全检查记录归档";
// start1.DEAL_DATE = record.MODIFY_TIME;
// start1.CREATE_TIME = record.CREATE_TIME;
// start1.STATUS = 5;
// recordLog.logList.Add(start1);
}
else
{
OperateLogList start1 = new OperateLogList();
start1.ID = temp1.SOURCE_DATA_ID;
start1.CODE = "SK010_SHOWPRINT";
start1.USER_NAME = recordUser.NAME;
start1.NAME = "安全检查记录归档";
start1.DEAL_DATE = record.MODIFY_TIME;
start1.CREATE_TIME = record.CREATE_TIME;
start1.STATUS = 0;
recordLog.logList.Add(start1);
}
}
// }
// else
// {
// OperateLogList start1 = new OperateLogList();
// start1.ID = temp1.SOURCE_DATA_ID;
// start1.CODE = "SK010_SHOWPRINT";
// start1.USER_NAME = recordUser.NAME;
// start1.NAME = "安全检查记录归档";
// start1.DEAL_DATE = record.MODIFY_TIME;
// start1.CREATE_TIME = record.CREATE_TIME;
// start1.STATUS = 0;
// recordLog.logList.Add(start1);
// }
//}
}
}
var temp3 = itemps.Where(t => t.NOTICE_STATUS != 1).OrderByDescending(n => n.NOTICE_STATUS).ThenBy(m => m.MODIFY_TIME).ToList();
@ -2044,37 +2044,37 @@ namespace APT.SK.WebApi.Controllers.Api
start.CREATE_TIME = temp1.CREATE_TIME;
start.STATUS = temp1.NOTICE_STATUS == 1 ? 5 : temp1.NOTICE_STATUS == 2 ? 10 : temp1.NOTICE_STATUS == 4 ? 15 : (temp1.NOTICE_STATUS == 0 && temp1.TASK_ENDDT >= DateTime.Now) ? 16 : (temp1.TASK_ENDDT < DateTime.Now && temp1.NOTICE_STATUS == 0) ? 20 : 0;
recordLog.logList.Add(start);
var record = safeRecords.FirstOrDefault(t => t.ID == temp1.SOURCE_DATA_ID);
if (record != null)
{
var recordUser = users.FirstOrDefault(t => t.ID == record.APPLY_USER_ID);
//归档
if (record.STATUS == PFStandardStatus.Archived || record.STATUS == PFStandardStatus.Close)
{
OperateLogList start1 = new OperateLogList();
start1.ID = temp1.SOURCE_DATA_ID;
start1.CODE = "SK010_SHOWPRINT";
start1.USER_NAME = recordUser.NAME;
start1.NAME = "安全检查记录归档";
start1.DEAL_DATE = record.MODIFY_TIME;
start1.CREATE_TIME = record.CREATE_TIME;
start1.STATUS = 5;
recordLog.logList.Add(start1);
//var record = safeRecords.FirstOrDefault(t => t.ID == temp1.SOURCE_DATA_ID);
//if (record != null)
//{
// var recordUser = users.FirstOrDefault(t => t.ID == record.APPLY_USER_ID);
// //归档
// if (record.STATUS == PFStandardStatus.Archived || record.STATUS == PFStandardStatus.Close)
// {
// OperateLogList start1 = new OperateLogList();
// start1.ID = temp1.SOURCE_DATA_ID;
// start1.CODE = "SK010_SHOWPRINT";
// start1.USER_NAME = recordUser.NAME;
// start1.NAME = "安全检查记录归档";
// start1.DEAL_DATE = record.MODIFY_TIME;
// start1.CREATE_TIME = record.CREATE_TIME;
// start1.STATUS = 5;
// recordLog.logList.Add(start1);
}
else
{
OperateLogList start1 = new OperateLogList();
start1.ID = temp1.SOURCE_DATA_ID;
start1.CODE = "SK010_SHOWPRINT";
start1.USER_NAME = recordUser.NAME;
start1.NAME = "安全检查记录归档";
start1.DEAL_DATE = record.MODIFY_TIME;
start1.CREATE_TIME = record.CREATE_TIME;
start1.STATUS = 0;
recordLog.logList.Add(start1);
}
}
// }
// else
// {
// OperateLogList start1 = new OperateLogList();
// start1.ID = temp1.SOURCE_DATA_ID;
// start1.CODE = "SK010_SHOWPRINT";
// start1.USER_NAME = recordUser.NAME;
// start1.NAME = "安全检查记录归档";
// start1.DEAL_DATE = record.MODIFY_TIME;
// start1.CREATE_TIME = record.CREATE_TIME;
// start1.STATUS = 0;
// recordLog.logList.Add(start1);
// }
//}
}
}
@ -2160,32 +2160,32 @@ namespace APT.SK.WebApi.Controllers.Api
start1.CREATE_TIME = item.CREATE_TIME;
start1.STATUS = item.NOTICE_STATUS == 1 ? 5 : item.NOTICE_STATUS == 2 ? 10 : item.NOTICE_STATUS == 4 ? 15 : (item.NOTICE_STATUS == 0 && item.TASK_ENDDT >= DateTime.Now) ? 16 : (item.TASK_ENDDT < DateTime.Now && item.NOTICE_STATUS == 0) ? 20 : 0;
recordSumLog.logList.Add(start1);
//归档
if (recordSum.STATUS == PFStandardStatus.Archived)
{
OperateLogList start2 = new OperateLogList();
start2.ID = safeRecordSumId;
start2.CODE = "SK012_SHOWPRINT";
start2.USER_NAME = recordSumUser.NAME;
start2.NAME = "安全检查记录汇总归档";
start2.DEAL_DATE = recordSum.MODIFY_TIME;
start2.CREATE_TIME = recordSum.CREATE_TIME;
start2.STATUS = 5;
recordSumLog.logList.Add(start2);
////归档
//if (recordSum.STATUS == PFStandardStatus.Archived)
//{
// OperateLogList start2 = new OperateLogList();
// start2.ID = safeRecordSumId;
// start2.CODE = "SK012_SHOWPRINT";
// start2.USER_NAME = recordSumUser.NAME;
// start2.NAME = "安全检查记录汇总归档";
// start2.DEAL_DATE = recordSum.MODIFY_TIME;
// start2.CREATE_TIME = recordSum.CREATE_TIME;
// start2.STATUS = 5;
// recordSumLog.logList.Add(start2);
}
else
{
OperateLogList start2 = new OperateLogList();
start2.ID = safeRecordSumId;
start2.CODE = "SK012_SHOWPRINT";
start2.USER_NAME = recordSumUser.NAME;
start2.NAME = "安全检查记录汇总归档";
start2.DEAL_DATE = recordSum.MODIFY_TIME;
start2.CREATE_TIME = recordSum.CREATE_TIME;
start2.STATUS = 0;
recordSumLog.logList.Add(start2);
}
//}
//else
//{
// OperateLogList start2 = new OperateLogList();
// start2.ID = safeRecordSumId;
// start2.CODE = "SK012_SHOWPRINT";
// start2.USER_NAME = recordSumUser.NAME;
// start2.NAME = "安全检查记录汇总归档";
// start2.DEAL_DATE = recordSum.MODIFY_TIME;
// start2.CREATE_TIME = recordSum.CREATE_TIME;
// start2.STATUS = 0;
// recordSumLog.logList.Add(start2);
//}
}
}
var temp4 = temp2.Where(t => t.NOTICE_STATUS != 1).OrderByDescending(n => n.NOTICE_STATUS).ThenBy(m => m.MODIFY_TIME).ToList();
@ -2203,30 +2203,30 @@ namespace APT.SK.WebApi.Controllers.Api
start1.STATUS = item.NOTICE_STATUS == 1 ? 5 : item.NOTICE_STATUS == 2 ? 10 : item.NOTICE_STATUS == 4 ? 15 : (item.NOTICE_STATUS == 0 && item.TASK_ENDDT >= DateTime.Now) ? 16 : (item.TASK_ENDDT < DateTime.Now && item.NOTICE_STATUS == 0) ? 20 : 0;
recordSumLog.logList.Add(start1);
//归档
if (recordSum.STATUS == PFStandardStatus.Archived)
{
OperateLogList start2 = new OperateLogList();
start2.ID = safeRecordSumId;
start2.CODE = "SK012_SHOWPRINT";
start2.USER_NAME = recordSumUser.NAME;
start2.NAME = "安全检查记录汇总归档";
start2.DEAL_DATE = recordSum.MODIFY_TIME;
start2.CREATE_TIME = recordSum.CREATE_TIME;
start2.STATUS = 5;
recordSumLog.logList.Add(start2);
}
else
{
OperateLogList start2 = new OperateLogList();
start2.ID = safeRecordSumId;
start2.CODE = "SK012_SHOWPRINT";
start2.USER_NAME = recordSumUser.NAME;
start2.NAME = "安全检查记录汇总归档";
start2.DEAL_DATE = recordSum.MODIFY_TIME;
start2.CREATE_TIME = recordSum.CREATE_TIME;
start2.STATUS = 0;
recordSumLog.logList.Add(start2);
}
//if (recordSum.STATUS == PFStandardStatus.Archived)
//{
// OperateLogList start2 = new OperateLogList();
// start2.ID = safeRecordSumId;
// start2.CODE = "SK012_SHOWPRINT";
// start2.USER_NAME = recordSumUser.NAME;
// start2.NAME = "安全检查记录汇总归档";
// start2.DEAL_DATE = recordSum.MODIFY_TIME;
// start2.CREATE_TIME = recordSum.CREATE_TIME;
// start2.STATUS = 5;
// recordSumLog.logList.Add(start2);
//}
//else
//{
// OperateLogList start2 = new OperateLogList();
// start2.ID = safeRecordSumId;
// start2.CODE = "SK012_SHOWPRINT";
// start2.USER_NAME = recordSumUser.NAME;
// start2.NAME = "安全检查记录汇总归档";
// start2.DEAL_DATE = recordSum.MODIFY_TIME;
// start2.CREATE_TIME = recordSum.CREATE_TIME;
// start2.STATUS = 0;
// recordSumLog.logList.Add(start2);
//}
}
}
}
@ -2241,6 +2241,31 @@ namespace APT.SK.WebApi.Controllers.Api
start1.CREATE_TIME = null;
start1.STATUS = 0;
recordSumLog.logList.Add(start1);
//OperateLogList start2 = new OperateLogList();
//start2.ID = null;
//start2.CODE = "SK012_SHOWPRINT";
//start2.USER_NAME = "检查人";
//start2.NAME = "安全检查记录汇总归档";
//start2.DEAL_DATE = null;
//start2.CREATE_TIME = null;
//start2.STATUS = 0;
//recordSumLog.logList.Add(start2);
}
//归档
if (recordSum.STATUS == PFStandardStatus.Archived)
{
OperateLogList start2 = new OperateLogList();
start2.ID = safeRecordSumId;
start2.CODE = "SK012_SHOWPRINT";
start2.USER_NAME = recordSumUser.NAME;
start2.NAME = "安全检查记录汇总归档";
start2.DEAL_DATE = recordSum.MODIFY_TIME;
start2.CREATE_TIME = recordSum.CREATE_TIME;
start2.STATUS = 5;
recordSumLog.logList.Add(start2);
}
else
{
OperateLogList start2 = new OperateLogList();
start2.ID = null;
start2.CODE = "SK012_SHOWPRINT";
@ -2427,7 +2452,7 @@ namespace APT.SK.WebApi.Controllers.Api
OperateLogList start3 = new OperateLogList();
start3.ID = null;
start3.CODE = "SK014_SHOWPRINT";
start3.USER_NAME = "整改责任人";
start3.USER_NAME = "上报人";
start3.NAME = "隐患上报归档";
start3.DEAL_DATE = null;
start3.CREATE_TIME = null;
@ -2493,7 +2518,7 @@ namespace APT.SK.WebApi.Controllers.Api
OperateLogList start3 = new OperateLogList();
start3.ID = null;
start3.CODE = "SK014_SHOWPRINT";
start3.USER_NAME = "整改责任人";
start3.USER_NAME = "上报人";
start3.NAME = "隐患上报归档";
start3.DEAL_DATE = null;
start3.CREATE_TIME = null;
@ -2766,7 +2791,7 @@ namespace APT.SK.WebApi.Controllers.Api
OperateLogList start1 = new OperateLogList();
start1.ID = null;
start1.CODE = "SK020_SHOWPRINT";
start1.USER_NAME = "整改责任人";
start1.USER_NAME = "验收人";
start1.NAME = "隐患整改通知确认";
start1.DEAL_DATE = null;
start1.CREATE_TIME = null;
@ -2820,7 +2845,7 @@ namespace APT.SK.WebApi.Controllers.Api
OperateLogList start1 = new OperateLogList();
start1.ID = null;
start1.CODE = "SK020_SHOWPRINT";
start1.USER_NAME = "整改责任人";
start1.USER_NAME = "验收人";
start1.NAME = "隐患整改通知确认";
start1.DEAL_DATE = null;
start1.CREATE_TIME = null;
@ -2855,7 +2880,7 @@ namespace APT.SK.WebApi.Controllers.Api
OperateLogList start1 = new OperateLogList();
start1.ID = null;
start1.CODE = "SK020_SHOWPRINT";
start1.USER_NAME = "整改责任人";
start1.USER_NAME = "验收人";
start1.NAME = "隐患整改通知确认";
start1.DEAL_DATE = null;
start1.CREATE_TIME = null;

15
APT.MicroApi/APT.SK.WebApi/Controllers/Api/SecurityInspectionRecordController.cs
View File

@ -751,7 +751,8 @@ namespace APT.SK.WebApi.Controllers.Api
summaryDetail.HIDDEN_LEVEL = itemDetail.HIDDEN_LEVEL;
summaryDetail.HIDDEN_PLACE = itemDetail.HIDDEN_PLACE;
summaryDetail.MARK = itemDetail.MARK;
summaryDetail.NUM = itemDetail.NUM;
summaryDetail.NUM = itemDetail.NUM;
summaryDetail.REMARK = itemDetail.REMARK;
tempDetails.Add(summaryDetail);
if (itemDetail.Nav_CheckRecordDetailUsers != null && itemDetail.Nav_CheckRecordDetailUsers.Any())
{
@ -824,7 +825,8 @@ namespace APT.SK.WebApi.Controllers.Api
summaryDetail.HIDDEN_LEVEL = itemDetail.HIDDEN_LEVEL;
summaryDetail.HIDDEN_PLACE = itemDetail.HIDDEN_PLACE;
summaryDetail.MARK = itemDetail.MARK;
summaryDetail.NUM = itemDetail.NUM;
summaryDetail.NUM = itemDetail.NUM;
summaryDetail.REMARK = itemDetail.REMARK;
sumdetails.Add(summaryDetail);
var groupUsers = tempDetailUsers.Where(t => ids.Contains(t.SECURITY_INSPECTION_RECORD_SUMMARY_DETAIL_ID)).Select(m => m.USER_ID).Distinct().ToList();
if (groupUsers.Any())
@ -913,7 +915,8 @@ namespace APT.SK.WebApi.Controllers.Api
summaryDetail.HIDDEN_DESCRIPTION = string.IsNullOrEmpty(itemDetail.HIDDEN_DESCRIPTION) ? itemDetail.Nav_Question?.DESCREPTION : itemDetail.HIDDEN_DESCRIPTION;
summaryDetail.HIDDEN_LEVEL = itemDetail.HIDDEN_LEVEL;
summaryDetail.HIDDEN_PLACE = itemDetail.HIDDEN_PLACE;
summaryDetail.MARK = itemDetail.MARK;
summaryDetail.MARK = itemDetail.MARK;
summaryDetail.REMARK = itemDetail.REMARK;
sumdetails.Add(summaryDetail);
if (itemDetail.Nav_CheckRecordDetailUsers != null && itemDetail.Nav_CheckRecordDetailUsers.Any())
{
@ -999,7 +1002,8 @@ namespace APT.SK.WebApi.Controllers.Api
summaryDetail.HIDDEN_DESCRIPTION = string.IsNullOrEmpty(itemDetail.HIDDEN_DESCRIPTION) ? itemDetail.Nav_Question?.DESCREPTION : itemDetail.HIDDEN_DESCRIPTION;
summaryDetail.HIDDEN_LEVEL = itemDetail.HIDDEN_LEVEL;
summaryDetail.HIDDEN_PLACE = itemDetail.HIDDEN_PLACE;
summaryDetail.MARK = itemDetail.MARK;
summaryDetail.MARK = itemDetail.MARK;
summaryDetail.REMARK = itemDetail.REMARK;
sumdetails.Add(summaryDetail);
if (itemDetail.Nav_CheckRecordDetailUsers != null && itemDetail.Nav_CheckRecordDetailUsers.Any())
{
@ -1117,7 +1121,8 @@ namespace APT.SK.WebApi.Controllers.Api
detail.HIDDEN_DESCRIPTION = string.IsNullOrEmpty(item.HIDDEN_DESCRIPTION) ? item.Nav_Question?.DESCREPTION : item.HIDDEN_DESCRIPTION;
detail.HIDDEN_LEVEL = item.HIDDEN_LEVEL;
detail.HIDDEN_PLACE = item.HIDDEN_PLACE;
detail.MARK = item.MARK;
detail.MARK = item.MARK;
detail.REMARK = item.REMARK;
if (item.Nav_CheckRecordDetailUsers != null && item.Nav_CheckRecordDetailUsers.Any())
{
var itemUserList = item.Nav_CheckRecordDetailUsers.Select(t => t.Nav_User?.NAME).ToList();

3
APT.MicroApi/APT.SK.WebApi/Controllers/Api/SecurityInspectionRecordSummaryController.cs
View File

@ -310,6 +310,7 @@ namespace APT.SK.WebApi.Controllers.Api
detail.HIDDEN_LEVEL = item.HIDDEN_LEVEL;
detail.HIDDEN_PLACE = item.HIDDEN_PLACE;
detail.MARK = item.MARK;
detail.REMARK = item.REMARK;
if (item.Nav_CheckRecordDetailUsers != null && item.Nav_CheckRecordDetailUsers.Any())
{
var itemUserList = item.Nav_CheckRecordDetailUsers.Select(t => t.Nav_User?.NAME).ToList();
@ -504,6 +505,7 @@ namespace APT.SK.WebApi.Controllers.Api
detail.HIDDEN_LEVEL = item.HIDDEN_LEVEL;
detail.HIDDEN_PLACE = item.HIDDEN_PLACE;
detail.MARK = item.MARK;
detail.REMARK = item.REMARK;
if (item.Nav_CheckRecordDetailUsers != null && item.Nav_CheckRecordDetailUsers.Any())
{
var itemUserList = item.Nav_CheckRecordDetailUsers.Select(t => t.Nav_User?.NAME).ToList();
@ -654,6 +656,7 @@ namespace APT.SK.WebApi.Controllers.Api
detail.HIDDEN_LEVEL = item.HIDDEN_LEVEL;
detail.HIDDEN_PLACE = item.HIDDEN_PLACE;
detail.MARK = item.MARK;
detail.REMARK = item.REMARK;
if (item.Nav_CheckRecordDetailUsers != null && item.Nav_CheckRecordDetailUsers.Any())
{
var itemUserList = item.Nav_CheckRecordDetailUsers.Select(t => t.Nav_User?.NAME).ToList();