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

Compare commits

base: wyw:1236187d7347d7c6c3c495e8b4795fb58c68e2ef
Branches Tags
wyw:master
..
compare: wyw:d2579aee159e28288377425143cf083d5b68ea80
Branches Tags
wyw:master

No commits in common. "1236187d7347d7c6c3c495e8b4795fb58c68e2ef" and "d2579aee159e28288377425143cf083d5b68ea80" have entirely different histories.
1236187d73 ... d2579aee15

24 changed files with 113963 additions and 116642 deletions
Show Stats Expand all files Collapse all files

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

@ -11335,7 +11335,7 @@ namespace APT.BaseData.Services.DomainServices
}
else
{
var entity = this.GetEntity<T_SK_HIDDEN_DANGER_REPORT>(modelApp != null ? modelApp.DATA_ID : entityInt.DATA_ID, "Nav_ReportFiles");
var entity = this.GetEntity<T_SK_HIDDEN_DANGER_REPORT>(modelApp != null ? modelApp.DATA_ID : entityInt.DATA_ID);
entity.STATUS = PFStandardStatus.Archived;
var reportDetails = this.GetEntities<T_SK_HIDDEN_DANGER_REPORT_DETAIL>(t => t.HIDDEN_DANGER_REPORT_ID == entity.ID, new BaseFilter(entity.ORG_ID), "Nav_ReportDetailFiles", "Nav_ReportDetailBasics", "Nav_ReportDetailReasons");
//List<T_SK_HIDDEN_DANGER_REPORT_DETAIL> reportDetails = new List<T_SK_HIDDEN_DANGER_REPORT_DETAIL>();
@ -11392,7 +11392,7 @@ namespace APT.BaseData.Services.DomainServices
record.CHECK_TYPE_ID = entity.CHECK_TYPE_ID;
record.CHECK_QUESTION_ID = detail.CHECK_QUESTION_ID;
record.CHECK_CONTENTS_ID = detail.CHECK_CONTENTS_ID;
record.CHECK_TIME = entity.CHECK_TIME != null ? entity.CHECK_TIME : DateTime.Now;
record.CHECK_TIME = entity.CHECK_TIME;
records.Add(record);
if (detail.Nav_ReportDetailFiles != null && detail.Nav_ReportDetailFiles.Any())
{
@ -11471,7 +11471,7 @@ namespace APT.BaseData.Services.DomainServices
record.CHECK_TYPE_ID = entity.CHECK_TYPE_ID;
record.CHECK_QUESTION_ID = detail.CHECK_QUESTION_ID;
record.CHECK_CONTENTS_ID = detail.CHECK_CONTENTS_ID;
record.CHECK_TIME = entity.CHECK_TIME != null ? entity.CHECK_TIME : DateTime.Now;
record.CHECK_TIME = entity.CHECK_TIME;
records.Add(record);
if (detail.Nav_ReportDetailFiles != null && detail.Nav_ReportDetailFiles.Any())
{
@ -11531,20 +11531,20 @@ namespace APT.BaseData.Services.DomainServices
notice.CHECK_TYPE_ID = entity.CHECK_TYPE_ID;
notice.PLANCHECKFREQUENCY = entity.PLANCHECKFREQUENCY;
notice.DEPARTMENT_TYPE = entity.DEPARTMENT_TYPE;
notice.CHECK_TIME = entity.CHECK_TIME!=null ? entity.CHECK_TIME :DateTime.Now;
notice.CHECK_TIME = entity.CHECK_TIME;
notice.CHECK_PERSON = entity.CHECK_PERSON;
notices.Add(notice);
if (entity.Nav_ReportFiles != null && entity.Nav_ReportFiles.Any())
{
foreach (var item in entity.Nav_ReportFiles)
{
T_SK_HIDDEN_DANGER_RECTIFY_NOTICE_FILE file = new T_SK_HIDDEN_DANGER_RECTIFY_NOTICE_FILE();
file.ORG_ID = item.ORG_ID;
file.IMG_FILE_ID = item.IMG_FILE_ID;
file.HIDDEN_DANGER_RECTIFY_NOTICE_ID = notice.ID;
nfileList.Add(file);
}
}
//if (entity.Nav_ReportFiles != null && entity.Nav_ReportFiles.Any())
//{
// foreach (var item in entity.Nav_ReportFiles)
// {
// T_SK_HIDDEN_DANGER_RECTIFY_NOTICE_FILE file = new T_SK_HIDDEN_DANGER_RECTIFY_NOTICE_FILE();
// file.ORG_ID = item.ORG_ID;
// file.IMG_FILE_ID = item.IMG_FILE_ID;
// file.HIDDEN_DANGER_RECTIFY_NOTICE_ID = notice.ID;
// nfileList.Add(file);
// }
//}
T_SK_HIDDEN_DANGER_RECTIFY_NOTICE_DETAIL noticeDetail = new T_SK_HIDDEN_DANGER_RECTIFY_NOTICE_DETAIL();
noticeDetail.ORG_ID = entity.ORG_ID;
noticeDetail.HIDDEN_DANGER_RECTIFY_NOTICE_ID = notice.ID;
@ -11604,16 +11604,15 @@ namespace APT.BaseData.Services.DomainServices
DateTime.Now.AddDays(1), (int)FMNoticeTypeEnum.消息, "SK020");
sendNotices.Add(sendNotice);
}
detail.Nav_ReportDetailBasics = null;
detail.Nav_ReportDetailFiles = null;
}
var checkUser = users.FirstOrDefault(t => t.ID == detail.RECITIFY_USER_ID);
if (checkUser != null)
{
var sendNotice = NotificationTaskService.InsertUserNoticeTaskModel("隐患上报表" + DateTime.Now.Month.PadLeft(2, '0') + DateTime.Now.Day.PadLeft(2, '0') + "-确认", entity.ID, entity.ORG_ID, checkUser.ID, checkUser.NAME, DateTime.Now,
var sendNotice = NotificationTaskService.InsertUserNoticeTaskModel("隐患上报表" + DateTime.Now.Month.PadLeft(2,'0')+ DateTime.Now.Day.PadLeft(2, '0') + "-确认", entity.ID, entity.ORG_ID, checkUser.ID, checkUser.NAME, DateTime.Now,
DateTime.Now.AddHours(24), (int)FMNoticeTypeEnum.消息, "SK014_SHOWPRINT");
sendNotices.Add(sendNotice);
entity.STATUS = PFStandardStatus.Sign;
}
detail.Nav_ReportDetailBasics = null;
detail.Nav_ReportDetailFiles = null;
}
//if (detail.IS_STORE == SKIsStoreEnum.Yes)
//{
@ -11729,7 +11728,7 @@ namespace APT.BaseData.Services.DomainServices
}
else
{
var entity = this.GetEntity<T_SK_HIDDEN_DANGER_CONFIRM>(modelApp != null ? modelApp.DATA_ID : entityInt.DATA_ID, "Nav_Report", "Nav_Reasons", "Nav_Files");
var entity = this.GetEntity<T_SK_HIDDEN_DANGER_CONFIRM>(modelApp != null ? modelApp.DATA_ID : entityInt.DATA_ID, "Nav_Report", "Nav_Reasons");
entity.STATUS = PFStandardStatus.Archived;
var photos = this.GetEntities<T_SK_HIDDEN_DANGER_CONFIRM_PHOTO>(t => t.HIDDEN_DANGER_CONFIRM_ID == entity.ID, new BaseFilter(entity.ORG_ID));
var users = this.GetEntities<T_FM_USER>(t => t.ENABLE_STATUS == 0, new BaseFilter(entity.ORG_ID), "Nav_ApproveRole");
@ -11739,7 +11738,6 @@ namespace APT.BaseData.Services.DomainServices
T_SK_HIDDEN_DANGER_RECTIFY_RECORD record = null;
List<T_SK_HIDDEN_DANGER_RECTIFY_RECORD_PHOTOA> photoList = new List<T_SK_HIDDEN_DANGER_RECTIFY_RECORD_PHOTOA>();
T_SK_HIDDEN_DANGER_RECTIFY_NOTICE notice = null;
List<T_SK_HIDDEN_DANGER_RECTIFY_NOTICE_FILE> noticeFiles = new List<T_SK_HIDDEN_DANGER_RECTIFY_NOTICE_FILE>();
List<T_SK_HIDDEN_DANGER_RECTIFY_NOTICE_DETAIL> noticeDetails = new List<T_SK_HIDDEN_DANGER_RECTIFY_NOTICE_DETAIL>();
List<T_SK_HIDDEN_DANGER_RECTIFY_NOTICE_DETAIL_FILE> noticeFileList = new List<T_SK_HIDDEN_DANGER_RECTIFY_NOTICE_DETAIL_FILE>();
List<T_SK_HIDDEN_DANGER_RECTIFY_NOTICE_DETAIL_REASON> noticeReasonList = new List<T_SK_HIDDEN_DANGER_RECTIFY_NOTICE_DETAIL_REASON>();
@ -11931,17 +11929,6 @@ namespace APT.BaseData.Services.DomainServices
notice.DEPARTMENT_TYPE = entity.DEPARTMENT_TYPE;
notice.CREATE_TIME = entity.Nav_Report?.CREATE_TIME;
notice.CHECK_PERSON = entity.Nav_ApplyUser?.NAME;
if (entity.Nav_Files != null && entity.Nav_Files.Any())
{
foreach (var item in entity.Nav_Files)
{
T_SK_HIDDEN_DANGER_RECTIFY_NOTICE_FILE file = new T_SK_HIDDEN_DANGER_RECTIFY_NOTICE_FILE();
file.ORG_ID = item.ORG_ID;
file.IMG_FILE_ID = item.IMG_FILE_ID;
file.HIDDEN_DANGER_RECTIFY_NOTICE_ID = notice.ID;
noticeFiles.Add(file);
}
}
T_SK_HIDDEN_DANGER_RECTIFY_NOTICE_DETAIL noticeDetail = new T_SK_HIDDEN_DANGER_RECTIFY_NOTICE_DETAIL();
noticeDetail.ORG_ID = entity.ORG_ID;
noticeDetail.HIDDEN_DANGER_RECTIFY_NOTICE_ID = notice.ID;
@ -11992,14 +11979,6 @@ namespace APT.BaseData.Services.DomainServices
sendNotices.Add(sendNotice);
}
}
var checkUser = users.FirstOrDefault(t => t.ID == entity.RECITIFY_USER_ID);
if (checkUser != null)
{
var sendNotice = NotificationTaskService.InsertUserNoticeTaskModel("隐患确认单" + DateTime.Now.Month.PadLeft(2, '0') + DateTime.Now.Day.PadLeft(2, '0') + "-确认", entity.ID, entity.ORG_ID, checkUser.ID, checkUser.NAME, DateTime.Now,
DateTime.Now.AddHours(24), (int)FMNoticeTypeEnum.消息, "SK018_SHOWPRINT");
sendNotices.Add(sendNotice);
entity.STATUS = PFStandardStatus.Sign;
}
}
UnifiedCommit(() =>
{
@ -12027,8 +12006,6 @@ namespace APT.BaseData.Services.DomainServices
this.BantchSaveEntityNoCommit(reasonList);
if (notice != null)
this.UpdateEntityNoCommit(notice);
if (noticeFiles != null && noticeFiles.Any())
this.BantchSaveEntityNoCommit(noticeFiles);
if (noticeDetails != null && noticeDetails.Any())
this.BantchSaveEntityNoCommit(noticeDetails);
if (noticeFileList != null && noticeFileList.Any())
@ -12122,11 +12099,9 @@ namespace APT.BaseData.Services.DomainServices
else
{
var entity = this.GetEntity<T_SK_HIDDEN_DANGER_RECTIFY_DELAY_APPLY>(modelApp != null ? modelApp.DATA_ID : entityInt.DATA_ID);
entity.STATUS = PFStandardStatus.Reading;
entity.STATUS = PFStandardStatus.Sign;
var record = this.GetEntity<T_SK_HIDDEN_DANGER_RECTIFY_RECORD>(t => t.ID == entity.HIDDEN_DANGER_RECTIFY_RECORD_ID, "Nav_AcceptUser");
record.RECITIFY_TIME = entity.DELAY_RECITIFY_TIME;
var noticeTasks = this.GetEntities<T_FM_NOTIFICATION_TASK>(t => t.SOURCE_DATA_ID == entity.HIDDEN_DANGER_RECTIFY_RECORD_ID && t.NOTICE_STATUS == 0,new BaseFilter(entity.ORG_ID));
noticeTasks.ForEach(t => { t.TASK_ENDDT = entity.DELAY_RECITIFY_TIME.Value; });
record.RECITIFY_TIME = DateTime.Now;
T_FM_NOTIFICATION_TASK notice = null;
if (record != null && record.ACCEPT_USER_ID != null)
{
@ -12149,8 +12124,6 @@ namespace APT.BaseData.Services.DomainServices
this.UpdateEntityNoCommit(record);
if (notice != null)
this.UpdateEntityNoCommit(notice);
if (noticeTasks != null && noticeTasks.Any())
BantchSaveEntityNoCommit(noticeTasks);
});
}
return true;

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

@ -1315,7 +1315,6 @@ builder.Property(t => t.REQUIRES).HasMaxLength(500);
builder.Ignore(t => t.PUBLISH);
builder.Ignore(t => t.IS_OVERTIME);
builder.Property(t => t.PARENT_NAME).HasMaxLength(500);
builder.Ignore(t => t.Nav_AcceptUsers);
}
}
#endregion

