CQC 报表代码bug

修复

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<PageData<CqcCarbonConsumablesDTO>> page(@Parameter(hidden = true) @RequestParam Map<String, Object> params){
+        String applyNo = MapUtils.getString(params,"applyNo");
+        if(ObjectUtils.isEmpty(applyNo)){
+            return new Result<>();
+        }
         PageData<CqcCarbonConsumablesDTO> page = cqcCarbonConsumablesService.getPageData(params, CqcCarbonConsumablesDTO.class);
         return new Result<PageData<CqcCarbonConsumablesDTO>>().ok(page);
     }

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<PageData<CqcCarbonDiscardDTO>> page(@Parameter(hidden = true) @RequestParam Map<String, Object> params){
+        String applyNo = MapUtils.getString(params,"applyNo");
+        if(ObjectUtils.isEmpty(applyNo)){
+            return new Result<>();
+        }
         PageData<CqcCarbonDiscardDTO> page = cqcCarbonDiscardService.getPageData(params, CqcCarbonDiscardDTO.class);
         return new Result<PageData<CqcCarbonDiscardDTO>>().ok(page);
     }

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<PageData<CqcCarbonDistributionDTO>> page(@Parameter(hidden = true) @RequestParam Map<String, Object> params){
+        String applyNo = MapUtils.getString(params,"applyNo");
+        if(ObjectUtils.isEmpty(applyNo)){
+            return new Result<>();
+        }
         PageData<CqcCarbonDistributionDTO> page = cqcCarbonDistributionService.getPageData(params, CqcCarbonDistributionDTO.class);
         return new Result<PageData<CqcCarbonDistributionDTO>>().ok(page);
     }

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<PageData<CqcCarbonEnergyDTO>> page(@Parameter(hidden = true) @RequestParam Map<String, Object> params){
+        String applyNo = MapUtils.getString(params,"applyNo");
+        if(ObjectUtils.isEmpty(applyNo)){
+            return new Result<>();
+        }
         PageData<CqcCarbonEnergyDTO> page = cqcCarbonEnergyService.getPageData(params, CqcCarbonEnergyDTO.class);
         return new Result<PageData<CqcCarbonEnergyDTO>>().ok(page);
     }

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<PageData<CqcCarbonMakeDTO>> page(@Parameter(hidden = true) @RequestParam Map<String, Object> params){
+        String applyNo = MapUtils.getString(params,"applyNo");
+        if(ObjectUtils.isEmpty(applyNo)){
+            return new Result<>();
+        }
         PageData<CqcCarbonMakeDTO> page = cqcCarbonMakeService.getPageData(params, CqcCarbonMakeDTO.class);
         return new Result<PageData<CqcCarbonMakeDTO>>().ok(page);
     }

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<PageData<CqcCarbonRawDTO>> page(@Parameter(hidden = true) @RequestParam Map<String, Object> params){
+        String applyNo = MapUtils.getString(params,"applyNo");
+        if(ObjectUtils.isEmpty(applyNo)){
+            return new Result<>();
+        }
         PageData<CqcCarbonRawDTO> page = cqcCarbonRawService.getPageData(params, CqcCarbonRawDTO.class);
         return new Result<PageData<CqcCarbonRawDTO>>().ok(page);
     }

modules/cqc-service/src/main/java/com/thing/cqc/cqcCarbonReport/service/impl/CqcCarbonReportServiceImpl.java

@@ -70,7 +70,7 @@ public class CqcCarbonReportServiceImpl extends BaseServiceImpl<CqcCarbonReportM
         if(!tenantCode.equals(1001L)){
             wrapper.eq(CqcCarbonReportEntity::getTenantCode,tenantCode);
         }
-        String status = MapUtils.getString(params,"params");
+        String status = MapUtils.getString(params,"status");
         wrapper.eq("status",status,ObjectUtils.isNotEmpty(status));
         String enterpriseNameCn = MapUtils.getString(params,"enterpriseNameCn");
         String productNameCn = MapUtils.getString(params,"productNameCn");