Bladeren bron

配分事项添加2/3/4级id

wangxx 1 maand geleden
bovenliggende
commit
41d00d25e6

+ 18 - 0
airport-ledger/src/main/java/com/sundot/airport/ledger/domain/ScoreEvent.java

@@ -29,6 +29,15 @@ public class ScoreEvent extends BaseEntity {
29
     @Excel(name = "末级指标ID")
29
     @Excel(name = "末级指标ID")
30
     private Long indicatorId;
30
     private Long indicatorId;
31
 
31
 
32
+    @Excel(name = "二级指标ID")
33
+    private Long level2Id;
34
+
35
+    @Excel(name = "三级指标ID")
36
+    private Long level3Id;
37
+
38
+    @Excel(name = "四级指标ID")
39
+    private Long level4Id;
40
+
32
     @Excel(name = "二级指标")
41
     @Excel(name = "二级指标")
33
     private String level2Name;
42
     private String level2Name;
34
 
43
 
@@ -93,6 +102,15 @@ public class ScoreEvent extends BaseEntity {
93
     public Long getIndicatorId() { return indicatorId; }
102
     public Long getIndicatorId() { return indicatorId; }
94
     public void setIndicatorId(Long indicatorId) { this.indicatorId = indicatorId; }
103
     public void setIndicatorId(Long indicatorId) { this.indicatorId = indicatorId; }
95
 
104
 
105
+    public Long getLevel2Id() { return level2Id; }
106
+    public void setLevel2Id(Long level2Id) { this.level2Id = level2Id; }
107
+
108
+    public Long getLevel3Id() { return level3Id; }
109
+    public void setLevel3Id(Long level3Id) { this.level3Id = level3Id; }
110
+
111
+    public Long getLevel4Id() { return level4Id; }
112
+    public void setLevel4Id(Long level4Id) { this.level4Id = level4Id; }
113
+
96
     public String getLevel2Name() { return level2Name; }
114
     public String getLevel2Name() { return level2Name; }
97
     public void setLevel2Name(String level2Name) { this.level2Name = level2Name; }
115
     public void setLevel2Name(String level2Name) { this.level2Name = level2Name; }
98
 
116
 

+ 2 - 0
airport-ledger/src/main/java/com/sundot/airport/ledger/service/impl/LedgerSyncServiceImpl.java

@@ -451,10 +451,12 @@ public class LedgerSyncServiceImpl implements ILedgerSyncService {
451
         e.setDimensionName(dimId != null ? dimCache.entrySet().stream()
451
         e.setDimensionName(dimId != null ? dimCache.entrySet().stream()
452
                 .filter(x -> x.getValue().equals(dimId)).map(Map.Entry::getKey).findFirst().orElse("") : "");
452
                 .filter(x -> x.getValue().equals(dimId)).map(Map.Entry::getKey).findFirst().orElse("") : "");
453
         if (lv2 != null) {
453
         if (lv2 != null) {
454
+            e.setIndicatorId(lv2.getId());
454
             e.setLevel2Name(lv2.getName());
455
             e.setLevel2Name(lv2.getName());
455
         }
456
         }
456
         if (lv3 != null) {
457
         if (lv3 != null) {
457
             e.setIndicatorId(lv3.getId());
458
             e.setIndicatorId(lv3.getId());
459
+            e.setLevel3Id(lv3.getId());
458
             e.setLevel3Name(lv3.getName());
460
             e.setLevel3Name(lv3.getName());
459
         } else if (lv2 != null) {
461
         } else if (lv2 != null) {
460
             e.setIndicatorId(lv2.getId());
462
             e.setIndicatorId(lv2.getId());