配分事项表同步功能添加岗位、区域、通道

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

@@ -212,7 +212,8 @@ public class LedgerSyncServiceImpl implements ILedgerSyncService {
             ScoreEvent e = buildEvent(dimId, lv2, lv3, row.getInspectedName(),
                     null, row.getRecordDate(),
                     row.getLocation(), sv, ZERO,
-                    row.getProblemDesc(), src, row.getEvidenceFile());
+                    row.getProblemDesc(), src, row.getEvidenceFile(),
+                    row.getChannelId(),row.getChannelNo(),row.getAreaId(),row.getPositionId(),row.getPosition());
             scoreEventMapper.insert(e);
             ins++;
         }
@@ -252,8 +253,9 @@ public class LedgerSyncServiceImpl implements ILedgerSyncService {
             ScoreIndicator lv3 = getIndicator(l3Id);
             ScoreEvent e = buildEvent(dimId, lv2, lv3, row.getInspectorName(),
                     row.getTeamName(), row.getRecordDate(),
-                    row.getChannelNo(), sv, ZERO,
-                    row.getItemName(), src, row.getEvidenceFile());
+                    row.getLocation(), sv, ZERO,
+                    row.getItemName(), src, row.getEvidenceFile(),
+                    row.getChannelId(),row.getChannelNo(),row.getAreaId(),row.getPositionId(),row.getPosition());
             scoreEventMapper.insert(e);
             ins++;
         }
@@ -287,8 +289,9 @@ public class LedgerSyncServiceImpl implements ILedgerSyncService {
             ScoreIndicator lv3 = getIndicator(l3Id);
             ScoreEvent e = buildEvent(dimId, lv2, lv3, row.getTestedName(),
                     row.getTeamName(), row.getRecordDate(),
-                    null, NEG_HALF, ZERO,
-                    row.getTestItem(), src, row.getEvidenceFile());
+                    row.getRegion(), NEG_HALF, ZERO,
+                    row.getTestItem(), src, row.getEvidenceFile(),
+                    row.getChannelId(),row.getChannel(),row.getAreaId(),row.getPositionId(),row.getTestType());
             scoreEventMapper.insert(e);
             ins++;
         }
@@ -322,8 +325,9 @@ public class LedgerSyncServiceImpl implements ILedgerSyncService {
             ScoreIndicator lv3 = getIndicator(l3Id);
             ScoreEvent e = buildEvent(dimId, lv2, lv3, row.getResponsibleName(),
                     row.getTeamName(), row.getRecordDate(),
-                    null, sv, ZERO,
-                    row.getEventDesc(), src, row.getEvidenceFile());
+                    row.getArea(), sv, ZERO,
+                    row.getEventDesc(), src, row.getEvidenceFile(),
+                    row.getChannelId(),row.getChannelNo(),row.getAreaId(),row.getPositionId(),row.getPosition());
             scoreEventMapper.insert(e);
             ins++;
         }
@@ -354,8 +358,9 @@ public class LedgerSyncServiceImpl implements ILedgerSyncService {
             ScoreIndicator lv3 = getIndicator(l3Id);
             ScoreEvent e = buildEvent(dimId, lv2, lv3, row.getInspectorName(),
                     row.getTeamName(), row.getRecordDate(),
-                    null, sv, ZERO,
-                    row.getItemName(), src, row.getEvidenceFile());
+                    row.getWorkArea(), sv, ZERO,
+                    row.getItemName(), src, row.getEvidenceFile(),
+                    null,null,row.getAreaId(),row.getPositionId(),row.getPosition());
             scoreEventMapper.insert(e);
             ins++;
         }
@@ -391,7 +396,8 @@ public class LedgerSyncServiceImpl implements ILedgerSyncService {
             ScoreEvent e = buildEvent(dimId, lv2, lv3, row.getPersonName(),
                     row.getTeamName(), row.getApproveDate() != null ? new java.util.Date(row.getApproveDate().getTime()) : null,
                     null, sv, ZERO,
-                    row.getRewardReason(), src, null);
+                    row.getRewardReason(), src, null,
+                    null,null,null,null,null);
             scoreEventMapper.insert(e);
             ins++;
         }
