From e9a4e85e95bbce3d1b90b9bc6acdfc9465a902c8 Mon Sep 17 00:00:00 2001 From: xiachao Date: Wed, 14 Aug 2024 18:09:53 +0800 Subject: [PATCH] =?UTF-8?q?CQC=20=E6=8A=A5=E8=A1=A8=E4=BB=A3=E7=A0=81bug?= =?UTF-8?q?=20=E4=BF=AE=E5=A4=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/CqcCarbonConsumablesController.java | 6 ++++++ .../controller/CqcCarbonDiscardController.java | 6 ++++++ .../controller/CqcCarbonDistributionController.java | 6 ++++++ .../controller/CqcCarbonEnergyController.java | 6 ++++++ .../cqcCarbonMake/controller/CqcCarbonMakeController.java | 6 ++++++ .../cqc/cqcCarbonRaw/controller/CqcCarbonRawController.java | 6 ++++++ .../service/impl/CqcCarbonReportServiceImpl.java | 2 +- 7 files changed, 37 insertions(+), 1 deletion(-) diff --git a/modules/cqc-service/src/main/java/com/thing/cqc/cqcCarbonConsumables/controller/CqcCarbonConsumablesController.java b/modules/cqc-service/src/main/java/com/thing/cqc/cqcCarbonConsumables/controller/CqcCarbonConsumablesController.java index cb8e324..9169f1a 100644 --- a/modules/cqc-service/src/main/java/com/thing/cqc/cqcCarbonConsumables/controller/CqcCarbonConsumablesController.java +++ b/modules/cqc-service/src/main/java/com/thing/cqc/cqcCarbonConsumables/controller/CqcCarbonConsumablesController.java @@ -16,6 +16,8 @@ import io.swagger.v3.oas.annotations.Parameter; import io.swagger.v3.oas.annotations.Parameters; import io.swagger.v3.oas.annotations.tags.Tag; import lombok.RequiredArgsConstructor; +import org.apache.commons.collections4.MapUtils; +import org.apache.commons.lang3.ObjectUtils; import org.springframework.web.bind.annotation.*; import java.util.List; @@ -45,6 +47,10 @@ public class CqcCarbonConsumablesController { @Parameter(name = "applyNo", description = "applyNo,报表唯一编码") }) public Result> page(@Parameter(hidden = true) @RequestParam Map params){ + String applyNo = MapUtils.getString(params,"applyNo"); + if(ObjectUtils.isEmpty(applyNo)){ + return new Result<>(); + } PageData page = cqcCarbonConsumablesService.getPageData(params, CqcCarbonConsumablesDTO.class); return new Result>().ok(page); } diff --git a/modules/cqc-service/src/main/java/com/thing/cqc/cqcCarbonDiscard/controller/CqcCarbonDiscardController.java b/modules/cqc-service/src/main/java/com/thing/cqc/cqcCarbonDiscard/controller/CqcCarbonDiscardController.java index 89d367d..4bb1be1 100644 --- a/modules/cqc-service/src/main/java/com/thing/cqc/cqcCarbonDiscard/controller/CqcCarbonDiscardController.java +++ b/modules/cqc-service/src/main/java/com/thing/cqc/cqcCarbonDiscard/controller/CqcCarbonDiscardController.java @@ -17,6 +17,8 @@ import io.swagger.v3.oas.annotations.Parameter; import io.swagger.v3.oas.annotations.Parameters; import io.swagger.v3.oas.annotations.tags.Tag; import lombok.RequiredArgsConstructor; +import org.apache.commons.collections4.MapUtils; +import org.apache.commons.lang3.ObjectUtils; import org.springframework.web.bind.annotation.*; import java.util.List; @@ -46,6 +48,10 @@ public class CqcCarbonDiscardController { @Parameter(name = "applyNo", description = "applyNo,报表唯一编码") }) public Result> page(@Parameter(hidden = true) @RequestParam Map params){ + String applyNo = MapUtils.getString(params,"applyNo"); + if(ObjectUtils.isEmpty(applyNo)){ + return new Result<>(); + } PageData page = cqcCarbonDiscardService.getPageData(params, CqcCarbonDiscardDTO.class); return new Result>().ok(page); } diff --git a/modules/cqc-service/src/main/java/com/thing/cqc/cqcCarbonDistribution/controller/CqcCarbonDistributionController.java b/modules/cqc-service/src/main/java/com/thing/cqc/cqcCarbonDistribution/controller/CqcCarbonDistributionController.java index 4901e9b..6855bc5 100644 --- a/modules/cqc-service/src/main/java/com/thing/cqc/cqcCarbonDistribution/controller/CqcCarbonDistributionController.java +++ b/modules/cqc-service/src/main/java/com/thing/cqc/cqcCarbonDistribution/controller/CqcCarbonDistributionController.java @@ -16,6 +16,8 @@ import io.swagger.v3.oas.annotations.Parameter; import io.swagger.v3.oas.annotations.Parameters; import io.swagger.v3.oas.annotations.tags.Tag; import lombok.RequiredArgsConstructor; +import org.apache.commons.collections4.MapUtils; +import org.apache.commons.lang3.ObjectUtils; import org.springframework.web.bind.annotation.*; import java.util.List; @@ -45,6 +47,10 @@ public class CqcCarbonDistributionController { @Parameter(name = "applyNo", description = "applyNo,报表唯一编码") }) public Result> page(@Parameter(hidden = true) @RequestParam Map params){ + String applyNo = MapUtils.getString(params,"applyNo"); + if(ObjectUtils.isEmpty(applyNo)){ + return new Result<>(); + } PageData page = cqcCarbonDistributionService.getPageData(params, CqcCarbonDistributionDTO.class); return new Result>().ok(page); } diff --git a/modules/cqc-service/src/main/java/com/thing/cqc/cqcCarbonEnergy/controller/CqcCarbonEnergyController.java b/modules/cqc-service/src/main/java/com/thing/cqc/cqcCarbonEnergy/controller/CqcCarbonEnergyController.java index 68d9519..d22dd71 100644 --- a/modules/cqc-service/src/main/java/com/thing/cqc/cqcCarbonEnergy/controller/CqcCarbonEnergyController.java +++ b/modules/cqc-service/src/main/java/com/thing/cqc/cqcCarbonEnergy/controller/CqcCarbonEnergyController.java @@ -17,6 +17,8 @@ import io.swagger.v3.oas.annotations.Parameter; import io.swagger.v3.oas.annotations.Parameters; import io.swagger.v3.oas.annotations.tags.Tag; import lombok.RequiredArgsConstructor; +import org.apache.commons.collections4.MapUtils; +import org.apache.commons.lang3.ObjectUtils; import org.springframework.web.bind.annotation.*; import java.util.List; @@ -46,6 +48,10 @@ public class CqcCarbonEnergyController { @Parameter(name = "applyNo", description = "applyNo,报表唯一编码") }) public Result> page(@Parameter(hidden = true) @RequestParam Map params){ + String applyNo = MapUtils.getString(params,"applyNo"); + if(ObjectUtils.isEmpty(applyNo)){ + return new Result<>(); + } PageData page = cqcCarbonEnergyService.getPageData(params, CqcCarbonEnergyDTO.class); return new Result>().ok(page); } diff --git a/modules/cqc-service/src/main/java/com/thing/cqc/cqcCarbonMake/controller/CqcCarbonMakeController.java b/modules/cqc-service/src/main/java/com/thing/cqc/cqcCarbonMake/controller/CqcCarbonMakeController.java index 486b612..24efd3d 100644 --- a/modules/cqc-service/src/main/java/com/thing/cqc/cqcCarbonMake/controller/CqcCarbonMakeController.java +++ b/modules/cqc-service/src/main/java/com/thing/cqc/cqcCarbonMake/controller/CqcCarbonMakeController.java @@ -17,6 +17,8 @@ import io.swagger.v3.oas.annotations.Parameter; import io.swagger.v3.oas.annotations.Parameters; import io.swagger.v3.oas.annotations.tags.Tag; import lombok.RequiredArgsConstructor; +import org.apache.commons.collections4.MapUtils; +import org.apache.commons.lang3.ObjectUtils; import org.springframework.web.bind.annotation.*; import java.util.List; @@ -46,6 +48,10 @@ public class CqcCarbonMakeController { @Parameter(name = "applyNo", description = "applyNo,报表唯一编码") }) public Result> page(@Parameter(hidden = true) @RequestParam Map params){ + String applyNo = MapUtils.getString(params,"applyNo"); + if(ObjectUtils.isEmpty(applyNo)){ + return new Result<>(); + } PageData page = cqcCarbonMakeService.getPageData(params, CqcCarbonMakeDTO.class); return new Result>().ok(page); } diff --git a/modules/cqc-service/src/main/java/com/thing/cqc/cqcCarbonRaw/controller/CqcCarbonRawController.java b/modules/cqc-service/src/main/java/com/thing/cqc/cqcCarbonRaw/controller/CqcCarbonRawController.java index 0976a22..553c653 100644 --- a/modules/cqc-service/src/main/java/com/thing/cqc/cqcCarbonRaw/controller/CqcCarbonRawController.java +++ b/modules/cqc-service/src/main/java/com/thing/cqc/cqcCarbonRaw/controller/CqcCarbonRawController.java @@ -16,6 +16,8 @@ import io.swagger.v3.oas.annotations.Parameter; import io.swagger.v3.oas.annotations.Parameters; import io.swagger.v3.oas.annotations.tags.Tag; import lombok.RequiredArgsConstructor; +import org.apache.commons.collections4.MapUtils; +import org.apache.commons.lang3.ObjectUtils; import org.springframework.web.bind.annotation.*; import java.util.List; @@ -45,6 +47,10 @@ public class CqcCarbonRawController { @Parameter(name = "applyNo", description = "applyNo,报表唯一编码") }) public Result> page(@Parameter(hidden = true) @RequestParam Map params){ + String applyNo = MapUtils.getString(params,"applyNo"); + if(ObjectUtils.isEmpty(applyNo)){ + return new Result<>(); + } PageData page = cqcCarbonRawService.getPageData(params, CqcCarbonRawDTO.class); return new Result>().ok(page); } diff --git a/modules/cqc-service/src/main/java/com/thing/cqc/cqcCarbonReport/service/impl/CqcCarbonReportServiceImpl.java b/modules/cqc-service/src/main/java/com/thing/cqc/cqcCarbonReport/service/impl/CqcCarbonReportServiceImpl.java index bb57b2b..10b3e6e 100644 --- a/modules/cqc-service/src/main/java/com/thing/cqc/cqcCarbonReport/service/impl/CqcCarbonReportServiceImpl.java +++ b/modules/cqc-service/src/main/java/com/thing/cqc/cqcCarbonReport/service/impl/CqcCarbonReportServiceImpl.java @@ -70,7 +70,7 @@ public class CqcCarbonReportServiceImpl extends BaseServiceImpl