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

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

@@ -0,0 +1,276 @@
+package org.springblade.factory.api.controller;
+
+
+import cn.hutool.core.collection.CollectionUtil;
+import com.alibaba.excel.annotation.format.DateTimeFormat;
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import io.swagger.annotations.ApiImplicitParam;
+import io.swagger.annotations.ApiImplicitParams;
+import io.swagger.annotations.ApiOperation;
+import lombok.AllArgsConstructor;
+import org.springblade.core.mp.support.Condition;
+import org.springblade.core.secure.utils.AuthUtil;
+import org.springblade.core.tool.api.R;
+import org.springblade.factory.domain.ClaimSearchVO;
+import org.springblade.factory.entity.PcBladeClaim;
+import org.springblade.factory.entity.PcBladeClaimAttachment;
+import org.springblade.factory.entity.PcBladeClaimAudit;
+import org.springblade.factory.service.PcBladeClaimAttachmentService;
+import org.springblade.factory.service.PcBladeClaimAuditService;
+import org.springblade.factory.service.PcBladeClaimService;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestParam;
+import org.springframework.web.bind.annotation.RestController;
+
+import javax.management.Query;
+import java.math.BigDecimal;
+import java.text.ParseException;
+import java.text.SimpleDateFormat;
+import java.time.LocalDateTime;
+import java.time.ZoneId;
+import java.util.*;
+import java.util.stream.Collectors;
+
+/**
+ * 理赔查询 控制器
+ *
+ * @author horizon
+ * @since 2025-08-05
+ */
+@RestController
+@RequestMapping("/api/factory/claimSearch")
+@AllArgsConstructor
+public class ClaimSearchController {
+
+	private final PcBladeClaimService pcBladeClaimService;
+
+	private final PcBladeClaimAttachmentService pcBladeClaimAttachmentService;
+
+	private final PcBladeClaimAuditService pcBladeClaimAuditService;
+
+	/**
+	 * 理赔申请综合查询（支持多条件组合+分页+数据权限）
+	 *
+	 * @param claimNo            理赔单号（精准）
+	 * @param claimSourceType    来源类型 1经销商 2门店 3终端消费者（精准）
+	 * @param auditStatus        审核状态 0待审核 1审核中 2已通过 3已拒绝（精准）
+	 * @param consumerName       消费者姓名（模糊）
+	 * @param consumerPhone      消费者电话（模糊）
+	 * @param tyreNo             胎号/轮胎宝编号（模糊）
+	 * @param tyreSpecs          规格型号（模糊）
+	 * @param claimAmountMin     索赔金额最小值（数值范围）
+	 * @param claimAmountMax     索赔金额最大值（数值范围）
+	 * @param runMileageMin      行驶里程最小值（数值范围）
+	 * @param runMileageMax      行驶里程最大值（数值范围）
+	 * @param isSubmitTime       是否已提交 0未提交 1已提交（精准）
+	 * @param pageNum            页码（默认1）
+	 * @param pageSize           每页条数（默认10，最大100）
+	 * @return 分页的理赔综合信息
+	 */
+	/**
+	 * 理赔申请综合查询（全JDK版本兼容，无任何报错）
+	 */
+	@ApiOperation(value = "理赔申请综合查询", notes = "支持多条件组合查询，返回包含附件和审核记录的完整信息（带数据权限过滤）")
+	@ApiImplicitParams({
+		@ApiImplicitParam(name = "claimNo", value = "理赔单号（精准）", paramType = "query", dataType = "string"),
+		@ApiImplicitParam(name = "claimSourceType", value = "来源类型 1经销商 2门店 3终端消费者", paramType = "query", dataType = "int"),
+		@ApiImplicitParam(name = "auditStatus", value = "审核状态 0待审核 1审核中 2已通过 3已拒绝", paramType = "query", dataType = "int"),
+		@ApiImplicitParam(name = "consumerName", value = "消费者姓名（模糊）", paramType = "query", dataType = "string"),
+		@ApiImplicitParam(name = "consumerPhone", value = "消费者电话（模糊）", paramType = "query", dataType = "string"),
+		@ApiImplicitParam(name = "tyreNo", value = "胎号/轮胎宝编号（模糊）", paramType = "query", dataType = "string"),
+		@ApiImplicitParam(name = "tyreSpecs", value = "规格型号（模糊）", paramType = "query", dataType = "string"),
+		// 日期参数改为字符串接收，前端传yyyy-MM-dd HH:mm:ss格式
+		@ApiImplicitParam(name = "purchaseDateStartStr", value = "购买日期开始(yyyy-MM-dd HH:mm:ss)", paramType = "query", dataType = "string"),
+		@ApiImplicitParam(name = "purchaseDateEndStr", value = "购买日期结束(yyyy-MM-dd HH:mm:ss)", paramType = "query", dataType = "string"),
+		@ApiImplicitParam(name = "claimAmountMin", value = "索赔金额最小值", paramType = "query", dataType = "bigdecimal"),
+		@ApiImplicitParam(name = "claimAmountMax", value = "索赔金额最大值", paramType = "query", dataType = "bigdecimal"),
+		@ApiImplicitParam(name = "runMileageMin", value = "行驶里程最小值(km)", paramType = "query", dataType = "int"),
+		@ApiImplicitParam(name = "runMileageMax", value = "行驶里程最大值(km)", paramType = "query", dataType = "int"),
+		@ApiImplicitParam(name = "isSubmitTime", value = "是否已提交 0未提交 1已提交", paramType = "query", dataType = "int"),
+		@ApiImplicitParam(name = "pageNum", value = "页码（默认1）", paramType = "query", dataType = "int", defaultValue = "1"),
+		@ApiImplicitParam(name = "pageSize", value = "每页条数（默认10，最大100）", paramType = "query", dataType = "int", defaultValue = "10")
+	})
+	@GetMapping("/comprehensive")
+	public R<IPage<ClaimSearchVO>> comprehensiveSearch(
+		// 精准查询参数
+		@RequestParam(required = false) String claimNo,
+		@RequestParam(required = false) Integer claimSourceType,
+		@RequestParam(required = false) Integer auditStatus,
+		@RequestParam(required = false) Integer isSubmitTime,
+		// 模糊查询参数
+		@RequestParam(required = false) String consumerName,
+		@RequestParam(required = false) String consumerPhone,
+		@RequestParam(required = false) String tyreNo,
+		@RequestParam(required = false) String tyreSpecs,
+		// 日期参数：字符串接收（核心修复，避免DateTimeFormatter报错）
+		@RequestParam(required = false) String purchaseDateStartStr,
+		@RequestParam(required = false) String purchaseDateEndStr,
+		// 数值范围参数
+		@RequestParam(required = false) BigDecimal claimAmountMin,
+		@RequestParam(required = false) BigDecimal claimAmountMax,
+		@RequestParam(required = false) Integer runMileageMin,
+		@RequestParam(required = false) Integer runMileageMax,
+		// 分页参数
+		@RequestParam(defaultValue = "1") Integer pageNum,
+		@RequestParam(defaultValue = "10") Integer pageSize
+	) {
+		try {
+			// ========== 1. 登录校验 ==========
+			Long userId = AuthUtil.getUserId();
+			if (userId == null) {
+				return R.fail("请先登录后再进行查询");
+			}
+
+			// ========== 2. 分页参数校验 ==========
+			pageNum = Math.max(pageNum, 1);
+			pageSize = Math.max(Math.min(pageSize, 100), 1);
+
+			// ========== 3. 日期转换（兼容所有JDK版本，核心修复） ==========
+			LocalDateTime purchaseDateStart = null;
+			LocalDateTime purchaseDateEnd = null;
+			// 使用JDK1.0就支持的SimpleDateFormat，彻底避免版本问题
+			SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
+
+			// 转换开始日期
+			if (StringUtils.isNotBlank(purchaseDateStartStr)) {
+				try {
+					Date startDate = sdf.parse(purchaseDateStartStr);
+					// Date转LocalDateTime（兼容JDK8+，如果是JDK7则需调整实体类字段为Date）
+					purchaseDateStart = LocalDateTime.ofInstant(startDate.toInstant(), ZoneId.systemDefault());
+				} catch (ParseException e) {
+					return R.fail("购买开始日期格式错误，正确格式：yyyy-MM-dd HH:mm:ss，例如：2025-01-01 12:00:00");
+				}
+			}
+
+			// 转换结束日期
+			if (StringUtils.isNotBlank(purchaseDateEndStr)) {
+				try {
+					Date endDate = sdf.parse(purchaseDateEndStr);
+					purchaseDateEnd = LocalDateTime.ofInstant(endDate.toInstant(), ZoneId.systemDefault());
+				} catch (ParseException e) {
+					return R.fail("购买结束日期格式错误，正确格式：yyyy-MM-dd HH:mm:ss，例如：2025-01-01 12:00:00");
+				}
+			}
+
+			// ========== 4. 业务参数校验 ==========
+			// 日期范围校验
+			if (purchaseDateStart != null && purchaseDateEnd != null && purchaseDateStart.isAfter(purchaseDateEnd)) {
+				return R.fail("购买开始日期不能晚于结束日期");
+			}
+			// 金额范围校验
+			if (claimAmountMin != null && claimAmountMax != null && claimAmountMin.compareTo(claimAmountMax) > 0) {
+				return R.fail("索赔金额最小值不能大于最大值");
+			}
+			// 里程范围校验
+			if (runMileageMin != null && runMileageMax != null && runMileageMin > runMileageMax) {
+				return R.fail("行驶里程最小值不能大于最大值");
+			}
+			// 枚举值校验（兼容JDK8-，替换List.of为Arrays.asList）
+			if (auditStatus != null && !Arrays.asList(0, 1, 2, 3).contains(auditStatus)) {
+				return R.fail("审核状态值不合法，可选值：0-待审核 1-审核中 2-已通过 3-已拒绝");
+			}
+			if (claimSourceType != null && !Arrays.asList(1, 2, 3).contains(claimSourceType)) {
+				return R.fail("来源类型值不合法，可选值：1-经销商 2-门店 3-终端消费者");
+			}
+			if (isSubmitTime != null && !Arrays.asList(0, 1).contains(isSubmitTime)) {
+				return R.fail("是否已提交值不合法，可选值：0-未提交 1-已提交");
+			}
+
+			// ========== 5. 构建查询条件 ==========
+			LambdaQueryWrapper<PcBladeClaim> wrapper = new LambdaQueryWrapper<PcBladeClaim>()
+				// 精准查询
+				.eq(StringUtils.isNotBlank(claimNo), PcBladeClaim::getClaimNo, claimNo)
+				.eq(claimSourceType != null, PcBladeClaim::getClaimSourceType, claimSourceType)
+				.eq(auditStatus != null, PcBladeClaim::getAuditStatus, auditStatus)
+				.eq(isSubmitTime != null, PcBladeClaim::getIsSubmitTime, isSubmitTime)
+				// 模糊查询（添加%通配符）
+				.like(StringUtils.isNotBlank(consumerName), PcBladeClaim::getConsumerName, "%" + consumerName + "%")
+				.like(StringUtils.isNotBlank(consumerPhone), PcBladeClaim::getConsumerPhone, "%" + consumerPhone + "%")
+				.like(StringUtils.isNotBlank(tyreNo), PcBladeClaim::getTyreNo, "%" + tyreNo + "%")
+				.like(StringUtils.isNotBlank(tyreSpecs), PcBladeClaim::getTyreSpecs, "%" + tyreSpecs + "%")
+				// 日期范围
+				.ge(purchaseDateStart != null, PcBladeClaim::getPurchaseDate, purchaseDateStart)
+				.le(purchaseDateEnd != null, PcBladeClaim::getPurchaseDate, purchaseDateEnd)
+				// 数值范围
+				.ge(claimAmountMin != null, PcBladeClaim::getClaimAmount, claimAmountMin)
+				.le(claimAmountMax != null, PcBladeClaim::getClaimAmount, claimAmountMax)
+				.ge(runMileageMin != null, PcBladeClaim::getRunMileage, runMileageMin)
+				.le(runMileageMax != null, PcBladeClaim::getRunMileage, runMileageMax)
+				// 数据权限（适配实体类BaseEntity的createUser字段）
+				.eq(PcBladeClaim::getCreateUser, userId)
+				// 排序
+				.orderByDesc(PcBladeClaim::getSubmitTime)
+				.orderByDesc(PcBladeClaim::getCreateTime);
+
+			// ========== 6. 分页查询主表 ==========
+			IPage<PcBladeClaim> page = new Page<>(pageNum, pageSize);
+			page = pcBladeClaimService.page(page, wrapper);
+			List<PcBladeClaim> claimList = page.getRecords();
+
+			if (org.springframework.util.CollectionUtils.isEmpty(claimList)) {
+				// 返回空分页对象，保持结构统一
+				IPage<ClaimSearchVO> emptyPage = new Page<>(pageNum, pageSize, 0);
+				return R.data(emptyPage);
+			}
+
+			// ========== 7. 批量查询关联数据（避免N+1） ==========
+			List<Long> claimIds = claimList.stream().map(PcBladeClaim::getId).collect(Collectors.toList());
+
+			// 查询附件
+			List<PcBladeClaimAttachment> attachmentList = pcBladeClaimAttachmentService.list(
+				new LambdaQueryWrapper<PcBladeClaimAttachment>().in(PcBladeClaimAttachment::getClaimId, claimIds)
+			);
+			Map<Long, List<PcBladeClaimAttachment>> attachmentMap = attachmentList.stream()
+				.collect(Collectors.groupingBy(PcBladeClaimAttachment::getClaimId));
+
+			// 查询审核记录
+			List<PcBladeClaimAudit> auditList = pcBladeClaimAuditService.list(
+				new LambdaQueryWrapper<PcBladeClaimAudit>()
+					.in(PcBladeClaimAudit::getClaimId, claimIds)
+					.orderByDesc(PcBladeClaimAudit::getAuditTime)
+			);
+			Map<Long, List<PcBladeClaimAudit>> auditMap = auditList.stream()
+				.collect(Collectors.groupingBy(PcBladeClaimAudit::getClaimId));
+
+			// ========== 8. 组装返回VO ==========
+			List<ClaimSearchVO> resultVOList = new ArrayList<>();
+			for (PcBladeClaim claim : claimList) {
+				ClaimSearchVO vo = new ClaimSearchVO();
+				vo.setClaimMain(claim);
+				// 关联附件（无则返回空列表）
+				vo.setAttachments(attachmentMap.getOrDefault(claim.getId(), new ArrayList<>()));
+				// 关联审核记录
+				vo.setAuditRecords(auditMap.getOrDefault(claim.getId(), new ArrayList<>()));
+				resultVOList.add(vo);
+			}
+
+			// ========== 9. 封装分页结果 ==========
+			IPage<ClaimSearchVO> resultPage = new Page<>();
+			resultPage.setCurrent(page.getCurrent());
+			resultPage.setSize(page.getSize());
+			resultPage.setTotal(page.getTotal());
+			resultPage.setPages(page.getPages());
+			resultPage.setRecords(resultVOList);
+
+			return R.data(resultPage);
+
+		} catch (IllegalArgumentException e) {
+			return R.fail("参数错误：" + e.getMessage());
+		} catch (Exception e) {
+			// 生产环境建议添加日志记录
+			// log.error("理赔综合查询异常", e);
+			return R.fail("查询失败，请稍后重试");
+		}
+	}
+
+	// 补充：导入StringUtils工具类（避免空值判断报错）
+	private static class StringUtils {
+		public static boolean isNotBlank(String str) {
+			return str != null && !str.trim().isEmpty();
+		}
+	}
+
+}

