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

双控优化及sa用户修改

Browse Source
This commit is contained in:
何美荣 2026-04-07 17:08:11 +08:00
parent ec338ad4ff
commit cd3196ba55
10 changed files with 49 additions and 33 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -11723,6 +11723,10 @@ namespace APT.BaseData.Services.DomainServices
{ {
user = users.FirstOrDefault(t => t.ID == departFirst?.USER_ID); user = users.FirstOrDefault(t => t.ID == departFirst?.USER_ID);
} }
if (user == null)
{
throw new Exception("未找到整改责任人对应组织的安全员和负责人，请确认基础配置已完善");
}
T_SK_HIDDEN_DANGER_RECTIFY_NOTICE notice = new T_SK_HIDDEN_DANGER_RECTIFY_NOTICE(); T_SK_HIDDEN_DANGER_RECTIFY_NOTICE notice = new T_SK_HIDDEN_DANGER_RECTIFY_NOTICE();
notice.ORG_ID = detail.ORG_ID; notice.ORG_ID = detail.ORG_ID;
notice.HIDDEN_DANGER_REPORT_ID = entity.ID; notice.HIDDEN_DANGER_REPORT_ID = entity.ID;
@ -11735,7 +11739,7 @@ namespace APT.BaseData.Services.DomainServices
notice.CHECK_TYPE_ID = entity.CHECK_TYPE_ID; notice.CHECK_TYPE_ID = entity.CHECK_TYPE_ID;
notice.PLANCHECKFREQUENCY = entity.PLANCHECKFREQUENCY; notice.PLANCHECKFREQUENCY = entity.PLANCHECKFREQUENCY;
notice.DEPARTMENT_TYPE = entity.DEPARTMENT_TYPE; notice.DEPARTMENT_TYPE = entity.DEPARTMENT_TYPE;
notice.CHECK_TIME = entity.CHECK_TIME != null ? entity.CHECK_TIME : DateTime.Now; notice.CHECK_TIME = entity.CHECK_TIME != null ? entity.CHECK_TIME : entity.CREATE_TIME;
notice.CHECK_PERSON = entity.CHECK_PERSON; notice.CHECK_PERSON = entity.CHECK_PERSON;
notice.NOTICE_CODE = entity.NOTICE_CODE; notice.NOTICE_CODE = entity.NOTICE_CODE;
notices.Add(notice); notices.Add(notice);
@ -12135,6 +12139,10 @@ namespace APT.BaseData.Services.DomainServices
{ {
user = users.FirstOrDefault(t => t.ID == departFist?.USER_ID); user = users.FirstOrDefault(t => t.ID == departFist?.USER_ID);
} }
if (user == null)
{
throw new Exception("未找到整改责任人对应组织的安全员和负责人，请确认基础配置已完善");
}
notice = new T_SK_HIDDEN_DANGER_RECTIFY_NOTICE(); notice = new T_SK_HIDDEN_DANGER_RECTIFY_NOTICE();
notice.ORG_ID = entity.ORG_ID; notice.ORG_ID = entity.ORG_ID;
notice.HIDDEN_DANGER_REPORT_ID = entity.Nav_Report?.ID; notice.HIDDEN_DANGER_REPORT_ID = entity.Nav_Report?.ID;
@ -12146,7 +12154,7 @@ namespace APT.BaseData.Services.DomainServices
notice.CHECK_TYPE_ID = entity.CHECK_TYPE_ID; notice.CHECK_TYPE_ID = entity.CHECK_TYPE_ID;
notice.PLANCHECKFREQUENCY = entity.PLANCHECKFREQUENCY; notice.PLANCHECKFREQUENCY = entity.PLANCHECKFREQUENCY;
notice.DEPARTMENT_TYPE = entity.DEPARTMENT_TYPE; notice.DEPARTMENT_TYPE = entity.DEPARTMENT_TYPE;
notice.CREATE_TIME = entity.Nav_Report?.CREATE_TIME; notice.CHECK_TIME = entity.Nav_Report?.CREATE_TIME;
notice.CHECK_PERSON = entity.Nav_ApplyUser?.NAME; notice.CHECK_PERSON = entity.Nav_ApplyUser?.NAME;
notice.NOTICE_CODE = entity.NOTICE_CODE; notice.NOTICE_CODE = entity.NOTICE_CODE;
if (entity.Nav_Files != null && entity.Nav_Files.Any()) if (entity.Nav_Files != null && entity.Nav_Files.Any())

2
APT.MicroApi/APT.BS.WebApi/appsettings.Test.json
View File

