feat: 调整代码格式

service-manage/src/main/java/com/simuwang/manage/service/impl/DeletionServiceImpl.java

@@ -157,6 +157,15 @@ public class DeletionServiceImpl implements DeletionService {
 
     }
 
+    public static Integer getWeekOfYear(String priceDate) {
+        int year = Integer.parseInt(priceDate.substring(0, 4));
+        int week = DateUtil.weekOfYear(DateUtils.parse(priceDate, DateUtils.YYYY_MM_DD));
+        if (week < 10) {
+            return Integer.valueOf(year + "0" + week);
+        }
+        return Integer.valueOf(year + "" + week);
+    }
+
     private void distributionDeletion(String fundId, List<NavDO> navDOList) {
         if(navDOList.size() < 1){
             return;
@@ -246,7 +255,7 @@ public class DeletionServiceImpl implements DeletionService {
             TreeMap<Integer,List<AssetDO>> weekNavListMap = new TreeMap<>();
             //按周数整合
             for(String priceDate : navListMap.keySet()){
-                Integer weekOfYear = Integer.parseInt(priceDate.substring(0,4)+DateUtil.weekOfYear(DateUtils.parse(priceDate,DateUtils.YYYY_MM_DD)));
+                Integer weekOfYear = getWeekOfYear(priceDate);
                 if(weekNavListMap.containsKey(weekOfYear)){
                     List<AssetDO> assetDOS = weekNavListMap.get(weekOfYear);
                     assetDOS.addAll(navListMap.get(priceDate));
@@ -428,7 +437,7 @@ public class DeletionServiceImpl implements DeletionService {
             TreeMap<Integer,List<NavDO>> weekNavListMap = new TreeMap<>();
             //按周数整合
             for(String priceDate : navListMap.keySet()){
-                Integer weekOfYear = Integer.parseInt(priceDate.substring(0,4)+DateUtil.weekOfYear(DateUtils.parse(priceDate,DateUtils.YYYY_MM_DD)));;
+                Integer weekOfYear = getWeekOfYear(priceDate);
                 if(weekNavListMap.containsKey(weekOfYear)){
                     List<NavDO> navDOS = weekNavListMap.get(weekOfYear);
                     navDOS.addAll(navListMap.get(priceDate));
@@ -609,7 +618,7 @@ public class DeletionServiceImpl implements DeletionService {
             TreeMap<Integer,List<FundPositionDetailDO>> weekNavListMap = new TreeMap<>();
             //按周数整合
             for(String priceDate : valuationListMap.keySet()){
-                Integer weekOfYear = Integer.parseInt(priceDate.substring(0,4)+DateUtil.weekOfYear(DateUtils.parse(priceDate,DateUtils.YYYY_MM_DD)));;
+                Integer weekOfYear = getWeekOfYear(priceDate);
                 if(weekNavListMap.containsKey(weekOfYear)){
                     List<FundPositionDetailDO> valuationDOS = weekNavListMap.get(weekOfYear);
                     valuationDOS.addAll(valuationListMap.get(priceDate));