From 088a46dc697ef5b719f1ab62c9988f96a21e5e0c Mon Sep 17 00:00:00 2001
From: zhanghl <253316343@qq.com>
Date: 星期一, 12 五月 2025 11:17:22 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev' into dev
---
aps-modules/aps-job/src/main/java/com/aps/job/service/impl/ApsWorkOrderJobServiceImpl.java | 9 ++++-----
1 files changed, 4 insertions(+), 5 deletions(-)
diff --git a/aps-modules/aps-job/src/main/java/com/aps/job/service/impl/ApsWorkOrderJobServiceImpl.java b/aps-modules/aps-job/src/main/java/com/aps/job/service/impl/ApsWorkOrderJobServiceImpl.java
index 44e11f2..c45b643 100644
--- a/aps-modules/aps-job/src/main/java/com/aps/job/service/impl/ApsWorkOrderJobServiceImpl.java
+++ b/aps-modules/aps-job/src/main/java/com/aps/job/service/impl/ApsWorkOrderJobServiceImpl.java
@@ -1,9 +1,9 @@
package com.aps.job.service.impl;
+import cn.hutool.core.util.IdUtil;
import com.alibaba.fastjson.JSONArray;
import com.alibaba.fastjson.JSONObject;
import com.aps.common.core.utils.DateUtils;
-import com.aps.common.core.utils.uuid.Sequence;
import com.aps.job.domain.ApsWorkOrderJob;
import com.aps.job.domain.ApsWorkOrderJobLog;
import com.aps.job.mapper.ApsWorkOrderJobLogMapper;
@@ -27,8 +27,6 @@
import java.util.ArrayList;
import java.util.Arrays;
import java.util.List;
-
-import static com.aps.common.core.utils.uuid.IdUtils.getId;
/**
* 宸ュ崟鍚屾Service涓氬姟灞傚鐞�
@@ -161,7 +159,7 @@
param.setDocState(Arrays.asList(0,1,2,4));
param.setBeginDate(yesterdayMidnight.format(formatter));
param.setEndDate(today.format(formatter));
- param.setPageSize(100);
+ param.setPageSize(500);
while (continueFlag){
param.setPageIndex(currentPage);
continueFlag= batchSaveByPager(param);
@@ -296,7 +294,7 @@
}
ApsWorkOrderJob order = result.getObject(i, ApsWorkOrderJob.class);
- order.setId(getId());
+ order.setId(IdUtil.getSnowflakeNextId());
order.setOrderId(jsonObject.getString("ID"));
order.setCreateTime(DateUtils.getNowDate());
order.setPageIndex(i);
@@ -305,6 +303,7 @@
order.setProcessStatus("0");
order.setOpStatus(jsonObject.getString("OpStatus"));
order.setNextOpName(jsonObject.getString("NextOpName"));
+ order.setLowOrderCode(jsonObject.getString("LowLevelCode"));
jobs.add(order);
orderIds.add(order.getOrderId());
} catch (Exception e) {
--
Gitblit v1.9.3