From 00836d660664988d230fdeae76be47e056132147 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=AB=98=E5=B5=A9?= Date: Wed, 29 Mar 2023 17:38:09 +0800 Subject: [PATCH] =?UTF-8?q?=E5=BC=80=E5=8F=91OTA=E5=A4=87=E6=A1=88?= =?UTF-8?q?=E5=B7=A5=E5=85=B7-=E8=BD=A6=E8=BE=86=E5=8D=87=E7=BA=A7?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../service/impl/OtaBaCxAqcsServiceImpl.java | 30 ++++++----------- .../impl/OtaBaCxKsjxtmccsServiceImpl.java | 12 ++++++- .../impl/OtaBaCxZxsjyqServiceImpl.java | 33 +++++++------------ .../impl/OtaBaSjSjmbclServiceImpl.java | 1 + 4 files changed, 33 insertions(+), 43 deletions(-) diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/service/impl/OtaBaCxAqcsServiceImpl.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/service/impl/OtaBaCxAqcsServiceImpl.java index 85b38658b..c7420a449 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/service/impl/OtaBaCxAqcsServiceImpl.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/service/impl/OtaBaCxAqcsServiceImpl.java @@ -28,6 +28,8 @@ import java.io.File; import java.io.InputStream; import java.util.List; import java.util.Date; +import java.util.Map; +import java.util.stream.Collectors; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import org.springframework.web.multipart.MultipartFile; @@ -95,28 +97,16 @@ public class OtaBaCxAqcsServiceImpl extends ServiceImpl reList = cu.comparisonRecord(otaBaCxAqcs.getOtaId(), OtaModuleEnum.CX_AQCS, otaBaCxAqcsOld, otaBaCxAqcs, sysDictService); - for (AttachmentEO aeoNew : otaBaCxAqcs.getZmclList()) { - boolean flag = true; - for (AttachmentEO aeoOld : otaBaCxAqcsOld.getZmclList()) { - if (aeoNew.getId().equals(aeoOld.getId())) { - flag = false; - break; - } - } - if (flag) { - reList.add(cu.addAttRecord(otaBaCxAqcs.getOtaId(), OtaModuleEnum.CX_AQCS, "证明材料", aeoNew.getFileName())); + Map newAttMap = otaBaCxAqcs.getZmclList().stream().collect(Collectors.toMap(AttachmentEO::getId, AttachmentEO::getFileName)); + Map oldAttMap = otaBaCxAqcsOld.getZmclList().stream().collect(Collectors.toMap(AttachmentEO::getId, AttachmentEO::getFileName)); + for (String nId : newAttMap.keySet()) { + if (!oldAttMap.containsKey(nId)) { + reList.add(cu.addAttRecord(otaBaCxAqcs.getOtaId(), OtaModuleEnum.CX_AQCS, "证明材料", newAttMap.get(nId))); } } - for (AttachmentEO aeoOld : otaBaCxAqcsOld.getZmclList()) { - boolean flag = true; - for (AttachmentEO aeoNew : otaBaCxAqcs.getZmclList()) { - if (aeoOld.getId().equals(aeoNew.getId())) { - flag = false; - break; - } - } - if (flag) { - reList.add(cu.delAttRecord(otaBaCxAqcs.getOtaId(), OtaModuleEnum.CX_AQCS, "证明材料", aeoOld.getFileName())); + for (String oId : oldAttMap.keySet()) { + if (!newAttMap.containsKey(oId)) { + reList.add(cu.delAttRecord(otaBaCxAqcs.getOtaId(), OtaModuleEnum.CX_AQCS, "证明材料", newAttMap.get(oId))); } } otaBaCxTxjlService.saveBatch(reList); diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/service/impl/OtaBaCxKsjxtmccsServiceImpl.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/service/impl/OtaBaCxKsjxtmccsServiceImpl.java index a31008aac..d5461ddf2 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/service/impl/OtaBaCxKsjxtmccsServiceImpl.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/service/impl/OtaBaCxKsjxtmccsServiceImpl.java @@ -18,7 +18,7 @@ import com.jero.modules.ota.service.IOtaBaCxTxjlService; import com.jero.modules.ota.utils.ComparisonUtil; import com.jero.modules.ota.utils.ImportFileUtil; import com.jero.modules.system.service.ISysDictService; -import com.jero.modules.system.util.StringUtils; +import org.apache.commons.lang3.StringUtils; import org.apache.commons.lang3.ObjectUtils; import org.apache.poi.ss.usermodel.Cell; import org.apache.poi.ss.usermodel.Row; @@ -107,6 +107,16 @@ public class OtaBaCxKsjxtmccsServiceImpl extends ServiceImpl reList = cu.comparisonListRecord(otaId, OtaModuleEnum.CX_KSJDXTMCYCS, OtaTitleEnum.XTLB.getName(), oldList, newList, sysDictService); saveOrUpdateBatch(newList); + + + for (OtaBaCxKsjxtmccs newMccs:newList) { + String newTpt = newMccs.getTpt(); + if(StringUtils.isNotEmpty(newTpt)){ + + + } + + } otaBaCxTxjlService.saveBatch(reList); String fj = (String) json.get("fj"); if (StringUtils.isNotEmpty(fj)) { diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/service/impl/OtaBaCxZxsjyqServiceImpl.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/service/impl/OtaBaCxZxsjyqServiceImpl.java index d4cc7dc9e..3a84bef71 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/service/impl/OtaBaCxZxsjyqServiceImpl.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/service/impl/OtaBaCxZxsjyqServiceImpl.java @@ -17,8 +17,6 @@ import com.jero.modules.ota.service.IOtaBaCxZxsjyqService; import com.jero.modules.ota.utils.ComparisonUtil; import com.jero.modules.ota.utils.ImportFileUtil; import com.jero.modules.system.service.ISysDictService; -import org.apache.commons.collections4.ListUtils; -import org.apache.commons.lang3.ArrayUtils; import org.apache.commons.lang3.ObjectUtils; import org.apache.commons.lang3.StringUtils; import org.apache.poi.ss.usermodel.Cell; @@ -36,6 +34,8 @@ import java.io.File; import java.io.InputStream; import java.util.Date; import java.util.List; +import java.util.Map; +import java.util.stream.Collectors; /** * @Description: 车型备案-在线升级要求 @@ -101,28 +101,17 @@ public class OtaBaCxZxsjyqServiceImpl extends ServiceImpl reList = cu.comparisonRecord(otaBaCxZxsjyq.getOtaId(), OtaModuleEnum.CX_ZXSJYQ, otaBaCxZxsjyqOld, otaBaCxZxsjyq, sysDictService); - for (AttachmentEO aeoNew : otaBaCxZxsjyq.getZmclList()) { - boolean flag = true; - for (AttachmentEO aeoOld : otaBaCxZxsjyqOld.getZmclList()) { - if (aeoNew.getId().equals(aeoOld.getId())) { - flag = false; - break; - } - } - if (flag) { - reList.add(cu.addAttRecord(otaBaCxZxsjyq.getOtaId(), OtaModuleEnum.CX_ZXSJYQ, "证明材料", aeoNew.getFileName())); + Map newAttMap = otaBaCxZxsjyq.getZmclList().stream().collect(Collectors.toMap(AttachmentEO::getId, AttachmentEO::getFileName)); + Map oldAttMap = otaBaCxZxsjyqOld.getZmclList().stream().collect(Collectors.toMap(AttachmentEO::getId, AttachmentEO::getFileName)); + + for (String nId : newAttMap.keySet()) { + if (!oldAttMap.containsKey(nId)) { + reList.add(cu.addAttRecord(otaBaCxZxsjyq.getOtaId(), OtaModuleEnum.CX_ZXSJYQ, "证明材料", newAttMap.get(nId))); } } - for (AttachmentEO aeoOld : otaBaCxZxsjyqOld.getZmclList()) { - boolean flag = true; - for (AttachmentEO aeoNew : otaBaCxZxsjyq.getZmclList()) { - if (aeoOld.getId().equals(aeoNew.getId())) { - flag = false; - break; - } - } - if (flag) { - reList.add(cu.delAttRecord(otaBaCxZxsjyq.getOtaId(), OtaModuleEnum.CX_ZXSJYQ, "证明材料", aeoOld.getFileName())); + for (String oId : oldAttMap.keySet()) { + if (!newAttMap.containsKey(oId)) { + reList.add(cu.delAttRecord(otaBaCxZxsjyq.getOtaId(), OtaModuleEnum.CX_ZXSJYQ, "证明材料", newAttMap.get(oId))); } } otaBaCxTxjlService.saveBatch(reList); diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/service/impl/OtaBaSjSjmbclServiceImpl.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/service/impl/OtaBaSjSjmbclServiceImpl.java index 5d54760a5..f03bccacc 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/service/impl/OtaBaSjSjmbclServiceImpl.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/service/impl/OtaBaSjSjmbclServiceImpl.java @@ -71,6 +71,7 @@ public class OtaBaSjSjmbclServiceImpl extends ServiceImpl