Merge remote-tracking branch 'origin/dev' into dev

blade-service/logpm-report/src/main/java/com/logpm/report/config/MybatisPlusConfig.java

@@ -21,7 +21,7 @@ import org.springframework.web.servlet.config.annotation.WebMvcConfigurer;
  * @create 2024-03-08 13:59
  */
 @Configuration
-@MapperScan("com.baomidou.cloud.service.*.mapper*r")
+@MapperScan("com.baomidou.cloud.service.*.mapper*")
 public class MybatisPlusConfig implements WebMvcConfigurer {
 
 //	@Bean

blade-service/logpm-report/src/main/java/com/logpm/report/service/impl/QualityDispatchNumberServiceImpl.java

@@ -57,7 +57,7 @@ public class QualityDispatchNumberServiceImpl implements QualityDispatchNumberSe
 			throw new ServiceException("时间不能为空");
 		}
 		page.setPages(1);
-		page.setSize(-1);
+		page.setSize(Integer.MAX_VALUE);
 		if (StrUtil.isEmpty(query.getWarehouseName())) {
 			BasicdataWarehouseEntity myCurrentWarehouse = warehouseClient.getMyCurrentWarehouse();
 			if (ObjectUtil.isNotEmpty(myCurrentWarehouse)) {
@@ -128,7 +128,7 @@ public class QualityDispatchNumberServiceImpl implements QualityDispatchNumberSe
 			throw new ServiceException("时间不能为空");
 		}
 		page.setPages(1);
-		page.setSize(-1);
+		page.setSize(Integer.MAX_VALUE);
 		if (StrUtil.isEmpty(query.getWarehouseName())) {
 			BasicdataWarehouseEntity myCurrentWarehouse = warehouseClient.getMyCurrentWarehouse();
 			if (ObjectUtil.isNotEmpty(myCurrentWarehouse)) {
@@ -204,7 +204,7 @@ public class QualityDispatchNumberServiceImpl implements QualityDispatchNumberSe
 	public void exporTask(HttpServletResponse response, QualityDispatchTaskQuery query) {
 		IPage<QualityDispatchTaskVO> page = Condition.getPage(query);
 		page.setPages(1);
-		page.setSize(-1);
+		page.setSize(Integer.MAX_VALUE);
 		List<QualityDispatchTaskVO> list = getQualityDispatchTaskVOS(query, page);
 		ExcelUtil.export(response, list, QualityDispatchTaskVO.class);
 	}

blade-service/logpm-report/src/main/java/com/logpm/report/service/impl/ReportDeliverServiceImpl.java

@@ -457,8 +457,8 @@ public class ReportDeliverServiceImpl implements ReportDeliverService {
 	@Override
 	public void exportDetailsV3(HttpServletResponse response, DevilerDetailsQuery query) {
 		IPage<ReportDetailVO> page = Condition.getPage(query);
-		page.setPages(-1);
+		page.setPages(1);
-		page.setSize(-1);
+		page.setSize(Integer.MAX_VALUE);
 		Integer more = 1;
 		if (StrUtil.isEmpty(query.getWarehouseNameRange())) {
 			BasicdataWarehouseEntity myCurrentWarehouse = warehouseClient.getMyCurrentWarehouse();