From ac4e090952cfa701d7d681ada7d7900e3ce45755 Mon Sep 17 00:00:00 2001
From: ludc
Date: 星期五, 17 五月 2024 11:05:03 +0800
Subject: [PATCH] 集成申请，历史数据导入，关键属性查重多线程导致判重失误问题
---
Source/UBCS/ubcs-service-api/ubcs-util-api/src/main/java/com/vci/ubcs/starter/util/DefaultAttrAssimtUtil.java | 14 +++++++-------
1 files changed, 7 insertions(+), 7 deletions(-)
diff --git a/Source/UBCS/ubcs-service-api/ubcs-util-api/src/main/java/com/vci/ubcs/starter/util/DefaultAttrAssimtUtil.java b/Source/UBCS/ubcs-service-api/ubcs-util-api/src/main/java/com/vci/ubcs/starter/util/DefaultAttrAssimtUtil.java
index c7adc5e..9522cb8 100644
--- a/Source/UBCS/ubcs-service-api/ubcs-util-api/src/main/java/com/vci/ubcs/starter/util/DefaultAttrAssimtUtil.java
+++ b/Source/UBCS/ubcs-service-api/ubcs-util-api/src/main/java/com/vci/ubcs/starter/util/DefaultAttrAssimtUtil.java
@@ -87,20 +87,19 @@
baseModel.setFirstV("1");
baseModel.setLastR("1");
baseModel.setLastV("1");
- baseModel.setRevisionSeq(1);
// TODO:鐩墠鍙湁缂栫爜瑙勫垯涓湁鐢ㄥ埌锛屽悗鏈熼渶瑕佸幓鎺夎繖娈典唬鐮佺殑璇濓紝灏辨妸浠栧姞鍦ㄧ紪鐮佽鍒欐柊澧炰腑鍘�
if(Func.isBlank(baseModel.getOwner())){
// 璁剧疆鎵�鏈夎��
baseModel.setOwner(Func.isNotEmpty(user) ? user.getUserId().toString():AuthUtil.getUserId().toString());
}
-
baseModel.setVersionSeq(1);
- baseModel.setVersionRule("0");
baseModel.setVersionValue("1");
- baseModel.setRevisionOid(VciBaseUtil.getPk());
- baseModel.setLastModifier(account);
+ baseModel.setVersionRule("0");
+ baseModel.setRevisionSeq(1);
baseModel.setRevisionValue("1");
baseModel.setRevisionRule("1");
+ baseModel.setRevisionOid(VciBaseUtil.getPk());
+ baseModel.setLastModifier(account);
baseModel.setTenantId(Func.isNotEmpty(user) ? user.getTenantId():AuthUtil.getTenantId());
}catch (VciBaseException e){
e.printStackTrace();
@@ -118,8 +117,9 @@
public static <T extends BaseModel> T updateDefaultAttrAssimt(T object) throws VciBaseException {
BaseModel baseModel = object;
try {
- baseModel.setLastModifyTime(new Date());
- baseModel.setTs(new Date());
+ Date date = new Date();
+ baseModel.setLastModifyTime(date);
+ baseModel.setTs(date);
// 鐢ㄦ埛id
// String userId = AuthUtil.getUserId().toString();
// 瑕佹眰鏀规垚璐﹀彿
--
Gitblit v1.9.3