导出Excel报错

src/main/java/cn/quantgroup/customer/rest/vo/thirdworkorder/ThirdWorkOrderExportVo.java

@@ -107,7 +107,12 @@ public class ThirdWorkOrderExportVo implements Serializable {
    * 订单状态
    */
   @ExcelProperty(value = "订单状态", index = 12)
-  private String orderStatus;
+  private String orderStatusText;
+
+  /**
+   * 订单状态
+   */
+  private Integer orderStatus;
 
 
   /**

src/main/java/cn/quantgroup/customer/service/impl/ThirdWorkOrderServiceImpl.java

@@ -17,6 +17,7 @@ import cn.quantgroup.third.customer.entity.WorkflowProcessInstanceTaskAssignee;
 import cn.quantgroup.third.customer.repo.LhpdsCustomer2Repo;
 import cn.quantgroup.third.customer.repo.LhpdsSysUserRepo;
 import cn.quantgroup.third.customer.repo.WorkflowProcessInstanceTaskAssigneeRepo;
+import com.alibaba.fastjson.JSON;
 import java.io.File;
 import java.io.FileInputStream;
 import java.util.ArrayList;
@@ -283,9 +284,9 @@ public class ThirdWorkOrderServiceImpl implements IThirdWorkOrderService {
             List<ThirdWorkOrderExportVo> dbAllData = new ArrayList<>();
 
             List<ThirdWorkOrderExportVo> kdspResult = new ArrayList<>();
-            for (int i = 1;i <= pageNo;i++){
             Set<String> orderNos = new HashSet<>();
-                long offset = (param.getPageNo() - 1) * param.getPageSize();
+            for (int i = 1;i <= pageNo;i++){
+                long offset = (i - 1) * pageSize;
                 String tempSql = sql.toString() + " limit "+offset+","+pageSize;
                 Query nativeQuery = entityManager.createNativeQuery(tempSql);
                 List<Object[]> result = nativeQuery.getResultList();
@@ -337,7 +338,18 @@ public class ThirdWorkOrderServiceImpl implements IThirdWorkOrderService {
                     dbAllData.add(exportVo);
                 }
 
-                JsonResult<List<ThirdWorkOrderExportVo>> orderResult = iKdspService.getOrderDetailForWorkOder(new ArrayList<>(orderNos),tenantId);
+            }
+
+            int orderPageNo = (orderNos.size() + pageSize - 1) / pageSize;
+            List<String> orderNoList = new ArrayList<>(orderNos);
+            for (int i =0;i < orderPageNo;i++){
+                List<String> subList = null;
+                if (i != orderPageNo-1){
+                    subList = orderNoList.subList(i*pageSize, pageSize);
+                }else {
+                    subList = orderNoList.subList(i*pageSize, orderNos.size()-1);
+                }
+                JsonResult<List<ThirdWorkOrderExportVo>> orderResult = iKdspService.getOrderDetailForWorkOder(subList,tenantId);
                 if (!orderResult.isSuccess()){
                     log.error("工单导出查询订单信息失败:{}",orderResult.getMsg());
                     return;
@@ -356,13 +368,16 @@ public class ThirdWorkOrderServiceImpl implements IThirdWorkOrderService {
                     continue;
                 }
                 for (ThirdWorkOrderExportVo kdspOrder : kdspOrders){
-                    String orderStatus = kdspOrder.getOrderStatus();
-                    Integer code = StringUtils.isNotBlank(orderStatus)?Integer.parseInt(orderStatus):null;
-                    KdspOrderStatusEnum orderStatusEnum = KdspOrderStatusEnum.getByCode(code);
+                    log.info("订单数据：{}", JSON.toJSONString(kdspOrder));
+                    if ("1726483753343406080".equals(kdspOrder.getOrderNo())){
+                        System.out.println("11");
+                    }
+                    KdspOrderStatusEnum orderStatusEnum = KdspOrderStatusEnum.getByCode(kdspOrder.getOrderStatus());
                     if (orderStatusEnum != null){
-                        kdspOrder.setOrderStatus(orderStatusEnum.getDesc());
+                        kdspOrder.setOrderStatusText(orderStatusEnum.getDesc());
+                    }else {
+                        kdspOrder.setOrderStatusText(kdspOrder.getOrderStatus()+"");
                     }
-
                     kdspOrder.setId(dbData.getId());
                     kdspOrder.setProcessInstanceId(dbData.getProcessInstanceId());
                     kdspOrder.setCreateUser(dbData.getCreateUser());