@@ -425,7 +431,8 @@ public class LedgerSyncServiceImpl implements ILedgerSyncService {
             ScoreEvent e = buildEvent(dimId, lv2, lv3, row.getInspectedName(),
                     row.getTeamName(), row.getRecordDate(),
                     row.getLocation(), sv, ZERO,
-                    row.getProblemDesc(), src, row.getEvidenceFile());
+                    row.getProblemDesc(), src, row.getEvidenceFile(),
+                    row.getChannelId(),row.getChannelNo(),row.getAreaId(),row.getPositionId(),row.getPosition());
             scoreEventMapper.insert(e);
             ins++;
         }
@@ -452,7 +459,8 @@ public class LedgerSyncServiceImpl implements ILedgerSyncService {
             ScoreEvent e = buildEvent(dimId, lv2, null, row.getResponsibleName(),
                     row.getTeamName(), row.getRecordDate(),
                     null, sv, ZERO,
-                    row.getComplaintDesc(), src, row.getEvidenceFile());
+                    row.getComplaintDesc(), src, row.getEvidenceFile(),
+                    null,null,null,null,null);
             scoreEventMapper.insert(e);
             ins++;
         }
@@ -480,7 +488,8 @@ public class LedgerSyncServiceImpl implements ILedgerSyncService {
             ScoreEvent e = buildEvent(dimId, lv2, lv3, row.getPersonName(),
                     row.getTeamName(), row.getScoreDate(),
                     null, sv, ZERO,
-                    "航站楼加分", src, null);
+                    "航站楼加分", src, null,
+                    null,null,null,null,null);
             scoreEventMapper.insert(e);
             ins++;
         }
@@ -515,7 +524,8 @@ public class LedgerSyncServiceImpl implements ILedgerSyncService {
             ScoreEvent e = buildEvent(dimId, lv2, lv3, row.getPersonName(),
                     row.getTeamName(), null,
                     null, POS_FIVE, ZERO,
-                    row.getExamCategory() + " " + row.getExamPeriod(), src, null);
+                    row.getExamCategory() + " " + row.getExamPeriod(), src, null,
+                    null,null,null,null,null);
             scoreEventMapper.insert(e);
             ins++;
         }
@@ -648,7 +658,8 @@ public class LedgerSyncServiceImpl implements ILedgerSyncService {
     private ScoreEvent buildEvent(Long dimId, ScoreIndicator lv2, ScoreIndicator lv3,
                                   String personName, String teamName, java.util.Date eventDate,
                                   String location, BigDecimal sv, BigDecimal cascade,
-                                  String desc, String sourceLedger, String evidenceFile) {
+                                  String desc, String sourceLedger, String evidenceFile,
+                                  Long channelId,String channelNo,Long areaId,Long positionId,String position) {
         ScoreEvent e = new ScoreEvent();
         e.setDimensionId(dimId);
         e.setDimensionName(dimId != null ? dimCache.entrySet().stream()
@@ -690,7 +701,12 @@ public class LedgerSyncServiceImpl implements ILedgerSyncService {
         e.setEvidenceFile(evidenceFile);
         e.setCreateBy("system");
         e.setCreateTime(DateUtils.getNowDate());
-        
+        e.setChannelId(channelId);
+        e.setChannelName(channelNo);
+        e.setRegionalName(location);
+        e.setRegionalId(areaId);
+        e.setPostId(positionId);
+        e.setPostName(position);
         // 通过人员名称解析组织信息（ID和名称）
         if (StrUtil.isNotEmpty(e.getPersonName())) {
             Map<String, Object> orgInfo = resolveOrgInfoByName(e.getPersonName());