4
APT.MS.Domain/Entities/FO/T_FO_JOB_ACTIVITY_RECORD.cs
View File

@ -164,9 +164,5 @@ namespace APT.MS.Domain.Entities.FO
/// </summary>
[Description("相关方")]
public Guid? RELATED_ID { get; set; }
[Description("导航属性：完工验收人员表")]
[DataFieldIngore]
public ICollection<T_FO_JOB_ACTIVITY_PERSON> Nav_AcceptUsers { get; set; }
}
}

22
APT.MicroApi/APT.BD.WebApi/Controllers/Api/T4/T4Control.cs
View File

@ -2,12 +2,6 @@
//------------------------------------------------------------------------------
// T4模板文件：基础接口类
// 此代码由T4模板自动生成
@ -22,7 +16,6 @@ using APT.BaseData.Domain.ApiModel.PF;
namespace APT.BD.WebApi.Controllers.Api
{
using APT.BaseData.Domain.Entities.BD;
#region Hmi-HMI资源表维护
/// <summary>
/// HMI资源表维护
@ -130,10 +123,8 @@ namespace APT.BD.WebApi.Controllers.Api
return WitEntity(null, filter);
}
}
#endregion
#region Picture-图片资源
/// <summary>
/// 图片资源
@ -241,10 +232,8 @@ namespace APT.BD.WebApi.Controllers.Api
return WitEntity(null, filter);
}
}
#endregion
#region PictureFile-资源图片文件
/// <summary>
/// 资源图片文件
@ -352,10 +341,8 @@ namespace APT.BD.WebApi.Controllers.Api
return WitEntity(null, filter);
}
}
#endregion
#region Place-区域表
/// <summary>
/// 区域表
@ -462,7 +449,6 @@ namespace APT.BD.WebApi.Controllers.Api
{
return WitEntity(null, filter);
}
/// <summary>
/// 获得树形实体数据
/// </summary>
@ -474,10 +460,8 @@ namespace APT.BD.WebApi.Controllers.Api
return WitTreeOrderEntities(null, filter);
}
}
#endregion
#region ServerInfo-服务器信息表
/// <summary>
/// 服务器信息表
@ -585,10 +569,8 @@ namespace APT.BD.WebApi.Controllers.Api
return WitEntity(null, filter);
}
}
#endregion
#region SystemInfo-系统信息表
/// <summary>
/// 系统信息表
@ -696,10 +678,8 @@ namespace APT.BD.WebApi.Controllers.Api
return WitEntity(null, filter);
}
}
#endregion
#region WordTemplate-WORD模板维护
/// <summary>
/// WORD模板维护
@ -807,8 +787,6 @@ namespace APT.BD.WebApi.Controllers.Api
return WitEntity(null, filter);
}
}
#endregion
}

130
APT.MicroApi/APT.BS.WebApi/Controllers/Api/T4/T4Control.cs
View File

@ -2,12 +2,6 @@
//------------------------------------------------------------------------------
// T4模板文件：基础接口类
// 此代码由T4模板自动生成
@ -22,7 +16,6 @@ using APT.BaseData.Domain.ApiModel.PF;
namespace APT.BS.WebApi.Controllers.Api
{
using APT.MS.Domain.Entities.BS;
#region CheckContent-检查内容表
/// <summary>
/// 检查内容表
@ -130,10 +123,8 @@ namespace APT.BS.WebApi.Controllers.Api
return WitEntity(null, filter);
}
}
#endregion
#region CheckContents-检查内容
/// <summary>
/// 检查内容
@ -241,10 +232,8 @@ namespace APT.BS.WebApi.Controllers.Api
return WitEntity(null, filter);
}
}
#endregion
#region CheckContentCheckType-检查类型
/// <summary>
/// 检查类型
@ -352,10 +341,8 @@ namespace APT.BS.WebApi.Controllers.Api
return WitEntity(null, filter);
}
}
#endregion
#region CheckContentCheckTypeLevel-检查内容检查类型子表(关联层级)
/// <summary>
/// 检查内容检查类型子表(关联层级)
@ -463,10 +450,8 @@ namespace APT.BS.WebApi.Controllers.Api
return WitEntity(null, filter);
}
}
#endregion
#region CheckContentHmRiskArea-检查区域
/// <summary>
/// 检查区域
@ -574,10 +559,8 @@ namespace APT.BS.WebApi.Controllers.Api
return WitEntity(null, filter);
}
}
#endregion
#region CheckMain-安全检查库
/// <summary>
/// 安全检查库
@ -685,10 +668,8 @@ namespace APT.BS.WebApi.Controllers.Api
return WitEntity(null, filter);
}
}
#endregion
#region CheckContentMainDepartment-安全检查库责任部门
/// <summary>
/// 安全检查库责任部门
@ -796,10 +777,8 @@ namespace APT.BS.WebApi.Controllers.Api
return WitEntity(null, filter);
}
}
#endregion
#region CheckContentQuestion-检查问题
/// <summary>
/// 检查问题
@ -907,10 +886,8 @@ namespace APT.BS.WebApi.Controllers.Api
return WitEntity(null, filter);
}
}
#endregion
#region CheckMainLaw-检查库法规
/// <summary>
/// 检查库法规
@ -1018,10 +995,8 @@ namespace APT.BS.WebApi.Controllers.Api
return WitEntity(null, filter);
}
}
#endregion
#region CheckProject-检查项目
/// <summary>
/// 检查项目
@ -1129,10 +1104,8 @@ namespace APT.BS.WebApi.Controllers.Api
return WitEntity(null, filter);
}
}
#endregion
#region CheckProjectCategory-检查项目分类表
/// <summary>
/// 检查项目分类表
@ -1240,10 +1213,8 @@ namespace APT.BS.WebApi.Controllers.Api
return WitEntity(null, filter);
}
}
#endregion
#region CheckProjectCategoryChecktype-检查项目分类_检查类型
/// <summary>
/// 检查项目分类_检查类型
@ -1351,10 +1322,8 @@ namespace APT.BS.WebApi.Controllers.Api
return WitEntity(null, filter);
}
}
#endregion
#region CheckProjectCategoryObject-检查项目分类_检查区域
/// <summary>
/// 检查项目分类_检查区域
@ -1462,10 +1431,8 @@ namespace APT.BS.WebApi.Controllers.Api
return WitEntity(null, filter);
}
}
#endregion
#region CheckProjectProjectCategory-检查项目分类
/// <summary>
/// 检查项目分类
@ -1573,10 +1540,8 @@ namespace APT.BS.WebApi.Controllers.Api
return WitEntity(null, filter);
}
}
#endregion
#region CheckQuestion-检查问题
/// <summary>
/// 检查问题
@ -1684,10 +1649,8 @@ namespace APT.BS.WebApi.Controllers.Api
return WitEntity(null, filter);
}
}
#endregion
#region CheckType-检查类型表
/// <summary>
/// 检查类型表
@ -1794,7 +1757,6 @@ namespace APT.BS.WebApi.Controllers.Api
{
return WitEntity(null, filter);
}
/// <summary>
/// 获得树形实体数据
/// </summary>
@ -1806,10 +1768,8 @@ namespace APT.BS.WebApi.Controllers.Api
return WitTreeOrderEntities(null, filter);
}
}
#endregion
#region CheckTypeLevel-检查层级
/// <summary>
/// 检查层级
@ -1917,10 +1877,8 @@ namespace APT.BS.WebApi.Controllers.Api
return WitEntity(null, filter);
}
}
#endregion
#region CheckTypeMinetype-检查类型生产单元
/// <summary>
/// 检查类型生产单元
@ -2028,10 +1986,8 @@ namespace APT.BS.WebApi.Controllers.Api
return WitEntity(null, filter);
}
}
#endregion
#region DepartmentAreaobject-部门范围
/// <summary>
/// 部门范围
@ -2139,10 +2095,8 @@ namespace APT.BS.WebApi.Controllers.Api
return WitEntity(null, filter);
}
}
#endregion
#region OperateLog-操作日志
/// <summary>
/// 操作日志
@ -2250,10 +2204,8 @@ namespace APT.BS.WebApi.Controllers.Api
return WitEntity(null, filter);
}
}
#endregion
#region PlanSet-制定任务
/// <summary>
/// 制定任务
@ -2361,10 +2313,8 @@ namespace APT.BS.WebApi.Controllers.Api
return WitEntity(null, filter);
}
}
#endregion
#region PlanSetArea-制定任务区域
/// <summary>
/// 制定任务区域
@ -2472,10 +2422,8 @@ namespace APT.BS.WebApi.Controllers.Api
return WitEntity(null, filter);
}
}
#endregion
#region PlanSetDepartmentOut-制定任务排除组织
/// <summary>
/// 制定任务排除组织
@ -2583,10 +2531,8 @@ namespace APT.BS.WebApi.Controllers.Api
return WitEntity(null, filter);
}
}
#endregion
#region PlanSetDepObject-制定任务部门触发范围
/// <summary>
/// 制定任务部门触发范围
@ -2694,10 +2640,8 @@ namespace APT.BS.WebApi.Controllers.Api
return WitEntity(null, filter);
}
}
#endregion
#region PlanSetObject-制定任务触发范围
/// <summary>
/// 制定任务触发范围
@ -2805,10 +2749,8 @@ namespace APT.BS.WebApi.Controllers.Api
return WitEntity(null, filter);
}
}
#endregion
#region RiskCategory-隐患类别
/// <summary>
/// 隐患类别
@ -2916,10 +2858,8 @@ namespace APT.BS.WebApi.Controllers.Api
return WitEntity(null, filter);
}
}
#endregion
#region RiskLevelDelayDays-隐患等级最长延期整改天数
/// <summary>
/// 隐患等级最长延期整改天数
@ -3027,10 +2967,8 @@ namespace APT.BS.WebApi.Controllers.Api
return WitEntity(null, filter);
}
}
#endregion
#region RiskReason-隐患原因表
/// <summary>
/// 隐患原因表
@ -3138,10 +3076,8 @@ namespace APT.BS.WebApi.Controllers.Api
return WitEntity(null, filter);
}
}
#endregion
#region RiskSubmit-隐患上报表
/// <summary>
/// 隐患上报表
@ -3249,10 +3185,8 @@ namespace APT.BS.WebApi.Controllers.Api
return WitEntity(null, filter);
}
}
#endregion
#region RiskSubmitContent-隐患上报明细
/// <summary>
/// 隐患上报明细
@ -3360,10 +3294,8 @@ namespace APT.BS.WebApi.Controllers.Api
return WitEntity(null, filter);
}
}
#endregion
#region RiskSubmitContentBack-隐患上报明细退回
/// <summary>
/// 隐患上报明细退回
@ -3471,10 +3403,8 @@ namespace APT.BS.WebApi.Controllers.Api
return WitEntity(null, filter);
}
}
#endregion
#region RiskSubmitContentDeal-隐患整改记录
/// <summary>
/// 隐患整改记录
@ -3582,10 +3512,8 @@ namespace APT.BS.WebApi.Controllers.Api
return WitEntity(null, filter);
}
}
#endregion
#region RiskSubmitContentDealAfterFile-检查任务附件表
/// <summary>
/// 检查任务附件表
@ -3693,10 +3621,8 @@ namespace APT.BS.WebApi.Controllers.Api
return WitEntity(null, filter);
}
}
#endregion
#region RiskSubmitContentDealFile-检查任务附件表
/// <summary>
/// 检查任务附件表
@ -3804,10 +3730,8 @@ namespace APT.BS.WebApi.Controllers.Api
return WitEntity(null, filter);
}
}
#endregion
#region RiskSubmitContentDealUserchecksign-隐患整改验收人签名
/// <summary>
/// 隐患整改验收人签名
@ -3915,10 +3839,8 @@ namespace APT.BS.WebApi.Controllers.Api
return WitEntity(null, filter);
}
}
#endregion
#region RiskSubmitContentDealUsersign-隐患整改责任人签名
/// <summary>
/// 隐患整改责任人签名
@ -4026,10 +3948,8 @@ namespace APT.BS.WebApi.Controllers.Api
return WitEntity(null, filter);
}
}
#endregion
#region RiskSubmitContentFile-检查任务明细附件表
/// <summary>
/// 检查任务明细附件表
@ -4137,10 +4057,8 @@ namespace APT.BS.WebApi.Controllers.Api
return WitEntity(null, filter);
}
}
#endregion
#region RiskSubmitContentReason-隐患上报明细原因
/// <summary>
/// 隐患上报明细原因
@ -4248,10 +4166,8 @@ namespace APT.BS.WebApi.Controllers.Api
return WitEntity(null, filter);
}
}
#endregion
#region RiskSubmitContentTemp-隐患上报详情待入库
/// <summary>
/// 隐患上报详情待入库
@ -4359,10 +4275,8 @@ namespace APT.BS.WebApi.Controllers.Api
return WitEntity(null, filter);
}
}
#endregion
#region RiskSubmitDelayApply-延期整改申请
/// <summary>
/// 延期整改申请
@ -4470,10 +4384,8 @@ namespace APT.BS.WebApi.Controllers.Api
return WitEntity(null, filter);
}
}
#endregion
#region RiskSubmitDelayApplyDetail-延期整改申请详情
/// <summary>
/// 延期整改申请详情
@ -4581,10 +4493,8 @@ namespace APT.BS.WebApi.Controllers.Api
return WitEntity(null, filter);
}
}
#endregion
#region RiskSubmitFile-检查任务附件表
/// <summary>
/// 检查任务附件表
@ -4692,10 +4602,8 @@ namespace APT.BS.WebApi.Controllers.Api
return WitEntity(null, filter);
}
}
#endregion
#region RiskSubmitNotice-隐患通知
/// <summary>
/// 隐患通知
@ -4803,10 +4711,8 @@ namespace APT.BS.WebApi.Controllers.Api
return WitEntity(null, filter);
}
}
#endregion
#region RiskSubmitNoticePerson-隐患通知
/// <summary>
/// 隐患通知
@ -4914,10 +4820,8 @@ namespace APT.BS.WebApi.Controllers.Api
return WitEntity(null, filter);
}
}
#endregion
#region RiskTpm-TPM对接数据
/// <summary>
/// TPM对接数据
@ -5025,10 +4929,8 @@ namespace APT.BS.WebApi.Controllers.Api
return WitEntity(null, filter);
}
}
#endregion
#region SafeCheck-安全检查
/// <summary>
/// 安全检查
@ -5136,10 +5038,8 @@ namespace APT.BS.WebApi.Controllers.Api
return WitEntity(null, filter);
}
}
#endregion
#region SafeCheckDetail-检查明细
/// <summary>
/// 检查明细
@ -5247,10 +5147,8 @@ namespace APT.BS.WebApi.Controllers.Api
return WitEntity(null, filter);
}
}
#endregion
#region SafeCheckDetailFile-检查任务明细附件表
/// <summary>
/// 检查任务明细附件表
@ -5358,10 +5256,8 @@ namespace APT.BS.WebApi.Controllers.Api
return WitEntity(null, filter);
}
}
#endregion
#region SafeCheckDetailLaw-检查依据
/// <summary>
/// 检查依据
@ -5469,10 +5365,8 @@ namespace APT.BS.WebApi.Controllers.Api
return WitEntity(null, filter);
}
}
#endregion
#region SafeCheckDetailQuestion-检查明细问题
/// <summary>
/// 检查明细问题
@ -5580,10 +5474,8 @@ namespace APT.BS.WebApi.Controllers.Api
return WitEntity(null, filter);
}
}
#endregion
#region SafeCheckDetailReason-检查明细隐患原因
/// <summary>
/// 检查明细隐患原因
@ -5691,10 +5583,8 @@ namespace APT.BS.WebApi.Controllers.Api
return WitEntity(null, filter);
}
}
#endregion
#region SafeCheckDetailReject-检查明细退回
/// <summary>
/// 检查明细退回
@ -5802,10 +5692,8 @@ namespace APT.BS.WebApi.Controllers.Api
return WitEntity(null, filter);
}
}
#endregion
#region SafeCheckDetailRejectFile-检查明细退回附件
/// <summary>
/// 检查明细退回附件
@ -5913,10 +5801,8 @@ namespace APT.BS.WebApi.Controllers.Api
return WitEntity(null, filter);
}
}
#endregion
#region SafeCheckDetailUser-检查明细人员
/// <summary>
/// 检查明细人员
@ -6024,10 +5910,8 @@ namespace APT.BS.WebApi.Controllers.Api
return WitEntity(null, filter);
}
}
#endregion
#region SafeCheckFile-安全检查文件
/// <summary>
/// 安全检查文件
@ -6135,10 +6019,8 @@ namespace APT.BS.WebApi.Controllers.Api
return WitEntity(null, filter);
}
}
#endregion
#region SafeCheckProject-安全检查文件
/// <summary>
/// 安全检查文件
@ -6246,10 +6128,8 @@ namespace APT.BS.WebApi.Controllers.Api
return WitEntity(null, filter);
}
}
#endregion
#region SafeCheckProjectCategory-安全检查文件
/// <summary>
/// 安全检查文件
@ -6357,10 +6237,8 @@ namespace APT.BS.WebApi.Controllers.Api
return WitEntity(null, filter);
}
}
#endregion
#region SafeCheckRecord-检查记录确认
/// <summary>
/// 检查记录确认
@ -6468,10 +6346,8 @@ namespace APT.BS.WebApi.Controllers.Api
return WitEntity(null, filter);
}
}
#endregion
#region SafeCheckRecordDetail-检查记录确认明细
/// <summary>
/// 检查记录确认明细
@ -6579,10 +6455,8 @@ namespace APT.BS.WebApi.Controllers.Api
return WitEntity(null, filter);
}
}
#endregion
#region SafeCheckRiskArea-检查区域
/// <summary>
/// 检查区域
@ -6690,10 +6564,8 @@ namespace APT.BS.WebApi.Controllers.Api
return WitEntity(null, filter);
}
}
#endregion
#region SafeCheckUsersign-检查签名
/// <summary>
/// 检查签名
@ -6801,8 +6673,6 @@ namespace APT.BS.WebApi.Controllers.Api
return WitEntity(null, filter);
}
}
#endregion
}

