From 638f1149c2db734afd4dc543395b0107f98d1a9c Mon Sep 17 00:00:00 2001 From: wjn Date: Fri, 1 Mar 2024 10:45:36 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Controllers/CurrentClassRecord.cs | 14 +++++++------- .../Controllers/TeamActivityController.cs | 9 +++++---- .../APT.PF.WebApi/appsettings.Development.json | 1 - .../Api/SEController/5SETTrainNotifyController.cs | 4 ++++ 4 files changed, 16 insertions(+), 12 deletions(-) diff --git a/APT.MicroApi/APT.FO.WebApi/Controllers/CurrentClassRecord.cs b/APT.MicroApi/APT.FO.WebApi/Controllers/CurrentClassRecord.cs index 06273ba..3d51885 100644 --- a/APT.MicroApi/APT.FO.WebApi/Controllers/CurrentClassRecord.cs +++ b/APT.MicroApi/APT.FO.WebApi/Controllers/CurrentClassRecord.cs @@ -158,12 +158,12 @@ namespace APT.FO.WebApi.Controllers.Api.FO if (currCalendar != null) { var currCalendarID = currCalendar.CALENDAR_ID; - var currDepartmentConfig = this.GetEntity(t => t.DEPARTMENT_ID == entity.DEPARTMENT_ID && t.CALENDAR_ID == currCalendarID); - if (currDepartmentConfig == null) + var currDepartmentConfig = GetEntity(t => t.TEAM_ID == entity.CLASS_TEAM_ID&&t.IS_DELETED==false, "Nav_DepartmentCalendarConfig"); + if (currDepartmentConfig.Nav_DepartmentCalendarConfig == null) { throw new Exception("未找到排班数据!"); } - if (currDepartmentConfig.IS_HANDOVER == true) + if (currDepartmentConfig.Nav_DepartmentCalendarConfig.IS_HANDOVER == true) { var searchFilter = new BaseFilter(entity.ORG_ID); searchFilter.SelectField = new string[] { "TEAM_ID", "PERSON_ID", "Nav_Person.Nav_Post", "Nav_Person.Nav_User", "Nav_DepartmentScheduling" }; @@ -295,11 +295,11 @@ namespace APT.FO.WebApi.Controllers.Api.FO else { var currCalendarID = this.GetEntity(t => t.CLASS_ID == entity.CLASS_ID).CALENDAR_ID; - var currDepartmentConfig = this.GetEntity(t => t.DEPARTMENT_ID == entity.DEPARTMENT_ID && t.CALENDAR_ID == currCalendarID); + var currDepartmentConfig = GetEntity(t => t.TEAM_ID == currRecord.CLASS_TEAM_ID, "Nav_DepartmentCalendarConfig"); currRecord.AUDIT_DATE = DateTime.Now; currRecord.SHIFT_STATUS = (int)FOShiftStatusEnum.归档; currRecord.AUDIT_OPINION = entity.AUDIT_OPINION; - if (currDepartmentConfig.IS_HANDOVER == true) + if (currDepartmentConfig.Nav_DepartmentCalendarConfig.IS_HANDOVER == true) { var users = currRecord.Nav_Users; var files = currRecord.Nav_Files; @@ -388,8 +388,8 @@ namespace APT.FO.WebApi.Controllers.Api.FO model.AUDIT_DATE = DateTime.Now; var currCalendar = this.GetEntity(t => t.CLASS_ID == model.CLASS_ID); var currCalendarID = currCalendar.CALENDAR_ID; - var currDepartmentConfig = this.GetEntity(t => t.DEPARTMENT_ID == model.DEPARTMENT_ID && t.CALENDAR_ID == currCalendarID); - if (currDepartmentConfig.IS_HANDOVER == true) + var currDepartmentConfig = GetEntity(t => t.TEAM_ID == model.CLASS_TEAM_ID&&t.IS_DELETED==false, "Nav_DepartmentCalendarConfig"); + if (currDepartmentConfig.Nav_DepartmentCalendarConfig.IS_HANDOVER == true) { var users = GetEntities(t => t.CURRENT_CLASS_RECORD_ID == entity.ID, new BaseFilter(orgId)).ToList(); var files = GetEntities(t => t.CURRENT_CLASS_RECORD_ID == entity.ID, new BaseFilter(orgId)).ToList(); diff --git a/APT.MicroApi/APT.FO.WebApi/Controllers/TeamActivityController.cs b/APT.MicroApi/APT.FO.WebApi/Controllers/TeamActivityController.cs index 25f8efc..0bc63b4 100644 --- a/APT.MicroApi/APT.FO.WebApi/Controllers/TeamActivityController.cs +++ b/APT.MicroApi/APT.FO.WebApi/Controllers/TeamActivityController.cs @@ -48,10 +48,7 @@ namespace APT.FO.WebApi.Controllers.Api.FO var files = entity.Nav_TeamActivityFile; entity.Nav_TeamActivityFile = null; - if (files==null||files.Count()==0) - { - throw new Exception("请上传附件!"); - } + if (entity.ACTIVITY_TIME == DateTime.MinValue) { throw new Exception("请修改活动日期!"); @@ -95,6 +92,10 @@ namespace APT.FO.WebApi.Controllers.Api.FO if (entity != null && entity.OpType == 0) { + if (files==null||files.Count()==0) + { + throw new Exception("请上传附件!"); + } //通知参会人员签到 var userID = APT.Infrastructure.Api.AppContext.CurrentSession.UserID; var baseFilter = new BaseFilter(entity.ORG_ID); diff --git a/APT.MicroApi/APT.PF.WebApi/appsettings.Development.json b/APT.MicroApi/APT.PF.WebApi/appsettings.Development.json index 3739279..7d01fcf 100644 --- a/APT.MicroApi/APT.PF.WebApi/appsettings.Development.json +++ b/APT.MicroApi/APT.PF.WebApi/appsettings.Development.json @@ -19,7 +19,6 @@ }, "RedisConfig": { "RedisConnectionString": "172.21.157.142:6379,password=mhsaferedis,defaultDatabase=15", - "RedisConnectionPwd": "mhsaferedis", "IsRedis": true }, "InflexdbConfig": { diff --git a/APT.MicroApi/APT.SC.WebApi/Controllers/Api/SEController/5SETTrainNotifyController.cs b/APT.MicroApi/APT.SC.WebApi/Controllers/Api/SEController/5SETTrainNotifyController.cs index 1e98521..6de7ed1 100644 --- a/APT.MicroApi/APT.SC.WebApi/Controllers/Api/SEController/5SETTrainNotifyController.cs +++ b/APT.MicroApi/APT.SC.WebApi/Controllers/Api/SEController/5SETTrainNotifyController.cs @@ -46,6 +46,10 @@ namespace APT.SC.WebApi.Controllers.Api.SE throw new Exception("通知发送，不可更改"); } var Nav_TrainContentList = entity.Nav_TrainContentList; + if (Nav_TrainContentList.Count()==0) + { + throw new Exception("请选择培训内容"); + } var Nav_TrainUserList = entity.Nav_TrainUserList.Where(t => t.USER_ID != Guid.Empty); var Nav_Files = entity.Nav_Files; List sendNoticeTask = null;