From 7d09eb13b823f329425a83ee0daf599c80fb2bec Mon Sep 17 00:00:00 2001 From: "583641232@qq.com" <583641232@qq.com> Date: Tue, 30 Jul 2024 16:35:45 +0800 Subject: [PATCH] =?UTF-8?q?:sparkles:=204=E6=A8=A1=E5=9D=97=E5=90=88?= =?UTF-8?q?=E5=B9=B6=E5=8D=95=E5=85=83=E6=A0=BC=EF=BC=8C=E5=A4=9A=E5=B7=A5?= =?UTF-8?q?=E4=BD=9C=E8=A1=A8=E5=AF=BC=E5=85=A5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../analysiscenter/service/impl/AnalysisResultServiceImpl.java | 3 ++- .../datacenter/service/impl/CarInfoServiceImpl.java | 2 ++ .../service/impl/CollectionInformationServiceImpl.java | 3 +++ .../datacenter/service/impl/OtherAssetsServiceImpl.java | 2 ++ .../datacenter/service/impl/OtherInformationServiceImpl.java | 3 +++ .../datacenter/service/impl/PlateNumberServiceImpl.java | 2 ++ .../datacenter/service/impl/RealEstateServiceImpl.java | 2 +- 7 files changed, 15 insertions(+), 2 deletions(-) diff --git a/cas-system/src/main/java/com/inscloudtech/analysiscenter/service/impl/AnalysisResultServiceImpl.java b/cas-system/src/main/java/com/inscloudtech/analysiscenter/service/impl/AnalysisResultServiceImpl.java index 4a5dcf1..5f9b212 100644 --- a/cas-system/src/main/java/com/inscloudtech/analysiscenter/service/impl/AnalysisResultServiceImpl.java +++ b/cas-system/src/main/java/com/inscloudtech/analysiscenter/service/impl/AnalysisResultServiceImpl.java @@ -117,11 +117,12 @@ public class AnalysisResultServiceImpl implements IAnalysisResultService { public void importData(MultipartFile file, String caseId, String analysisResultId) { List readSheets = new ArrayList<>(); for(int i = 0; i < CLASS_LIST.size(); i++){ - if(i == 5){ + if(i == 6){ break; } Class aClass = CLASS_LIST.get(i); Class serviceClass = SERVICE_LIST.get(i); + ReadSheet readSheet = EasyExcel.readSheet(i).head(aClass).registerReadListener(getReadListener(serviceClass, analysisResultId)).build(); readSheets.add(readSheet); } diff --git a/cas-system/src/main/java/com/inscloudtech/datacenter/service/impl/CarInfoServiceImpl.java b/cas-system/src/main/java/com/inscloudtech/datacenter/service/impl/CarInfoServiceImpl.java index 9f19f22..192463d 100644 --- a/cas-system/src/main/java/com/inscloudtech/datacenter/service/impl/CarInfoServiceImpl.java +++ b/cas-system/src/main/java/com/inscloudtech/datacenter/service/impl/CarInfoServiceImpl.java @@ -158,6 +158,8 @@ public class CarInfoServiceImpl implements ICarInfoService { lqw.like(StringUtils.isNotBlank(bo.getAddress()), CarInfo::getAddress, bo.getAddress()); lqw.eq(StringUtils.isNotBlank(bo.getBgc()), CarInfo::getBgc, bo.getBgc()); lqw.eq(StringUtils.isNotBlank(bo.getRemark()), CarInfo::getRemark, bo.getRemark()); + lqw.in(CollectionUtil.isNotEmpty(bo.getIds()), CarInfo::getId, bo.getIds()); + if(StrUtil.isNotEmpty(bo.getAnalysisResultId())){ lqw.eq(CarInfo::getAnalysisResultId, bo.getAnalysisResultId()); }else { diff --git a/cas-system/src/main/java/com/inscloudtech/datacenter/service/impl/CollectionInformationServiceImpl.java b/cas-system/src/main/java/com/inscloudtech/datacenter/service/impl/CollectionInformationServiceImpl.java index 2f1b397..5bdccfc 100644 --- a/cas-system/src/main/java/com/inscloudtech/datacenter/service/impl/CollectionInformationServiceImpl.java +++ b/cas-system/src/main/java/com/inscloudtech/datacenter/service/impl/CollectionInformationServiceImpl.java @@ -13,6 +13,7 @@ import com.inscloudtech.common.utils.StringUtils; import com.inscloudtech.common.utils.bean.BeanUtils; import com.inscloudtech.datacenter.domain.CarInfo; import com.inscloudtech.datacenter.domain.CollectionInformation; +import com.inscloudtech.datacenter.domain.OtherAssets; import com.inscloudtech.datacenter.mapper.CarInfoMapper; import com.inscloudtech.datacenter.mapper.es.CarInfoEsMapper; import com.inscloudtech.datacenter.mapper.es.CollectionInformationEsMapper; @@ -132,6 +133,8 @@ public class CollectionInformationServiceImpl implements CollectionInformationSe lqw.like(StringUtils.isNotBlank(bo.getAssetsInfo()), CollectionInformation::getAssetsInfo, bo.getAssetsInfo()); lqw.like(StringUtils.isNotBlank(bo.getActionInfo()), CollectionInformation::getActionInfo, bo.getActionInfo()); lqw.like(StringUtils.isNotBlank(bo.getRemark()), CollectionInformation::getRemark, bo.getRemark()); + lqw.in(CollectionUtil.isNotEmpty(bo.getIds()), CollectionInformation::getId, bo.getIds()); + if(StrUtil.isNotEmpty(bo.getAnalysisResultId())){ lqw.eq(CollectionInformation::getAnalysisResultId, bo.getAnalysisResultId()); }else { diff --git a/cas-system/src/main/java/com/inscloudtech/datacenter/service/impl/OtherAssetsServiceImpl.java b/cas-system/src/main/java/com/inscloudtech/datacenter/service/impl/OtherAssetsServiceImpl.java index ef6294b..467ac0b 100644 --- a/cas-system/src/main/java/com/inscloudtech/datacenter/service/impl/OtherAssetsServiceImpl.java +++ b/cas-system/src/main/java/com/inscloudtech/datacenter/service/impl/OtherAssetsServiceImpl.java @@ -100,6 +100,8 @@ public class OtherAssetsServiceImpl implements IOtherAssetsService { wrapper.eq(bo.getAnalysisResultId() != null, OtherAssets::getAnalysisResultId, bo.getAnalysisResultId()); wrapper.like(StrUtil.isNotBlank(bo.getOriginalName()),OtherAssets::getOriginalName, bo.getOriginalName()); wrapper.like(StrUtil.isNotBlank(bo.getContent()),OtherAssets::getContent, bo.getContent()); + wrapper.in(CollectionUtil.isNotEmpty(bo.getIds()), OtherAssets::getId, bo.getIds()); + if(StrUtil.isNotBlank(bo.getSearchValue())){ wrapper.matchPhrase(OtherAssets::getContent,bo.getSearchValue().trim().replaceAll("([　]|\\s|\\u00A0)+","")); } diff --git a/cas-system/src/main/java/com/inscloudtech/datacenter/service/impl/OtherInformationServiceImpl.java b/cas-system/src/main/java/com/inscloudtech/datacenter/service/impl/OtherInformationServiceImpl.java index f750771..28ad5b1 100644 --- a/cas-system/src/main/java/com/inscloudtech/datacenter/service/impl/OtherInformationServiceImpl.java +++ b/cas-system/src/main/java/com/inscloudtech/datacenter/service/impl/OtherInformationServiceImpl.java @@ -1,5 +1,6 @@ package com.inscloudtech.datacenter.service.impl; +import cn.hutool.core.collection.CollectionUtil; import cn.hutool.core.util.StrUtil; import com.inscloudtech.analysiscenter.domain.AnalysisDto; import com.inscloudtech.common.core.domain.PageQuery; @@ -123,6 +124,8 @@ public class OtherInformationServiceImpl implements IOtherInformationService { wrapper.eq(bo.getAnalysisResultId() != null, OtherInformation::getAnalysisResultId, bo.getAnalysisResultId()); wrapper.like(StrUtil.isNotBlank(bo.getOriginalName()),OtherInformation::getOriginalName, bo.getOriginalName()); wrapper.like(StrUtil.isNotBlank(bo.getContent()),OtherInformation::getContent, bo.getContent()); + wrapper.in(CollectionUtil.isNotEmpty(bo.getIds()), OtherInformation::getId, bo.getIds()); + if(StrUtil.isNotBlank(bo.getSearchValue())){ wrapper.matchPhrase(OtherInformation::getContent,bo.getSearchValue().trim().replaceAll("([　]|\\s|\\u00A0)+","")); } diff --git a/cas-system/src/main/java/com/inscloudtech/datacenter/service/impl/PlateNumberServiceImpl.java b/cas-system/src/main/java/com/inscloudtech/datacenter/service/impl/PlateNumberServiceImpl.java index b95a5fa..0692404 100644 --- a/cas-system/src/main/java/com/inscloudtech/datacenter/service/impl/PlateNumberServiceImpl.java +++ b/cas-system/src/main/java/com/inscloudtech/datacenter/service/impl/PlateNumberServiceImpl.java @@ -14,6 +14,7 @@ import com.inscloudtech.common.utils.StringUtils; import com.inscloudtech.common.utils.bean.BeanUtils; import com.inscloudtech.datacenter.domain.CarInfo; import com.inscloudtech.datacenter.domain.PlateNumberInfo; +import com.inscloudtech.datacenter.domain.RealEstate; import com.inscloudtech.datacenter.mapper.CarInfoMapper; import com.inscloudtech.datacenter.mapper.es.CarInfoEsMapper; import com.inscloudtech.datacenter.mapper.es.PlateNumberEsMapper; @@ -248,6 +249,7 @@ public class PlateNumberServiceImpl implements PlateNumberService { lqw.like(StringUtils.isNotBlank(bo.getBankName()), PlateNumberInfo::getBankName, bo.getBankName()); lqw.like(StringUtils.isNotBlank(bo.getRemark()), PlateNumberInfo::getRemark, bo.getRemark()); lqw.like(StringUtils.isNotBlank(bo.getBsHolder()), PlateNumberInfo::getBsHolder, bo.getBsHolder()); + lqw.in(CollectionUtil.isNotEmpty(bo.getIds()), PlateNumberInfo::getId, bo.getIds()); if(StrUtil.isNotEmpty(bo.getAnalysisResultId())){ lqw.eq(PlateNumberInfo::getAnalysisResultId, bo.getAnalysisResultId()); }else { diff --git a/cas-system/src/main/java/com/inscloudtech/datacenter/service/impl/RealEstateServiceImpl.java b/cas-system/src/main/java/com/inscloudtech/datacenter/service/impl/RealEstateServiceImpl.java index 2866842..f68bcee 100644 --- a/cas-system/src/main/java/com/inscloudtech/datacenter/service/impl/RealEstateServiceImpl.java +++ b/cas-system/src/main/java/com/inscloudtech/datacenter/service/impl/RealEstateServiceImpl.java @@ -196,7 +196,7 @@ public class RealEstateServiceImpl implements IRealEstateService { lqw.like(StringUtils.isNotBlank(bo.getOtherInformation()), RealEstate::getOtherInformation, bo.getOtherInformation()); lqw.like(StringUtils.isNotBlank(bo.getRemark()), RealEstate::getRemark, bo.getRemark()); lqw.eq(StringUtils.isNotBlank(bo.getBgc()), RealEstate::getBgc, bo.getBgc()); - + lqw.in(CollectionUtil.isNotEmpty(bo.getIds()), RealEstate::getId, bo.getIds()); if(StrUtil.isNotBlank(bo.getSearchValue())){ lqw.queryStringQuery("*"+bo.getSearchValue().trim().replaceAll("([　]|\\s|\\u00A0)+","")+"*");