同步修改
This commit is contained in:
		
							parent
							
								
									2dcb1eaaea
								
							
						
					
					
						commit
						937f0032b6
					
				@ -524,6 +524,10 @@ namespace APT.SC.WebApi.Controllers.Api.SE
 | 
			
		||||
                        sendNoticeTask.AddRange(NotificationTaskService.InsertUserNoticeTaskModels(allSendUserTitles, allSendDataIds, filter.GetOrgId(), allSendUserIds, allSendUserNames, DateTime.Now, DateTime.Now.AddDays(1).Date, (int)FMNoticeTypeEnum.今日提醒, "PF135"));
 | 
			
		||||
                    }
 | 
			
		||||
                }
 | 
			
		||||
                else
 | 
			
		||||
                {
 | 
			
		||||
                    finishNotice = NotificationTaskService.GetTaskFinishModel(Guid.Parse(filter.Parameter1));
 | 
			
		||||
                }
 | 
			
		||||
                UnifiedCommit(() =>
 | 
			
		||||
                {
 | 
			
		||||
                    UpdateEntityNoCommit(data);
 | 
			
		||||
 | 
			
		||||
@ -246,20 +246,25 @@ namespace APT.SE.WebApi.Controllers.Api
 | 
			
		||||
                {
 | 
			
		||||
                    throw new Exception("名称不能为空!");
 | 
			
		||||
                }
 | 
			
		||||
                if (!string.IsNullOrEmpty(dtSource.Rows[i][1].ToString().Trim()))
 | 
			
		||||
                var testType = dtSource.Rows[i][1].ToString().Trim();
 | 
			
		||||
                if (!string.IsNullOrEmpty(testType))
 | 
			
		||||
                {
 | 
			
		||||
                    if (dtSource.Rows[i][1].ToString().Trim() == "是非题")
 | 
			
		||||
                    {
 | 
			
		||||
                        mainTable.TYPE = SETestTypeEnum.是非题;
 | 
			
		||||
                    }
 | 
			
		||||
                    if (dtSource.Rows[i][1].ToString().Trim() == "单选题")
 | 
			
		||||
                    else if (dtSource.Rows[i][1].ToString().Trim() == "单选题")
 | 
			
		||||
                    {
 | 
			
		||||
                        mainTable.TYPE = SETestTypeEnum.单选题;
 | 
			
		||||
                    }
 | 
			
		||||
                    if (dtSource.Rows[i][1].ToString().Trim() == "多选题")
 | 
			
		||||
                    else if (dtSource.Rows[i][1].ToString().Trim() == "多选题")
 | 
			
		||||
                    {
 | 
			
		||||
                        mainTable.TYPE = SETestTypeEnum.多选题;
 | 
			
		||||
                    }
 | 
			
		||||
                    else
 | 
			
		||||
                    {
 | 
			
		||||
                        throw new Exception("没有《"+ testType+"》类型");
 | 
			
		||||
                    }
 | 
			
		||||
                }
 | 
			
		||||
                else
 | 
			
		||||
                {
 | 
			
		||||
 | 
			
		||||
@ -130,10 +130,6 @@ namespace APT.SC.WebApi.Controllers.Api.SE
 | 
			
		||||
            {
 | 
			
		||||
                var finishId = new Guid(filter.Parameter2);
 | 
			
		||||
                T_SE_THREE_LEVEL_SAFE_EDU_CARD record = GetEntity<T_SE_THREE_LEVEL_SAFE_EDU_CARD>(filter.Parameter1);
 | 
			
		||||
                if (record.STATUS != SEThreeLevelSafeTrainStatus.审阅中)
 | 
			
		||||
                {
 | 
			
		||||
                    throw new Exception("当前状态无法审阅!");
 | 
			
		||||
                }
 | 
			
		||||
                record.STATUS = SEThreeLevelSafeTrainStatus.归档;
 | 
			
		||||
                var finishNotice = NotificationTaskService.GetTaskFinishModel(finishId);
 | 
			
		||||
                UnifiedCommit(() =>
 | 
			
		||||
 | 
			
		||||
		Loading…
	
		Reference in New Issue
	
	Block a user