@ -1,7 +1,7 @@
{ {
"ConnectionStrings": { "ConnectionStrings": {
//"default": "User ID=postgres;Password=dfdn!energy;Host=36.134.166.114;Port=5432;Database=mh_op;CommandTimeout=1024;" //"default": "User ID=postgres;Password=dfdn!energy;Host=36.134.166.114;Port=5432;Database=mh_op;CommandTimeout=1024;"
"default": "Server=121.41.2.71;Database=mh_jy_ops;uid=sa;pwd=mhsafe!2021;" "default": "Server=121.41.2.71;Database=mh_jy_ops;uid=qls;pwd=mhsafe!2021;"
}, },
"AppSettings": { "AppSettings": {
"DataBaseType": "sqlserver", "DataBaseType": "sqlserver",

2
APT.MicroApi/APT.FM.WebApi/appsettings.Test.json
View File

@ -6,7 +6,7 @@
//"default": "User ID=postgres;Password=ldxmesadm;Host=172.20.8.91;Port=5432;Database=mes;CommandTimeout=1024;" //"default": "User ID=postgres;Password=ldxmesadm;Host=172.20.8.91;Port=5432;Database=mes;CommandTimeout=1024;"
//"default": "User ID=postgres;Password=dfdn!energy;Host=36.134.166.114;Port=5432;Database=mh_op;CommandTimeout=1024;" //"default": "User ID=postgres;Password=dfdn!energy;Host=36.134.166.114;Port=5432;Database=mh_op;CommandTimeout=1024;"
//"default": "User ID=postgres;Password=opt!energy;Host=36.133.75.96;Port=5432;Database=postgres;CommandTimeout=1024;" //"default": "User ID=postgres;Password=opt!energy;Host=36.133.75.96;Port=5432;Database=postgres;CommandTimeout=1024;"
"default": "Server=121.41.2.71;Database=mh_jy_ops;uid=sa;pwd=mhsafe!2021;" "default": "Server=121.41.2.71;Database=mh_jy_ops;uid=qls;pwd=mhsafe!2021;"
}, },
"AppSettings": { "AppSettings": {
"DataBaseType": "sqlserver", "DataBaseType": "sqlserver",

2
APT.MicroApi/APT.OP.WebApi/appsettings.Test.json
View File

@ -6,7 +6,7 @@
//"default": "User ID=postgres;Password=ldxmesadm;Host=172.20.8.91;Port=5432;Database=mes;CommandTimeout=1024;" //"default": "User ID=postgres;Password=ldxmesadm;Host=172.20.8.91;Port=5432;Database=mes;CommandTimeout=1024;"
//"default": "User ID=postgres;Password=dfdn!energy;Host=36.134.166.114;Port=5432;Database=mh_op;CommandTimeout=1024;" //"default": "User ID=postgres;Password=dfdn!energy;Host=36.134.166.114;Port=5432;Database=mh_op;CommandTimeout=1024;"
//"default": "User ID=postgres;Password=dfdn!energy;Host=localhost;Port=5432;Database=postgres;CommandTimeout=1024;" //"default": "User ID=postgres;Password=dfdn!energy;Host=localhost;Port=5432;Database=postgres;CommandTimeout=1024;"
"default": "Server=121.41.2.71;Database=mh_jy_ops;uid=sa;pwd=mhsafe!2021;" "default": "Server=121.41.2.71;Database=mh_jy_ops;uid=qls;pwd=mhsafe!2021;"
}, },
"AppSettings": { "AppSettings": {

2
APT.MicroApi/APT.PF.WebApi/appsettings.Test.json
View File

@ -6,7 +6,7 @@
//"default": "User ID=postgres;Password=ldxmesadm;Host=172.20.8.91;Port=5432;Database=mes;CommandTimeout=1024;" //"default": "User ID=postgres;Password=ldxmesadm;Host=172.20.8.91;Port=5432;Database=mes;CommandTimeout=1024;"
//"default": "User ID=postgres;Password=dfdn!energy;Host=36.134.166.114;Port=5432;Database=mh_op;CommandTimeout=1024;" //"default": "User ID=postgres;Password=dfdn!energy;Host=36.134.166.114;Port=5432;Database=mh_op;CommandTimeout=1024;"
//"default": "User ID=postgres;Password=opt!energy;Host=36.133.75.96;Port=5432;Database=postgres;CommandTimeout=1024;" //"default": "User ID=postgres;Password=opt!energy;Host=36.133.75.96;Port=5432;Database=postgres;CommandTimeout=1024;"
"default": "Server=121.41.2.71;Database=mh_jy_ops;uid=sa;pwd=mhsafe!2021;" //<EFBFBD><EFBFBD>ʽ<EFBFBD><EFBFBD><EFBFBD><EFBFBD> "default": "Server=121.41.2.71;Database=mh_jy_ops;uid=qls;pwd=mhsafe!2021;" //<EFBFBD><EFBFBD>ʽ<EFBFBD><EFBFBD><EFBFBD><EFBFBD>
}, },
"AppSettings": { "AppSettings": {
"DataBaseType": "sqlserver", "DataBaseType": "sqlserver",

2
APT.MicroApi/APT.PP.WebApi/appsettings.Test.json
View File

@ -1,7 +1,7 @@
{ {
"ConnectionStrings": { "ConnectionStrings": {
//"default": "User ID=postgres;Password=dfdn!energy;Host=36.134.166.114;Port=5432;Database=mh_op;CommandTimeout=1024;" //"default": "User ID=postgres;Password=dfdn!energy;Host=36.134.166.114;Port=5432;Database=mh_op;CommandTimeout=1024;"
"default": "Server=121.41.2.71;Database=mh_jy_ops;uid=sa;pwd=mhsafe!2021;", "default": "Server=121.41.2.71;Database=mh_jy_ops;uid=qls;pwd=mhsafe!2021;",
"tpm": "Data Source=10.2.7.17;Initial Catalog=QLTPMDB;Persist Security Info=True;User ID=MHUser;Password=MHUser2024ok%" "tpm": "Data Source=10.2.7.17;Initial Catalog=QLTPMDB;Persist Security Info=True;User ID=MHUser;Password=MHUser2024ok%"
}, },
"AppSettings": { "AppSettings": {

2
APT.MicroApi/APT.SC.WebApi/appsettings.Test.json
View File

@ -1,7 +1,7 @@
{ {
"ConnectionStrings": { "ConnectionStrings": {
//"default": "User ID=postgres;Password=dfdn!energy;Host=36.134.166.114;Port=5432;Database=mh_op;CommandTimeout=1024;" //"default": "User ID=postgres;Password=dfdn!energy;Host=36.134.166.114;Port=5432;Database=mh_op;CommandTimeout=1024;"
"default": "Server=121.41.2.71;Database=mh_jy_ops;uid=sa;pwd=mhsafe!2021;", "default": "Server=121.41.2.71;Database=mh_jy_ops;uid=qls;pwd=mhsafe!2021;"
//"head": "Server=124.117.209.78;Database=mh_jy_head;uid=sa;pwd=JySafe@2025*;" //"head": "Server=124.117.209.78;Database=mh_jy_head;uid=sa;pwd=JySafe@2025*;"
}, },
"AppSettings": { "AppSettings": {

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

@ -46,27 +46,27 @@ namespace APT.SK.WebApi.Controllers.Api
if (entity.APPLY_DEPARTMENT_ID == null) if (entity.APPLY_DEPARTMENT_ID == null)
entity.APPLY_DEPARTMENT_ID = departId; entity.APPLY_DEPARTMENT_ID = departId;
T_FM_NOTIFICATION_TASK finishNotice = null; T_FM_NOTIFICATION_TASK finishNotice = null;
if (entity.STATUS != PFStandardStatus.Draft) //if (entity.STATUS != PFStandardStatus.Draft && entity.STATUS != PFStandardStatus.Rejected)
{ //{
var taskId = entity.TaskID; // var taskId = entity.TaskID;
if (taskId == Guid.Empty) // if (taskId == Guid.Empty)
{ // {
var taskTemp = GetEntity<T_FM_NOTIFICATION_TASK>(i => i.SOURCE_DATA_ID == entity.ID && i.USER_ID == userId // var taskTemp = GetEntity<T_FM_NOTIFICATION_TASK>(i => i.SOURCE_DATA_ID == entity.ID && i.USER_ID == userId
&& i.NOTICE_STATUS == FMNoticeStatusEnum.未处理.GetInt() && i.SOURCE_FORMCODE == "SK020"); //&& i.NOTICE_STATUS == FMNoticeStatusEnum.未处理.GetInt() && i.SOURCE_FORMCODE == "SK020");
if (taskTemp != null) // if (taskTemp != null)
{ // {
taskTemp.NOTICE_STATUS = 1; // taskTemp.NOTICE_STATUS = 1;
taskTemp.SOURCE_FORMCODE = "SK020_SHOWPRINT"; // taskTemp.SOURCE_FORMCODE = "SK020_SHOWPRINT";
finishNotice = taskTemp; // finishNotice = taskTemp;
} // }
} // }
if (taskId != Guid.Empty) // if (taskId != Guid.Empty)
{ // {
finishNotice = NotificationTaskService.FOGetTaskFinishModel(taskId, entity.ID, "SK020_SHOWPRINT"); // finishNotice = NotificationTaskService.FOGetTaskFinishModel(taskId, entity.ID, "SK020_SHOWPRINT");
} // }
UpdateEntity(finishNotice); // UpdateEntity(finishNotice);
throw new Exception("你已提交,请勿重复提交!"); // throw new Exception("你已提交,请勿重复提交!");
} //}
var details = entity.Nav_RectifyDetails; var details = entity.Nav_RectifyDetails;
entity.Nav_RectifyDetails = null; entity.Nav_RectifyDetails = null;
var files = entity.Nav_RectifyFiles; var files = entity.Nav_RectifyFiles;
@ -568,7 +568,7 @@ namespace APT.SK.WebApi.Controllers.Api
return SafeExecute(() => return SafeExecute(() =>
{ {
T_FM_NOTIFICATION_TASK task = null; T_FM_NOTIFICATION_TASK task = null;
var notice = this.GetEntity<T_SK_HIDDEN_DANGER_RECTIFY_NOTICE>(entity.ID, "Nav_RectifyDetails.Nav_RectifyDetailFiles", "Nav_RectifyDetails.Nav_ImplementUser"); var notice = this.GetEntity<T_SK_HIDDEN_DANGER_RECTIFY_NOTICE>(entity.ID, "Nav_RectifyDetails.Nav_RectifyDetailFiles", "Nav_RectifyDetails.Nav_RectifyDetailReasons", "Nav_RectifyDetails.Nav_ImplementUser");
var userId = APT.Infrastructure.Api.AppContext.CurrentSession.UserID; var userId = APT.Infrastructure.Api.AppContext.CurrentSession.UserID;
if (entity.TaskID != Guid.Empty) if (entity.TaskID != Guid.Empty)
{ {
@ -578,7 +578,7 @@ namespace APT.SK.WebApi.Controllers.Api
userId = currTask.USER_ID; userId = currTask.USER_ID;
} }
} }
var details = this.GetEntities<T_SK_HIDDEN_DANGER_RECTIFY_NOTICE_DETAIL>(t => t.HIDDEN_DANGER_RECTIFY_NOTICE_ID == notice.ID && t.ACCEPT_USER_ID == userId, new BaseFilter(notice.ORG_ID), "Nav_RectifyDetailFiles", "Nav_RectifyDetailReasons").ToList(); var details = this.GetEntities<T_SK_HIDDEN_DANGER_RECTIFY_NOTICE_DETAIL>(t => t.HIDDEN_DANGER_RECTIFY_NOTICE_ID == notice.ID && t.ACCEPT_USER_ID == userId, new BaseFilter(notice.ORG_ID)).ToList();
details.ForEach(t => details.ForEach(t =>
{ {
t.ISCHECK = true; t.ISCHECK = true;

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

@ -97,6 +97,10 @@ namespace APT.SK.WebApi.Controllers
entity.PRODUCTION_UNIT_ID = record.PRODUCTION_UNIT_ID; entity.PRODUCTION_UNIT_ID = record.PRODUCTION_UNIT_ID;
entity.NOTICE_CODE = record.NOTICE_CODE; entity.NOTICE_CODE = record.NOTICE_CODE;
} }
if (entity.COMPLETE_DATE == null)
{
entity.COMPLETE_DATE = DateTime.Now;
}
var photoas = entity.Nav_RectifyPhotoas; var photoas = entity.Nav_RectifyPhotoas;
entity.Nav_RectifyPhotoas = null; entity.Nav_RectifyPhotoas = null;
var photobs = entity.Nav_RectifyPhotobs; var photobs = entity.Nav_RectifyPhotobs;
@ -200,6 +204,10 @@ namespace APT.SK.WebApi.Controllers
} }
else else
{ {
if (entity.ACCEPT_DATE == null)
{
entity.ACCEPT_DATE = DateTime.Now;
}
//触发审批 //触发审批
entity.STATUS = PFStandardStatus.Approving; entity.STATUS = PFStandardStatus.Approving;
//取审批流水码 //取审批流水码

2
APT.MicroApi/APT.SK.WebApi/appsettings.Test.json
View File

@ -1,7 +1,7 @@
{ {
"ConnectionStrings": { "ConnectionStrings": {
//"default": "User ID=postgres;Password=dfdn!energy;Host=36.134.166.114;Port=5432;Database=mh_op;CommandTimeout=1024;" //"default": "User ID=postgres;Password=dfdn!energy;Host=36.134.166.114;Port=5432;Database=mh_op;CommandTimeout=1024;"
"default": "Server=121.41.2.71;Database=mh_jy_ops;uid=sa;pwd=mhsafe!2021;" "default": "Server=121.41.2.71;Database=mh_jy_ops;uid=qls;pwd=mhsafe!2021;"
}, },
"AppSettings": { "AppSettings": {
"DataBaseType": "sqlserver", "DataBaseType": "sqlserver",