项目编号、项目名称模糊搜索

jfcloud-gene-biz/src/main/java/com/github/jfcloud/gene/sample/service/biz/SampleAnimalServiceImpl.java

@@ -90,16 +90,20 @@ public class SampleAnimalServiceImpl extends ServiceImpl<SampleAnimalMapper, Sam
                 .select(InspectionCommission::getId)
                 .in(InspectionCommission::getSampleAnimalId, sampleAnimalIdSet));
         Set<Long> commissionIdSet = inspectionCommissions.stream().map(InspectionCommission::getId).collect(Collectors.toSet());
-        inspectionCommissionMapper.deleteBatchIds(commissionIdSet);
-        commissionDetailService.remove(new LambdaQueryWrapper<>(CommissionDetail.class).in(CommissionDetail::getInspectionCommissionId, commissionIdSet));
+        if (CollUtil.isNotEmpty(commissionIdSet)) {
+            inspectionCommissionMapper.deleteBatchIds(commissionIdSet);
+            commissionDetailService.remove(new LambdaQueryWrapper<>(CommissionDetail.class).in(CommissionDetail::getInspectionCommissionId, commissionIdSet));
+        }
 
         //删除送检申请单
         List<SampleCheckOrder> orders = checkOrderMapper.selectList(new LambdaQueryWrapper<>(SampleCheckOrder.class)
                 .select(SampleCheckOrder::getId)
                 .in(SampleCheckOrder::getSampleAnimalId, sampleAnimalIdSet));
         Set<Long> orderIdSet = orders.stream().map(SampleCheckOrder::getId).collect(Collectors.toSet());
-        checkOrderMapper.deleteBatchIds(orderIdSet);
-        sampleCheckItemService.remove(new LambdaQueryWrapper<>(SampleCheckItem.class).in(SampleCheckItem::getCheckOrderId, orderIdSet));
+        if (CollUtil.isNotEmpty(orderIdSet)) {
+            checkOrderMapper.deleteBatchIds(orderIdSet);
+            sampleCheckItemService.remove(new LambdaQueryWrapper<>(SampleCheckItem.class).in(SampleCheckItem::getCheckOrderId, orderIdSet));
+        }
     }
 
     @Transactional(rollbackFor = Exception.class)

jfcloud-gene-biz/src/main/java/com/github/jfcloud/gene/sample/service/impl/SampleInfoServiceImpl.java

@@ -176,12 +176,15 @@ public class SampleInfoServiceImpl extends ServiceImpl<SampleInfoMapper, SampleI
     public Page<SamplePageDto> getPage(SamplePageVo vo) {
         Page<SampleInfo> pageQuery = new Page<>(vo.getCurrent(), vo.getSize());
         LambdaQueryWrapper<SampleInfo> wrapper = new LambdaQueryWrapper<>(SampleInfo.class)
-                .like(StrUtil.isNotBlank(vo.getProject()), SampleInfo::getProjectNo, vo.getProject())
-                .like(StrUtil.isNotBlank(vo.getProject()), SampleInfo::getProjectName, vo.getProject())
                 .eq(StrUtil.isNotBlank(vo.getType()), SampleInfo::getType, vo.getType())
                 .eq(StrUtil.isNotBlank(vo.getStatus()), SampleInfo::getStatus, vo.getStatus())
                 .eq(Objects.nonNull(vo.getApplicantId()), SampleInfo::getApplicantId, vo.getApplicantId())
+                .eq(SampleInfo::getDeleted, WhetherEnum.NO.getCode())
                 .orderByDesc(SampleInfo::getCreateTime);
+        if (StrUtil.isNotBlank(vo.getProject())) {
+            wrapper.and(i -> i.like(SampleInfo::getProjectNo, vo.getProject()).or()
+                    .like(SampleInfo::getProjectName, vo.getProject()));
+        }
         Page<SampleInfo> page = baseMapper.selectPageByScope(pageQuery, wrapper, DataScope.of());
 
         Page<SamplePageDto> pageResult = new Page<>(page.getCurrent(), page.getSize(), page.getTotal());