From a394a83e7d40b9f2d39a39baba31cede30145ace Mon Sep 17 00:00:00 2001 From: PigBaoBei <2739175034@qq.com> Date: Fri, 2 Feb 2024 10:20:46 +0800 Subject: [PATCH 1/2] =?UTF-8?q?PDA=E7=AD=BE=E6=94=B6=E8=AF=A6=E6=83=85?= =?UTF-8?q?=E6=8E=A5=E5=8F=A3=E4=BF=AE=E5=A4=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/logpm/distribution/mapper/DistributionSignforMapper.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionSignforMapper.xml b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionSignforMapper.xml index b230711fa..613245c63 100644 --- a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionSignforMapper.xml +++ b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionSignforMapper.xml @@ -1267,7 +1267,7 @@ 2 AS type, IF ( ldll.id IS NULL, 0, 1 ) AS isLoading, - IF(ldll.id is null or ldll.signfor_state = 1,0,1) AS isSignfor, + IF(ldll.id is null or ldll.signfor_state = 1,1,0) AS isSignfor, 0 AS isAbnormal FROM logpm_distribution_reservation AS ldr From ccb9edddca24fa9c1abbdc1bf207b852f50e58bb Mon Sep 17 00:00:00 2001 From: zhenghaoyu Date: Sat, 3 Feb 2024 14:57:03 +0800 Subject: [PATCH 2/2] =?UTF-8?q?1.=E7=9B=98=E7=82=B9-bug=E4=BF=AE=E5=A4=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/logpm/warehouse/service/impl/TaskQuestServiceImpl.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/service/impl/TaskQuestServiceImpl.java b/blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/service/impl/TaskQuestServiceImpl.java index 090894032..30a220491 100644 --- a/blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/service/impl/TaskQuestServiceImpl.java +++ b/blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/service/impl/TaskQuestServiceImpl.java @@ -1196,7 +1196,7 @@ public class TaskQuestServiceImpl extends BaseServiceImpl list2 = baseMapper.selectQuestDetailList(questDetailDTO.getQuestNum(), questContrastVO); if (ObjectUtils.isNotNull(list2)) { - list2.stream().collect(Collectors.groupingBy(QuestDetailEntity::getStockId)).forEach((k, v) -> { + list2.stream().filter(item -> !Objects.isNull(item.getStockId())).collect(Collectors.groupingBy(QuestDetailEntity::getStockId)).forEach((k, v) -> { DistributionStockListEntity stockListBy = distributionStockListClient.getStockListById(k); if (ObjectUtils.isNull(stockListBy)) { return;