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

APT.BaseData.Services/Services/PF/PFApproveCallBackService.cs

@@ -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);
                 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_OUTSOURCE = true;
                     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())
                     {
                         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;
                         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;
                     }

APT.MicroApi/APT.FO.WebApi/Controllers/ChangeShiftRecordController.cs

@@ -44,7 +44,7 @@ namespace APT.FO.WebApi.Controllers.Api.FO
                     throw new Exception("对应岗位人员已填写，请刷新确认!");
                 }
                 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)
                 {
                     throw new Exception("请选择接班人员!");

APT.MicroApi/APT.FO.WebApi/Controllers/CrucialLicenseJobOutsourceController.cs

@@ -254,7 +254,7 @@ namespace APT.FO.WebApi.Controllers
             T_FM_NOTIFICATION_TASK finishNotice = null;
             //细表
             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))
                 express = express.And(t => t.PARAM == param);
             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.DATA_ID = id;
                 approve.NAME = approveTemp.NAME;
-                approve.APPROVE_CODE = "FO017_SHOWPRINT";
+                approve.APPROVE_CODE = "FO025_SHOWPRINT";
                 approve.CODE = serialCode;
                 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();
@@ -323,7 +323,7 @@ namespace APT.FO.WebApi.Controllers
                         var curentApprove = appdetails.FirstOrDefault(i => i.APPROVE_USER_ID == applyUserId);
                         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())
                             {
                                 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);
                             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())
                         {
                             var sendUserNames = new List<string>();

APT.MicroApi/APT.FO.WebApi/Controllers/CurrentClassRecord.cs

@@ -62,23 +62,6 @@ namespace APT.FO.WebApi.Controllers.Api.FO
                         UpdateEntity(finishNotice);
                         throw new Exception("你已提交,不能修改!");
                     }
-                    var files = entity.Nav_Files;
-                    if(files != null)
-                    {
-                        foreach (var file in files)
-                        {
-                            if (file.CURRENT_CLASS_RECORD_ID == Guid.Empty)
-                            {
-                                file.CURRENT_CLASS_RECORD_ID = entity.ID;
-                            }
-                        }
-                    }
-                    var labour = entity.Nav_LabourSupplies;
-                    T_FM_NOTIFICATION_TASK sendNotice = null;
-                    List<T_FM_NOTIFICATION_TASK> notifications = null;
-                    T_FO_CURRENT_CLASS_RECORD_USER currUserRecord = null;
-                    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)
@@ -112,6 +95,24 @@ namespace APT.FO.WebApi.Controllers.Api.FO
                         }
                     }
                     entity.EDITOR_ID = currUser;
