From dfa9fc852bbfd54b56ca111b00834fc2f6a5e7f8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E4=BD=95=E7=BE=8E=E8=8D=A3?= <10755671+mei-rong-he@user.noreply.gitee.com> Date: Sun, 11 Jan 2026 11:38:16 +0800 Subject: [PATCH 1/6] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E7=94=A8=E6=88=B7?= =?UTF-8?q?=E7=BB=84=E7=BB=87=EF=BC=8C=E8=87=AA=E5=8A=A8=E6=9B=B4=E6=96=B0?= =?UTF-8?q?=E6=8E=92=E7=8F=AD=E6=98=8E=E7=BB=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Controllers/Api/UserController.cs | 106 +++++++++++------- 1 file changed, 67 insertions(+), 39 deletions(-) diff --git a/APT.MicroApi/APT.FM.WebApi/Controllers/Api/UserController.cs b/APT.MicroApi/APT.FM.WebApi/Controllers/Api/UserController.cs index 8b6e24f..7bb09c3 100644 --- a/APT.MicroApi/APT.FM.WebApi/Controllers/Api/UserController.cs +++ b/APT.MicroApi/APT.FM.WebApi/Controllers/Api/UserController.cs @@ -743,6 +743,9 @@ namespace APT.FM.WebApi.Controllers.Api.FM T_FM_DEPARTMENT departmentInfo = null; List teamPersons = new List(); List teamPersonIds = new List(); + var departScheIds = new List(); + var deleteDepartScheIds = new List(); + List departScheDetails = new List(); if (!string.IsNullOrEmpty(entity.PHONE) && entity.PHONE.Length != 11) { throw new Exception("手机号码应该为11位!"); @@ -752,44 +755,65 @@ namespace APT.FM.WebApi.Controllers.Api.FM departmentInfo = this.GetEntity(t => t.ID == entity.DEPARTMENT_ID && t.ENABLE_STATUS == (int)FMEnableStatusEnum.启用); if (departmentInfo == null) throw new Exception("组织架构已失效，请重新选择!"); - var teamPersonInfo = this.GetEntity(t => t.PERSON_ID == entity.PERSON_ID); - //if (teamPersonInfo != null) - //{ - // teamPersonIds.Add(teamPersonInfo.ID); - //} - //if (departmentInfo != null && departmentInfo.DEPARTMENT_TYPE == (int)FMDepartmentType.班组) - { - teamInfo = this.GetEntity(t => t.DEPARTMENT_ID == entity.DEPARTMENT_ID); - if (teamInfo != null) - { - if (teamPersonInfo == null) - { - T_FM_TEAM_PERSON teamPerson = new T_FM_TEAM_PERSON(); - teamPerson.PERSON_ID = person.ID; - teamPerson.TEAM_ID = teamInfo.ID; - teamPerson.ORG_ID = teamInfo.ORG_ID; - teamPersons.Add(teamPerson); - } - else - { - teamPersonInfo.PERSON_ID = person.ID; - teamPersonInfo.TEAM_ID = teamInfo.ID; - teamPersons.Add(teamPersonInfo); - } - } - else - { - if (teamPersonInfo != null) - teamPersonIds.Add(teamPersonInfo.ID); - } - personTeam = teamPersons; - if (entity.APPROVE_ROLE_ID != null) - { - var isExist = userList.FirstOrDefault(t => t.APPROVE_ROLE_ID == entity.APPROVE_ROLE_ID && t.DEPARTMENT_ID == entity.DEPARTMENT_ID && t.ENABLE_STATUS == 0); - if (isExist != null) - this.ThrowError("070001"); - } - } + var teamPersonInfo = this.GetEntity(t => t.PERSON_ID == entity.PERSON_ID); + //if (teamPersonInfo != null) + //{ + // teamPersonIds.Add(teamPersonInfo.ID); + //} + //if (departmentInfo != null && departmentInfo.DEPARTMENT_TYPE == (int)FMDepartmentType.班组) + //{ + teamInfo = this.GetEntity(t => t.DEPARTMENT_ID == entity.DEPARTMENT_ID); + if (teamInfo != null) + { + departScheIds = this.GetEntities(t => t.DEPARTMENT_ID == entity.DEPARTMENT_ID && t.TEAM_ID == teamInfo.ID && t.DATE_TIME >= DateTime.Now.Date && t.START_TIME >= DateTime.Now, new BaseFilter(entity.ORG_ID)).Select(m => m.ID).ToList(); + if (teamPersonInfo == null) + { + T_FM_TEAM_PERSON teamPerson = new T_FM_TEAM_PERSON(); + teamPerson.PERSON_ID = person.ID; + teamPerson.TEAM_ID = teamInfo.ID; + teamPerson.ORG_ID = teamInfo.ORG_ID; + teamPersons.Add(teamPerson); + } + else + { + teamPersonInfo.PERSON_ID = person.ID; + teamPersonInfo.TEAM_ID = teamInfo.ID; + teamPersons.Add(teamPersonInfo); + } + } + else + { + if (teamPersonInfo != null) + teamPersonIds.Add(teamPersonInfo.ID); + } + personTeam = teamPersons; + if (entity.APPROVE_ROLE_ID != null) + { + var isExist = userList.FirstOrDefault(t => t.APPROVE_ROLE_ID == entity.APPROVE_ROLE_ID && t.DEPARTMENT_ID == entity.DEPARTMENT_ID && t.ENABLE_STATUS == 0); + if (isExist != null) + this.ThrowError("070001"); + } + //删除旧的排班，在新的排班里面加入 + deleteDepartScheIds = this.GetEntities(t =>t.Nav_DepartmentScheduling!=null && t.Nav_DepartmentScheduling.DATE_TIME >= DateTime.Now.Date && t.Nav_DepartmentScheduling.START_TIME >= DateTime.Now && t.PERSON_ID == entity.PERSON_ID,new BaseFilter(entity.ORG_ID)).Select(m => m.ID).ToList(); + if (departScheIds != null && departScheIds.Any()) + { + var departScheDetailTemps = this.GetEntities(t => departScheIds.Contains(t.DEPARTMENT_SCHEDULING_ID) && t.PERSON_ID == entity.PERSON_ID, new BaseFilter(entity.ORG_ID)).ToList(); + foreach (var id in departScheIds) + { + var detail = departScheDetailTemps.FirstOrDefault(t => t.DEPARTMENT_SCHEDULING_ID == id); + if (detail == null) + { + T_FM_DEPARTMENT_SCHEDULING_DETAIL de = new T_FM_DEPARTMENT_SCHEDULING_DETAIL(); + de.ORG_ID = entity.ORG_ID; + de.DEPARTMENT_SCHEDULING_ID = id; + de.PERSON_ID = entity.PERSON_ID.Value; + departScheDetails.Add(de); + } + } + } + + //} + if (entity.APPROVE_ROLE_ID != null) { var isExist = userList.FirstOrDefault(t => t.APPROVE_ROLE_ID == entity.APPROVE_ROLE_ID && t.DEPARTMENT_ID == entity.DEPARTMENT_ID && t.ENABLE_STATUS == 0 && t.Nav_Department != null && t.Nav_Department.DEPARTMENT_TYPE != 3); @@ -1089,7 +1113,11 @@ namespace APT.FM.WebApi.Controllers.Api.FM if (teamPersonIds.Any()) this.DeleteEntityNoCommit(t => teamPersonIds.Contains(t.ID)); if (noticeToday != null) - this.UpdateEntityNoCommit(noticeToday); + this.UpdateEntityNoCommit(noticeToday); + if (deleteDepartScheIds!=null && deleteDepartScheIds.Any()) + this.BantchDeleteEntityNoCommit(deleteDepartScheIds); + if (departScheDetails != null && departScheDetails.Any()) + this.BantchSaveEntityNoCommit(departScheDetails); }); From 654e742a5c6e89477106e3f981fb84413588ff79 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E4=BD=95=E7=BE=8E=E8=8D=A3?= <10755671+mei-rong-he@user.noreply.gitee.com> Date: Mon, 12 Jan 2026 14:04:08 +0800 Subject: [PATCH 2/6] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E7=BB=84=E7=BB=87?= =?UTF-8?q?=E6=9E=B6=E6=9E=84=E5=90=8C=E6=AD=A5=E6=8E=92=E7=8F=AD=E6=98=8E?= =?UTF-8?q?=E7=BB=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- APT.MicroApi/APT.FM.WebApi/Controllers/Api/UserController.cs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/APT.MicroApi/APT.FM.WebApi/Controllers/Api/UserController.cs b/APT.MicroApi/APT.FM.WebApi/Controllers/Api/UserController.cs index 7bb09c3..9560e0e 100644 --- a/APT.MicroApi/APT.FM.WebApi/Controllers/Api/UserController.cs +++ b/APT.MicroApi/APT.FM.WebApi/Controllers/Api/UserController.cs @@ -765,7 +765,7 @@ namespace APT.FM.WebApi.Controllers.Api.FM teamInfo = this.GetEntity(t => t.DEPARTMENT_ID == entity.DEPARTMENT_ID); if (teamInfo != null) { - departScheIds = this.GetEntities(t => t.DEPARTMENT_ID == entity.DEPARTMENT_ID && t.TEAM_ID == teamInfo.ID && t.DATE_TIME >= DateTime.Now.Date && t.START_TIME >= DateTime.Now, new BaseFilter(entity.ORG_ID)).Select(m => m.ID).ToList(); + departScheIds = this.GetEntities(t => t.TEAM_ID == teamInfo.ID && t.DATE_TIME >= DateTime.Now.Date && t.START_TIME >= DateTime.Now, new BaseFilter(entity.ORG_ID)).Select(m => m.ID).ToList(); if (teamPersonInfo == null) { T_FM_TEAM_PERSON teamPerson = new T_FM_TEAM_PERSON(); From 565442458838584245a9bc4983a0b07ba5d89133 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E4=BD=95=E7=BE=8E=E8=8D=A3?= <10755671+mei-rong-he@user.noreply.gitee.com> Date: Tue, 13 Jan 2026 14:30:54 +0800 Subject: [PATCH 3/6] =?UTF-8?q?=E9=9A=90=E6=82=A3=E5=BA=93=E5=8E=BB?= =?UTF-8?q?=E9=99=A4=E6=A3=80=E6=9F=A5=E5=86=85=E5=AE=B9=E4=B8=BA=E7=A9=BA?= =?UTF-8?q?=E7=9A=84=E6=95=B0=E6=8D=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Controllers/Api/HiddenDangerRectifyRecordController.cs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/APT.MicroApi/APT.SK.WebApi/Controllers/Api/HiddenDangerRectifyRecordController.cs b/APT.MicroApi/APT.SK.WebApi/Controllers/Api/HiddenDangerRectifyRecordController.cs index 467f949..a01ce4b 100644 --- a/APT.MicroApi/APT.SK.WebApi/Controllers/Api/HiddenDangerRectifyRecordController.cs +++ b/APT.MicroApi/APT.SK.WebApi/Controllers/Api/HiddenDangerRectifyRecordController.cs @@ -589,7 +589,7 @@ namespace APT.SK.WebApi.Controllers var result = new PagedActionResult(); //var areaList = this.GetEntities(t => t.IS_DELETED == false, new BaseFilter(pageFilter.OrgId)).ToList(); //var contentList = this.GetEntities(t => t.IS_DELETED == false, new BaseFilter(pageFilter.OrgId)).ToList(); - var records = this.GetEntities(t => t.IS_DELETED == false, pageFilter, "Nav_ProductionUnit", "Nav_RiskArea", "Nav_Contents", "Nav_Question", "Nav_CheckType"); + var records = this.GetEntities(t => t.IS_DELETED == false && t.CHECK_CONTENTS_ID !=null && t.CHECK_QUESTION_ID !=null, pageFilter, "Nav_ProductionUnit", "Nav_RiskArea", "Nav_Contents", "Nav_Question", "Nav_CheckType"); var groupRecords = records.GroupBy(m => new { m.PRODUCTION_UNIT_ID,m.RISK_AREA_ID, m.CHECK_CONTENTS_ID, m.CHECK_QUESTION_ID, m.HIDDEN_LEVEL }) .Select(m => m.FirstOrDefault()).ToList(); //.Select(m => new T_SK_HIDDEN_DANGER_RECTIFY_RECORD From bfa5894be297f885d1ab6ca5904275c45d8c3376 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E4=BD=95=E7=BE=8E=E8=8D=A3?= <10755671+mei-rong-he@user.noreply.gitee.com> Date: Wed, 14 Jan 2026 08:51:00 +0800 Subject: [PATCH 4/6] =?UTF-8?q?=E7=8F=AD=E5=89=8D=E4=BC=9A=E8=B7=91?= =?UTF-8?q?=E6=89=B9=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../APT.PP.WebApi/Controllers/Api/FOController.cs | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/APT.MicroApi/APT.PP.WebApi/Controllers/Api/FOController.cs b/APT.MicroApi/APT.PP.WebApi/Controllers/Api/FOController.cs index 0118fb8..1123e3e 100644 --- a/APT.MicroApi/APT.PP.WebApi/Controllers/Api/FOController.cs +++ b/APT.MicroApi/APT.PP.WebApi/Controllers/Api/FOController.cs @@ -96,9 +96,9 @@ namespace APT.PP.WebApi.Controllers.Api.PP shift.RUN_STATUS = true; //查出当前班组 var currentTeam = shift.Nav_Team; - var userAgent = userVacations.FirstOrDefault(t => t.USER_ID == currentTeam.Nav_ChargePerson.Nav_User.ID); - var userId = userAgent != null && userAgent.AGENT_ID != null ? userAgent.AGENT_ID : currentTeam.Nav_ChargePerson.Nav_User.ID; - var userName = userAgent != null && userAgent.AGENT_ID != null ? userAgent.Nav_Agent?.NAME : currentTeam.Nav_ChargePerson.Nav_User.NAME; + var userAgent = userVacations.FirstOrDefault(t => t.USER_ID == currentTeam?.Nav_ChargePerson?.Nav_User?.ID); + var userId = userAgent != null && userAgent.AGENT_ID != null ? userAgent.AGENT_ID : currentTeam?.Nav_ChargePerson?.Nav_User?.ID; + var userName = userAgent != null && userAgent.AGENT_ID != null ? userAgent.Nav_Agent?.NAME : currentTeam?.Nav_ChargePerson?.Nav_User?.NAME; //当前班组的人员 var currentTeamUsers = shift.Nav_DepartmentSchedulingDetail; T_FO_PRE_SHIFT_MEETING_RECORD record = new T_FO_PRE_SHIFT_MEETING_RECORD(); ; @@ -244,9 +244,9 @@ namespace APT.PP.WebApi.Controllers.Api.PP var depart = departs.FirstOrDefault(t=>t.TEAM_ID == shift.TEAM_ID); //查出当前班组 var currentTeam = shift.Nav_Team; - var userAgent = userVacations.FirstOrDefault(t => t.USER_ID == currentTeam.Nav_ChargePerson.Nav_User.ID); - var userId = userAgent != null && userAgent.AGENT_ID != null ? userAgent.AGENT_ID : currentTeam.Nav_ChargePerson.Nav_User.ID; - var userName = userAgent != null && userAgent.AGENT_ID != null ? userAgent.Nav_Agent?.NAME : currentTeam.Nav_ChargePerson.Nav_User.NAME; + var userAgent = userVacations.FirstOrDefault(t => t.USER_ID == currentTeam?.Nav_ChargePerson?.Nav_User?.ID); + var userId = userAgent != null && userAgent.AGENT_ID != null ? userAgent.AGENT_ID : currentTeam?.Nav_ChargePerson?.Nav_User?.ID; + var userName = userAgent != null && userAgent.AGENT_ID != null ? userAgent.Nav_Agent?.NAME : currentTeam?.Nav_ChargePerson?.Nav_User?.NAME; var isExsist = preShiftMeetings.FirstOrDefault(t=>t.TEAM_ID == shift.TEAM_ID && t.START_TIME.Date == shift.START_TIME.Date); if (isExsist != null) { From 2434bb4df6a1c6cb61951a3dbf6c163fae1cc0e0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E4=BD=95=E7=BE=8E=E8=8D=A3?= <10755671+mei-rong-he@user.noreply.gitee.com> Date: Wed, 14 Jan 2026 18:06:00 +0800 Subject: [PATCH 5/6] =?UTF-8?q?=E4=BC=81=E4=B8=9A=E5=BA=93=E6=A3=80?= =?UTF-8?q?=E6=9F=A5=E6=B8=85=E5=8D=95=EF=BC=8C=E5=B2=97=E4=BD=8D=E6=B8=85?= =?UTF-8?q?=E5=8D=95=E5=8F=96=E6=B6=88=E7=94=9F=E4=BA=A7=E5=8D=95=E5=85=83?= =?UTF-8?q?=E6=9D=83=E9=99=90?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Api/EnterpriseLibraryController.cs | 25 ++++++++++--------- 1 file changed, 13 insertions(+), 12 deletions(-) diff --git a/APT.MicroApi/APT.SK.WebApi/Controllers/Api/EnterpriseLibraryController.cs b/APT.MicroApi/APT.SK.WebApi/Controllers/Api/EnterpriseLibraryController.cs index 2522d2b..78d215b 100644 --- a/APT.MicroApi/APT.SK.WebApi/Controllers/Api/EnterpriseLibraryController.cs +++ b/APT.MicroApi/APT.SK.WebApi/Controllers/Api/EnterpriseLibraryController.cs @@ -1803,15 +1803,16 @@ namespace APT.SK.WebApi.Controllers.Api { var loginDepart = APT.Infrastructure.Api.AppContext.CurrentSession.DepartmentID; var posts = this.GetEntities(t => t.IS_DELETED == false, new BaseFilter(filter.OrgId)); - var departs = this.GetEntities(t => t.ENABLE_STATUS == 0, new BaseFilter(filter.OrgId)); + var departs = this.GetEntities(t => t.ENABLE_STATUS == 0 && t.CATEGORY == FMCATEGORY.ACTURE, new BaseFilter(filter.OrgId)); var users = this.GetEntities(t => t.ENABLE_STATUS == 0, new BaseFilter(filter.OrgId)); var AHDepart = departs.FirstOrDefault(t => t.ID == loginDepart); - if (AHDepart != null && (AHDepart.DEPARTMENT_TYPE == 5 || AHDepart.DEPARTMENT_TYPE == 2)) - { - loginDepart = departs.FirstOrDefault(t => t.PARENT_ID == null).ID; - } - List departmentIds = new List() { loginDepart.Value }; - DepartmentService.GetDepartmentIds(filter.OrgId.Value, new List() { loginDepart.Value }, ref departmentIds); + //if (AHDepart != null && (AHDepart.DEPARTMENT_TYPE == 5 || AHDepart.DEPARTMENT_TYPE == 2)) + //{ + // loginDepart = departs.FirstOrDefault(t => t.PARENT_ID == null).ID; + //} + //List departmentIds = new List() { loginDepart.Value }; + //DepartmentService.GetDepartmentIds(filter.OrgId.Value, new List() { loginDepart.Value }, ref departmentIds); + List departmentIds = departs.Select(t => t.ID).ToList(); var checkList = new JsonActionResult>(); List postLists = new List(); var detailContents = this.GetEntities(t => t.DEPARTMENT_ID != null && departmentIds.Contains((Guid)t.DEPARTMENT_ID), new BaseFilter(filter.OrgId), "Nav_Library.Nav_ProductionUnit", "Nav_PostDetails", "Nav_Department"); @@ -2706,14 +2707,14 @@ namespace APT.SK.WebApi.Controllers.Api } list.Add(listNew); } - if (userInfoTemp != null && userInfoTemp.Nav_Department!=null && (userInfoTemp.NAME.Contains("管理员") || userInfoTemp.Nav_Department.DEPARTMENT_STATUS == 2 || userInfoTemp.Nav_Department.DEPARTMENT_TYPE == 5)) + //if (userInfoTemp != null && userInfoTemp.Nav_Department!=null && (userInfoTemp.NAME.Contains("管理员") || userInfoTemp.Nav_Department.DEPARTMENT_STATUS == 2 || userInfoTemp.Nav_Department.DEPARTMENT_TYPE == 5)) { checkList.Data = list.OrderBy(n => n.PRODUCTION_UNIT_ID).ThenBy(x => x.Num).ThenBy(n => n.CheckDepart).ToList(); } - else - { - checkList.Data = list.Where(t => t.PRODUCTION_UNIT_ID != null && selectMinetype.Contains((Guid)t.PRODUCTION_UNIT_ID)).OrderBy(n => n.PRODUCTION_UNIT_ID).ThenBy(x => x.Num).ThenBy(n => n.CheckDepart).ToList(); - } + //else + //{ + // checkList.Data = list.Where(t => t.PRODUCTION_UNIT_ID != null && selectMinetype.Contains((Guid)t.PRODUCTION_UNIT_ID)).OrderBy(n => n.PRODUCTION_UNIT_ID).ThenBy(x => x.Num).ThenBy(n => n.CheckDepart).ToList(); + //} checkList.TotalCount = checkList.Data.Count; } return checkList; From 8d074fcb7d3c03bab11bd61af7259c27754a8727 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E4=BD=95=E7=BE=8E=E8=8D=A3?= <10755671+mei-rong-he@user.noreply.gitee.com> Date: Thu, 15 Jan 2026 14:27:49 +0800 Subject: [PATCH 6/6] =?UTF-8?q?=E9=A2=86=E5=AF=BC=E5=B8=A6=E7=8F=AD?= =?UTF-8?q?=E5=AD=90=E8=A1=A8=E7=AD=BE=E5=90=8D=E6=98=BE=E7=A4=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../APT.FO.WebApi/Controllers/LeaderWellRecordController.cs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/APT.MicroApi/APT.FO.WebApi/Controllers/LeaderWellRecordController.cs b/APT.MicroApi/APT.FO.WebApi/Controllers/LeaderWellRecordController.cs index f6b864d..cab0830 100644 --- a/APT.MicroApi/APT.FO.WebApi/Controllers/LeaderWellRecordController.cs +++ b/APT.MicroApi/APT.FO.WebApi/Controllers/LeaderWellRecordController.cs @@ -38,7 +38,7 @@ namespace APT.FO.WebApi.Controllers "Nav_Files.Nav_ImgFile", "Nav_PreUsers.Nav_PreUser.Nav_UserSignFiles.Nav_ImgFile", "Nav_AfterUsers.Nav_AfterUser.Nav_UserSignFiles.Nav_ImgFile"); if (entity != null) { - var details = this.GetEntities(t => t.LEADER_WELL_RECORD_ID == entity.ID, new BaseFilter(entity.ORG_ID), "Nav_DetailFiles.Nav_ImgFile", "Nav_User","Nav_DetailAreas.Nav_Area").ToList(); + var details = this.GetEntities(t => t.LEADER_WELL_RECORD_ID == entity.ID, new BaseFilter(entity.ORG_ID), "Nav_DetailFiles.Nav_ImgFile", "Nav_User.Nav_UserSignFiles.Nav_ImgFile", "Nav_DetailAreas.Nav_Area").ToList(); entity.Nav_Details = details.OrderByDescending(t => t.START_DATE).ToList(); } return entity;