提交代码

IRaCIS.Core.API/Controllers/InspectionController.cs

@@ -80,26 +80,20 @@ namespace IRaCIS.Core.API.Controllers
       
         public async Task<IResponseOutput> AddOrUpdateSV(DataInspectionDto<SubjectVisitCommand> opt)
         {
-            //opt.AuditInfo.SubjectCode = opt.OptCommand.Code;
+          
             var fun = await _subjectVisitService.AddOrUpdateSV(opt.OptCommand);
             if (!fun.IsSuccess)
             {
                 return ResponseOutput.NotOk(fun.ErrorMessage);
             }
             opt.AuditInfo.SubjectId = Guid.Parse(fun.Data);
-            //var statusdata = new
+          
-            //{
-            //    Status = 1,
-            //    //OutEnrollmentTime = DateTime.Now.ToString("yyyy-MM-dd"),
-            //    //VisitOverTime = DateTime.Now.ToString("yyyy-MM-dd"),
-            //    Reason = string.Empty,
-            //};
 
             return await _inspectionService.Enforcement(opt.OptCommand, opt.AuditInfo, opt.SignInfo, null, fun);
         }
         #endregion
 
-        #region setting
+        #region 配置项目信息
         /// <summary>
         /// 配置 基础逻辑信息
         /// </summary>

IRaCIS.Core.Application/Service/Common/DTO/FrontAuditConfigViewModel.cs

@@ -112,6 +112,18 @@ namespace IRaCIS.Core.Application.ViewModel
 
         public string ObjectTypeId { get; set; } = string.Empty;
 
+        public string ConfigType { get; set; } = string.Empty;
+
+    }
+
+    public class ChangeFrontAuditSortDto
+    {
+        
+    }
+
+    public class FrontAuditSort
+    {
+        //public Guid 
     }
 
     ///<summary> FrontAuditConfigAddOrEdit  列表查询参数模型</summary>

IRaCIS.Core.Application/Service/Common/FrontAuditConfigService.cs

@@ -158,11 +158,16 @@ namespace IRaCIS.Core.Application.Service
                 .WhereIf(!iq.Code.IsNullOrEmpty(), x => x.Code == iq.Code)
                 .WhereIf(!iq.ChildrenTypeId.IsNullOrEmpty(), x => x.ChildrenTypeId == iq.ChildrenTypeId)
                 .WhereIf(!iq.ModuleTypeId.IsNullOrEmpty(), x => x.ModuleTypeId == iq.ModuleTypeId)
-                .WhereIf(!iq.ObjectTypeId.IsNullOrEmpty(), x => x.ObjectTypeId == iq.ObjectTypeId);
+                .WhereIf(!iq.ObjectTypeId.IsNullOrEmpty(), x => x.ObjectTypeId == iq.ObjectTypeId)
+                .WhereIf(!iq.ConfigType.IsNullOrEmpty(), x => x.ConfigType == iq.ConfigType);
 
             return await query.OrderBy(x=>x.Sort).ToListAsync();
         }
 
+        //public async Task<IResponseOutput> ChangeFrontAuditSort() 
+        //{
+        //    _frontAuditConfigRepository.UpdateFromQueryAsync(x=>)
+        //}
 
         /// <summary>
         /// 新增或者修改

IRaCIS.Core.Application/Service/Visit/SubjectService.cs

@@ -111,6 +111,7 @@ namespace IRaCIS.Application.Services
                     SubjectId = subjectCommand.Id,
                     SubjectCode = subjectCommand.Code,
                     IsSign=false,
+                    CreateTime = createtime,
                     Identification = "Subject|Init|Subject|Status",
                     JsonDetail= JsonConvert.SerializeObject(new {
                     Status= "OnVisit",

IRaCIS.Core.Application/Service/Visit/SubjectVisitService.cs

@@ -123,6 +123,8 @@ namespace IRaCIS.Core.Application.Services
             
             await _repository.SaveChangesAsync();
 
+            //if(svCommand.)
+
             // 保存数据后，重新算下是否缺失影像  应对状态撤回
             //if (svCommand.IsLostVisit == false)
             //{