修改

2022-05-26 13:56:47 +08:00
parent 5b992c0980
commit e33c681eb0
14 changed files with 249 additions and 28 deletions
@@ -448,7 +448,10 @@ namespace IRaCIS.Core.Application.Service.Inspection.DTO
        /// </summary>
        public bool? IsSign { get; set; }

-
+        /// <summary>
+        /// 批次Id
+        /// </summary>
+        public Guid? BatchId { get; set; }


    }
@@ -132,11 +132,13 @@ namespace IRaCIS.Core.Application.Service.Inspection
                            OptType = leftOptType.Id,
                            VisitNum=leftsubjectVisit.VisitNum,
                            IsFrontAdd=data.IsFrontAdd,
+                            BatchId=data.BatchId,
                            OptTypeName = leftOptType.Value,

                        };

            query = query.WhereIf(dto.SiteId != null, x => x.SiteId == dto.SiteId)
+                .WhereIf(dto.BatchId != null, x => x.BatchId == dto.BatchId)
                 .WhereIf(!dto.SubjectInfo.IsNullOrEmpty(), x => x.SubjectCode.Contains(dto.SubjectInfo))
                 .WhereIf(dto.VisitPlanInfo != null, x => x.VisitNum == dto.VisitPlanInfo)
                 .WhereIf(dto.StartTime != null, x => x.CreateTime >= dto.StartTime)