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-05-14 13:39:01 +08:00
commit d874aafb8e
2 changed files with 11 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
APT.MicroApi/APT.HM.WebApi/Controllers/Api/RiskRecordController.cs
View File

@ -195,20 +195,22 @@ namespace APT.HM.WebApi.Controllers.Api
var result = WitEntity(null, filter); var result = WitEntity(null, filter);
var ID = new Guid(filter.FilterGroup.Rules.ToList()[0].Value.ToString()); var ID = new Guid(filter.FilterGroup.Rules.ToList()[0].Value.ToString());
var filter1 = new BaseFilter(filter.GetOrgId()); var filter1 = new BaseFilter(filter.GetOrgId());
filter1.Include = new string[] { "Nav_EvaluateRiskRecordEquipment.Nav_Equipment", "Nav_EvaluateRiskRecordWorkduty.Nav_Workduty", "Nav_Area", "Nav_Identifying", "Nav_Type", "Nav_OperationStep", "Nav_LiableUser", "Nav_DepartmentLiable", "Nav_PostLiable" }; filter1.SelectField = new string[] { "Nav_EvaluateRiskRecordEquipment.Nav_Equipment.NAME", "Nav_EvaluateRiskRecordWorkduty.Nav_Workduty.NAME", "Nav_Area.NAME", "Nav_Identifying.NAME", "Nav_Type.NAME", "Nav_OperationStep.NAME", "Nav_LiableUser.NAME", "Nav_DepartmentLiable.NAME", "Nav_PostLiable.NAME","RISK_NAME", "RISK_PLACE" };
var detailData = GetEntities<T_HM_RISK_RECORD_DETAIL>(t => t.RECORD_ID == ID, filter1); var detailData = GetEntities<T_HM_RISK_RECORD_DETAIL>(t => t.RECORD_ID == ID, filter1);
var record = GetEntity<T_HM_RISK_RECORD>(ID); var record = GetEntity<T_HM_RISK_RECORD>(ID);
var filter2 = new BaseFilter(filter.GetOrgId()); var filter2 = new BaseFilter(filter.GetOrgId());
filter2.Include = new string[] { "Nav_Area","Nav_Users.Nav_User" }; filter2.SelectField = new string[] { "Nav_Area.NAME","Nav_Users.Nav_User.NAME", "Nav_Users.DEAL_STATUS", "Nav_Users.Nav_User.Nav_UserSignFiles.Nav_ImgFile.Nav_File" };
var riskUsers = GetEntities<T_HM_RISK_TASK_DETAIL>(t => t.TASK_ID == record.TASK_ID && t.RECORD_USER_ID == record.NOTE_TAKER_ID,filter2); var riskUsers = GetEntities<T_HM_RISK_TASK_DETAIL>(t => t.TASK_ID == record.TASK_ID && t.RECORD_USER_ID == record.NOTE_TAKER_ID,filter2);
List<T_HM_RISK_RECORD_USER> Nav_Users = new List<T_HM_RISK_RECORD_USER>(); List<T_HM_RISK_RECORD_USER> Nav_Users = new List<T_HM_RISK_RECORD_USER>();
result.Data.Nav_Users= Nav_Users; result.Data.Nav_Users= Nav_Users;
foreach ( var riskUser in riskUsers) foreach ( var riskUser in riskUsers)
{ {
var userNames = ""; var userNames = "";
List<T_FM_USER_SIGN_FILE> signfile = new List<T_FM_USER_SIGN_FILE>();
foreach (var user in riskUser.Nav_Users) foreach (var user in riskUser.Nav_Users)
{ {
userNames += user.Nav_User.NAME+" "; userNames += user.Nav_User.NAME+" ";
signfile= user.Nav_User.Nav_UserSignFiles;
} }
T_HM_RISK_AREA area = new T_HM_RISK_AREA(); T_HM_RISK_AREA area = new T_HM_RISK_AREA();
T_FM_USER fmuser = new T_FM_USER(); T_FM_USER fmuser = new T_FM_USER();
@ -219,6 +221,8 @@ namespace APT.HM.WebApi.Controllers.Api
}; };
item.Nav_Area.NAME = riskUser.Nav_Area.NAME; item.Nav_Area.NAME = riskUser.Nav_Area.NAME;
item.Nav_User.NAME = userNames; item.Nav_User.NAME = userNames;
item.Nav_User.Nav_UserSignFiles = signfile;
item.DEAL_STATUS = FOUserShiftStatusEnum.已处理;
result.Data.Nav_Users.Add(item); result.Data.Nav_Users.Add(item);
} }
result.Data.Nav_Details = detailData.ToList(); result.Data.Nav_Details = detailData.ToList();

8
APT.MicroApi/APT.HM.WebApi/Controllers/Api/RiskTaskController.cs
View File

@ -237,10 +237,6 @@ namespace APT.HM.WebApi.Controllers.Api
List<T_HM_RISK_RECORD_DETAIL_FACILITIES> facilities = new List<T_HM_RISK_RECORD_DETAIL_FACILITIES>(); List<T_HM_RISK_RECORD_DETAIL_FACILITIES> facilities = new List<T_HM_RISK_RECORD_DETAIL_FACILITIES>();
List<T_FM_NOTIFICATION_TASK> sendNotices = null; List<T_FM_NOTIFICATION_TASK> sendNotices = null;
T_FM_NOTIFICATION_TASK finishNotice = null; T_FM_NOTIFICATION_TASK finishNotice = null;
if (riskTask.TaskID != null)
{
finishNotice = NotificationTaskService.FOGetTaskFinishModel(riskTask.TaskID, riskTask.ID);
}
if (todoCount == 0 && currDetail.Any()) if (todoCount == 0 && currDetail.Any())
{ {
entity = GetEntity<T_HM_RISK_TASK>(riskTask.ID, new string[] { "Nav_Identifyings", "Nav_Files", "Nav_Detail.Nav_Area", "Nav_Detail.Nav_User" }); entity = GetEntity<T_HM_RISK_TASK>(riskTask.ID, new string[] { "Nav_Identifyings", "Nav_Files", "Nav_Detail.Nav_Area", "Nav_Detail.Nav_User" });
@ -395,6 +391,10 @@ namespace APT.HM.WebApi.Controllers.Api
} }
sendNotices = NotificationTaskService.InsertUserNoticeTaskModels(noticeTitles, noticeDataIds, orgId, noticeUserIds, noticeUserNames, DateTime.Now, DateTime.Parse(DateTime.Now.AddDays(7).ToShortDateString() + " 23:59:59"), 0, "HM064"); sendNotices = NotificationTaskService.InsertUserNoticeTaskModels(noticeTitles, noticeDataIds, orgId, noticeUserIds, noticeUserNames, DateTime.Now, DateTime.Parse(DateTime.Now.AddDays(7).ToShortDateString() + " 23:59:59"), 0, "HM064");
} }
if (riskTask.TaskID != null)
{
finishNotice = NotificationTaskService.FOGetTaskFinishModel(riskTask.TaskID, riskTask.ID);
}
} }
UnifiedCommit(() => UnifiedCommit(() =>
{ {