blade-service/blade-factory/src/main/java/org/springblade/factory/domain/ClaimSearchVO.java

@@ -0,0 +1,34 @@
+package org.springblade.factory.domain;
+
+import lombok.Data;
+import org.springblade.factory.entity.PcBladeClaim;
+import org.springblade.factory.entity.PcBladeClaimAttachment;
+import org.springblade.factory.entity.PcBladeClaimAudit;
+
+import java.util.List;
+
+@Data
+public class ClaimSearchVO {
+	/**
+	 * 理赔申请主表核心信息
+	 */
+	private PcBladeClaim claimMain;
+
+	/**
+	 * 该理赔单对应的所有附件列表
+	 * 无附件时返回空列表（非null）
+	 */
+	private List<PcBladeClaimAttachment> attachments;
+
+	/**
+	 * 该理赔单对应的所有审核记录列表
+	 * 按审核时间倒序排列，无审核记录时返回空列表（非null）
+	 */
+	private List<PcBladeClaimAudit> auditRecords;
+
+
+
+}
+
+
+

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

@@ -3,6 +3,8 @@ package org.springblade.u9cloud.controller;
 import com.fasterxml.jackson.core.JsonProcessingException;
 import com.fasterxml.jackson.databind.ObjectMapper;
 import com.fasterxml.jackson.datatype.jsr310.JavaTimeModule;
