From 111330b2dd0bccc176ab9c6324a6ed01d5bc0e93 Mon Sep 17 00:00:00 2001
From: xiejun <xj@2023>
Date: 星期四, 12 十月 2023 09:48:03 +0800
Subject: [PATCH] 历史导入编码最大流水值不正确问题修复
---
Source/UBCS/ubcs-service-api/ubcs-util-api/src/main/java/com/vci/ubcs/starter/web/util/VciBaseUtil.java | 33 ++++++++++++++++++++++-----------
1 files changed, 22 insertions(+), 11 deletions(-)
diff --git a/Source/UBCS/ubcs-service-api/ubcs-util-api/src/main/java/com/vci/ubcs/starter/web/util/VciBaseUtil.java b/Source/UBCS/ubcs-service-api/ubcs-util-api/src/main/java/com/vci/ubcs/starter/web/util/VciBaseUtil.java
index ca40971..4e65f82 100644
--- a/Source/UBCS/ubcs-service-api/ubcs-util-api/src/main/java/com/vci/ubcs/starter/web/util/VciBaseUtil.java
+++ b/Source/UBCS/ubcs-service-api/ubcs-util-api/src/main/java/com/vci/ubcs/starter/web/util/VciBaseUtil.java
@@ -19,6 +19,7 @@
import com.vci.ubcs.starter.web.wrapper.VciQueryWrapperForDO;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
+import org.springblade.core.tool.utils.Func;
import org.springframework.util.CollectionUtils;
import org.springframework.util.ResourceUtils;
@@ -1301,6 +1302,9 @@
Field[] declaredFields = type.getDeclaredFields();
Map<String, String> fieldMap = new HashMap();
String existField = "";
+ if(existFild == null){
+ existFild = new HashSet<>();
+ }
for (Field declaredField : declaredFields) {
declaredField.setAccessible(true);
@@ -1332,22 +1336,23 @@
if ("data".equals(propertyName)){
mapData = (Map) result;
}else if(existFild.contains((fieldMap.containsKey(propertyName)?fieldMap.get(propertyName):propertyName).toLowerCase())){
- returnMap.put(fieldMap.containsKey(propertyName)?fieldMap.get(propertyName):propertyName, result);
+ returnMap.put(fieldMap.containsKey(propertyName)?fieldMap.get(propertyName).toLowerCase():propertyName.toLowerCase(), result);
}
} else if(existFild.contains((fieldMap.containsKey(propertyName)?fieldMap.get(propertyName):propertyName).toLowerCase())){
- returnMap.put(fieldMap.containsKey(propertyName)?fieldMap.get(propertyName):propertyName, "");
+ returnMap.put(fieldMap.containsKey(propertyName)?fieldMap.get(propertyName).toLowerCase():propertyName.toLowerCase(), "");
}
}
}
- //浣滅敤涓昏鐢ㄤ簬宸睲AP涓殑鏁版嵁涓哄噯锛宐ean閲岄潰閬囧埌瀛楁鐩稿悓涔熶細杩涜瑕嗙洊銆�
- if(existFild == null){
- returnMap.putAll((Map) mapData);
- }else{
- Map resulMapChild = (Map) mapData;
- for (Object o : resulMapChild.keySet()) {
- if(existFild.contains(String.valueOf(o).toLowerCase())){
- returnMap.put(String.valueOf(o).toLowerCase(),resulMapChild.get(o));
+ //浣滅敤涓昏鐢ㄤ簬宸睲AP涓殑鏁版嵁涓哄噯锛宐ean閲岄潰閬囧埌瀛楁鐩稿悓涓攎ap閲岄潰鏁版嵁涓虹┖锛屽垯浣跨敤bean閲岄潰鐨勫��,
+// Map resulMapChild = (Map) mapData;
+ for (Object o : mapData.keySet()) {
+ if(existFild == null || existFild.contains(String.valueOf(o).toLowerCase())){
+ if((Func.isNotBlank(String.valueOf(returnMap.get(String.valueOf(o).toLowerCase())))
+ && returnMap.get(String.valueOf(o).toLowerCase()) !=null)
+ && Func.isBlank(String.valueOf(mapData.get(o)))){
+ continue;
}
+ returnMap.put(String.valueOf(o).toLowerCase(),mapData.get(o));
}
}
return returnMap;
@@ -1419,6 +1424,12 @@
return sb.toString();
}
-
+ public static String intToRomans(int num) {
+ String M[] = {"", "M", "MM", "MMM"};
+ String C[] = {"", "C", "CC", "CCC", "CD", "D", "DC", "DCC", "DCCC", "CM"};
+ String X[] = {"", "X", "XX", "XXX", "XL", "L", "LX", "LXX", "LXXX", "XC"};
+ String I[] = {"", "I", "II", "III", "IV", "V", "VI", "VII", "VIII", "IX"};
+ return M[num/1000]+C[(num%1000)/100]+X[(num%100)/10]+I[num%10];
+ }
}
--
Gitblit v1.9.3