From 1725d62c9bb09d4ff62857856e2a8ed572822749 Mon Sep 17 00:00:00 2001
From: PigBaoBei <2739175034@qq.com>
Date: Sat, 28 Sep 2024 18:56:07 +0800
Subject: [PATCH] =?UTF-8?q?=E5=9B=BE=E7=89=87=E4=B8=8A=E4=BC=A0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../DistributionLoadscanAbnormalMapper.xml | 2 +-
.../impl/DistributionSignforServiceImpl.java | 77 +++++++++++--------
2 files changed, 46 insertions(+), 33 deletions(-)
diff --git a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionLoadscanAbnormalMapper.xml b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionLoadscanAbnormalMapper.xml
index 2ac902cbe..edc300316 100644
--- a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionLoadscanAbnormalMapper.xml
+++ b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionLoadscanAbnormalMapper.xml
@@ -65,7 +65,7 @@
SELECT * FROM logpm_distribution_loadscan_abnormal ${ew.customSqlSegment}
diff --git a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionSignforServiceImpl.java b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionSignforServiceImpl.java
index eb0dd5e3c..609202928 100644
--- a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionSignforServiceImpl.java
+++ b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionSignforServiceImpl.java
@@ -907,7 +907,7 @@ public class DistributionSignforServiceImpl extends BaseServiceImpl saveDate = new ArrayList<>();
if (ObjectUtils.isNotNull(distributionSignfor.getMap())) {
List distributionSignPrintList = new ArrayList<>();
- distributionSignfor.getMap().forEach((k, v) -> {
- List list = iDistributionSignPrintService.list(Wrappers.query().lambda()
+ Map> map2 = distributionSignfor.getMap();
+ map2.forEach((k, v) -> {
+
+ List printEntities = iDistributionSignPrintService.list(Wrappers.query().lambda()
.eq(DistributionSignPrintEntity::getReservationId, distributionSignfor.getReservationId())
.eq(DistributionSignPrintEntity::getType, k)
- .eq(DistributionSignPrintEntity::getIsDeleted, "0")
);
-
- if (!list.isEmpty()) {
- //删除
- log.info(">>> 预约单 {}删除之前的图片 start", distributionSignfor.getReservationId());
- iDistributionSignPrintService.deleteLogic(list.stream().map(DistributionSignPrintEntity::getId).collect(Collectors.toList()));
- log.info(">>> 预约单 {}删除之前的图片 start", distributionSignfor.getReservationId());
-
+ Map> map = new HashMap<>();
+ if (!printEntities.isEmpty()) {
+ map = printEntities.stream().collect(Collectors.groupingBy(DistributionSignPrintEntity::getUrlRoute));
+ } else {
+ if (Objects.isNull(map.get(k))) {
+ v.forEach(a -> {
+ a.setOperatorId(AuthUtil.getUserId());
+ a.setOperatorUsername(AuthUtil.getNickName());
+ });
+ saveDate.addAll(v);
+ }
+ }
+ if (!map.isEmpty()) {
+ for (DistributionSignPrintDTO distributionSignPrintDTO : v) {
+ if (Objects.isNull(map.get(distributionSignPrintDTO.getUrlRoute()))) {
+ distributionSignPrintDTO.setOperatorId(AuthUtil.getUserId());
+ distributionSignPrintDTO.setOperatorUsername(AuthUtil.getNickName());
+ saveDate.add(distributionSignPrintDTO);
+ } else {
+ map.remove(distributionSignPrintDTO.getUrlRoute());
+ }
+ }
+ if (!map.isEmpty()) {
+ List distributionSignPrintEntities = map.get(k);
+ iDistributionSignPrintService.removeBatchByIds(distributionSignPrintEntities);
+ }
}
- v.forEach(i -> {
- DistributionSignPrintEntity distributionSignPrint = new DistributionSignPrintEntity();
- BeanUtils.copyProperties(i, distributionSignPrint);
- distributionSignPrint.setReservationId(distributionSignfor.getReservationId());
- distributionSignPrint.setId(null);
- distributionSignPrintList.add(distributionSignPrint);
- log.info(">>> 需要重新保存的数据 {}", distributionSignPrint);
-
- });
-
});
+ if (!saveDate.isEmpty()) {
+ iDistributionSignPrintService.saveBatch(saveDate);
+ }
if (!distributionSignPrintList.isEmpty()) {
//添加
this.update(Wrappers.update().lambda()
@@ -7846,7 +7859,7 @@ public class DistributionSignforServiceImpl extends BaseServiceImpl