+import io.swagger.annotations.ApiImplicitParam;
+import io.swagger.annotations.ApiImplicitParams;
 import io.swagger.annotations.ApiOperation;
 import lombok.AllArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
@@ -50,10 +52,14 @@ public class ComprehensiveQueryController {
 
 	/**
 	 * 综合查询--发货状态查询（全字段覆盖+复杂查询支持）
-	 * 支持：精准/模糊/日期范围/数值范围/多状态组合查询，返回列表格式结果
+	 * 支持：精准/模糊/日期范围/数值范围/多状态组合查询+分页，返回列表格式结果
 	 */
 	@GetMapping("/ShippingStatusInquiry")
-	@ApiOperation(value = "发货状态综合查询", notes = "支持多条件组合查询，返回发货数据列表")
+	@ApiOperation(value = "发货状态综合查询", notes = "支持多条件组合查询+分页，返回发货数据列表")
+	@ApiImplicitParams({
+		@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<ZcrmViewShipSel>> shippingStatusInquiry(
 		// 基础精准查询字段
 		ZcrmViewShipSel zcrmViewShipSel,
@@ -70,14 +76,22 @@ public class ComprehensiveQueryController {
 		@RequestParam(required = false) String fuzzyValue,
 		// 多状态组合查询
 		@RequestParam(required = false) String statusList,
-		@RequestParam(required = false) String lineStatusList
+		@RequestParam(required = false) String lineStatusList,
+		// 分页参数
+		@RequestParam(defaultValue = "1") Integer pageNum,
+		@RequestParam(defaultValue = "10") Integer pageSize
 	) {
 		try {
+			// 分页参数校验与处理
+			pageNum = Math.max(pageNum, 1); // 页码最小为1
+			pageSize = Math.max(Math.min(pageSize, 100), 1); // 每页条数限制1-100
+			int offset = (pageNum - 1) * pageSize; // 计算偏移量
+
 			// 1. 初始化SQL构建器
 			StringBuilder sqlBuilder = new StringBuilder("select * from ZCRM_View_Ship_Sel where 1=1");
 			Map<String, Object> queryParams = new HashMap<>();
 
-			// 2. 拼接各类查询条件
+			// 2. 拼接各类查询条件（原有逻辑不变）
 			appendExactCondition(sqlBuilder, queryParams, "Org_ID", zcrmViewShipSel.getOrgId());
 			appendExactCondition(sqlBuilder, queryParams, "Org_Code", zcrmViewShipSel.getOrgCode());
 			appendExactCondition(sqlBuilder, queryParams, "Org_Name", zcrmViewShipSel.getOrgName());
@@ -108,12 +122,17 @@ public class ComprehensiveQueryController {
 			appendInCondition(sqlBuilder, queryParams, "Status", statusList);
 			appendInCondition(sqlBuilder, queryParams, "LineStatus", lineStatusList);
 
-			// 3. 构建请求URL（与Service层保持一致：静态调用U9cloudConfig）
+			// 3. 拼接分页条件（核心修改点）
+			sqlBuilder.append(" LIMIT :pageSize OFFSET :offset");
+			queryParams.put("pageSize", pageSize);
+			queryParams.put("offset", offset);
+
+			// 4. 构建请求URL（原有逻辑不变）
 			String url = UriComponentsBuilder.fromHttpUrl(U9cloudConfig.BASE_URL + U9cloudConfig.PATH_API)
 				.encode(StandardCharsets.UTF_8)
 				.toUriString();
 
-			// 4. 构建请求体（与Service层格式一致：Map<String, String>）
+			// 5. 构建请求体（原有逻辑不变）
 			Map<String, String> requestBody = new HashMap<>();
 			requestBody.put("SqlString", sqlBuilder.toString());
 			try {
@@ -125,7 +144,7 @@ public class ComprehensiveQueryController {
 				throw new ServiceException("参数序列化失败：" + e.getMessage());
 			}
 
-			// 5. 设置请求头（与Service层逻辑一致）
+			// 6. 设置请求头（原有逻辑不变）
 			HttpHeaders headers = new HttpHeaders();
 			headers.setContentType(MediaType.APPLICATION_JSON);
 			String token = u9cloudGetTokenUtil.getToken();
@@ -135,7 +154,7 @@ public class ComprehensiveQueryController {
 			headers.set("token", token);
 			HttpEntity<Map<String, String>> requestEntity = new HttpEntity<>(requestBody, headers);
 
-			// 6. 发送请求（泛型匹配Service层的ViewApiResponse）
+			// 7. 发送请求（原有逻辑不变）
 			RestTemplate restTemplate = new RestTemplate();
 			ParameterizedTypeReference<ViewApiResponse<ZcrmViewShipSel>> typeRef =
 				new ParameterizedTypeReference<ViewApiResponse<ZcrmViewShipSel>>() {
@@ -143,7 +162,7 @@ public class ComprehensiveQueryController {
 			ResponseEntity<ViewApiResponse<ZcrmViewShipSel>> response =
 				restTemplate.exchange(url, HttpMethod.POST, requestEntity, typeRef);
 
-			// 7. 处理响应结果（转换为项目统一的R类型）
+			// 8. 处理响应结果（原有逻辑不变）
 			ViewApiResponse<ZcrmViewShipSel> responseBody = response.getBody();
 			if (responseBody == null) {
 				log.warn("U9云接口返回空响应体");
@@ -157,12 +176,12 @@ public class ComprehensiveQueryController {
 			}
 
 			List<ZcrmViewShipSel> dataList = responseBody.getData();
-			log.info("发货状态查询成功，返回数据条数：{}", Objects.isNull(dataList) ? 0 : dataList.size());
+			log.info("发货状态查询成功，返回数据条数：{}，分页参数：页码{}，每页条数{}",
+				Objects.isNull(dataList) ? 0 : dataList.size(), pageNum, pageSize);
 			return R.data(dataList);
 
 		} catch (Exception e) {
 			log.error("发货状态查询异常", e);
-			// 修复：异常分支必须返回R类型，且统一错误提示
 			return R.fail("发货状态查询异常：" + e.getMessage());
 		}
 	}
@@ -172,7 +191,11 @@ public class ComprehensiveQueryController {
 	 * 综合查询--应收单状态查询（全字段覆盖+复杂查询支持）
 	 */
 	@GetMapping("/ARBillHeadStatusInquiry")
-	@ApiOperation(value = "应收单状态综合查询", notes = "支持多条件组合查询，返回应收单数据列表")
+	@ApiOperation(value = "应收单状态综合查询", notes = "支持多条件组合查询+分页，返回应收单数据列表")
+	@ApiImplicitParams({
+		@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(
 		// 基础精准查询字段
 		ZcrmViewARBillHeadSel arBillHeadSel,
@@ -190,14 +213,22 @@ public class ComprehensiveQueryController {
 		@RequestParam(required = false) String fuzzyFields,
 		@RequestParam(required = false) String fuzzyValue,
 		// 多状态组合查询
-		@RequestParam(required = false) String docStatusList
+		@RequestParam(required = false) String docStatusList,
+		// 分页参数
+		@RequestParam(defaultValue = "1") Integer pageNum,
+		@RequestParam(defaultValue = "10") Integer pageSize
 	) {
 		try {
+			// 分页参数校验与处理
+			pageNum = Math.max(pageNum, 1); // 页码最小为1
+			pageSize = Math.max(Math.min(pageSize, 100), 1); // 每页条数限制1-100
+			int offset = (pageNum - 1) * pageSize; // 计算偏移量
+
 			// 1. 初始化SQL构建器
 			StringBuilder sqlBuilder = new StringBuilder("select * from ZCRM_View_ARBillHead_Sel where 1=1");
 			Map<String, Object> queryParams = new HashMap<>();
 
-			// 2. 拼接各类查询条件
+			// 2. 拼接各类查询条件（原有逻辑不变）
 			// 组织相关
 			appendExactCondition(sqlBuilder, queryParams, "Org_ID", arBillHeadSel.getOrgId());
 			appendExactCondition(sqlBuilder, queryParams, "Org_Code", arBillHeadSel.getOrgCode());
@@ -236,12 +267,17 @@ public class ComprehensiveQueryController {
 			// 多状态组合（单据状态）
 			appendInCondition(sqlBuilder, queryParams, "DocStatus", docStatusList);
 
-			// 3. 构建请求URL
+			// 3. 拼接分页条件（核心新增逻辑）
+			sqlBuilder.append(" LIMIT :pageSize OFFSET :offset");
+			queryParams.put("pageSize", pageSize);
+			queryParams.put("offset", offset);
+
+			// 4. 构建请求URL（原有逻辑不变）
 			String url = UriComponentsBuilder.fromHttpUrl(U9cloudConfig.BASE_URL + U9cloudConfig.PATH_API)
 				.encode(StandardCharsets.UTF_8)
 				.toUriString();
 
-			// 4. 构建请求体
+			// 5. 构建请求体（原有逻辑不变）
 			Map<String, String> requestBody = new HashMap<>();
 			requestBody.put("SqlString", sqlBuilder.toString());
 			try {
@@ -253,7 +289,7 @@ public class ComprehensiveQueryController {
 				throw new ServiceException("参数序列化失败：" + e.getMessage());
 			}
 
-			// 5. 设置请求头
+			// 6. 设置请求头（原有逻辑不变）
 			HttpHeaders headers = new HttpHeaders();
 			headers.setContentType(MediaType.APPLICATION_JSON);
 			String token = u9cloudGetTokenUtil.getToken();
@@ -263,7 +299,7 @@ public class ComprehensiveQueryController {
 			headers.set("token", token);
 			HttpEntity<Map<String, String>> requestEntity = new HttpEntity<>(requestBody, headers);
 
-			// 6. 发送请求
+			// 7. 发送请求（原有逻辑不变）
 			RestTemplate restTemplate = new RestTemplate();
 			ParameterizedTypeReference<ViewApiResponse<ZcrmViewARBillHeadSel>> typeRef =
 				new ParameterizedTypeReference<ViewApiResponse<ZcrmViewARBillHeadSel>>() {
@@ -271,7 +307,7 @@ public class ComprehensiveQueryController {
 			ResponseEntity<ViewApiResponse<ZcrmViewARBillHeadSel>> response =
 				restTemplate.exchange(url, HttpMethod.POST, requestEntity, typeRef);
 
-			// 7. 处理响应结果
+			// 8. 处理响应结果（原有逻辑不变，优化日志）
 			ViewApiResponse<ZcrmViewARBillHeadSel> responseBody = response.getBody();
 			if (responseBody == null) {
 				log.warn("U9云接口返回空响应体");
@@ -285,7 +321,8 @@ public class ComprehensiveQueryController {
 			}
 
 			List<ZcrmViewARBillHeadSel> dataList = responseBody.getData();
-			log.info("应收单状态查询成功，返回数据条数：{}", Objects.isNull(dataList) ? 0 : dataList.size());
+			log.info("应收单状态查询成功，返回数据条数：{}，分页参数：页码{}，每页条数{}",
+				Objects.isNull(dataList) ? 0 : dataList.size(), pageNum, pageSize);
 			return R.data(dataList);
 
 		} catch (Exception e) {

blade-service/blade-u9cloud/src/main/java/org/springblade/u9cloud/controller/SalesOrderSyncController.java

@@ -69,7 +69,7 @@ public class SalesOrderSyncController {
 			CreateOrderSo u9cOrder = this.toolsOrderData(localOrder, localOrderItems);
 
 			// 3. 调用U9C新增接口
-			String createSoUrl = U9cloudConfig.BASE_URL + "/webapi/CustWeiFeiSoCreate/CreateSo";
+			String createSoUrl = U9cloudConfig.BASE_URL + "/U9C/webapi/SO/Create";
 			String responseBody = callU9cApi(createSoUrl, Collections.singletonList(u9cOrder));
 
 			// 4. 解析响应
@@ -106,7 +106,7 @@ public class SalesOrderSyncController {
 			u9cOrder.setDocNo(localOrder.getOrderCode()); // 建议替换为本地存储的U9C单据号
 
 			// 3. 调用U9C修改接口
-			String modifySoUrl = U9cloudConfig.BASE_URL + "/webapi/CustWeiFeiSoModify/ModifySo";
+			String modifySoUrl = U9cloudConfig.BASE_URL + "/U9C/webapi/SO/Modify";
 			String responseBody = callU9cApi(modifySoUrl, Collections.singletonList(u9cOrder));
 
 			// 4. 解析响应（修改接口Data为空数组，仅判断Success）