修改综合查询-返回数据总数

blade-service/blade-factory/src/main/java/org/springblade/factory/api/controller/ComprehensiveQueryController.java

@@ -26,6 +26,7 @@ import org.springframework.web.bind.annotation.RestController;
 
 import java.math.BigDecimal;
 import java.time.LocalDateTime;
+import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 
@@ -59,7 +60,7 @@ public class ComprehensiveQueryController {
 		@ApiImplicitParam(name = "pageNum", value = "页码（默认1）", paramType = "query", dataType = "int", defaultValue = "1"),
 		@ApiImplicitParam(name = "pageSize", value = "每页条数（默认10，最大100）", paramType = "query", dataType = "int", defaultValue = "10")
 	})
-	public R<List<ViewShipSel>> shippingStatusInquiry(
+	public R<IPage<ViewShipSel>> shippingStatusInquiry(
 		// 基础精准查询字段
 		ViewShipSel zcrmViewShipSel,
 		// 日期范围查询参数
@@ -106,7 +107,7 @@ public class ComprehensiveQueryController {
 
 			log.info("发货状态查询成功，返回数据条数：{}，分页参数：页码{}，每页条数{}",
 				resultPage.getRecords().size(), pageNum, pageSize);
-			return R.data(resultPage.getRecords());
+			return R.data(resultPage);
 		} catch (Exception e) {
 			log.error("发货状态查询异常", e);
 			return R.fail("发货状态查询异常：" + e.getMessage());
@@ -122,7 +123,7 @@ public class ComprehensiveQueryController {
 		@ApiImplicitParam(name = "pageNum", value = "页码（默认1）", paramType = "query", dataType = "int", defaultValue = "1"),
 		@ApiImplicitParam(name = "pageSize", value = "每页条数（默认10，最大100）", paramType = "query", dataType = "int", defaultValue = "10")
 	})
-	public R<List<ZcrmViewARBillHeadSel>> arBillHeadStatusInquiry(
+	public R<IPage<ZcrmViewARBillHeadSel>> arBillHeadStatusInquiry(
 		// 基础精准查询字段
 		ZcrmViewARBillHeadSel arBillHeadSel,
 		// 日期范围查询参数
@@ -169,9 +170,10 @@ public class ComprehensiveQueryController {
 				docStatusList
 			);
 
+
 			log.info("应收单状态查询成功，返回数据条数：{}，分页参数：页码{}，每页条数{}",
 				resultPage.getRecords().size(), pageNum, pageSize);
-			return R.data(resultPage.getRecords());
+			return R.data(resultPage);
 		} catch (Exception e) {
 			log.error("应收单状态查询异常", e);
 			return R.fail("应收单状态查询异常：" + e.getMessage());