✨ 4模块合并单元格，多工作表导入

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<ReadSheet> 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);
         }

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 {

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 {

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)+",""));
         }

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)+",""));
         }

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 {

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)+","")+"*");