ccy/mh_sms
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'main' of http://47.122.43.22:3000/wjn/mh_sms

Browse Source
This commit is contained in:
wyw 2024-04-16 17:26:59 +08:00
commit 75fce758d8
5 changed files with 45 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
APT.MicroApi/APT.FO.WebApi/Controllers/CrucialLicenseJobController.cs
View File

@ -392,10 +392,26 @@ namespace APT.FO.WebApi.Controllers
{ {
return SafeExecute<bool>(() => return SafeExecute<bool>(() =>
{ {
var users = entity.Nav_CrucialLicensePerson.Where(t => t.USER_ID != null && !t.IS_DELETED).ToList(); var users = entity.Nav_CrucialLicensePerson;
var safeConfirms = entity.Nav_SafeConfirms.Where(t => !t.IS_DELETED).ToList(); if (users != null && users.Any())
var safeMeasures = entity.Nav_SafeMeasures.Where(t => !t.IS_DELETED).ToList(); {
var dealMeasures = entity.Nav_DealMeasures.Where(t => !t.IS_DELETED).ToList(); users = users.Where(t => t.USER_ID != null && !t.IS_DELETED).ToList();
}
var safeConfirms = entity.Nav_SafeConfirms;
if (safeConfirms != null && safeConfirms.Any())
{
safeConfirms = safeConfirms.Where(t => !t.IS_DELETED).ToList();
}
var safeMeasures = entity.Nav_SafeMeasures;
if (safeMeasures != null && safeMeasures.Any())
{
safeMeasures = safeMeasures.Where(t => !t.IS_DELETED).ToList();
}
var dealMeasures = entity.Nav_DealMeasures;
if (dealMeasures != null && dealMeasures.Any())
{
dealMeasures = dealMeasures.Where(t => !t.IS_DELETED).ToList();
}
var loginUserId = APT.Infrastructure.Api.AppContext.CurrentSession.UserID; var loginUserId = APT.Infrastructure.Api.AppContext.CurrentSession.UserID;
entity.Nav_CrucialLicensePerson = null; entity.Nav_CrucialLicensePerson = null;
entity.Nav_SafeConfirms = null; entity.Nav_SafeConfirms = null;

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

@ -172,7 +172,11 @@ namespace APT.FO.WebApi.Controllers
List<T_FO_JOB_ACTIVITY_FLOW_FILE> flowFile = new List<T_FO_JOB_ACTIVITY_FLOW_FILE>(); List<T_FO_JOB_ACTIVITY_FLOW_FILE> flowFile = new List<T_FO_JOB_ACTIVITY_FLOW_FILE>();
List<T_FO_JOB_ACTIVITY_MEASURE_FILE> measureFile = new List<T_FO_JOB_ACTIVITY_MEASURE_FILE>(); List<T_FO_JOB_ACTIVITY_MEASURE_FILE> measureFile = new List<T_FO_JOB_ACTIVITY_MEASURE_FILE>();
T_SE_TRAIN_NOTIFY notify = null; T_SE_TRAIN_NOTIFY notify = null;
var users = entity.Nav_JobActivityPerson.Where(t => t.USER_ID != null && !t.IS_DELETED).ToList(); var users = entity.Nav_JobActivityPerson;
if (users != null && users.Any())
{
users = users.Where(t => !t.IS_DELETED).ToList();
}
entity.Nav_JobActivityPerson = null; entity.Nav_JobActivityPerson = null;
var details = entity.Nav_Details; var details = entity.Nav_Details;
entity.Nav_Details = null; entity.Nav_Details = null;

6
APT.MicroApi/APT.FO.WebApi/Controllers/JobEventRecordController.cs
View File

@ -161,7 +161,11 @@ namespace APT.FO.WebApi.Controllers
List<T_FO_JOB_EVENT_FILE> file = new List<T_FO_JOB_EVENT_FILE>(); List<T_FO_JOB_EVENT_FILE> file = new List<T_FO_JOB_EVENT_FILE>();
List<T_FO_JOB_EVENT_FLOW_FILE> flowFile = new List<T_FO_JOB_EVENT_FLOW_FILE>(); List<T_FO_JOB_EVENT_FLOW_FILE> flowFile = new List<T_FO_JOB_EVENT_FLOW_FILE>();
List<T_FO_JOB_EVENT_MEASURE_FILE> measureFile = new List<T_FO_JOB_EVENT_MEASURE_FILE>(); List<T_FO_JOB_EVENT_MEASURE_FILE> measureFile = new List<T_FO_JOB_EVENT_MEASURE_FILE>();
var users = entity.Nav_JobEventPerson.Where(t=>t.USER_ID != null && !t.IS_DELETED).ToList(); var users = entity.Nav_JobEventPerson;
if (users != null && users.Any())
{
users = users.Where(t => t.USER_ID != null && !t.IS_DELETED).ToList();
}
entity.Nav_JobEventPerson = null; entity.Nav_JobEventPerson = null;
var details = entity.Nav_Details; var details = entity.Nav_Details;
entity.Nav_Details = null; entity.Nav_Details = null;

6
APT.MicroApi/APT.FO.WebApi/Controllers/PreOperSchController.cs
View File

@ -44,7 +44,11 @@ namespace APT.FM.WebApi.Controllers.Api.FO
{ {
return SafeExecute<bool>(() => return SafeExecute<bool>(() =>
{ {
var users = entity.Nav_PreOperSchUser.Where(t => t.USER_ID != null && !t.IS_DELETED).ToList(); var users = entity.Nav_PreOperSchUser;
if (users != null && users.Any())
{
users = users.Where(t => t.USER_ID != null && !t.IS_DELETED).ToList();
}
var files = entity.Nav_PreOperSchFile; var files = entity.Nav_PreOperSchFile;
entity.Nav_PreOperSchUser = null; entity.Nav_PreOperSchUser = null;
entity.Nav_PreOperSchFile = null; entity.Nav_PreOperSchFile = null;

11
APT.MicroApi/APT.FO.WebApi/Controllers/TechDisclosureFromController.cs
View File

@ -89,8 +89,15 @@ namespace APT.FO.WebApi.Controllers
return SafeExecute<bool>(() => return SafeExecute<bool>(() =>
{ {
entity.FORM_STATUS = (int)FOTeamActivityState.草稿; entity.FORM_STATUS = (int)FOTeamActivityState.草稿;
var persons = entity.Nav_Person.Where(t => t.USER_ID != null && !t.IS_DELETED).ToList(); var persons = entity.Nav_Person;
var deleteIds = new List<Guid>();
if (persons != null && persons.Any())
{
deleteIds = persons.Where(t => t.IS_DELETED).Select(m => m.ID).ToList();
persons = persons.Where(t => !t.IS_DELETED).ToList();
}
entity.Nav_Person = null; entity.Nav_Person = null;
List<T_FM_NOTIFICATION_TASK> notices = new List<T_FM_NOTIFICATION_TASK>(); List<T_FM_NOTIFICATION_TASK> notices = new List<T_FM_NOTIFICATION_TASK>();
T_FM_NOTIFICATION_TASK task = null; T_FM_NOTIFICATION_TASK task = null;
T_FO_JOB_ACTIVITY_RECORD record = null; T_FO_JOB_ACTIVITY_RECORD record = null;
@ -381,6 +388,8 @@ namespace APT.FO.WebApi.Controllers
this.BantchSaveEntityNoCommit(flowList); this.BantchSaveEntityNoCommit(flowList);
if (measureList != null && measureList.Any()) if (measureList != null && measureList.Any())
this.BantchSaveEntityNoCommit(measureList); this.BantchSaveEntityNoCommit(measureList);
if (deleteIds != null && deleteIds.Any())
this.BantchDeleteEntityNoCommit<T_FO_TECH_DISCLOSURE_PERSON>(deleteIds);
}); });
return true; return true;
}); });