+
+                    var files = entity.Nav_Files;
+                    if(files != null)
+                    {
+                        foreach (var file in files)
+                        {
+                            if (file.CURRENT_CLASS_RECORD_ID == Guid.Empty)
+                            {
+                                file.CURRENT_CLASS_RECORD_ID = entity.ID;
+                            }
+                        }
+                    }
+                    var labour = entity.Nav_LabourSupplies;
+                    T_FM_NOTIFICATION_TASK sendNotice = null;
+                    List<T_FM_NOTIFICATION_TASK> notifications = null;
+                    T_FO_CURRENT_CLASS_RECORD_USER currUserRecord = null;
+                    if (entity.PUBLISH != null && entity.PUBLISH.Equals("SaveAndNotify"))
+                    {
                         if (entity.TaskID != Guid.Empty)
                         {
                             finishNotice = NotificationTaskService.FOGetTaskFinishModel(entity.TaskID, entity.ID, "FO005_SHOWPRINT");

APT.MicroApi/APT.FO.WebApi/Controllers/JobActivityRecordController.cs

@@ -181,6 +181,12 @@ namespace APT.FO.WebApi.Controllers
                 var measures = entity.Nav_Measure;
                 entity.Nav_Measure = null;
                 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())
                 {
                     details.ForEach(t =>

APT.MicroApi/APT.FO.WebApi/Controllers/PreShiftMeetingRecordController.cs

@@ -147,7 +147,12 @@ namespace APT.FO.WebApi.Controllers.Api.FO
                     {
                         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;
                     if (taskId == Guid.Empty)
                     {

APT.MicroApi/APT.FO.WebApi/Controllers/TeamActivityController.cs

@@ -69,7 +69,7 @@ namespace APT.FO.WebApi.Controllers.Api.FO
                 T_FM_NOTIFICATION_TASK finishTask = null;
                 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(() =>
@@ -92,7 +92,7 @@ namespace APT.FO.WebApi.Controllers.Api.FO
 
                 if (entity != null && entity.OpType == 0)
                 {
-					if (files==null||files.Count()==0)
+                    if (files == null || files.Count() == 0)
                     {
                         throw new Exception("请上传附件!");
                     }
@@ -154,7 +154,25 @@ namespace APT.FO.WebApi.Controllers.Api.FO
                 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>
@@ -204,25 +222,6 @@ namespace APT.FO.WebApi.Controllers.Api.FO
             });
         }
         /// <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>
         /// <param name="pageFilter">分页过滤实体</param>

APT.MicroApi/APT.HM.WebApi/Controllers/Api/HazardTaskController.cs

@@ -76,7 +76,7 @@ namespace APT.HM.WebApi.Controllers.Api
                             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;
                     }
@@ -97,18 +97,27 @@ namespace APT.HM.WebApi.Controllers.Api
                     entity.APPROVECODE = null;
                     //是否需要发审批流，false不发，true的时候默认只发当前审核人
                     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"))
                     {
                         entity.STATUS = FOPreMeetingStatusEnum.审核中;
                         isSendApprove = true;
                         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)
                             UpdateEntityNoCommit(entity);   //保存主表
+                        if (task != null)
+                            UpdateEntityNoCommit(task);
                         if (files != null && files.Any())
                             BantchSaveEntityNoCommit(files);    //保存子表
                         if (riskDetail != null && riskDetail.Any())
@@ -237,7 +246,7 @@ namespace APT.HM.WebApi.Controllers.Api
                     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));
                     hazardRecords.Add(hazardRecord);
-                    noticeTitles.Add("职业危害辨识记录"+DateTime.Now.ToShortDateString());
+                    noticeTitles.Add("职业危害辨识记录" + DateTime.Now.ToShortDateString());
                     noticeUserIds.Add((Guid)userID);
                     noticeUserNames.Add(currDetail.FirstOrDefault().Nav_User.NAME);
                     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);
                         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())
                             {
                                 foreach (var danger in dangerDBAreas)
@@ -311,7 +320,7 @@ namespace APT.HM.WebApi.Controllers.Api
                 }
                 if (model.TaskID != null)
                 {
-                    finishNotice = NotificationTaskService.FOGetTaskFinishModel(model.TaskID,model.ID);
+                    finishNotice = NotificationTaskService.FOGetTaskFinishModel(model.TaskID, model.ID);
                 }
                 UnifiedCommit(() =>
                 {

APT.MicroApi/APT.HM.WebApi/Controllers/Api/RiskRecordController.cs

@@ -44,7 +44,7 @@ namespace APT.HM.WebApi.Controllers.Api
         {
             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 files = entity.Nav_Files;
                 var details = entity.Nav_Details;

APT.MicroApi/APT.HM.WebApi/Controllers/Api/RiskTaskController.cs

@@ -43,7 +43,6 @@ namespace APT.HM.WebApi.Controllers.Api
         /// <returns></returns>
         [HttpPost, Route("FullUpdate")]
         public JsonActionResult<bool> FullUpdate([FromBody] T_HM_RISK_TASK entity)
-        {
         {
             return SafeExecute<bool>(() =>
             {
@@ -101,13 +100,20 @@ namespace APT.HM.WebApi.Controllers.Api
                 entity.APPROVECODE = null;
                     //是否需要发审批流，false不发，true的时候默认只发当前审核人
                     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"))
                 {
                     entity.STATUS = FOPreMeetingStatusEnum.审核中;
                     isSendApprove = true;
                     entity.APPROVECODE = DateTime.Now.ToString("yyyyMMddHHmmss");
-                        isFinish = entity.TaskID;
+                        //isFinish = entity.TaskID;
+                        if (entity.TaskID != Guid.Empty)
+                    {
+                        task = NotificationTaskService.GetEntityTask(entity.TaskID, "HM061_SHOWPRINT");
+                        if (task.SOURCE_DATA_ID == null)
+                            task.SOURCE_DATA_ID = entity.ID;
+                    }
                 }
                 var param = "";
                     //0908 修改按最高层级触发审批
@@ -124,10 +130,12 @@ namespace APT.HM.WebApi.Controllers.Api
                     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)
                         UpdateEntityNoCommit(entity);   //保存主表
+                        if (task != null)
+                        UpdateEntityNoCommit(task);
                     if (files != null && files.Any())
                         BantchSaveEntityNoCommit(files);    //保存子表
                         if (identifyings != null && identifyings.Any())
@@ -142,7 +150,6 @@ namespace APT.HM.WebApi.Controllers.Api
                 return true;
             });
         }
-        }
 
         /// <summary>
         /// 审批流回调

APT.MicroApi/APT.SC.WebApi/Controllers/Api/SEController/SETestController.cs

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