[修改启用禁用时,启用时间,增加字段]
							parent
							
								
									edf8af3e4d
								
							
						
					
					
						commit
						2594ecd27e
					
				| 
						 | 
					@ -451,7 +451,8 @@ namespace IRaCIS.Core.Application.Image.QA
 | 
				
			||||||
                        //.WhereIf(visitSearchDTO.ChallengeState != null, t => t.ChallengeState == visitSearchDTO.ChallengeState)
 | 
					                        //.WhereIf(visitSearchDTO.ChallengeState != null, t => t.ChallengeState == visitSearchDTO.ChallengeState)
 | 
				
			||||||
                        .ProjectTo<QCVisitViewModel>(_mapper.ConfigurationProvider);
 | 
					                        .ProjectTo<QCVisitViewModel>(_mapper.ConfigurationProvider);
 | 
				
			||||||
 | 
					
 | 
				
			||||||
            var defalutSortArray = new string[] { nameof(SubjectVisit.IsUrgent) + " desc", nameof(QCVisitViewModel.AuditState) +" asc" };
 | 
					            var defalutSortArray = new string[] { nameof(QCVisitViewModel.IsUrgent) + " desc", nameof(QCVisitViewModel.SubjectId), nameof(QCVisitViewModel.VisitNum) };
 | 
				
			||||||
 | 
					            //var defalutSortArray = new string[] { nameof(SubjectVisit.IsUrgent) + " desc", nameof(QCVisitViewModel.AuditState) +" asc" };
 | 
				
			||||||
            var pageList = await query.ToPagedListAsync(visitSearchDTO.PageIndex, visitSearchDTO.PageSize, visitSearchDTO.SortField, visitSearchDTO.Asc, string.IsNullOrWhiteSpace(visitSearchDTO.SortField), defalutSortArray);
 | 
					            var pageList = await query.ToPagedListAsync(visitSearchDTO.PageIndex, visitSearchDTO.PageSize, visitSearchDTO.SortField, visitSearchDTO.Asc, string.IsNullOrWhiteSpace(visitSearchDTO.SortField), defalutSortArray);
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					
 | 
				
			||||||
| 
						 | 
					
 | 
				
			||||||
| 
						 | 
					@ -228,8 +228,12 @@ namespace IRaCIS.Application.Contracts
 | 
				
			||||||
 | 
					
 | 
				
			||||||
        public DateTime? DeletedTime { get; set; }
 | 
					        public DateTime? DeletedTime { get; set; }
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					        public DateTime? EnabledTime { get; set; }
 | 
				
			||||||
 | 
					
 | 
				
			||||||
        public DateTime UpdateTime { get; set; }
 | 
					        public DateTime UpdateTime { get; set; }
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					        public DateTime CreateTime { get; set; }
 | 
				
			||||||
 | 
					
 | 
				
			||||||
        public string Site { get; set; } = String.Empty;
 | 
					        public string Site { get; set; } = String.Empty;
 | 
				
			||||||
 | 
					
 | 
				
			||||||
        public string SiteCode { get; set; } = String.Empty;
 | 
					        public string SiteCode { get; set; } = String.Empty;
 | 
				
			||||||
| 
						 | 
					
 | 
				
			||||||
| 
						 | 
					@ -278,6 +278,16 @@ namespace IRaCIS.Core.Application.Services
 | 
				
			||||||
 | 
					
 | 
				
			||||||
            _mapper.Map(editTrialSiteCommand, dbEntity);
 | 
					            _mapper.Map(editTrialSiteCommand, dbEntity);
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					            if (editTrialSiteCommand.IsDeleted)
 | 
				
			||||||
 | 
					            {
 | 
				
			||||||
 | 
					                dbEntity.EnabledTime = null;
 | 
				
			||||||
 | 
					               
 | 
				
			||||||
 | 
					            }
 | 
				
			||||||
 | 
					            else
 | 
				
			||||||
 | 
					            {
 | 
				
			||||||
 | 
					                dbEntity.EnabledTime = DateTime.Now;
 | 
				
			||||||
 | 
					            }
 | 
				
			||||||
 | 
					
 | 
				
			||||||
            await _trialSiteRepository.SaveChangesAsync();
 | 
					            await _trialSiteRepository.SaveChangesAsync();
 | 
				
			||||||
 | 
					
 | 
				
			||||||
            return ResponseOutput.Ok();
 | 
					            return ResponseOutput.Ok();
 | 
				
			||||||
| 
						 | 
					
 | 
				
			||||||
| 
						 | 
					@ -22,6 +22,7 @@ namespace IRaCIS.Core.Domain.Models
 | 
				
			||||||
 | 
					
 | 
				
			||||||
        public bool IsDeleted { get; set; }
 | 
					        public bool IsDeleted { get; set; }
 | 
				
			||||||
        public DateTime? DeletedTime { get; set; }
 | 
					        public DateTime? DeletedTime { get; set; }
 | 
				
			||||||
 | 
					        public DateTime? EnabledTime { get; set; }
 | 
				
			||||||
 | 
					
 | 
				
			||||||
        public Guid? DeleteUserId { get; set; }
 | 
					        public Guid? DeleteUserId { get; set; }
 | 
				
			||||||
 | 
					
 | 
				
			||||||
| 
						 | 
					
 | 
				
			||||||
		Loading…
	
		Reference in New Issue