From 51aeb12b0bd3030931b22c666b9c83e7ee51c800 Mon Sep 17 00:00:00 2001 From: sfd <sun.sunshine@163.com> Date: 星期五, 09 五月 2025 17:18:33 +0800 Subject: [PATCH] Merge branch 'dev' of http://192.168.50.149:8085/r/aps-backend into dev --- aps-modules/aps-job/src/main/java/com/aps/job/service/impl/ApsWorkOrderJobServiceImpl.java | 9 +++++++-- 1 files changed, 7 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..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,5 +1,6 @@ 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; @@ -158,7 +159,7 @@ param.setDocState(Arrays.asList(0,1,2,4)); param.setBeginDate(yesterdayMidnight.format(formatter)); param.setEndDate(today.format(formatter)); - param.setPageSize(1000); + param.setPageSize(500); while (continueFlag){ param.setPageIndex(currentPage); continueFlag= batchSaveByPager(param); @@ -178,6 +179,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 +294,16 @@ } ApsWorkOrderJob order = result.getObject(i, ApsWorkOrderJob.class); + order.setId(IdUtil.getSnowflakeNextId()); 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")); + order.setLowOrderCode(jsonObject.getString("LowLevelCode")); jobs.add(order); orderIds.add(order.getOrderId()); } catch (Exception e) { -- Gitblit v1.9.3