From d668c213bbcccd83acb57056a6b7919fda7e6d2d Mon Sep 17 00:00:00 2001
From: zhanghl <253316343@qq.com>
Date: 星期一, 28 四月 2025 11:55:01 +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 | 11 +++++++++--
1 files changed, 9 insertions(+), 2 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 9881784..2c3541d 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
@@ -3,6 +3,7 @@
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;
@@ -51,6 +52,9 @@
@Autowired
private ApsWorkOrderJobLogMapper jobLogMapper;
+
+ @Autowired
+ private Sequence sequence;
/**
* 鏌ヨ宸ュ崟鍚屾
@@ -158,7 +162,7 @@
param.setDocState(Arrays.asList(0,1,2,4));
param.setBeginDate(yesterdayMidnight.format(formatter));
param.setEndDate(today.format(formatter));
- param.setPageSize(1000);
+ param.setPageSize(100);
while (continueFlag){
param.setPageIndex(currentPage);
continueFlag= batchSaveByPager(param);
@@ -178,6 +182,7 @@
jobLog.setCreateTime(DateUtils.getNowDate());
jobLog.setBizType("work_order");
jobLogMapper.insertApsWorkOrderJobLog(jobLog);
+ log.info("work_order_request锛歿}", JSONObject.toJSONString(jobLog));
return requestOnePage(jobLog);
}
/**
@@ -292,13 +297,15 @@
}
ApsWorkOrderJob order = result.getObject(i, ApsWorkOrderJob.class);
+ order.setId(sequence.nextId());
order.setOrderId(jsonObject.getString("ID"));
order.setCreateTime(DateUtils.getNowDate());
order.setPageIndex(i);
order.setPageNum(pageNum);
order.setDelFlag("0");
order.setProcessStatus("0");
-
+ order.setOpStatus(jsonObject.getString("OpStatus"));
+ order.setNextOpName(jsonObject.getString("NextOpName"));
jobs.add(order);
orderIds.add(order.getOrderId());
} catch (Exception e) {
--
Gitblit v1.9.3