wyw/mh_jy_safe
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Compare commits

base: wyw:875d397ab67abf86d83f5d89fabbdecbb1fa35fe
Branches Tags
wyw:master
..
compare: wyw:de1db46811a3592d333ced30a41ffdc5121c8b9e
Branches Tags
wyw:master

No commits in common. "875d397ab67abf86d83f5d89fabbdecbb1fa35fe" and "de1db46811a3592d333ced30a41ffdc5121c8b9e" have entirely different histories.
875d397ab6 ... de1db46811

1 changed files with 5 additions and 7 deletions
Show Stats Expand all files Collapse all files

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

@ -126,10 +126,10 @@ namespace APT.FO.WebApi.Controllers.Api.FO
//throw new Exception("未找到排班班次,请联系管理员排查"); //throw new Exception("未找到排班班次,请联系管理员排查");
} }
} }
if (entity.CLASS_ID == null) //if (entity.CLASS_ID == null)
{ //{
throw new Exception("班次不能为空!"); // throw new Exception("班次不能为空,请联系管理员排查");
} //}
entity.EDITOR_ID = userID; entity.EDITOR_ID = userID;
var files = entity.Nav_Files; var files = entity.Nav_Files;
@ -301,7 +301,6 @@ namespace APT.FO.WebApi.Controllers.Api.FO
List<T_FO_CURRENT_CLASS_RECORD_USER> currRecordUsers = null; List<T_FO_CURRENT_CLASS_RECORD_USER> currRecordUsers = null;
if (entity.CODE.Equals("1")) if (entity.CODE.Equals("1"))
{ {
//判断班次
if (entity.CLASS_ID == null || entity.CLASS_ID == Guid.Empty) if (entity.CLASS_ID == null || entity.CLASS_ID == Guid.Empty)
{ {
currRecord.AUDIT_DATE = DateTime.Now; currRecord.AUDIT_DATE = DateTime.Now;
@ -310,7 +309,6 @@ namespace APT.FO.WebApi.Controllers.Api.FO
currRecord.AUDIT_OPINION = entity.AUDIT_OPINION; currRecord.AUDIT_OPINION = entity.AUDIT_OPINION;
var users = currRecord.Nav_Users; var users = currRecord.Nav_Users;
var files = currRecord.Nav_Files; var files = currRecord.Nav_Files;
//直接创建交接班
CreateChangeShiftRecord(currRecord, users, files, null); CreateChangeShiftRecord(currRecord, users, files, null);
} }
else else
@ -320,7 +318,7 @@ namespace APT.FO.WebApi.Controllers.Api.FO
currRecord.AUDIT_DATE = DateTime.Now; currRecord.AUDIT_DATE = DateTime.Now;
currRecord.SHIFT_STATUS = (int)FOShiftStatusEnum.审批归档; currRecord.SHIFT_STATUS = (int)FOShiftStatusEnum.审批归档;
currRecord.AUDIT_OPINION = entity.AUDIT_OPINION; currRecord.AUDIT_OPINION = entity.AUDIT_OPINION;
if (currDepartmentConfig!=null && currDepartmentConfig.Nav_DepartmentCalendarConfig.IS_HANDOVER == true) if (currDepartmentConfig.Nav_DepartmentCalendarConfig.IS_HANDOVER == true)
{ {
var users = currRecord.Nav_Users; var users = currRecord.Nav_Users;
var files = currRecord.Nav_Files; var files = currRecord.Nav_Files;