修改查询

blade-service/blade-desk/src/main/java/org/springblade/desk/energy/controller/BsDischargeRecController.java

@@ -25,40 +25,38 @@
  */
 package org.springblade.desk.energy.controller;
 
-import io.swagger.v3.oas.annotations.tags.Tag;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.github.xiaoymin.knife4j.annotations.ApiOperationSupport;
 import io.swagger.v3.oas.annotations.Operation;
 import io.swagger.v3.oas.annotations.Parameter;
-import com.github.xiaoymin.knife4j.annotations.ApiOperationSupport;
-import lombok.AllArgsConstructor;
+import io.swagger.v3.oas.annotations.tags.Tag;
+import jakarta.servlet.http.HttpServletResponse;
 import jakarta.validation.Valid;
-
-import org.springblade.core.secure.BladeUser;
-import org.springblade.core.secure.annotation.IsAdmin;
+import lombok.AllArgsConstructor;
+import org.springblade.core.boot.ctrl.BladeController;
+import org.springblade.core.excel.util.ExcelUtil;
 import org.springblade.core.mp.support.Condition;
 import org.springblade.core.mp.support.Query;
+import org.springblade.core.secure.BladeUser;
+import org.springblade.core.secure.annotation.IsAdmin;
 import org.springblade.core.tool.api.R;
+import org.springblade.core.tool.utils.DateUtil;
 import org.springblade.core.tool.utils.Func;
 import org.springblade.desk.basic.util.ExcelExtUtil;
 import org.springblade.desk.energy.excel.BsDischargeRecExcel;
 import org.springblade.desk.energy.pojo.entity.BsDischargeRecEntity;
-import org.springblade.desk.energy.pojo.entity.BsDosingRecEntity;
 import org.springblade.desk.energy.pojo.vo.BsDischargeRecVO;
 import org.springblade.desk.energy.service.IBsDischargeRecService;
 import org.springblade.desk.energy.wrapper.BsDischargeRecWrapper;
 import org.springframework.core.io.Resource;
 import org.springframework.http.ResponseEntity;
 import org.springframework.web.bind.annotation.*;
-import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
-import com.baomidou.mybatisplus.core.metadata.IPage;
-import org.springblade.core.boot.ctrl.BladeController;
-import org.springblade.core.tool.utils.DateUtil;
-import org.springblade.core.excel.util.ExcelUtil;
-import org.springblade.core.tool.constant.BladeConstant;
-import java.util.Map;
-import java.util.List;
-import jakarta.servlet.http.HttpServletResponse;
 import org.springframework.web.multipart.MultipartFile;
 
+import java.util.List;
+import java.util.Map;
+
 /**
  * 槽液排放记录表 控制器
  *

blade-service/blade-desk/src/main/java/org/springblade/desk/energy/controller/BsInsTestController.java

@@ -45,7 +45,6 @@ import org.springblade.core.tool.utils.DateUtil;
 import org.springblade.core.tool.utils.Func;
 import org.springblade.desk.basic.util.ExcelExtUtil;
 import org.springblade.desk.energy.excel.BsInsTestExcel;
-import org.springblade.desk.energy.pojo.entity.BsDosingRecEntity;
 import org.springblade.desk.energy.pojo.entity.BsInsTestEntity;
 import org.springblade.desk.energy.pojo.vo.BsInsTestVO;
 import org.springblade.desk.energy.service.IBsInsTestService;

blade-service/blade-desk/src/main/java/org/springblade/desk/energy/util/JasperReportUtil.java

@@ -84,7 +84,6 @@ public class JasperReportUtil {
                         ((Map)params).put("subData_" + subReport.getDataParamName(), subData != null ? new JRBeanCollectionDataSource(subData) : null);
                     }
                 }
-
                 JasperPrint jp = JasperFillManager.fillReport(jr, (Map)params, new JRBeanCollectionDataSource((Collection)mainData));
                 mainData = null;
                 subData = null;