Merge branch 'master' of http://git.ius.plus:88/Project-Wing/WingMongoDBModule

src/Service/DatabaseService.cs

@@ -3207,9 +3207,10 @@ namespace WingMongoDBModule.Service
                     entity.CreateTime = DateTime.UtcNow;
                     entity.UpdateTime = DateTime.UtcNow;
                     entity.OperateTime = DateTime.UtcNow;
-                    entity.OperatorName = "系统默认";
-                    entity.CreatorName = "系统默认";
+                    entity.OperatorName = "系统";
+                    entity.CreatorName = "系统";
                     entity.PatientType = OrganizationPatientTypeEnum.Animals;
+                    entity.Name = "系统默认";
                     entity.Introduction = "系统默认，用于转移数据";
                     await _researchProjectDBRepository.InsertOneAsync(entity);
 

src/Service/ResearchProjectDBService.cs

@@ -60,7 +60,7 @@ namespace WingMongoDBModule.Service
                 }
                 else if (request.SearchType == ResearchProjectSearchTypeEnum.Undefined && !string.IsNullOrEmpty(request.UserCode))
                 {
-                    filter = filter & builder.Where(x => x.BelongUserCode == request.UserCode || x.UserCodes.Contains(request.UserCode));
+                    filter = filter & builder.Where(x => x.BelongUserCode == request.UserCode || x.UserCodes.Contains(request.UserCode) || x.Code == "BaseVetProject");
                 }
                 else if (request.SearchType == ResearchProjectSearchTypeEnum.Default)
                 {
@@ -81,6 +81,10 @@ namespace WingMongoDBModule.Service
         {
             using (new Performance(_performanceThreshold, "{0} GetResearchProjectDetailDBAsync execute", "DatabaseService"))
             {
+                if (request.Code == "BaseVetProject")
+                {
+                    return true;
+                }
                 var builder = Builders<ResearchProjectEntity>.Filter;
                 var filter = builder.Where(c => c.IsDelete == false);
                 if (!string.IsNullOrEmpty(request.Code))
@@ -1209,9 +1213,9 @@ namespace WingMongoDBModule.Service
                 deviceUploadTimeAxisDetail.DataJson = JsonConvert.SerializeObject(deviceUploadTimeAxisJson);
                 list.Add(deviceUploadTimeAxisDetail);
             }
-            //邀请用户、移除用户、删除样本、删除检查、修改项目
+            //邀请用户、移除用户、删除样本、删除检查、修改项目，转出，转入
             var tasks = await GetTaskListByBusinessCodeDBAsync(projectCode);
-            var userTasks = tasks.Where(x => x.TaskType == VTaskType.InviteUser || x.TaskType == VTaskType.RemoveUser || x.TaskType == VTaskType.DeleteRecord || x.TaskType == VTaskType.DeleteSample || x.TaskType == VTaskType.ProjectUpdate);
+            var userTasks = tasks.Where(x => x.TaskType == VTaskType.InviteUser || x.TaskType == VTaskType.RemoveUser || x.TaskType == VTaskType.DeleteRecord || x.TaskType == VTaskType.DeleteSample || x.TaskType == VTaskType.ProjectUpdate || x.TaskType == VTaskType.TransferOut || x.TaskType == VTaskType.TransferIn);
             foreach (var item in userTasks)
             {
                 var userTimeAxisDetail = new TimeAxisDetail();
@@ -1237,6 +1241,14 @@ namespace WingMongoDBModule.Service
                 {
                     userTimeAxisDetail.TimeAxisType = TimeAxisDetailEnum.ProjectUpdate;
                 }
+                else if (item.TaskType == VTaskType.TransferOut)
+                {
+                    userTimeAxisDetail.TimeAxisType = TimeAxisDetailEnum.TransferOut;
+                }
+                else if (item.TaskType == VTaskType.TransferIn)
+                {
+                    userTimeAxisDetail.TimeAxisType = TimeAxisDetailEnum.TransferIn;
+                }
                 if (userTimeAxisDetail.TimeAxisType == TimeAxisDetailEnum.InviteUser || userTimeAxisDetail.TimeAxisType == TimeAxisDetailEnum.RemoveUser)
                 {
                     var userCodes = item.JsonData.Split(',').ToList();