115
APT.MicroApi/APT.FM.WebApi/Controllers/Api/T4/T4Control.cs
View File

@ -2,12 +2,6 @@
//------------------------------------------------------------------------------
// T4模板文件：基础接口类
// 此代码由T4模板自动生成
@ -23,7 +17,6 @@ namespace APT.FM.WebApi.Controllers.Api
{
using APT.BaseData.Domain.Entities.FM;
using APT.BaseData.Domain.Entities;
#region Api-API
/// <summary>
/// API
@ -131,10 +124,8 @@ using APT.BaseData.Domain.Entities;
return WitEntity(null, filter);
}
}
#endregion
#region BaseAdd-企业位置信息
/// <summary>
/// 企业位置信息
@ -242,10 +233,8 @@ using APT.BaseData.Domain.Entities;
return WitEntity(null, filter);
}
}
#endregion
#region BaseEnergy-企业能耗配置信息
/// <summary>
/// 企业能耗配置信息
@ -353,10 +342,8 @@ using APT.BaseData.Domain.Entities;
return WitEntity(null, filter);
}
}
#endregion
#region BaseInfo-企业基本信息
/// <summary>
/// 企业基本信息
@ -464,10 +451,8 @@ using APT.BaseData.Domain.Entities;
return WitEntity(null, filter);
}
}
#endregion
#region DepartmentCalendarConfig-部门日历配置表
/// <summary>
/// 部门日历配置表
@ -575,10 +560,8 @@ using APT.BaseData.Domain.Entities;
return WitEntity(null, filter);
}
}
#endregion
#region DepartmentCalendarConfigDetail-部门日历配置明细表
/// <summary>
/// 部门日历配置明细表
@ -686,10 +669,8 @@ using APT.BaseData.Domain.Entities;
return WitEntity(null, filter);
}
}
#endregion
#region DepartmentCalendarConfigTeam-部门日历配置班组表
/// <summary>
/// 部门日历配置班组表
@ -797,10 +778,8 @@ using APT.BaseData.Domain.Entities;
return WitEntity(null, filter);
}
}
#endregion
#region DepartmentCompletion-XX班完成情况统计
/// <summary>
/// XX班完成情况统计
@ -908,10 +887,8 @@ using APT.BaseData.Domain.Entities;
return WitEntity(null, filter);
}
}
#endregion
#region DepartmentCompletionSort-班组完成情况前十
/// <summary>
/// 班组完成情况前十
@ -1019,10 +996,8 @@ using APT.BaseData.Domain.Entities;
return WitEntity(null, filter);
}
}
#endregion
#region DepartmentPost-部门岗位
/// <summary>
/// 部门岗位
@ -1130,10 +1105,8 @@ using APT.BaseData.Domain.Entities;
return WitEntity(null, filter);
}
}
#endregion
#region DepartmentPostUser-部门岗位人员
/// <summary>
/// 部门岗位人员
@ -1241,10 +1214,8 @@ using APT.BaseData.Domain.Entities;
return WitEntity(null, filter);
}
}
#endregion
#region DepartmentProductionUnit-生产单元
/// <summary>
/// 生产单元
@ -1352,10 +1323,8 @@ using APT.BaseData.Domain.Entities;
return WitEntity(null, filter);
}
}
#endregion
#region DepartmentSafeuser-安全员表
/// <summary>
/// 安全员表
@ -1463,10 +1432,8 @@ using APT.BaseData.Domain.Entities;
return WitEntity(null, filter);
}
}
#endregion
#region DepartmentScheduling-部门排班表
/// <summary>
/// 部门排班表
@ -1574,10 +1541,8 @@ using APT.BaseData.Domain.Entities;
return WitEntity(null, filter);
}
}
#endregion
#region DepartmentSchedulingDetail-排班信息人员明细表
/// <summary>
/// 排班信息人员明细表
@ -1685,10 +1650,8 @@ using APT.BaseData.Domain.Entities;
return WitEntity(null, filter);
}
}
#endregion
#region DepartmentUser-部门人员表
/// <summary>
/// 部门人员表
@ -1796,10 +1759,8 @@ using APT.BaseData.Domain.Entities;
return WitEntity(null, filter);
}
}
#endregion
#region Enum-枚举管理
/// <summary>
/// 枚举管理
@ -1907,10 +1868,8 @@ using APT.BaseData.Domain.Entities;
return WitEntity(null, filter);
}
}
#endregion
#region Enums-枚举表单
/// <summary>
/// 枚举表单
@ -2018,10 +1977,8 @@ using APT.BaseData.Domain.Entities;
return WitEntity(null, filter);
}
}
#endregion
#region EnumItem-枚举项
/// <summary>
/// 枚举项
@ -2129,10 +2086,8 @@ using APT.BaseData.Domain.Entities;
return WitEntity(null, filter);
}
}
#endregion
#region EnumType-枚举类别
/// <summary>
/// 枚举类别
@ -2240,10 +2195,8 @@ using APT.BaseData.Domain.Entities;
return WitEntity(null, filter);
}
}
#endregion
#region HiddenDangerRectification-隐患整改完成情况统计
/// <summary>
/// 隐患整改完成情况统计
@ -2351,10 +2304,8 @@ using APT.BaseData.Domain.Entities;
return WitEntity(null, filter);
}
}
#endregion
#region JobActivityCompletion-班组作业完成率统计
/// <summary>
/// 班组作业完成率统计
@ -2462,10 +2413,8 @@ using APT.BaseData.Domain.Entities;
return WitEntity(null, filter);
}
}
#endregion
#region MessageTemplate-短信模板表
/// <summary>
/// 短信模板表
@ -2573,10 +2522,8 @@ using APT.BaseData.Domain.Entities;
return WitEntity(null, filter);
}
}
#endregion
#region Monitoring-服务器监听表
/// <summary>
/// 服务器监听表
@ -2684,10 +2631,8 @@ using APT.BaseData.Domain.Entities;
return WitEntity(null, filter);
}
}
#endregion
#region Notice-信息通知表
/// <summary>
/// 信息通知表
@ -2795,10 +2740,8 @@ using APT.BaseData.Domain.Entities;
return WitEntity(null, filter);
}
}
#endregion
#region NotificationTask-娑堟伅琛?
/// <summary>
/// 娑堟伅琛?
@ -2906,10 +2849,8 @@ using APT.BaseData.Domain.Entities;
return WitEntity(null, filter);
}
}
#endregion
#region NotificationTaskTimeSet-寰呭姙琛ㄦ椂闂撮厤缃?
/// <summary>
/// 寰呭姙琛ㄦ椂闂撮厤缃?
@ -3017,10 +2958,8 @@ using APT.BaseData.Domain.Entities;
return WitEntity(null, filter);
}
}
#endregion
#region ParamSet-参数设置表
/// <summary>
/// 参数设置表
@ -3128,10 +3067,8 @@ using APT.BaseData.Domain.Entities;
return WitEntity(null, filter);
}
}
#endregion
#region ParamSetDepartment-组织关联信息
/// <summary>
/// 组织关联信息
@ -3239,10 +3176,8 @@ using APT.BaseData.Domain.Entities;
return WitEntity(null, filter);
}
}
#endregion
#region Person-人员信息
/// <summary>
/// 人员信息
@ -3350,10 +3285,8 @@ using APT.BaseData.Domain.Entities;
return WitEntity(null, filter);
}
}
#endregion
#region PersonCertificateFile-证书
/// <summary>
/// 证书
@ -3461,10 +3394,8 @@ using APT.BaseData.Domain.Entities;
return WitEntity(null, filter);
}
}
#endregion
#region PersonEducationFile-学历证
/// <summary>
/// 学历证
@ -3572,10 +3503,8 @@ using APT.BaseData.Domain.Entities;
return WitEntity(null, filter);
}
}
#endregion
#region PersonIdcardFile-身份证
/// <summary>
/// 身份证
@ -3683,10 +3612,8 @@ using APT.BaseData.Domain.Entities;
return WitEntity(null, filter);
}
}
#endregion
#region PersonSkills-技能
/// <summary>
/// 技能
@ -3794,10 +3721,8 @@ using APT.BaseData.Domain.Entities;
return WitEntity(null, filter);
}
}
#endregion
#region PersonWork-工作经历
/// <summary>
/// 工作经历
@ -3905,10 +3830,8 @@ using APT.BaseData.Domain.Entities;
return WitEntity(null, filter);
}
}
#endregion
#region RiskLevelProportion-风险等级占比
/// <summary>
/// 风险等级占比
@ -4016,10 +3939,8 @@ using APT.BaseData.Domain.Entities;
return WitEntity(null, filter);
}
}
#endregion
#region RiskTypeProportion-风险类别占比
/// <summary>
/// 风险类别占比
@ -4127,10 +4048,8 @@ using APT.BaseData.Domain.Entities;
return WitEntity(null, filter);
}
}
#endregion
#region RoleDepartment-部门权限
/// <summary>
/// 部门权限
@ -4238,10 +4157,8 @@ using APT.BaseData.Domain.Entities;
return WitEntity(null, filter);
}
}
#endregion
#region Snapshot-随手拍
/// <summary>
/// 随手拍
@ -4349,10 +4266,8 @@ using APT.BaseData.Domain.Entities;
return WitEntity(null, filter);
}
}
#endregion
#region SnapshotFile-随手拍图片
/// <summary>
/// 随手拍图片
@ -4460,10 +4375,8 @@ using APT.BaseData.Domain.Entities;
return WitEntity(null, filter);
}
}
#endregion
#region SyncLimit-数据同步次数限制
/// <summary>
/// 数据同步次数限制
@ -4571,10 +4484,8 @@ using APT.BaseData.Domain.Entities;
return WitEntity(null, filter);
}
}
#endregion
#region SyncLog-跑批日志表
/// <summary>
/// 跑批日志表
@ -4682,10 +4593,8 @@ using APT.BaseData.Domain.Entities;
return WitEntity(null, filter);
}
}
#endregion
#region SyncLogDetail-跑批日志明细表
/// <summary>
/// 跑批日志明细表
@ -4793,10 +4702,8 @@ using APT.BaseData.Domain.Entities;
return WitEntity(null, filter);
}
}
#endregion
#region SyncUserRule-用户数据同步例外配置
/// <summary>
/// 用户数据同步例外配置
@ -4904,10 +4811,8 @@ using APT.BaseData.Domain.Entities;
return WitEntity(null, filter);
}
}
#endregion
#region Team-班组表
/// <summary>
/// 班组表
@ -5015,10 +4920,8 @@ using APT.BaseData.Domain.Entities;
return WitEntity(null, filter);
}
}
#endregion
#region TeamPerson-班组人员关联信息
/// <summary>
/// 班组人员关联信息
@ -5126,10 +5029,8 @@ using APT.BaseData.Domain.Entities;
return WitEntity(null, filter);
}
}
#endregion
#region UserDepartment-用户部门关联表
/// <summary>
/// 用户部门关联表
@ -5237,10 +5138,8 @@ using APT.BaseData.Domain.Entities;
return WitEntity(null, filter);
}
}
#endregion
#region UserPost-宀椾綅鍒楄〃
/// <summary>
/// 宀椾綅鍒楄〃
@ -5348,10 +5247,8 @@ using APT.BaseData.Domain.Entities;
return WitEntity(null, filter);
}
}
#endregion
#region UserProductionUnit-生产单元
/// <summary>
/// 生产单元
@ -5459,10 +5356,8 @@ using APT.BaseData.Domain.Entities;
return WitEntity(null, filter);
}
}
#endregion
#region UserProductionUnitSet-生产单元
/// <summary>
/// 生产单元
@ -5570,10 +5465,8 @@ using APT.BaseData.Domain.Entities;
return WitEntity(null, filter);
}
}
#endregion
#region UserSignFile-签名照片
/// <summary>
/// 签名照片
@ -5681,10 +5574,8 @@ using APT.BaseData.Domain.Entities;
return WitEntity(null, filter);
}
}
#endregion
#region UserTest-测试多选
/// <summary>
/// 测试多选
@ -5792,10 +5683,8 @@ using APT.BaseData.Domain.Entities;
return WitEntity(null, filter);
}
}
#endregion
#region UserVacationSet-人员休假设置
/// <summary>
/// 人员休假设置
@ -5903,10 +5792,8 @@ using APT.BaseData.Domain.Entities;
return WitEntity(null, filter);
}
}
#endregion
#region WorkTicketCompletion-关键许可工作票完成情况统计
/// <summary>
/// 关键许可工作票完成情况统计
@ -6014,8 +5901,6 @@ using APT.BaseData.Domain.Entities;
return WitEntity(null, filter);
}
}
#endregion
}

