From a3560df559a34b68a41abe5ba09b9669d984d540 Mon Sep 17 00:00:00 2001 From: PigBaoBei <2739175034@qq.com> Date: Fri, 25 Oct 2024 22:17:09 +0800 Subject: [PATCH] =?UTF-8?q?=E5=93=81=E7=B1=BB=E4=BF=A1=E6=81=AFBUG?= =?UTF-8?q?=E4=BF=AE=E5=A4=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../logpm/basicdata/entity/BasicdataCategoryEntity.java | 2 +- .../logpm/basicdata/excel/BasicdataCategoryImporter.java | 2 +- .../service/impl/BasicdataClientServiceImpl.java | 8 +++++--- .../impl/WarehouseWarehousingEntryServiceImpl.java | 1 + 4 files changed, 8 insertions(+), 5 deletions(-) diff --git a/blade-service-api/logpm-basicdata-api/src/main/java/com/logpm/basicdata/entity/BasicdataCategoryEntity.java b/blade-service-api/logpm-basicdata-api/src/main/java/com/logpm/basicdata/entity/BasicdataCategoryEntity.java index 070b24a36..9e5e60ffa 100644 --- a/blade-service-api/logpm-basicdata-api/src/main/java/com/logpm/basicdata/entity/BasicdataCategoryEntity.java +++ b/blade-service-api/logpm-basicdata-api/src/main/java/com/logpm/basicdata/entity/BasicdataCategoryEntity.java @@ -114,6 +114,6 @@ public class BasicdataCategoryEntity extends TenantEntity { * 类型 */ @ApiModelProperty(value = "类型") - private Integer type; + private String type; } diff --git a/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/excel/BasicdataCategoryImporter.java b/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/excel/BasicdataCategoryImporter.java index 97e460ef3..f3e986124 100644 --- a/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/excel/BasicdataCategoryImporter.java +++ b/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/excel/BasicdataCategoryImporter.java @@ -60,7 +60,7 @@ public class BasicdataCategoryImporter implements ExcelImporter predicateContractStartTime = Predicate.isEqual(oldClientEntity.getContractStartTime()); - boolean contractStartTime = predicateContractStartTime.test(newClientEntity.getContractStartTime()); - if (!contractStartTime) { - content.append("合同开始时间由[").append(sdf.format(oldClientEntity.getContractStartTime())).append("]变更为-->[").append(sdf.format(oldClientEntity.getContractStartTime())).append("],"); + if(!Objects.isNull(predicateContractStartTime)){ + boolean contractStartTime = predicateContractStartTime.test(newClientEntity.getContractStartTime()); + if (!contractStartTime) { + content.append("合同开始时间由[").append(sdf.format(oldClientEntity.getContractStartTime())).append("]变更为-->[").append(sdf.format(oldClientEntity.getContractStartTime())).append("],"); + } } //对于合同结束时间比对 Predicate predicateContractEntTime = Predicate.isEqual(oldClientEntity.getContractEntTime()); diff --git a/blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/service/impl/WarehouseWarehousingEntryServiceImpl.java b/blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/service/impl/WarehouseWarehousingEntryServiceImpl.java index bf78d3827..fb34ed9ff 100644 --- a/blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/service/impl/WarehouseWarehousingEntryServiceImpl.java +++ b/blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/service/impl/WarehouseWarehousingEntryServiceImpl.java @@ -494,6 +494,7 @@ public class WarehouseWarehousingEntryServiceImpl extends BaseServiceImpl data, Boolean isCovered) { //分组 + Map> collect = data.stream().collect(Collectors.groupingBy(o -> { System.out.println("====<<<<<<<<" + o); if (ObjectUtils.isEmpty(o) || ObjectUtils.isNull(o.getCustomerName()) || ObjectUtils.isNull(o.getCustomerCode())) {