From 7c2f69ddcc1a35a314768bae203b7bd5df875429 Mon Sep 17 00:00:00 2001
From: 6c <420680616@qq.com>
Date: 星期四, 18 九月 2025 10:29:31 +0800
Subject: [PATCH] 请求历史特殊处理-若是多次维修导致报表库数据重复，那么按照主键取最新数据
---
product-server-data-center/src/main/java/com/product/data/center/service/DataExtractService.java | 14 +++++++++++++-
1 files changed, 13 insertions(+), 1 deletions(-)
diff --git a/product-server-data-center/src/main/java/com/product/data/center/service/DataExtractService.java b/product-server-data-center/src/main/java/com/product/data/center/service/DataExtractService.java
index 25252be..c96f279 100644
--- a/product-server-data-center/src/main/java/com/product/data/center/service/DataExtractService.java
+++ b/product-server-data-center/src/main/java/com/product/data/center/service/DataExtractService.java
@@ -533,7 +533,7 @@
maybeUpdate.getData().sort((o1, o2) -> DateUtil.compare(o1.getDate(extractUpdateTimeField), o2.getDate(extractUpdateTimeField)));
- batchResultEntity = targetNewDao.updateBatch(maybeUpdate, updateFilterEntity, false);
+ batchResultEntity = targetNewDao.updateBatch(maybeUpdate, updateFilterEntity, true);
WriteExtractUtil.append("鏇存柊鎻愬彇杩囨护鍚庢暟鎹細" + extractTargetTable + ",闇�瑕佹洿鏂扮殑鏉℃暟锛�" + maybeUpdate.getRows() + ",鑰楁椂锛�" + tempTestTimer2.intervalMs());
targetNewDao.closeConnection();
@@ -599,6 +599,8 @@
if (DataTableEntity.isEmpty(dt) || !"T_PM_MO_BASE".equalsIgnoreCase(targetTable)) {
return;
}
+ StringBuilder b=new StringBuilder();
+ b.append("select * from T_PM_PROJECT_BASE where project_id in( ");
Map<String, FieldSetEntity> map = new HashMap<>();
List<Object> moNumberList = new ArrayList<>();
for (int i = 0; i < dt.getRows(); i++) {
@@ -607,8 +609,13 @@
continue;
}
moNumberList.add(moNumber);
+
+ if(i>0)b.append(",");
+ b.append(moNumber);
+
map.put(moNumber, dt.getFieldSetEntity(i));
}
+ b.append(" ) ");
//鏌ヨ鍒朵护鍗曞叧鑱旂殑宸ュ崟鏁版嵁
DataTableEntity projectBaseDt = targetDao.getList("T_PM_PROJECT_BASE", new String[]{"PROJECT_ID,PROJECT_BASE_ID"},
BaseUtil.buildQuestionMarkFilter("project_id", moNumberList.size(), true), moNumberList.toArray(), null, 1, dt.getRows());
@@ -625,6 +632,11 @@
}
}
if (!map.isEmpty()) {
+ b.append("\r\n鏈壘鍒板伐鍗曪細");
+ map.forEach((key, value) -> {
+ b.append(key).append(",");
+ });
+ SpringMVCContextHolder.getSystemLogger().error(b.toString());
throw new BaseException(ErrorCode.MO_NUMBER_MASTER_PROJECT_BASE_EMPTY);
}
}
--
Gitblit v1.9.2