From f29e6f31e4f2d533124fc68346b7cc072f427c9b Mon Sep 17 00:00:00 2001
From: chengf <cgf12138@163.com>
Date: 星期四, 11 十二月 2025 16:58:24 +0800
Subject: [PATCH] Z三导入逻辑
---
service-job/src/main/java/com/java110/job/importData/adapt/ImportReportMainV2QueueDataAdapt.java | 16 +++++++++-------
1 files changed, 9 insertions(+), 7 deletions(-)
diff --git a/service-job/src/main/java/com/java110/job/importData/adapt/ImportReportMainV2QueueDataAdapt.java b/service-job/src/main/java/com/java110/job/importData/adapt/ImportReportMainV2QueueDataAdapt.java
index 1af7253..ad07c42 100644
--- a/service-job/src/main/java/com/java110/job/importData/adapt/ImportReportMainV2QueueDataAdapt.java
+++ b/service-job/src/main/java/com/java110/job/importData/adapt/ImportReportMainV2QueueDataAdapt.java
@@ -22,10 +22,8 @@
import java.math.BigDecimal;
import java.text.ParseException;
import java.text.SimpleDateFormat;
-import java.util.ArrayList;
-import java.util.Calendar;
-import java.util.Date;
-import java.util.List;
+import java.util.*;
+
/**
* 绛炬姤鏀舵敮娆炬暟鎹鍏ラ�傞厤鍣紙閫傞厤"Z涓夈�佹ā鐗堢鎶ユ敹鏀鎯呭喌-V5-20251127.xlsx"鐨�"鑽ｉ『鑻戠鎶ュ崟"sheet锛�
* 鍓嶇璇锋眰闇�浼犲叆锛歱aram.append('importAdapt', "importReportMainV2QueueData")
@@ -97,7 +95,8 @@
private MaintenancePaymentPo buildMaintenancePaymentPo(JSONArray cellArray) throws ParseException {
MaintenancePaymentPo po = new MaintenancePaymentPo();
// 鍩虹瀛楁锛堢洿鎺ユ槧灏凟xcel鍗曞厓鏍硷級
- po.setId(GenerateCodeFactory.getGeneratorId(GenerateCodeFactory.CODE_PREFIX_maintenanceId)); // 涓婚敭ID
+ long longId = UUID.randomUUID().getMostSignificantBits() & Long.MAX_VALUE; // 閬垮厤璐熸暟
+ po.setId(longId+""); // 涓婚敭ID
po.setAuxiliaryColumn(getCellValue(cellArray, 0)); // 绗�1鍒楋細杈呭姪鍒�
po.setFlowNumber(getCellValue(cellArray, 1)); // 绗�2鍒楋細娴佽浆缂栧彿
po.setSerialNumber(parseInteger(getCellValue(cellArray, 2))); // 绗�3鍒楋細搴忓彿
@@ -275,7 +274,9 @@
int arrivalDateCol, int arrivalAmountCol,
int withdrawerCol, int shortageCol) throws ParseException {
MpPaymentRecordPo po = new MpPaymentRecordPo();
- po.setId(GenerateCodeFactory.getGeneratorId(GenerateCodeFactory.CODE_PREFIX_paymentRecordId));
+
+ long longId = UUID.randomUUID().getMostSignificantBits() & Long.MAX_VALUE; // 閬垮厤璐熸暟
+ po.setId(longId+"");
po.setMpId(flowNumber + "_PRINT" + printTimes); // mp_id = 娴佽浆缂栧彿_鎵撳嵃娆℃暟锛堢‘淇濆敮涓�锛�
po.setFirstPrintDate(parseDate(getCellValue(cellArray, dateCol)));
po.setResolutionNumber(getCellValue(cellArray, resolutionCol));
@@ -298,7 +299,8 @@
*/
private MpFifthPaymentRecordPo buildMpFifthPaymentRecordPo(JSONArray cellArray, String flowNumber) throws ParseException {
MpFifthPaymentRecordPo po = new MpFifthPaymentRecordPo();
- po.setId(GenerateCodeFactory.getGeneratorId(GenerateCodeFactory.CODE_PREFIX_fifthPaymentId));
+ long longId = UUID.randomUUID().getMostSignificantBits() & Long.MAX_VALUE; // 閬垮厤璐熸暟
+ po.setId(longId+"");
po.setMpId(flowNumber + "_FIFTH"); // mp_id = 娴佽浆缂栧彿_FIFTH
// 绗簲娆℃嫙浠樺疄浠樻暟鎹紙绗�106-111鍒楋級
po.setFifthPlannedPaymentAmount(parseBigDecimal(getCellValue(cellArray, 137))); // 绗簲娆℃嫙浠橀噾棰�
--
Gitblit v1.8.0