ccy/mh_sms
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

修改

Browse Source
This commit is contained in:
wjn 2024-03-01 10:45:36 +08:00
parent 3fc746f65e
commit 638f1149c2
4 changed files with 16 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -158,12 +158,12 @@ namespace APT.FO.WebApi.Controllers.Api.FO
if (currCalendar != null)
{
var currCalendarID = currCalendar.CALENDAR_ID;
var currDepartmentConfig = this.GetEntity<T_FM_DEPARTMENT_CALENDAR_CONFIG>(t => t.DEPARTMENT_ID == entity.DEPARTMENT_ID && t.CALENDAR_ID == currCalendarID);
if (currDepartmentConfig == null)
var currDepartmentConfig = GetEntity<T_FM_DEPARTMENT_CALENDAR_CONFIG_TEAM>(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_FM_CALENDAR_CLASS>(t => t.CLASS_ID == entity.CLASS_ID).CALENDAR_ID;
var currDepartmentConfig = this.GetEntity<T_FM_DEPARTMENT_CALENDAR_CONFIG>(t => t.DEPARTMENT_ID == entity.DEPARTMENT_ID && t.CALENDAR_ID == currCalendarID);
var currDepartmentConfig = GetEntity<T_FM_DEPARTMENT_CALENDAR_CONFIG_TEAM>(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_FM_CALENDAR_CLASS>(t => t.CLASS_ID == model.CLASS_ID);
var currCalendarID = currCalendar.CALENDAR_ID;
var currDepartmentConfig = this.GetEntity<T_FM_DEPARTMENT_CALENDAR_CONFIG>(t => t.DEPARTMENT_ID == model.DEPARTMENT_ID && t.CALENDAR_ID == currCalendarID);
if (currDepartmentConfig.IS_HANDOVER == true)
var currDepartmentConfig = GetEntity<T_FM_DEPARTMENT_CALENDAR_CONFIG_TEAM>(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_FO_CURRENT_CLASS_RECORD_USER>(t => t.CURRENT_CLASS_RECORD_ID == entity.ID, new BaseFilter(orgId)).ToList();
var files = GetEntities<T_FO_CURRENT_CLASS_RECORD_FILE>(t => t.CURRENT_CLASS_RECORD_ID == entity.ID, new BaseFilter(orgId)).ToList();

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

@ -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);

1
APT.MicroApi/APT.PF.WebApi/appsettings.Development.json
View File

@ -19,7 +19,6 @@
},
"RedisConfig": {
"RedisConnectionString": "172.21.157.142:6379,password=mhsaferedis,defaultDatabase=15",
"RedisConnectionPwd": "mhsaferedis",
"IsRedis": true
},
"InflexdbConfig": {

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

@ -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<T_FM_NOTIFICATION_TASK> sendNoticeTask = null;