20
APT.MicroApi/APT.FO.WebApi/Controllers/JobActivityRecordController.cs
View File

@ -129,23 +129,6 @@ namespace APT.FO.WebApi.Controllers
// result.Nav_Flow = result.Nav_Flow.OrderBy(t => t.NUM).ThenBy(m => m.SafeMeasuresStr).ToList();
//if (result.Nav_Measure != null && result.Nav_Measure.Any())
// result.Nav_Measure = result.Nav_Measure.OrderBy(t => t.NUM).ThenBy(m => m.DealMeasuresStr).ToList();
var tasks = this.GetEntities<T_FM_NOTIFICATION_TASK>(t => t.SOURCE_DATA_ID == entity.ID && t.SOURCE_FORMCODE == "FO022_SHOWPRINT" && t.NOTICE_TITLE == "关键许可作业活动记录-完工验收" && !t.IS_DELETED, null);
if (tasks != null && tasks.Any())
{
var taskUserIds = tasks.Select(m => m.USER_ID).Distinct().ToList();
entity.Nav_AcceptUsers = new List<T_FO_JOB_ACTIVITY_PERSON>();
var users = this.GetEntities<T_FM_USER>(t => taskUserIds.Contains(t.ID), null, "Nav_UserSignFiles.Nav_ImgFile");
foreach (var task in tasks)
{
var user = users.FirstOrDefault(t => t.ID == task.USER_ID);
T_FO_JOB_ACTIVITY_PERSON pe = new T_FO_JOB_ACTIVITY_PERSON();
pe.USER_ID = task.USER_ID;
pe.Nav_User = user;
pe.DEAL_STATUS = task.NOTICE_STATUS == 0 ? 0 : 1;
pe.JOB_ACTIVITY_RECORD_ID = entity.ID;
entity.Nav_AcceptUsers.Add(pe);
}
}
}
return entity;
});
@ -364,8 +347,6 @@ namespace APT.FO.WebApi.Controllers
{
entity.FORM_STATUS = (int)FOTeamActivityState.已归档;
users.ForEach(t => t.DEAL_STATUS = 1);
//触发完工验收
GetAutoNext(entity, ref notices);
}
else
{
@ -505,7 +486,6 @@ namespace APT.FO.WebApi.Controllers
userIds.Distinct();
var userInfos = this.GetEntities<T_FM_USER>(t => t.ENABLE_STATUS == 0, new BaseFilter(job.ORG_ID));
var departIds = userInfos.Where(t => userIds.Contains(t.ID)).Select(m => m.DEPARTMENT_ID).Distinct().ToList();
departIds.Add(job.TERRITORY_DEPARTMENT_ID);
var chargeUserIds = this.GetEntities<T_FM_DEPARTMENT>(t => departIds.Contains(t.ID) && t.USER_ID != null, new BaseFilter(job.ORG_ID)).Select(m => (Guid)m.USER_ID).Distinct().ToList();
if (chargeUserIds != null && chargeUserIds.Any())
{

117
APT.MicroApi/APT.FO.WebApi/Controllers/T4/T4Control.cs
View File

@ -2,12 +2,6 @@
//------------------------------------------------------------------------------
// T4模板文件：基础接口类
// 此代码由T4模板自动生成
@ -22,7 +16,6 @@ using APT.BaseData.Domain.ApiModel.PF;
namespace APT.FO.WebApi.Controllers.Api
{
using APT.MS.Domain.Entities.FO;
#region ChangeShiftRecord-岗位交接班记录表
/// <summary>
/// 岗位交接班记录表
@ -130,10 +123,8 @@ namespace APT.FO.WebApi.Controllers.Api
return WitEntity(null, filter);
}
}
#endregion
#region ChangeShiftRecordAfterUser-接班人员表
/// <summary>
/// 接班人员表
@ -241,10 +232,8 @@ namespace APT.FO.WebApi.Controllers.Api
return WitEntity(null, filter);
}
}
#endregion
#region ChangeShiftRecordFile-附件表
/// <summary>
/// 附件表
@ -352,10 +341,8 @@ namespace APT.FO.WebApi.Controllers.Api
return WitEntity(null, filter);
}
}
#endregion
#region ChangeShiftRecordPreUser-交班人员表
/// <summary>
/// 交班人员表
@ -463,10 +450,8 @@ namespace APT.FO.WebApi.Controllers.Api
return WitEntity(null, filter);
}
}
#endregion
#region CrucialLicenseDealMeasure-作业后处理措施
/// <summary>
/// 作业后处理措施
@ -574,10 +559,8 @@ namespace APT.FO.WebApi.Controllers.Api
return WitEntity(null, filter);
}
}
#endregion
#region CrucialLicenseJob-关键许可工作表
/// <summary>
/// 关键许可工作表
@ -685,10 +668,8 @@ namespace APT.FO.WebApi.Controllers.Api
return WitEntity(null, filter);
}
}
#endregion
#region CrucialLicenseJobFile-附件上传
/// <summary>
/// 附件上传
@ -796,10 +777,8 @@ namespace APT.FO.WebApi.Controllers.Api
return WitEntity(null, filter);
}
}
#endregion
#region CrucialLicenseJobOutsource-关键许可工作表
/// <summary>
/// 关键许可工作表
@ -907,10 +886,8 @@ namespace APT.FO.WebApi.Controllers.Api
return WitEntity(null, filter);
}
}
#endregion
#region CrucialLicenseOutsourceDealMeasure-作业后处理措施
/// <summary>
/// 作业后处理措施
@ -1018,10 +995,8 @@ namespace APT.FO.WebApi.Controllers.Api
return WitEntity(null, filter);
}
}
#endregion
#region CrucialLicenseOutsourcePerson-关键许可人员表
/// <summary>
/// 关键许可人员表
@ -1129,10 +1104,8 @@ namespace APT.FO.WebApi.Controllers.Api
return WitEntity(null, filter);
}
}
#endregion
#region CrucialLicenseOutsourceSafeConfirm-作业前安全确认
/// <summary>
/// 作业前安全确认
@ -1240,10 +1213,8 @@ namespace APT.FO.WebApi.Controllers.Api
return WitEntity(null, filter);
}
}
#endregion
#region CrucialLicenseOutsourceSafeMeasure-作业流程及安全措施
/// <summary>
/// 作业流程及安全措施
@ -1351,10 +1322,8 @@ namespace APT.FO.WebApi.Controllers.Api
return WitEntity(null, filter);
}
}
#endregion
#region CrucialLicensePerson-关键许可人员表
/// <summary>
/// 关键许可人员表
@ -1462,10 +1431,8 @@ namespace APT.FO.WebApi.Controllers.Api
return WitEntity(null, filter);
}
}
#endregion
#region CrucialLicenseSafeConfirm-作业前安全确认
/// <summary>
/// 作业前安全确认
@ -1573,10 +1540,8 @@ namespace APT.FO.WebApi.Controllers.Api
return WitEntity(null, filter);
}
}
#endregion
#region CrucialLicenseSafeMeasure-作业流程及安全措施
/// <summary>
/// 作业流程及安全措施
@ -1684,10 +1649,8 @@ namespace APT.FO.WebApi.Controllers.Api
return WitEntity(null, filter);
}
}
#endregion
#region CurrentClassRecord-岗位当班工作记录表
/// <summary>
/// 岗位当班工作记录表
@ -1795,10 +1758,8 @@ namespace APT.FO.WebApi.Controllers.Api
return WitEntity(null, filter);
}
}
#endregion
#region CurrentClassRecordFile-附件表
/// <summary>
/// 附件表
@ -1906,10 +1867,8 @@ namespace APT.FO.WebApi.Controllers.Api
return WitEntity(null, filter);
}
}
#endregion
#region CurrentClassRecordLabourSupply-岗位当班劳保用品清单
/// <summary>
/// 岗位当班劳保用品清单
@ -2017,10 +1976,8 @@ namespace APT.FO.WebApi.Controllers.Api
return WitEntity(null, filter);
}
}
#endregion
#region CurrentClassRecordUser-岗位当班工作人员表
/// <summary>
/// 岗位当班工作人员表
@ -2128,10 +2085,8 @@ namespace APT.FO.WebApi.Controllers.Api
return WitEntity(null, filter);
}
}
#endregion
#region Holidays-国家法定假期维护
/// <summary>
/// 国家法定假期维护
@ -2239,10 +2194,8 @@ namespace APT.FO.WebApi.Controllers.Api
return WitEntity(null, filter);
}
}
#endregion
#region HolidaysDetail-
/// <summary>
///
@ -2350,10 +2303,8 @@ namespace APT.FO.WebApi.Controllers.Api
return WitEntity(null, filter);
}
}
#endregion
#region JobActivityDetail-作业活动记录(关键/许可)明细表
/// <summary>
/// 作业活动记录(关键/许可)明细表
@ -2461,10 +2412,8 @@ namespace APT.FO.WebApi.Controllers.Api
return WitEntity(null, filter);
}
}
#endregion
#region JobActivityFile-作业活动记录附件表
/// <summary>
/// 作业活动记录附件表
@ -2572,10 +2521,8 @@ namespace APT.FO.WebApi.Controllers.Api
return WitEntity(null, filter);
}
}
#endregion
#region JobActivityFlow-作业流程及安全措施确认
/// <summary>
/// 作业流程及安全措施确认
@ -2683,10 +2630,8 @@ namespace APT.FO.WebApi.Controllers.Api
return WitEntity(null, filter);
}
}
#endregion
#region JobActivityFlowFile-作业流程及安全措施附件表
/// <summary>
/// 作业流程及安全措施附件表
@ -2794,10 +2739,8 @@ namespace APT.FO.WebApi.Controllers.Api
return WitEntity(null, filter);
}
}
#endregion
#region JobActivityMeasure-作业后处理措施确认
/// <summary>
/// 作业后处理措施确认
@ -2905,10 +2848,8 @@ namespace APT.FO.WebApi.Controllers.Api
return WitEntity(null, filter);
}
}
#endregion
#region JobActivityMeasureFile-作业活动记录附件表
/// <summary>
/// 作业活动记录附件表
@ -3016,10 +2957,8 @@ namespace APT.FO.WebApi.Controllers.Api
return WitEntity(null, filter);
}
}
#endregion
#region JobActivityPerson-作业活动记录(关键/许可)人员表
/// <summary>
/// 作业活动记录(关键/许可)人员表
@ -3127,10 +3066,8 @@ namespace APT.FO.WebApi.Controllers.Api
return WitEntity(null, filter);
}
}
#endregion
#region JobActivityRecord-作业活动记录表(关键/许可)
/// <summary>
/// 作业活动记录表(关键/许可)
@ -3238,10 +3175,8 @@ namespace APT.FO.WebApi.Controllers.Api
return WitEntity(null, filter);
}
}
#endregion
#region JobEventDetail-作业活动记录明细表
/// <summary>
/// 作业活动记录明细表
@ -3349,10 +3284,8 @@ namespace APT.FO.WebApi.Controllers.Api
return WitEntity(null, filter);
}
}
#endregion
#region JobEventFile-作业活动记录附件表
/// <summary>
/// 作业活动记录附件表
@ -3460,10 +3393,8 @@ namespace APT.FO.WebApi.Controllers.Api
return WitEntity(null, filter);
}
}
#endregion
#region JobEventFlow-作业流程及安全措施确认
/// <summary>
/// 作业流程及安全措施确认
@ -3571,10 +3502,8 @@ namespace APT.FO.WebApi.Controllers.Api
return WitEntity(null, filter);
}
}
#endregion
#region JobEventFlowFile-作业流程及安全措施附件表
/// <summary>
/// 作业流程及安全措施附件表
@ -3682,10 +3611,8 @@ namespace APT.FO.WebApi.Controllers.Api
return WitEntity(null, filter);
}
}
#endregion
#region JobEventMeasure-作业后处理措施确认
/// <summary>
/// 作业后处理措施确认
@ -3793,10 +3720,8 @@ namespace APT.FO.WebApi.Controllers.Api
return WitEntity(null, filter);
}
}
#endregion
#region JobEventMeasureFile-作业活动记录附件表
/// <summary>
/// 作业活动记录附件表
@ -3904,10 +3829,8 @@ namespace APT.FO.WebApi.Controllers.Api
return WitEntity(null, filter);
}
}
#endregion
#region JobEventPerson-作业活动记录人员表
/// <summary>
/// 作业活动记录人员表
@ -4015,10 +3938,8 @@ namespace APT.FO.WebApi.Controllers.Api
return WitEntity(null, filter);
}
}
#endregion
#region JobEventRecord-作业活动记录表
/// <summary>
/// 作业活动记录表
@ -4126,10 +4047,8 @@ namespace APT.FO.WebApi.Controllers.Api
return WitEntity(null, filter);
}
}
#endregion
#region LabourSupply-劳保用品
/// <summary>
/// 劳保用品
@ -4237,10 +4156,8 @@ namespace APT.FO.WebApi.Controllers.Api
return WitEntity(null, filter);
}
}
#endregion
#region PreOperSch-作业方案讨论记录
/// <summary>
/// 作业方案讨论记录
@ -4348,10 +4265,8 @@ namespace APT.FO.WebApi.Controllers.Api
return WitEntity(null, filter);
}
}
#endregion
#region PreOperSchFile-作业方案讨论记录附件
/// <summary>
/// 作业方案讨论记录附件
@ -4459,10 +4374,8 @@ namespace APT.FO.WebApi.Controllers.Api
return WitEntity(null, filter);
}
}
#endregion
#region PreOperSchUser-作业方案讨论记录参会人员表
/// <summary>
/// 作业方案讨论记录参会人员表
@ -4570,10 +4483,8 @@ namespace APT.FO.WebApi.Controllers.Api
return WitEntity(null, filter);
}
}
#endregion
#region PreShiftMeetingRecord-班前会议记录表
/// <summary>
/// 班前会议记录表
@ -4681,10 +4592,8 @@ namespace APT.FO.WebApi.Controllers.Api
return WitEntity(null, filter);
}
}
#endregion
#region PreShiftMeetingRecordDetail-导航：上班生产情况
/// <summary>
/// 导航：上班生产情况
@ -4792,10 +4701,8 @@ namespace APT.FO.WebApi.Controllers.Api
return WitEntity(null, filter);
}
}
#endregion
#region PreShiftMeetingRecordDetailPost-涉及岗位
/// <summary>
/// 涉及岗位
@ -4903,10 +4810,8 @@ namespace APT.FO.WebApi.Controllers.Api
return WitEntity(null, filter);
}
}
#endregion
#region PreShiftMeetingRecordFile-班前会议附件
/// <summary>
/// 班前会议附件
@ -5014,10 +4919,8 @@ namespace APT.FO.WebApi.Controllers.Api
return WitEntity(null, filter);
}
}
#endregion
#region PreShiftMeetingRecordUser-班前会议记录与会人员表
/// <summary>
/// 班前会议记录与会人员表
@ -5125,10 +5028,8 @@ namespace APT.FO.WebApi.Controllers.Api
return WitEntity(null, filter);
}
}
#endregion
#region Scheduling-工作票排班明细
/// <summary>
/// 工作票排班明细
@ -5236,10 +5137,8 @@ namespace APT.FO.WebApi.Controllers.Api
return WitEntity(null, filter);
}
}
#endregion
#region SchedulingTemplate-工作票排班模板
/// <summary>
/// 工作票排班模板
@ -5347,10 +5246,8 @@ namespace APT.FO.WebApi.Controllers.Api
return WitEntity(null, filter);
}
}
#endregion
#region SchedulingTemplateDetail-明细表
/// <summary>
/// 明细表
@ -5458,10 +5355,8 @@ namespace APT.FO.WebApi.Controllers.Api
return WitEntity(null, filter);
}
}
#endregion
#region TeamActivity-班组安全活动记录表
/// <summary>
/// 班组安全活动记录表
@ -5569,10 +5464,8 @@ namespace APT.FO.WebApi.Controllers.Api
return WitEntity(null, filter);
}
}
#endregion
#region TeamActivityFile-班组安全活动附件
/// <summary>
/// 班组安全活动附件
@ -5680,10 +5573,8 @@ namespace APT.FO.WebApi.Controllers.Api
return WitEntity(null, filter);
}
}
#endregion
#region TeamActivityUser-班组安全活动人员表
/// <summary>
/// 班组安全活动人员表
@ -5791,10 +5682,8 @@ namespace APT.FO.WebApi.Controllers.Api
return WitEntity(null, filter);
}
}
#endregion
#region TeamSlogan-班组口号配置
/// <summary>
/// 班组口号配置
@ -5902,10 +5791,8 @@ namespace APT.FO.WebApi.Controllers.Api
return WitEntity(null, filter);
}
}
#endregion
#region TechDisclosureFrom-技术交底表
/// <summary>
/// 技术交底表
@ -6013,10 +5900,8 @@ namespace APT.FO.WebApi.Controllers.Api
return WitEntity(null, filter);
}
}
#endregion
#region TechDisclosurePerson-被交底人员表
/// <summary>
/// 被交底人员表
@ -6124,8 +6009,6 @@ namespace APT.FO.WebApi.Controllers.Api
return WitEntity(null, filter);
}
}
#endregion
}

