From feddd20a4323e49ef9f424d07e53c12e715203fc Mon Sep 17 00:00:00 2001 From: sfd <sun.sunshine@163.com> Date: 星期二, 13 五月 2025 14:45:20 +0800 Subject: [PATCH] 修改冲突 --- aps-modules/aps-job/src/main/java/com/aps/job/service/impl/ApsWorkOrderJobServiceImpl.java | 6 +++++- 1 files changed, 5 insertions(+), 1 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 fc2078b..8c8762d 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 @@ -159,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); @@ -303,6 +303,10 @@ order.setProcessStatus("0"); order.setOpStatus(jsonObject.getString("OpStatus")); order.setNextOpName(jsonObject.getString("NextOpName")); + order.setLowOrderCode(jsonObject.getString("LowLevelCode")); + order.setOrderCreateTime(jsonObject.getDate("CreatedOn")); + order.setApproveOn(jsonObject.getDate("ApproveOn")); + order.setStartWorkDate(jsonObject.getDate("StartDatetime")); jobs.add(order); orderIds.add(order.getOrderId()); } catch (Exception e) { -- Gitblit v1.9.3