Commit 22bac8c3 authored by suhuiguang's avatar suhuiguang

feat(jyjc):检验检测业务管理

1.按照要求进行调整
parent 5a46c82e
...@@ -66,9 +66,7 @@ public class JyjcBizManageServiceImpl { ...@@ -66,9 +66,7 @@ public class JyjcBizManageServiceImpl {
queryWrapper.eq(JyjcOpeningApplication::getStatus, FlowStatusEnum.TO_BE_FINISHED.getName()); queryWrapper.eq(JyjcOpeningApplication::getStatus, FlowStatusEnum.TO_BE_FINISHED.getName());
queryWrapper.like(StringUtils.isNotEmpty(model.getUnitCodeName()), JyjcOpeningApplication::getUnitCodeName, model.getUnitCodeName()); queryWrapper.like(StringUtils.isNotEmpty(model.getUnitCodeName()), JyjcOpeningApplication::getUnitCodeName, model.getUnitCodeName());
queryWrapper.eq(StringUtils.isNotEmpty(model.getOpenBizType()), JyjcOpeningApplication::getOpenBizType, model.getOpenBizType()); queryWrapper.eq(StringUtils.isNotEmpty(model.getOpenBizType()), JyjcOpeningApplication::getOpenBizType, model.getOpenBizType());
if (StringUtils.isNotEmpty(model.getDetectionRegionName())) { queryWrapper.like(StringUtils.isNotEmpty(model.getDetectionRegionName()), JyjcOpeningApplication::getDetectionRegion, model.getDetectionRegionName());
queryWrapper.and(wp -> wp.like(JyjcOpeningApplication::getDetectionRegion, model.getDetectionRegionName()).and(w -> w.isNull(JyjcOpeningApplication::getExclusionRegion).or().notLike(JyjcOpeningApplication::getExclusionRegion, model.getDetectionRegionName())));
}
queryWrapper.orderByDesc(BaseEntity::getSequenceNbr); queryWrapper.orderByDesc(BaseEntity::getSequenceNbr);
IPage<JyjcOpeningApplication> res = openingApplicationService.page(pageApp, queryWrapper); IPage<JyjcOpeningApplication> res = openingApplicationService.page(pageApp, queryWrapper);
Map<String, String> detectionRegionCodeNameMap = getDetectionRegionCodeNameMap(); Map<String, String> detectionRegionCodeNameMap = getDetectionRegionCodeNameMap();
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment