From dec8951aae400e54f6ee83a8f95867dba9da8af1 Mon Sep 17 00:00:00 2001
From: zhanghl <253316343@qq.com>
Date: 星期五, 23 五月 2025 17:17:33 +0800
Subject: [PATCH] [钣金计划大表] 优化：焊缝统计导出Excel样式
---
aps-modules/aps-job/src/main/java/com/aps/job/service/impl/ApsWorkOrderJobServiceImpl.java | 28 ++++++++++++++++++++++++++--
1 files changed, 26 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 6778319..d0ad895 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,19 @@
}
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"));
+ 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) {
@@ -343,4 +351,20 @@
apsWorkOrderJobMapper.batchInsertPlatePlan();
}
+
+ /**
+ * 鍚屾閽ｉ噾宸ュ崟淇℃伅
+ * */
+ @Transactional
+ @Override
+ public void syncGasPipingData() {
+ apsWorkOrderJobMapper.deleteAllGasPiping();
+ apsWorkOrderJobMapper.batchInsertGasPiping();
+ }
+
+ @Override
+ public void deleteAllWorkOrderJob(){
+ apsWorkOrderJobMapper.deleteAllWorkOrderJob();
+ }
+
}
--
Gitblit v1.9.3