294
APT.MicroApi/APT.HM.WebApi/Controllers/Api/T4/T4Control.cs
View File

File diff suppressed because it is too large Load Diff

9
APT.MicroApi/APT.LG.WebApi/Controllers/Api/T4/T4Control.cs
View File

@ -2,12 +2,6 @@
//------------------------------------------------------------------------------
// T4模板文件：基础接口类
// 此代码由T4模板自动生成
@ -22,7 +16,6 @@ using APT.BaseData.Domain.ApiModel.PF;
namespace APT.LG.WebApi.Controllers.Api
{
using APT.BaseData.Domain.Entities.LG;
#region Oprate-表单操作日志表
/// <summary>
/// 表单操作日志表
@ -130,8 +123,6 @@ namespace APT.LG.WebApi.Controllers.Api
return WitEntity(null, filter);
}
}
#endregion
}

14
APT.MicroApi/APT.NW.WebApi/Controllers/Api/T4/T4Control.cs
View File

@ -2,12 +2,6 @@
//------------------------------------------------------------------------------
// T4模板文件：基础接口类
// 此代码由T4模板自动生成
@ -22,7 +16,6 @@ using APT.BaseData.Domain.ApiModel.PF;
namespace APT.NW.WebApi.Controllers.Api
{
using APT.BaseData.Domain.Entities.NW;
#region Enterprise-子企业表
/// <summary>
/// 子企业表
@ -129,7 +122,6 @@ namespace APT.NW.WebApi.Controllers.Api
{
return WitEntity(null, filter);
}
/// <summary>
/// 获得树形实体数据
/// </summary>
@ -141,10 +133,8 @@ namespace APT.NW.WebApi.Controllers.Api
return WitTreeOrderEntities(null, filter);
}
}
#endregion
#region RoleDataPerm-子企业数据权限表
/// <summary>
/// 子企业数据权限表
@ -252,10 +242,8 @@ namespace APT.NW.WebApi.Controllers.Api
return WitEntity(null, filter);
}
}
#endregion
#region RoleMenu-子企业权限表
/// <summary>
/// 子企业权限表
@ -363,8 +351,6 @@ namespace APT.NW.WebApi.Controllers.Api
return WitEntity(null, filter);
}
}
#endregion
}

