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-11 09:49:33 +08:00
commit 185240abe3
12 changed files with 198 additions and 172 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1899,7 +1899,7 @@ namespace APT.BaseData.Services.DomainServices
}); });
} }
var user = this.GetEntity<T_FM_USER>(t => t.ENABLE_STATUS == (int)FMEnableStatusEnum.启用 && t.ID == tech.DISCLOSURE_PERSON_ID); var user = this.GetEntity<T_FM_USER>(t => t.ENABLE_STATUS == (int)FMEnableStatusEnum.启用 && t.ID == entity.APPLY_USER_ID);
//发消息 //发消息
DateTime dtEnd = NotificationTaskService.GetTaskEndTime(FMTASKTYPE.JobSite, entity.ORG_ID.Value, DateTime.Now, null, null); DateTime dtEnd = NotificationTaskService.GetTaskEndTime(FMTASKTYPE.JobSite, entity.ORG_ID.Value, DateTime.Now, null, null);
notices.Add(NotificationTaskService.InsertUserNoticeTaskModel("安全技术交底表(外包)", tech.ID, entity.ORG_ID, user.ID, user.NAME, DateTime.Now, notices.Add(NotificationTaskService.InsertUserNoticeTaskModel("安全技术交底表(外包)", tech.ID, entity.ORG_ID, user.ID, user.NAME, DateTime.Now,
@ -2213,15 +2213,15 @@ namespace APT.BaseData.Services.DomainServices
tech.IS_AUTO = (int)ISImportantEnum.是; tech.IS_AUTO = (int)ISImportantEnum.是;
tech.IS_OUTSOURCE = true; tech.IS_OUTSOURCE = true;
tech.RELATED_ID = entity.RELATED_ID; tech.RELATED_ID = entity.RELATED_ID;
if (entity.MONITOR_USER_ID != null) //if (entity.MONITOR_USER_ID != null)
{ //{
T_FO_TECH_DISCLOSURE_PERSON person = new T_FO_TECH_DISCLOSURE_PERSON(); // T_FO_TECH_DISCLOSURE_PERSON person = new T_FO_TECH_DISCLOSURE_PERSON();
person.ORG_ID = entity.ORG_ID; // person.ORG_ID = entity.ORG_ID;
person.USER_ID = entity.MONITOR_USER_ID; // person.USER_ID = entity.MONITOR_USER_ID;
person.TECH_DISCLOSURE_FROM_ID = tech.ID; // person.TECH_DISCLOSURE_FROM_ID = tech.ID;
person.CREATER_ID = entity.CREATER_ID; // person.CREATER_ID = entity.CREATER_ID;
techUsers.Add(person); // techUsers.Add(person);
} //}
if (entity.Nav_CrucialLicensePerson != null && entity.Nav_CrucialLicensePerson.Any()) if (entity.Nav_CrucialLicensePerson != null && entity.Nav_CrucialLicensePerson.Any())
{ {
entity.Nav_CrucialLicensePerson.ForEach(t => entity.Nav_CrucialLicensePerson.ForEach(t =>
@ -4488,7 +4488,7 @@ namespace APT.BaseData.Services.DomainServices
var tempDepartment = GetEntity<T_FM_DEPARTMENT>(t => t.ID == department.PARENT_ID).PARENT_ID; var tempDepartment = GetEntity<T_FM_DEPARTMENT>(t => t.ID == department.PARENT_ID).PARENT_ID;
departmentId = GetEntity<T_FM_DEPARTMENT>(t => t.ID == tempDepartment).ID; departmentId = GetEntity<T_FM_DEPARTMENT>(t => t.ID == tempDepartment).ID;
} }
if (department.DEPARTMENT_TYPE == (int)FMDepartmentType.部门) else if (department.DEPARTMENT_TYPE == (int)FMDepartmentType.部门)
{ {
departmentId = department.ID; departmentId = department.ID;
} }

2
APT.MicroApi/APT.FO.WebApi/Controllers/ChangeShiftRecordController.cs
View File

@ -44,7 +44,7 @@ namespace APT.FO.WebApi.Controllers.Api.FO
throw new Exception("对应岗位人员已填写，请刷新确认!"); throw new Exception("对应岗位人员已填写，请刷新确认!");
} }
var userID = APT.Infrastructure.Api.AppContext.CurrentSession.UserID; var userID = APT.Infrastructure.Api.AppContext.CurrentSession.UserID;
var afterUsers = entity.Nav_AfterUsers; var afterUsers = entity.Nav_AfterUsers.Where(t=>t.IS_DELETED==false);
if (afterUsers.Count() == 0) if (afterUsers.Count() == 0)
{ {
throw new Exception("请选择接班人员!"); throw new Exception("请选择接班人员!");

22
APT.MicroApi/APT.FO.WebApi/Controllers/CrucialLicenseJobOutsourceController.cs
View File

@ -254,7 +254,7 @@ namespace APT.FO.WebApi.Controllers
T_FM_NOTIFICATION_TASK finishNotice = null; T_FM_NOTIFICATION_TASK finishNotice = null;
//细表 //细表
List<T_PF_APPROVE_DETAIL> appdetails = new List<T_PF_APPROVE_DETAIL>(); List<T_PF_APPROVE_DETAIL> appdetails = new List<T_PF_APPROVE_DETAIL>();
Expression<Func<T_PF_APPROVE_TEMP, bool>> express = t => t.FORM_CODE == "FO017" && t.ENABLE_STATUS == (int)FMEnableStatusEnum.启用; Expression<Func<T_PF_APPROVE_TEMP, bool>> express = t => t.FORM_CODE == "FO025" && t.ENABLE_STATUS == (int)FMEnableStatusEnum.启用;
if (!string.IsNullOrEmpty(param)) if (!string.IsNullOrEmpty(param))
express = express.And(t => t.PARAM == param); express = express.And(t => t.PARAM == param);
var approveTemp = this.GetEntity<T_PF_APPROVE_TEMP>(express, "Nav_ApproveTempDetails", "Nav_ApproveTempDetails.Nav_ApproveRole"); var approveTemp = this.GetEntity<T_PF_APPROVE_TEMP>(express, "Nav_ApproveTempDetails", "Nav_ApproveTempDetails.Nav_ApproveRole");
@ -268,7 +268,7 @@ namespace APT.FO.WebApi.Controllers
approve.Nav_ApproveDetails = null; approve.Nav_ApproveDetails = null;
approve.DATA_ID = id; approve.DATA_ID = id;
approve.NAME = approveTemp.NAME; approve.NAME = approveTemp.NAME;
approve.APPROVE_CODE = "FO017_SHOWPRINT"; approve.APPROVE_CODE = "FO025_SHOWPRINT";
approve.CODE = serialCode; approve.CODE = serialCode;
approve.CALLBACK_INTERFACE = approveTemp.CALLBACK_INTERFACE; approve.CALLBACK_INTERFACE = approveTemp.CALLBACK_INTERFACE;
var approveRoles = approveTemp.Nav_ApproveTempDetails.Where(t => t.APPROVE_ROLE_ID != null).Select(x => (Guid)x.APPROVE_ROLE_ID).Distinct().ToList(); var approveRoles = approveTemp.Nav_ApproveTempDetails.Where(t => t.APPROVE_ROLE_ID != null).Select(x => (Guid)x.APPROVE_ROLE_ID).Distinct().ToList();
@ -323,7 +323,7 @@ namespace APT.FO.WebApi.Controllers
var curentApprove = appdetails.FirstOrDefault(i => i.APPROVE_USER_ID == applyUserId); var curentApprove = appdetails.FirstOrDefault(i => i.APPROVE_USER_ID == applyUserId);
if (curentApprove != null) if (curentApprove != null)
{ {
var removeApprove = appdetails.Where(i => i.NUM < curentApprove.NUM && i.NODE_APPROVE_STATUS == (int)NodeApproveStatus.Doing); var removeApprove = appdetails.Where(i => i.NUM < curentApprove.NUM && i.NODE_APPROVE_STATUS == (int)NodeApproveStatus.Doing).ToList();
if (removeApprove != null && removeApprove.Any()) if (removeApprove != null && removeApprove.Any())
{ {
foreach (var item in removeApprove) foreach (var item in removeApprove)
@ -338,14 +338,14 @@ namespace APT.FO.WebApi.Controllers
appdetails.Where(i => i.NUM == appdetails.Min(x => x.NUM) && i.APPROVE_USER_ID != applyUserId && i.NODE_APPROVE_STATUS == (int)NodeApproveStatus.Doing).ForEach(i => i.IS_CURRENT = true); appdetails.Where(i => i.NUM == appdetails.Min(x => x.NUM) && i.APPROVE_USER_ID != applyUserId && i.NODE_APPROVE_STATUS == (int)NodeApproveStatus.Doing).ForEach(i => i.IS_CURRENT = true);
sendUserIds = appdetails.Where(i => i.NUM == appdetails.Min(x => x.NUM) && i.APPROVE_USER_ID != applyUserId).Select(t => (Guid)t.APPROVE_USER_ID).ToList(); sendUserIds = appdetails.Where(i => i.NUM == appdetails.Min(x => x.NUM) && i.APPROVE_USER_ID != applyUserId).Select(t => (Guid)t.APPROVE_USER_ID).ToList();
} }
//else else
//{ {
// var appdetailsAll = appdetails; var appdetailsAll = appdetails;
// var removeTemps = appdetailsAll.FirstOrDefault(i => i.NUM == appdetails.Min(x => x.NUM) && i.APPROVE_USER_ID == applyUserId); var removeTemps = appdetailsAll.FirstOrDefault(i => i.NUM == appdetails.Min(x => x.NUM) && i.APPROVE_USER_ID == applyUserId);
// appdetailsAll.Remove(removeTemps); appdetailsAll.Remove(removeTemps);
// appdetails.Where(i => i.NUM == appdetailsAll.Min(x => x.NUM) && i.NODE_APPROVE_STATUS == (int)NodeApproveStatus.Doing).ForEach(i => i.IS_CURRENT = true); appdetails.Where(i => i.NUM == appdetailsAll.Min(x => x.NUM) && i.NODE_APPROVE_STATUS == (int)NodeApproveStatus.Doing).ForEach(i => i.IS_CURRENT = true);
// sendUserIds = appdetails.Where(i => i.NUM == appdetailsAll.Min(x => x.NUM) && i.NODE_APPROVE_STATUS == (int)NodeApproveStatus.Doing).Select(t => (Guid)t.APPROVE_USER_ID).ToList(); sendUserIds = appdetails.Where(i => i.NUM == appdetailsAll.Min(x => x.NUM) && i.NODE_APPROVE_STATUS == (int)NodeApproveStatus.Doing).Select(t => (Guid)t.APPROVE_USER_ID).ToList();
//} }
if (sendUserIds != null && sendUserIds.Any()) if (sendUserIds != null && sendUserIds.Any())
{ {
var sendUserNames = new List<string>(); var sendUserNames = new List<string>();

67
APT.MicroApi/APT.FO.WebApi/Controllers/CurrentClassRecord.cs
View File

@ -62,6 +62,40 @@ namespace APT.FO.WebApi.Controllers.Api.FO
UpdateEntity(finishNotice); UpdateEntity(finishNotice);
throw new Exception("你已提交,不能修改!"); throw new Exception("你已提交,不能修改!");
} }
var currUser = APT.Infrastructure.Api.AppContext.CurrentSession.UserID;
var currFMUser = GetEntity<T_FM_USER>((Guid)currUser, "Nav_Person.Nav_Post", "Nav_Department.Nav_Parent");
if (currFMUser != null)
{
var team = GetEntity<T_FM_TEAM>(t => t.DEPARTMENT_ID == currFMUser.DEPARTMENT_ID);
if (entity.CLASS_TEAM_ID == Guid.Empty || entity.CLASS_TEAM_ID == null)
{
if (team != null)
{
entity.CLASS_TEAM_ID = team.ID;
}
}
if (entity.CLASS_TEAM_ID == Guid.Empty || entity.DEPARTMENT_POST_ID == null)
{
entity.DEPARTMENT_POST_ID = currFMUser.Nav_Person.POST_ID;
}
if (entity.NAME == null)
{
isManual = true;
entity.NAME = DateTime.Now.ToShortDateString() + team.NAME + "-" + currFMUser.Nav_Person.Nav_Post.NAME + "当班工作记录";
entity.RECORD_DATE = DateTime.Now;
}
if (entity.CHARGE_USER_ID == null || entity.CHARGE_USER_ID == Guid.Empty)
{
entity.CHARGE_USER_ID = currFMUser.Nav_Department.USER_ID;
}
if (entity.DEPARTMENT_ID == null || entity.DEPARTMENT_ID == Guid.Empty)
{
entity.DEPARTMENT_ID = currFMUser.Nav_Department.Nav_Parent.ID;
}
}
entity.EDITOR_ID = currUser;
var files = entity.Nav_Files; var files = entity.Nav_Files;
if(files != null) if(files != null)
{ {
@ -79,39 +113,6 @@ namespace APT.FO.WebApi.Controllers.Api.FO
T_FO_CURRENT_CLASS_RECORD_USER currUserRecord = null; T_FO_CURRENT_CLASS_RECORD_USER currUserRecord = null;
if (entity.PUBLISH != null && entity.PUBLISH.Equals("SaveAndNotify")) if (entity.PUBLISH != null && entity.PUBLISH.Equals("SaveAndNotify"))
{ {
var currUser = APT.Infrastructure.Api.AppContext.CurrentSession.UserID;
var currFMUser = GetEntity<T_FM_USER>((Guid)currUser, "Nav_Person.Nav_Post", "Nav_Department.Nav_Parent");
if (currFMUser != null)
{
var team = GetEntity<T_FM_TEAM>(t => t.DEPARTMENT_ID == currFMUser.DEPARTMENT_ID);
if (entity.CLASS_TEAM_ID == Guid.Empty || entity.CLASS_TEAM_ID == null)
{
if (team != null)
{
entity.CLASS_TEAM_ID = team.ID;
}
}
if (entity.CLASS_TEAM_ID == Guid.Empty || entity.DEPARTMENT_POST_ID == null)
{
entity.DEPARTMENT_POST_ID = currFMUser.Nav_Person.POST_ID;
}
if (entity.NAME == null)
{
isManual = true;
entity.NAME = DateTime.Now.ToShortDateString() + team.NAME + "-" + currFMUser.Nav_Person.Nav_Post.NAME + "当班工作记录";
entity.RECORD_DATE = DateTime.Now;
}
if (entity.CHARGE_USER_ID == null || entity.CHARGE_USER_ID == Guid.Empty)
{
entity.CHARGE_USER_ID = currFMUser.Nav_Department.USER_ID;
}
if (entity.DEPARTMENT_ID == null || entity.DEPARTMENT_ID == Guid.Empty)
{
entity.DEPARTMENT_ID = currFMUser.Nav_Department.Nav_Parent.ID;
}
}
entity.EDITOR_ID = currUser;
if (entity.TaskID != Guid.Empty) if (entity.TaskID != Guid.Empty)
{ {
finishNotice = NotificationTaskService.FOGetTaskFinishModel(entity.TaskID, entity.ID, "FO005_SHOWPRINT"); finishNotice = NotificationTaskService.FOGetTaskFinishModel(entity.TaskID, entity.ID, "FO005_SHOWPRINT");

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

@ -181,6 +181,12 @@ namespace APT.FO.WebApi.Controllers
var measures = entity.Nav_Measure; var measures = entity.Nav_Measure;
entity.Nav_Measure = null; entity.Nav_Measure = null;
entity.DEPARTMENT_ID = APT.Infrastructure.Api.AppContext.CurrentSession.DepartmentID; entity.DEPARTMENT_ID = APT.Infrastructure.Api.AppContext.CurrentSession.DepartmentID;
users.ForEach(t => {
t.Nav_User = null;
t.Nav_RelatedUser = null;
t.ORG_ID = entity.ORG_ID;
t.JOB_ACTIVITY_RECORD_ID = entity.ID;
});
if (details != null && details.Any()) if (details != null && details.Any())
{ {
details.ForEach(t => details.ForEach(t =>

7
APT.MicroApi/APT.FO.WebApi/Controllers/PreShiftMeetingRecordController.cs
View File

@ -147,7 +147,12 @@ namespace APT.FO.WebApi.Controllers.Api.FO
{ {
entity.PRE_MEETING_STATUS = FOPreMeetingStatusEnum.归档; entity.PRE_MEETING_STATUS = FOPreMeetingStatusEnum.归档;
} }
sendNotices = NotificationTaskService.InsertUserNoticeTaskModels(title, entity.ID, entity.ORG_ID, userIds, userNames, DateTime.Now, entity.START_TIME.AddHours(1), (int)FMNoticeTypeEnum.消息, "FO003_SHOWPRINT"); var endTime = DateTime.Now.AddHours(1);
if (entity.START_TIME != DateTime.MinValue)
{
endTime = entity.START_TIME.AddHours(1);
}
sendNotices = NotificationTaskService.InsertUserNoticeTaskModels(title, entity.ID, entity.ORG_ID, userIds, userNames, DateTime.Now, endTime, (int)FMNoticeTypeEnum.消息, "FO003_SHOWPRINT");
var taskId = entity.TaskID; var taskId = entity.TaskID;
if (taskId == Guid.Empty) if (taskId == Guid.Empty)
{ {

47
APT.MicroApi/APT.FO.WebApi/Controllers/TeamActivityController.cs
View File

@ -69,7 +69,7 @@ namespace APT.FO.WebApi.Controllers.Api.FO
T_FM_NOTIFICATION_TASK finishTask = null; T_FM_NOTIFICATION_TASK finishTask = null;
if (entity.TaskID != Guid.Empty && entity.OpType != null && entity.OpType == 0) if (entity.TaskID != Guid.Empty && entity.OpType != null && entity.OpType == 0)
{ {
finishTask = NotificationTaskService.FOGetTaskFinishModel(entity.TaskID, entity.ID); finishTask = NotificationTaskService.FOGetTaskFinishModel(entity.TaskID, entity.ID, "FO010_SHOWPRINT");
} }
//事务控制 //事务控制
this.UnifiedCommit(() => this.UnifiedCommit(() =>
@ -92,10 +92,10 @@ namespace APT.FO.WebApi.Controllers.Api.FO
if (entity != null && entity.OpType == 0) if (entity != null && entity.OpType == 0)
{ {
if (files==null||files.Count()==0) if (files == null || files.Count() == 0)
{ {
throw new Exception("请上传附件!"); throw new Exception("请上传附件!");
} }
//通知参会人员签到 //通知参会人员签到
var userID = APT.Infrastructure.Api.AppContext.CurrentSession.UserID; var userID = APT.Infrastructure.Api.AppContext.CurrentSession.UserID;
var baseFilter = new BaseFilter(entity.ORG_ID); var baseFilter = new BaseFilter(entity.ORG_ID);
@ -154,7 +154,25 @@ namespace APT.FO.WebApi.Controllers.Api.FO
return true; return true;
}); });
} }
/// <summary>
/// 更新--已阅
/// </summary>
[HttpPost, Route("TeamActivityUserRead")]
public JsonActionResult<bool> TeamActivityUserRead([FromBody] T_FO_TEAM_ACTIVITY entity)
{
return SafeExecute<bool>(() =>
{
if (entity.TaskID == Guid.Empty)
{
throw new Exception("没有待办任务ID,请刷新重试!");
}
NotificationTaskService.NotificationTaskFinish(entity.TaskID, () =>
{
});
return true;
});
}
/// <summary> /// <summary>
/// 更新--保存签到 /// 更新--保存签到
/// </summary> /// </summary>
@ -204,25 +222,6 @@ namespace APT.FO.WebApi.Controllers.Api.FO
}); });
} }
/// <summary> /// <summary>
/// 更新--已阅
/// </summary>
[HttpPost, Route("TeamActivityUserRead")]
public JsonActionResult<bool> TeamActivityUserRead([FromBody] T_FO_TEAM_ACTIVITY entity)
{
return SafeExecute<bool>(() =>
{
if (entity.TaskID == Guid.Empty)
{
throw new Exception("没有待办任务ID,请刷新重试!");
}
NotificationTaskService.NotificationTaskFinish(entity.TaskID, () =>
{
});
return true;
});
}
/// <summary>
/// 排序分页查询数据 /// 排序分页查询数据
/// </summary> /// </summary>
/// <param name="pageFilter">分页过滤实体</param> /// <param name="pageFilter">分页过滤实体</param>

25
APT.MicroApi/APT.HM.WebApi/Controllers/Api/HazardTaskController.cs
View File

@ -76,7 +76,7 @@ namespace APT.HM.WebApi.Controllers.Api
detail.Nav_Identifyings = null; detail.Nav_Identifyings = null;
} }
}); });
if (entity.LIABLE_USER_ID == Guid.Empty||entity.LIABLE_USER_ID==null) if (entity.LIABLE_USER_ID == Guid.Empty || entity.LIABLE_USER_ID == null)
{ {
entity.LIABLE_USER_ID = APT.Infrastructure.Api.AppContext.CurrentSession.UserID; entity.LIABLE_USER_ID = APT.Infrastructure.Api.AppContext.CurrentSession.UserID;
} }
@ -97,18 +97,27 @@ namespace APT.HM.WebApi.Controllers.Api
entity.APPROVECODE = null; entity.APPROVECODE = null;
//是否需要发审批流，false不发，true的时候默认只发当前审核人 //是否需要发审批流，false不发，true的时候默认只发当前审核人
var isSendApprove = false; var isSendApprove = false;
var isFinish = Guid.Empty; //var isFinish = Guid.Empty;
T_FM_NOTIFICATION_TASK task = null;
if (entity.PUBLISH != null && entity.PUBLISH.Equals("SaveAndNotify")) if (entity.PUBLISH != null && entity.PUBLISH.Equals("SaveAndNotify"))
{ {
entity.STATUS = FOPreMeetingStatusEnum.审核中; entity.STATUS = FOPreMeetingStatusEnum.审核中;
isSendApprove = true; isSendApprove = true;
entity.APPROVECODE = DateTime.Now.ToString("yyyyMMddHHmmss"); entity.APPROVECODE = DateTime.Now.ToString("yyyyMMddHHmmss");
isFinish = entity.TaskID; //isFinish = entity.TaskID;
if (entity.TaskID != Guid.Empty)
{
task = NotificationTaskService.GetEntityTask(entity.TaskID, "HM101_SHOWPRINT");
if (task.SOURCE_DATA_ID == null)
task.SOURCE_DATA_ID = entity.ID;
}
} }
MFlowPermitService.InsertApprove(entity.APPROVECODE, "HM102", null, entity.ID, "HM101_SHOWPRINT", isFinish, isSendApprove, () => MFlowPermitService.InsertApprove(entity.APPROVECODE, "HM102", null, entity.ID, "HM101_SHOWPRINT", null, isSendApprove, () =>
{ {
if (entity != null) if (entity != null)
UpdateEntityNoCommit(entity); //保存主表 UpdateEntityNoCommit(entity); //保存主表
if (task != null)
UpdateEntityNoCommit(task);
if (files != null && files.Any()) if (files != null && files.Any())
BantchSaveEntityNoCommit(files); //保存子表 BantchSaveEntityNoCommit(files); //保存子表
if (riskDetail != null && riskDetail.Any()) if (riskDetail != null && riskDetail.Any())
@ -234,10 +243,10 @@ namespace APT.HM.WebApi.Controllers.Api
hazardRecord.ORG_ID = orgId; hazardRecord.ORG_ID = orgId;
hazardRecord.LIABLE_USER_ID = entity.LIABLE_USER_ID; hazardRecord.LIABLE_USER_ID = entity.LIABLE_USER_ID;
hazardRecord.PLAN_ID = entity.PLAN_ID; hazardRecord.PLAN_ID = entity.PLAN_ID;
hazardRecord.AREAS = string.Join("、", entity.Nav_Areas.Select(t => t.Nav_Area.NAME)); hazardRecord.AREAS = string.Join("、", entity.Nav_Areas.Select(t => t.Nav_Area.NAME));
hazardRecord.IDENTIFYINGS = string.Join("、", entity.Nav_Identifyings.Select(t => t.Nav_Identifying.NAME)); hazardRecord.IDENTIFYINGS = string.Join("、", entity.Nav_Identifyings.Select(t => t.Nav_Identifying.NAME));
hazardRecords.Add(hazardRecord); hazardRecords.Add(hazardRecord);
noticeTitles.Add("职业危害辨识记录"+DateTime.Now.ToShortDateString()); noticeTitles.Add("职业危害辨识记录" + DateTime.Now.ToShortDateString());
noticeUserIds.Add((Guid)userID); noticeUserIds.Add((Guid)userID);
noticeUserNames.Add(currDetail.FirstOrDefault().Nav_User.NAME); noticeUserNames.Add(currDetail.FirstOrDefault().Nav_User.NAME);
noticeDataIds.Add(hazardRecord.ID); noticeDataIds.Add(hazardRecord.ID);
@ -249,7 +258,7 @@ namespace APT.HM.WebApi.Controllers.Api
var dangerDB = this.GetEntities<T_HM_EVALUATE_HAZARD>(t => areaList.Contains((Guid)t.AREA_ID) && t.STATUS == (int)HMOperationStepEnum.有效, baseFilter); var dangerDB = this.GetEntities<T_HM_EVALUATE_HAZARD>(t => areaList.Contains((Guid)t.AREA_ID) && t.STATUS == (int)HMOperationStepEnum.有效, baseFilter);
foreach (var detail in currDetail) foreach (var detail in currDetail)
{ {
var dangerDBAreas = dangerDB.Where(t => t.AREA_ID == detail.AREA_ID&& detail.Nav_Identifyings.Select(x=>x.ID).Contains(t.IDENTIFYING_ID)); var dangerDBAreas = dangerDB.Where(t => t.AREA_ID == detail.AREA_ID && detail.Nav_Identifyings.Select(x => x.ID).Contains(t.IDENTIFYING_ID));
if (dangerDBAreas.Any()) if (dangerDBAreas.Any())
{ {
foreach (var danger in dangerDBAreas) foreach (var danger in dangerDBAreas)
@ -311,7 +320,7 @@ namespace APT.HM.WebApi.Controllers.Api
} }
if (model.TaskID != null) if (model.TaskID != null)
{ {
finishNotice = NotificationTaskService.FOGetTaskFinishModel(model.TaskID,model.ID); finishNotice = NotificationTaskService.FOGetTaskFinishModel(model.TaskID, model.ID);
} }
UnifiedCommit(() => UnifiedCommit(() =>
{ {

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

@ -44,7 +44,7 @@ namespace APT.HM.WebApi.Controllers.Api
{ {
return SafeExecute<bool>(() => return SafeExecute<bool>(() =>
{ {
var users = entity.Nav_Users; var users = GetEntities<T_HM_RISK_RECORD_USER>(t=>t.RECORD_ID==entity.ID,new BaseFilter(entity.ORG_ID));
var identifyings = entity.Nav_Identifyings; var identifyings = entity.Nav_Identifyings;
var files = entity.Nav_Files; var files = entity.Nav_Files;
var details = entity.Nav_Details; var details = entity.Nav_Details;

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

@ -44,104 +44,111 @@ namespace APT.HM.WebApi.Controllers.Api
[HttpPost, Route("FullUpdate")] [HttpPost, Route("FullUpdate")]
public JsonActionResult<bool> FullUpdate([FromBody] T_HM_RISK_TASK entity) public JsonActionResult<bool> FullUpdate([FromBody] T_HM_RISK_TASK entity)
{ {
return SafeExecute<bool>(() =>
{ {
return SafeExecute<bool>(() => var files = entity.Nav_Files;
var riskDetail = entity.Nav_Detail;
var identifyings = entity.Nav_Identifyings;
if (identifyings.Count == 0)
{ {
var files = entity.Nav_Files; throw new Exception("请选择辨识对象!");
var riskDetail = entity.Nav_Detail; }
var identifyings = entity.Nav_Identifyings; var areas = entity.Nav_Areas;
if (identifyings.Count == 0) List<T_HM_RISK_TASK_USER> users = new List<T_HM_RISK_TASK_USER>();
foreach (var detail in riskDetail)
{
if (detail.AREA_ID == Guid.Empty || detail.AREA_ID == null)
{ {
throw new Exception("请选择辨识对象!"); throw new Exception("请填写区域!");
} }
var areas = entity.Nav_Areas; if (detail.RECORD_USER_ID == Guid.Empty || detail.AREA_ID == null)
List<T_HM_RISK_TASK_USER> users = new List<T_HM_RISK_TASK_USER>();
foreach (var detail in riskDetail)
{ {
if (detail.AREA_ID == Guid.Empty || detail.AREA_ID == null) throw new Exception("请选择记录人员!");
}
if (detail.Nav_Users != null)
{
detail.Nav_Users.ForEach(user =>
{ {
throw new Exception("请填写区域!"); if (user.USER_ID != detail.RECORD_USER_ID)
}
if (detail.RECORD_USER_ID == Guid.Empty || detail.AREA_ID == null)
{
throw new Exception("请选择记录人员!");
}
if (detail.Nav_Users != null)
{
detail.Nav_Users.ForEach(user =>
{ {
if (user.USER_ID != detail.RECORD_USER_ID) user.ROW_NO = 999;
{ }
user.ROW_NO = 999; });
} users.AddRange(detail.Nav_Users);
}); detail.Nav_Users = null;
users.AddRange(detail.Nav_Users);
detail.Nav_Users = null;
}
};
if (entity.LIABLE_USER_ID == Guid.Empty || entity.LIABLE_USER_ID == null)
{
entity.LIABLE_USER_ID = APT.Infrastructure.Api.AppContext.CurrentSession.UserID;
} }
entity.Nav_Files = null; };
entity.Nav_Detail = null; if (entity.LIABLE_USER_ID == Guid.Empty || entity.LIABLE_USER_ID == null)
entity.Nav_Identifyings = null; {
entity.Nav_Areas = null; entity.LIABLE_USER_ID = APT.Infrastructure.Api.AppContext.CurrentSession.UserID;
identifyings?.ForEach(identifying => { identifying.Nav_Identifying = null; identifying.Nav_Task = null; }); }
areas?.ForEach(areas => { areas.Nav_Area = null; areas.Nav_Task = null; }); entity.Nav_Files = null;
entity.Nav_Detail = null;
entity.Nav_Identifyings = null;
entity.Nav_Areas = null;
identifyings?.ForEach(identifying => { identifying.Nav_Identifying = null; identifying.Nav_Task = null; });
areas?.ForEach(areas => { areas.Nav_Area = null; areas.Nav_Task = null; });
if (entity.INITIATING_DEPARTMENT == null) if (entity.INITIATING_DEPARTMENT == null)
{ {
var user = GetEntity<T_FM_USER>(t => t.ID == APT.Infrastructure.Api.AppContext.CurrentSession.UserID); var user = GetEntity<T_FM_USER>(t => t.ID == APT.Infrastructure.Api.AppContext.CurrentSession.UserID);
if (user != null) if (user != null)
entity.INITIATING_DEPARTMENT = user.DEPARTMENT_ID; entity.INITIATING_DEPARTMENT = user.DEPARTMENT_ID;
} }
var orgId = APT.Infrastructure.Api.AppContext.CurrentSession.OrgId; var orgId = APT.Infrastructure.Api.AppContext.CurrentSession.OrgId;
entity.STATUS = FOPreMeetingStatusEnum.草稿; entity.STATUS = FOPreMeetingStatusEnum.草稿;
entity.APPROVECODE = null; entity.APPROVECODE = null;
//是否需要发审批流，false不发，true的时候默认只发当前审核人 //是否需要发审批流，false不发，true的时候默认只发当前审核人
var isSendApprove = false; var isSendApprove = false;
var isFinish = Guid.Empty; //var isFinish = Guid.Empty;
if (entity.PUBLISH != null && entity.PUBLISH.Equals("SaveAndNotify")) T_FM_NOTIFICATION_TASK task = null;
if (entity.PUBLISH != null && entity.PUBLISH.Equals("SaveAndNotify"))
{
entity.STATUS = FOPreMeetingStatusEnum.审核中;
isSendApprove = true;
entity.APPROVECODE = DateTime.Now.ToString("yyyyMMddHHmmss");
//isFinish = entity.TaskID;
if (entity.TaskID != Guid.Empty)
{ {
entity.STATUS = FOPreMeetingStatusEnum.审核中; task = NotificationTaskService.GetEntityTask(entity.TaskID, "HM061_SHOWPRINT");
isSendApprove = true; if (task.SOURCE_DATA_ID == null)
entity.APPROVECODE = DateTime.Now.ToString("yyyyMMddHHmmss"); task.SOURCE_DATA_ID = entity.ID;
isFinish = entity.TaskID;
} }
var param = ""; }
var param = "";
//0908 修改按最高层级触发审批 //0908 修改按最高层级触发审批
if (entity.LEVEL.Contains("3")) if (entity.LEVEL.Contains("3"))
{ {
param = "GS"; param = "GS";
} }
else if (entity.LEVEL.Contains("0")) else if (entity.LEVEL.Contains("0"))
{ {
param = "BM"; param = "BM";
} }
else else
{ {
param = "CJ"; param = "CJ";
} }
MFlowPermitService.InsertApprove(entity.APPROVECODE, "HM062", param, entity.ID, "HM061_SHOWPRINT", isFinish, isSendApprove, () => MFlowPermitService.InsertApprove(entity.APPROVECODE, "HM062", param, entity.ID, "HM061_SHOWPRINT", null, isSendApprove, () =>
{ {
if (entity != null) if (entity != null)
UpdateEntityNoCommit(entity); //保存主表 UpdateEntityNoCommit(entity); //保存主表
if (files != null && files.Any()) if (task != null)
BantchSaveEntityNoCommit(files); //保存子表 UpdateEntityNoCommit(task);
if (files != null && files.Any())
BantchSaveEntityNoCommit(files); //保存子表
if (identifyings != null && identifyings.Any()) if (identifyings != null && identifyings.Any())
BantchSaveEntityNoCommit(identifyings); BantchSaveEntityNoCommit(identifyings);
if (riskDetail != null && riskDetail.Any()) if (riskDetail != null && riskDetail.Any())
BantchSaveEntityNoCommit(riskDetail); BantchSaveEntityNoCommit(riskDetail);
if (areas != null && areas.Any()) if (areas != null && areas.Any())
BantchSaveEntityNoCommit(areas); BantchSaveEntityNoCommit(areas);
if (users.Any()) if (users.Any())
BantchSaveEntityNoCommit(users); //保存孙表 BantchSaveEntityNoCommit(users); //保存孙表
}); });
return true; return true;
}); });
}
} }
/// <summary> /// <summary>

2
APT.MicroApi/APT.SC.WebApi/Controllers/Api/SEController/5SETTrainNotifyController.cs
View File

@ -46,7 +46,7 @@ namespace APT.SC.WebApi.Controllers.Api.SE
throw new Exception("通知发送，不可更改"); throw new Exception("通知发送，不可更改");
} }
var Nav_TrainContentList = entity.Nav_TrainContentList; var Nav_TrainContentList = entity.Nav_TrainContentList;
if (Nav_TrainContentList.Count()==0) if (Nav_TrainContentList.Count()==0)
{ {
throw new Exception("请选择培训内容"); throw new Exception("请选择培训内容");
} }

1
APT.MicroApi/APT.SC.WebApi/Controllers/Api/SEController/SETestController.cs
View File

@ -8,7 +8,6 @@ using System.Collections.Generic;
using System.Linq; using System.Linq;
using APT.Infrastructure.Core; using APT.Infrastructure.Core;
using APT.BaseData.Domain.ApiModel; using APT.BaseData.Domain.ApiModel;
using System.Data; using System.Data;
using System.IO; using System.IO;
using APT.BaseData.Domain.Entities.FM; using APT.BaseData.Domain.Entities.FM;