60
APT.MicroApi/APT.OP.WebApi/Controllers/Api/T4/T4Control.cs
View File

@ -2,12 +2,6 @@
//------------------------------------------------------------------------------
// T4模板文件：基础接口类
// 此代码由T4模板自动生成
@ -22,7 +16,6 @@ using APT.BaseData.Domain.ApiModel.PF;
namespace APT.OP.WebApi.Controllers.Api
{
using APT.BaseData.Domain.Entities.OP;
#region Alluser-用户表(租户平台)
/// <summary>
/// 用户表(租户平台)
@ -130,10 +123,8 @@ namespace APT.OP.WebApi.Controllers.Api
return WitEntity(null, filter);
}
}
#endregion
#region BillingRule-计费规则表
/// <summary>
/// 计费规则表
@ -241,10 +232,8 @@ namespace APT.OP.WebApi.Controllers.Api
return WitEntity(null, filter);
}
}
#endregion
#region BillingRuleVersion-计费规则子表
/// <summary>
/// 计费规则子表
@ -352,10 +341,8 @@ namespace APT.OP.WebApi.Controllers.Api
return WitEntity(null, filter);
}
}
#endregion
#region ChargeTimeSet-充电时长配置
/// <summary>
/// 充电时长配置
@ -463,10 +450,8 @@ namespace APT.OP.WebApi.Controllers.Api
return WitEntity(null, filter);
}
}
#endregion
#region Client-客户表
/// <summary>
/// 客户表
@ -574,10 +559,8 @@ namespace APT.OP.WebApi.Controllers.Api
return WitEntity(null, filter);
}
}
#endregion
#region ClinetOpenid-客户表OpenId
/// <summary>
/// 客户表OpenId
@ -685,10 +668,8 @@ namespace APT.OP.WebApi.Controllers.Api
return WitEntity(null, filter);
}
}
#endregion
#region CommonQuestion-常见问题
/// <summary>
/// 常见问题
@ -796,10 +777,8 @@ namespace APT.OP.WebApi.Controllers.Api
return WitEntity(null, filter);
}
}
#endregion
#region FileFirmware-充电桩固件表
/// <summary>
/// 充电桩固件表
@ -907,10 +886,8 @@ namespace APT.OP.WebApi.Controllers.Api
return WitEntity(null, filter);
}
}
#endregion
#region Member-会员表
/// <summary>
/// 会员表
@ -1018,10 +995,8 @@ namespace APT.OP.WebApi.Controllers.Api
return WitEntity(null, filter);
}
}
#endregion
#region Menu-菜单表(租户平台)
/// <summary>
/// 菜单表(租户平台)
@ -1128,7 +1103,6 @@ namespace APT.OP.WebApi.Controllers.Api
{
return WitEntity(null, filter);
}
/// <summary>
/// 获得树形实体数据
/// </summary>
@ -1140,10 +1114,8 @@ namespace APT.OP.WebApi.Controllers.Api
return WitTreeOrderEntities(null, filter);
}
}
#endregion
#region Notice-公告表
/// <summary>
/// 公告表
@ -1251,10 +1223,8 @@ namespace APT.OP.WebApi.Controllers.Api
return WitEntity(null, filter);
}
}
#endregion
#region NoticeDetail-公告内容
/// <summary>
/// 公告内容
@ -1362,10 +1332,8 @@ namespace APT.OP.WebApi.Controllers.Api
return WitEntity(null, filter);
}
}
#endregion
#region PeakValleyConfig-峰谷配置表
/// <summary>
/// 峰谷配置表
@ -1473,10 +1441,8 @@ namespace APT.OP.WebApi.Controllers.Api
return WitEntity(null, filter);
}
}
#endregion
#region RechargeCard-充值卡
/// <summary>
/// 充值卡
@ -1584,10 +1550,8 @@ namespace APT.OP.WebApi.Controllers.Api
return WitEntity(null, filter);
}
}
#endregion
#region RechargeOrder-充值订单
/// <summary>
/// 充值订单
@ -1695,10 +1659,8 @@ namespace APT.OP.WebApi.Controllers.Api
return WitEntity(null, filter);
}
}
#endregion
#region RechargeSetting-充值金额配置
/// <summary>
/// 充值金额配置
@ -1806,10 +1768,8 @@ namespace APT.OP.WebApi.Controllers.Api
return WitEntity(null, filter);
}
}
#endregion
#region RfidCard-RFID卡
/// <summary>
/// RFID卡
@ -1917,10 +1877,8 @@ namespace APT.OP.WebApi.Controllers.Api
return WitEntity(null, filter);
}
}
#endregion
#region RoleMenu-租户权限表
/// <summary>
/// 租户权限表
@ -2028,10 +1986,8 @@ namespace APT.OP.WebApi.Controllers.Api
return WitEntity(null, filter);
}
}
#endregion
#region Tenant-租户表
/// <summary>
/// 租户表
@ -2139,10 +2095,8 @@ namespace APT.OP.WebApi.Controllers.Api
return WitEntity(null, filter);
}
}
#endregion
#region TenantDbConn-租户数据库表
/// <summary>
/// 租户数据库表
@ -2250,10 +2204,8 @@ namespace APT.OP.WebApi.Controllers.Api
return WitEntity(null, filter);
}
}
#endregion
#region TenantDomain-租户域名表
/// <summary>
/// 租户域名表
@ -2361,10 +2313,8 @@ namespace APT.OP.WebApi.Controllers.Api
return WitEntity(null, filter);
}
}
#endregion
#region TenantExpiration-租户租期表
/// <summary>
/// 租户租期表
@ -2472,10 +2422,8 @@ namespace APT.OP.WebApi.Controllers.Api
return WitEntity(null, filter);
}
}
#endregion
#region User-用户表(租户平台)
/// <summary>
/// 用户表(租户平台)
@ -2583,10 +2531,8 @@ namespace APT.OP.WebApi.Controllers.Api
return WitEntity(null, filter);
}
}
#endregion
#region Version-版本升级表
/// <summary>
/// 版本升级表
@ -2694,10 +2640,8 @@ namespace APT.OP.WebApi.Controllers.Api
return WitEntity(null, filter);
}
}
#endregion
#region VersionMenu-菜单版本升级表
/// <summary>
/// 菜单版本升级表
@ -2805,10 +2749,8 @@ namespace APT.OP.WebApi.Controllers.Api
return WitEntity(null, filter);
}
}
#endregion
#region VersionTenant-租户版本升级表
/// <summary>
/// 租户版本升级表
@ -2916,8 +2858,6 @@ namespace APT.OP.WebApi.Controllers.Api
return WitEntity(null, filter);
}
}
#endregion
}

79
APT.MicroApi/APT.PF.WebApi/Controllers/Api/T4/T4Control.cs
View File

@ -2,12 +2,6 @@
//------------------------------------------------------------------------------
// T4模板文件：基础接口类
// 此代码由T4模板自动生成
@ -25,7 +19,6 @@ namespace APT.PF.WebApi.Controllers.Api
using APT.BaseData.Domain.Entities;
using APT.BaseData.Domain.Entities.PF;
using APT.BaseData.Domain.Entities.T4;
#region ApprovalRole-审批角色
/// <summary>
/// 审批角色
@ -133,10 +126,8 @@ using APT.BaseData.Domain.Entities.T4;
return WitEntity(null, filter);
}
}
#endregion
#region Approve-审批流主表
/// <summary>
/// 审批流主表
@ -244,10 +235,8 @@ using APT.BaseData.Domain.Entities.T4;
return WitEntity(null, filter);
}
}
#endregion
#region ApproveDetail-审批流子表
/// <summary>
/// 审批流子表
@ -355,10 +344,8 @@ using APT.BaseData.Domain.Entities.T4;
return WitEntity(null, filter);
}
}
#endregion
#region ApproveOperationRole-操作角色
/// <summary>
/// 操作角色
@ -466,10 +453,8 @@ using APT.BaseData.Domain.Entities.T4;
return WitEntity(null, filter);
}
}
#endregion
#region ApproveRejectConfig-审批驳回配置表
/// <summary>
/// 审批驳回配置表
@ -577,10 +562,8 @@ using APT.BaseData.Domain.Entities.T4;
return WitEntity(null, filter);
}
}
#endregion
#region ApproveRoleDepartment-分管部门
/// <summary>
/// 分管部门
@ -688,10 +671,8 @@ using APT.BaseData.Domain.Entities.T4;
return WitEntity(null, filter);
}
}
#endregion
#region ApproveTemp-审批流模板主表
/// <summary>
/// 审批流模板主表
@ -799,10 +780,8 @@ using APT.BaseData.Domain.Entities.T4;
return WitEntity(null, filter);
}
}
#endregion
#region ApproveTempDetail-审批流模板子表
/// <summary>
/// 审批流模板子表
@ -910,10 +889,8 @@ using APT.BaseData.Domain.Entities.T4;
return WitEntity(null, filter);
}
}
#endregion
#region AppVersion-App版本发布
/// <summary>
/// App版本发布
@ -1021,10 +998,8 @@ using APT.BaseData.Domain.Entities.T4;
return WitEntity(null, filter);
}
}
#endregion
#region AppVersionFile-App包文件
/// <summary>
/// App包文件
@ -1132,10 +1107,8 @@ using APT.BaseData.Domain.Entities.T4;
return WitEntity(null, filter);
}
}
#endregion
#region ClientScopes-资源表
/// <summary>
/// 资源表
@ -1243,10 +1216,8 @@ using APT.BaseData.Domain.Entities.T4;
return WitEntity(null, filter);
}
}
#endregion
#region CodeRuleRunLog-编码规则跑批表
/// <summary>
/// 编码规则跑批表
@ -1354,10 +1325,8 @@ using APT.BaseData.Domain.Entities.T4;
return WitEntity(null, filter);
}
}
#endregion
#region ComplaintLog-转办记录表
/// <summary>
/// 转办记录表
@ -1465,10 +1434,8 @@ using APT.BaseData.Domain.Entities.T4;
return WitEntity(null, filter);
}
}
#endregion
#region DataChannel-数据通道
/// <summary>
/// 数据通道
@ -1576,10 +1543,8 @@ using APT.BaseData.Domain.Entities.T4;
return WitEntity(null, filter);
}
}
#endregion
#region DataFrequency-采集频率
/// <summary>
/// 采集频率
@ -1687,10 +1652,8 @@ using APT.BaseData.Domain.Entities.T4;
return WitEntity(null, filter);
}
}
#endregion
#region Fddeback-意见反馈
/// <summary>
/// 意见反馈
@ -1798,10 +1761,8 @@ using APT.BaseData.Domain.Entities.T4;
return WitEntity(null, filter);
}
}
#endregion
#region FddebackFile-意见反馈附件
/// <summary>
/// 意见反馈附件
@ -1909,10 +1870,8 @@ using APT.BaseData.Domain.Entities.T4;
return WitEntity(null, filter);
}
}
#endregion
#region FileDb-
/// <summary>
///
@ -2020,10 +1979,8 @@ using APT.BaseData.Domain.Entities.T4;
return WitEntity(null, filter);
}
}
#endregion
#region FileDbFile-
/// <summary>
///
@ -2131,10 +2088,8 @@ using APT.BaseData.Domain.Entities.T4;
return WitEntity(null, filter);
}
}
#endregion
#region FileType-
/// <summary>
///
@ -2242,10 +2197,8 @@ using APT.BaseData.Domain.Entities.T4;
return WitEntity(null, filter);
}
}
#endregion
#region FormHomeChart-首页：图标区域
/// <summary>
/// 首页：图标区域
@ -2353,10 +2306,8 @@ using APT.BaseData.Domain.Entities.T4;
return WitEntity(null, filter);
}
}
#endregion
#region FormHomeHmi-首页：HMI区域
/// <summary>
/// 首页：HMI区域
@ -2464,10 +2415,8 @@ using APT.BaseData.Domain.Entities.T4;
return WitEntity(null, filter);
}
}
#endregion
#region FormHomeRanking-首页：排名区域
/// <summary>
/// 首页：排名区域
@ -2575,10 +2524,8 @@ using APT.BaseData.Domain.Entities.T4;
return WitEntity(null, filter);
}
}
#endregion
#region FormHomeStatistic-首页：统计区域
/// <summary>
/// 首页：统计区域
@ -2686,10 +2633,8 @@ using APT.BaseData.Domain.Entities.T4;
return WitEntity(null, filter);
}
}
#endregion
#region FormRelation-关联表单配置
/// <summary>
/// 关联表单配置
@ -2797,10 +2742,8 @@ using APT.BaseData.Domain.Entities.T4;
return WitEntity(null, filter);
}
}
#endregion
#region HomeTitle-首页方针
/// <summary>
/// 首页方针
@ -2908,10 +2851,8 @@ using APT.BaseData.Domain.Entities.T4;
return WitEntity(null, filter);
}
}
#endregion
#region MqttConfig-MQTT配置表
/// <summary>
/// MQTT配置表
@ -3019,10 +2960,8 @@ using APT.BaseData.Domain.Entities.T4;
return WitEntity(null, filter);
}
}
#endregion
#region MqttConfigTheme-
/// <summary>
///
@ -3130,10 +3069,8 @@ using APT.BaseData.Domain.Entities.T4;
return WitEntity(null, filter);
}
}
#endregion
#region Notice-通知
/// <summary>
/// 通知
@ -3241,10 +3178,8 @@ using APT.BaseData.Domain.Entities.T4;
return WitEntity(null, filter);
}
}
#endregion
#region NoticeFile-
/// <summary>
///
@ -3352,10 +3287,8 @@ using APT.BaseData.Domain.Entities.T4;
return WitEntity(null, filter);
}
}
#endregion
#region PicFilter-图片条件主表
/// <summary>
/// 图片条件主表
@ -3463,10 +3396,8 @@ using APT.BaseData.Domain.Entities.T4;
return WitEntity(null, filter);
}
}
#endregion
#region PicFilterDetail-图片条件子表
/// <summary>
/// 图片条件子表
@ -3574,10 +3505,8 @@ using APT.BaseData.Domain.Entities.T4;
return WitEntity(null, filter);
}
}
#endregion
#region QuestionFeedback-问题反馈表
/// <summary>
/// 问题反馈表
@ -3685,10 +3614,8 @@ using APT.BaseData.Domain.Entities.T4;
return WitEntity(null, filter);
}
}
#endregion
#region QuestionFeedbackFile-问题反馈附件表
/// <summary>
/// 问题反馈附件表
@ -3796,10 +3723,8 @@ using APT.BaseData.Domain.Entities.T4;
return WitEntity(null, filter);
}
}
#endregion
#region Scopes-资源表
/// <summary>
/// 资源表
@ -3907,10 +3832,8 @@ using APT.BaseData.Domain.Entities.T4;
return WitEntity(null, filter);
}
}
#endregion
#region VersionManage-版本管理表
/// <summary>
/// 版本管理表
@ -4018,8 +3941,6 @@ using APT.BaseData.Domain.Entities.T4;
return WitEntity(null, filter);
}
}
#endregion
}

7
APT.MicroApi/APT.PP.WebApi/Controllers/Api/T4/T4Control.cs
View File

@ -2,12 +2,6 @@
//------------------------------------------------------------------------------
// T4模板文件：基础接口类
// 此代码由T4模板自动生成
@ -21,5 +15,4 @@ using APT.Infrastructure.Api;
using APT.BaseData.Domain.ApiModel.PF;
namespace APT.PP.WebApi.Controllers.Api
{
}

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

File diff suppressed because it is too large Load Diff

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

@ -270,13 +270,14 @@ namespace APT.SK.WebApi.Controllers
var detailStr = new List<string>();
if (item.Nav_Details != null && item.Nav_Details.Any())
{
var i = 1;
foreach (var item2 in item.Nav_Details.OrderBy(t => t.NUM))
{
if (item2 != null && !string.IsNullOrEmpty(item2.MEASURES_NAME))
{
var temp = item2.NUM + "、" + item2.MEASURES_NAME + Environment.NewLine;
item.MINE_NAME = item.MINE_NAME + temp;
item.MEASURE = item.MEASURE + temp;
i++;
}
}
}
@ -318,7 +319,6 @@ namespace APT.SK.WebApi.Controllers
detailStr.Add(item2.MEASURES_NAME);
var temp = item2.NUM + "、" + item2.MEASURES_NAME + Environment.NewLine;
item.MINE_NAME = item.MINE_NAME + temp;
item.MEASURE = item.MEASURE + temp;
//i++;
}
if (item2 != null && item2.Nav_DetailContents != null && item2.Nav_DetailContents.Any())
@ -368,20 +368,20 @@ namespace APT.SK.WebApi.Controllers
}
}
}
//if (detailStr.Any())
//{
// detailStr = detailStr.Distinct().ToList();
// var i = 1;
// foreach (var item2 in detailStr)
// {
// if (!string.IsNullOrEmpty(item2))
// {
// var temp = i + "、" + item2 + "\r\n";
// item.MEASURE = item.MEASURE + temp;
// i++;
// }
// }
//}
if (detailStr.Any())
{
detailStr = detailStr.Distinct().ToList();
var i = 1;
foreach (var item2 in detailStr)
{
if (!string.IsNullOrEmpty(item2))
{
var temp = i + "、" + item2 + "\r\n";
item.MEASURE = item.MEASURE + temp;
i++;
}
}
}
if (contentStr.Any())
{
contentStr = contentStr.Distinct().ToList();

9
APT.MicroApi/APT.SK.WebApi/Controllers/Api/CheckTypeController.cs
View File

@ -60,13 +60,16 @@ namespace APT.SK.WebApi.Controllers.Api
public PagedActionResult<T_SK_CHECK_TYPE> OrderPagedNew([FromBody] KeywordPageFilter pageFilter)
{
var result = new PagedActionResult<T_SK_CHECK_TYPE>();
if (!string.IsNullOrEmpty(pageFilter.Keyword.ToString()))
if (!string.IsNullOrEmpty(pageFilter.Keyword))
{
if (pageFilter.Keyword != "0")
{
FilterRule order2 = new FilterRule();
order2.Field = "PRODUCTION_UNIT_ID";
order2.Value = Guid.Parse(pageFilter.Keyword.ToString());
order2.Field = "MineType";
order2.Value = (SKProductionUnit)(int.Parse(pageFilter.Keyword));
pageFilter.FilterGroup.Rules.Add(order2);
}
}
result = GetOrderPageEntities<T_SK_CHECK_TYPE>(null, pageFilter);
return result;
}

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

@ -647,7 +647,7 @@ namespace APT.SK.WebApi.Controllers.Api
var detailStr = new List<string>(); var detailNum = new List<int?>();
if (item.Nav_Details != null && item.Nav_Details.Any())
{
//var i = 1;
var i = 1;
foreach (var item2 in item.Nav_Details.OrderBy(t => t.NUM))
{
if (item2 != null && !string.IsNullOrEmpty(item2.MEASURES_NAME))
@ -656,8 +656,7 @@ namespace APT.SK.WebApi.Controllers.Api
detailNum.Add(item2.NUM);
var temp = item2.NUM + "、" + item2.MEASURES_NAME + Environment.NewLine;
item.MINE_NAME = item.MINE_NAME + temp;
item.MEASURE = item.MEASURE + temp;
//i++;
i++;
}
}
}
@ -796,9 +795,6 @@ namespace APT.SK.WebApi.Controllers.Api
if (item2 != null && !string.IsNullOrEmpty(item2.MEASURES_NAME))
{
detailStr.Add(item2.MEASURES_NAME);
var temp = item2.NUM + "、" + item2.MEASURES_NAME + Environment.NewLine;
item.MINE_NAME = item.MINE_NAME + temp;
item.MEASURE = item.MEASURE + temp;
}
if (item2 != null && item2.Nav_DetailContents != null && item2.Nav_DetailContents.Any())
{
@ -872,20 +868,20 @@ namespace APT.SK.WebApi.Controllers.Api
}
}
}
//if (detailStr.Any())
//{
// detailStr = detailStr.Distinct().ToList();
// var i = 1;
// foreach (var item2 in detailStr)
// {
// if (!string.IsNullOrEmpty(item2))
// {
// var temp = i + "、" + item2 + "\r\n";
// item.MEASURE = item.MEASURE + temp;
// i++;
// }
// }
//}
if (detailStr.Any())
{
detailStr = detailStr.Distinct().ToList();
var i = 1;
foreach (var item2 in detailStr)
{
if (!string.IsNullOrEmpty(item2))
{
var temp = i + "、" + item2 + "\r\n";
item.MEASURE = item.MEASURE + temp;
i++;
}
}
}
if (contentStr.Any())
{
contentStr = contentStr.Distinct().ToList();

38
APT.MicroApi/APT.SK.WebApi/Controllers/Api/HiddenDangerConfirmController.cs
View File

@ -366,43 +366,5 @@ namespace APT.SK.WebApi.Controllers.Api
//return ApproveCallBackService.CallReject("HM/HMLicenseAnalysis/RejectUpdate", id);
});
}
/// <summary>
/// 整改责任人确认
/// </summary>
/// <param name="entity"></param>
/// <returns></returns>
[HttpPost, Route("IdentityUpdate")]
public JsonActionResult<bool> IdentityUpdate([FromBody] T_SK_HIDDEN_DANGER_CONFIRM entity)
{
return SafeExecute(() =>
{
T_FM_NOTIFICATION_TASK task = null;
var notice = this.GetEntity<T_SK_HIDDEN_DANGER_CONFIRM>(entity.ID);
notice.STATUS = PFStandardStatus.Archived;
var userId = APT.Infrastructure.Api.AppContext.CurrentSession.UserID;
if (entity.TaskID != Guid.Empty)
{
var currTask = GetEntity<T_FM_NOTIFICATION_TASK>(t => t.ID == entity.TaskID);
if (currTask != null)
{
userId = currTask.USER_ID;
}
}
if (entity.TaskID != Guid.Empty)
{
task = NotificationTaskService.GetTaskFinishModel(entity.TaskID);
task.SOURCE_FORMCODE = "SK018_SHOWPRINT";
}
UnifiedCommit(() =>
{
if (notice != null)
this.UpdateEntityNoCommit(notice);
if (task != null)
this.UpdateEntityNoCommit(task);
});
return true;
});
}
}
}

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

@ -107,7 +107,7 @@ namespace APT.SK.WebApi.Controllers.Api
}
}
//发消息
var titleName = "隐患确认单(" + depart?.NAME + DateTime.Now.Month.PadLeft(2,'0') + DateTime.Now.Day.PadLeft(2, '0');
var titleName = "隐患确认单(" + depart?.NAME + DateTime.Now.ToShortDateString().Replace("/", "") + ")";
if (orgId.ToString() == "d9871ba8-0eec-9e4a-bb87-7d5a540d8913")
{
titleName = "手动隐患上报完善";

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

@ -53,16 +53,9 @@ namespace APT.SK.WebApi.Controllers.Api
var level = param == "Major" ? "重大" : "一般";
if (hiddenLevel == SKHiddenLevel.General)
{
var departmentType = this.GetEntity<T_FM_DEPARTMENT>(t => t.ID == entity.APPLY_DEPARTMENT_ID && t.ENABLE_STATUS == 0);
//param = Enum.GetName(typeof(FMDepartmentType), departmentType);
if (departmentType != null)
{
level = ((SKDepartmentTypeEnum)departmentType.DEPARTMENT_TYPE).GetDescription();
if (departmentType.DEPARTMENT_STATUS != 1)
{
level = "公司级";
}
}
var departmentType = this.GetEntity<T_FM_DEPARTMENT>(t => t.ID == entity.APPLY_DEPARTMENT_ID && t.ENABLE_STATUS == 0)?.DEPARTMENT_TYPE;
//param = Enum.GetName(typeof(SKDepartmentTypeEnum), departmentType);
param = ((SKDepartmentTypeEnum)departmentType).GetDescription();
}
entity.STATUS = PFStandardStatus.Approving;
//取审批流水码
@ -72,7 +65,7 @@ namespace APT.SK.WebApi.Controllers.Api
sysFilter.OrgId = entity.ORG_ID;
var codes = CodeRuleService.NewGenSerial(sysFilter);
var serialCode = codes.Split(new char[] { ',' });
MFlowPermitService.InsertApprove(serialCode[0], "SK024", level, entity.ID, "SK024_SHOWPRINT", entity.TaskID, true, () =>
MFlowPermitService.InsertApprove(serialCode[0], "SK024", param, entity.ID, "SK024_SHOWPRINT", entity.TaskID, true, () =>
{
if (entity != null)
UpdateEntityNoCommit(entity);

42
APT.MicroApi/APT.SK.WebApi/Controllers/Api/HiddenDangerRectifyRecordController.cs
View File

@ -135,41 +135,12 @@ namespace APT.SK.WebApi.Controllers
{
if (entity.STATUS == PFStandardStatus.Draft || entity.STATUS == PFStandardStatus.Rejected)
{
//整改责任人确认
if (entity.RECITIFY_USER_ID != null)
{
entity.STATUS = PFStandardStatus.Reading;
entity.COMPLETE_DATE = DateTime.Now;
//var departName = this.GetEntity<T_FM_DEPARTMENT>(t => t.ID == entity.APPLY_DEPARTMENT_ID && t.ENABLE_STATUS == 0)?.NAME;
var UserNames = new List<string>();
var user = this.GetEntity<T_FM_USER>(t => t.ENABLE_STATUS == (int)FMEnableStatusEnum.启用 && t.ID == entity.RECITIFY_USER_ID);
//发消息
notice = NotificationTaskService.InsertUserNoticeTaskModel("隐患整改记录" + DateTime.Now.Month.PadLeft(2, '0') + DateTime.Now.Day.PadLeft(2, '0') + "-整改责任人确认", entity.ID, entity.ORG_ID, (Guid)entity.RECITIFY_USER_ID, user?.NAME, DateTime.Now,
DateTime.Now.AddHours(24), (int)FMNoticeTypeEnum.消息, "SK022");
}
}
else if (entity.STATUS == PFStandardStatus.Reading)
{
if (entity.ACCEPT_RESULTE == MS.Domain.Enums.SK.SKAcceptResultEnum.No)
{
if (entity.IMPLEMENT_USER_ID != null)
{
//驳回给整改落实人
entity.STATUS = PFStandardStatus.Rejected;
//var departName = this.GetEntity<T_FM_DEPARTMENT>(t => t.ID == entity.APPLY_DEPARTMENT_ID && t.ENABLE_STATUS == 0)?.NAME;
var UserNames = new List<string>();
var user = this.GetEntity<T_FM_USER>(t => t.ENABLE_STATUS == (int)FMEnableStatusEnum.启用 && t.ID == entity.IMPLEMENT_USER_ID);
//发消息
notice = NotificationTaskService.InsertUserNoticeTaskModel("隐患整改记录(" + DateTime.Now.ToShortDateString().Replace("/", "") + ")-驳回", entity.ID, entity.ORG_ID, (Guid)entity.IMPLEMENT_USER_ID, user?.NAME, DateTime.Now,
DateTime.Now.AddHours(24), (int)FMNoticeTypeEnum.消息, "SK022");
}
}
else
{
//验收人确认
if (entity.ACCEPT_USER_ID != null)
{
entity.STATUS = PFStandardStatus.Sign;
entity.ACCEPT_OPINION = null;
entity.ACCEPT_RESULTE = SKAcceptResultEnum.Yes;
entity.ACCEPT_DATE = DateTime.Now;
var departName = this.GetEntity<T_FM_DEPARTMENT>(t => t.ID == entity.APPLY_DEPARTMENT_ID && t.ENABLE_STATUS == 0)?.NAME;
var UserNames = new List<string>();
var user = this.GetEntity<T_FM_USER>(t => t.ENABLE_STATUS == (int)FMEnableStatusEnum.启用 && t.ID == entity.ACCEPT_USER_ID);
@ -178,7 +149,6 @@ namespace APT.SK.WebApi.Controllers
DateTime.Now.AddHours(24), (int)FMNoticeTypeEnum.消息, "SK022");
}
}
}
else if (entity.STATUS == PFStandardStatus.Sign)
{
if (entity.ACCEPT_RESULTE == MS.Domain.Enums.SK.SKAcceptResultEnum.No)
@ -225,14 +195,14 @@ namespace APT.SK.WebApi.Controllers
//param = Enum.GetName(typeof(SKDepartmentTypeEnum), departmentType);
if (departmentType != null)
{
level = ((SKDepartmentTypeEnum)departmentType.DEPARTMENT_TYPE).GetDescription();
param = ((SKDepartmentTypeEnum)departmentType.DEPARTMENT_TYPE).GetDescription();
if (departmentType.DEPARTMENT_STATUS != 1)
{
level = "公司级";
param = "公司级";
}
}
}
MFlowPermitService.InsertApprove(serialCode[0], "SK022", level, entity.ID, "SK022_SHOWPRINT", entity.TaskID, true, () =>
MFlowPermitService.InsertApprove(serialCode[0], "SK022", param, entity.ID, "SK022_SHOWPRINT", entity.TaskID, true, () =>
{
if (entity != null)
UpdateEntityNoCommit(entity);

34
APT.MicroApi/APT.SK.WebApi/Controllers/Api/HiddenDangerReportController.cs
View File

@ -68,10 +68,8 @@ namespace APT.SK.WebApi.Controllers.Api
List<Guid> deleteFileIds = new List<Guid>();
List<Guid> deleteBasicIds = new List<Guid>();
List<Guid> deleteDetailIds = new List<Guid>();
List<Guid> deleteReasonIds = new List<Guid>();
List<T_SK_HIDDEN_DANGER_REPORT_DETAIL_FILE> fileList = new List<T_SK_HIDDEN_DANGER_REPORT_DETAIL_FILE>();
List<T_SK_HIDDEN_DANGER_REPORT_DETAIL_BASIC> basicList = new List<T_SK_HIDDEN_DANGER_REPORT_DETAIL_BASIC>();
List<T_SK_HIDDEN_DANGER_REPORT_DETAIL_REASON> reasonList = new List<T_SK_HIDDEN_DANGER_REPORT_DETAIL_REASON>();
SKHiddenLevel? hiddenLevel = SKHiddenLevel.General;
if (details != null && details.Any())
{
@ -90,11 +88,6 @@ namespace APT.SK.WebApi.Controllers.Api
var tempIds = t.Nav_ReportDetailBasics.Select(m => m.ID).ToList();
deleteBasicIds.AddRange(tempIds);
}
if (t.Nav_ReportDetailReasons != null && t.Nav_ReportDetailReasons.Any())
{
var tempIds = t.Nav_ReportDetailReasons.Select(m => m.ID).ToList();
deleteReasonIds.AddRange(tempIds);
}
deleteDetailIds.Add(t.ID);
});
}
@ -131,17 +124,6 @@ namespace APT.SK.WebApi.Controllers.Api
basicList.Add(basic);
}
}
if (item.Nav_ReportDetailReasons != null && item.Nav_ReportDetailReasons.Any())
{
foreach (var item2 in item.Nav_ReportDetailReasons)
{
T_SK_HIDDEN_DANGER_REPORT_DETAIL_REASON basic = new T_SK_HIDDEN_DANGER_REPORT_DETAIL_REASON();
basic.ORG_ID = entity.ORG_ID;
basic.HIDDEN_DANGER_REPORT_DETAIL_ID = item.ID;
basic.REASON_ID = item2.REASON_ID;
reasonList.Add(basic);
}
}
if (item.RECITIFY_USER_ID != null)
{
if (item.RECITIFY_USER_ID == loginUserId)
@ -210,19 +192,17 @@ namespace APT.SK.WebApi.Controllers.Api
//param = Enum.GetName(typeof(FMDepartmentType), departmentType);
if (departmentType != null)
{
level = ((SKDepartmentTypeEnum)departmentType.DEPARTMENT_TYPE).GetDescription();
param = ((SKDepartmentTypeEnum)departmentType.DEPARTMENT_TYPE).GetDescription();
if (departmentType.DEPARTMENT_STATUS != 1)
{
level = "公司级";
param = "公司级";
}
}
}
MFlowPermitService.InsertApprove(serialCode[0], "SK014", level, entity.ID, "SK014_SHOWPRINT", entity.TaskID, true, () =>
MFlowPermitService.InsertApprove(serialCode[0], "SK014", param, entity.ID, "SK014_SHOWPRINT", entity.TaskID, true, () =>
{
if (deleteBasicIds != null && deleteBasicIds.Any())
this.BantchDeleteEntityNoCommit<T_SK_HIDDEN_DANGER_REPORT_DETAIL_BASIC>(deleteBasicIds);
if (deleteReasonIds != null && deleteReasonIds.Any())
this.BantchDeleteEntityNoCommit<T_SK_HIDDEN_DANGER_REPORT_DETAIL_REASON>(deleteReasonIds);
if (deleteFileIds != null && deleteFileIds.Any())
this.BantchDeleteEntityNoCommit<T_SK_HIDDEN_DANGER_REPORT_DETAIL_FILE>(deleteFileIds);
if (deleteDetailIds != null && deleteDetailIds.Any())
@ -239,8 +219,6 @@ namespace APT.SK.WebApi.Controllers.Api
BantchSaveEntityNoCommit(fileList);
if (basicList != null && basicList.Any())
BantchSaveEntityNoCommit(basicList);
if (reasonList != null && reasonList.Any())
BantchSaveEntityNoCommit(reasonList);
if (notices != null && notices.Any())
BantchSaveEntityNoCommit(notices);
}, null, null, null, null, null, "SK014_SHOWPRINT", null, level + "隐患上报审批");
@ -255,8 +233,6 @@ namespace APT.SK.WebApi.Controllers.Api
this.UnifiedCommit(() =>
{
if (deleteReasonIds != null && deleteReasonIds.Any())
this.BantchDeleteEntityNoCommit<T_SK_HIDDEN_DANGER_REPORT_DETAIL_REASON>(deleteReasonIds);
if (deleteBasicIds != null && deleteBasicIds.Any())
this.BantchDeleteEntityNoCommit<T_SK_HIDDEN_DANGER_REPORT_DETAIL_BASIC>(deleteBasicIds);
if (deleteFileIds != null && deleteFileIds.Any())
@ -275,8 +251,6 @@ namespace APT.SK.WebApi.Controllers.Api
BantchSaveEntityNoCommit(fileList);
if (basicList != null && basicList.Any())
BantchSaveEntityNoCommit(basicList);
if (reasonList != null && reasonList.Any())
BantchSaveEntityNoCommit(reasonList);
if (notices != null && notices.Any())
BantchSaveEntityNoCommit(notices);
});
@ -389,7 +363,7 @@ namespace APT.SK.WebApi.Controllers.Api
});
}
/// <summary>
/// 整改责任人确认
/// 识别人确认
/// </summary>
/// <param name="entity"></param>
/// <returns></returns>

306
APT.MicroApi/APT.SK.WebApi/Controllers/Api/T4/T4Control.cs
View File

File diff suppressed because it is too large Load Diff