ledger_supervision_problem字段删除和调整、相关代码调整、一键导入功能导入模版调整调整

airport-admin/src/main/java/com/sundot/airport/web/controller/ledger/LedgerTemplateController.java

@@ -107,13 +107,14 @@ public class LedgerTemplateController extends BaseController {
             "时间","事件描述","类别","航班号","责任人","涉及班组","涉及物品","岗位","区域","通道号","图像"
         });
 
-        // 9. 2026查获违规品统计 (20列)
+        // 9. 2026查获违规品统计 (23列)
         nm.put("seizureStats", "2026查获违规品统计");
         hm.put("seizureStats", 2);
         cm.put("seizureStats", new String[]{
-            "查获时间","地点","通道号","部门/队室","区域","安检员","安检员岗位","值班组长",
-            "航班号","航班目的地","机票号","购票时间","旅客姓名","旅客性别","证件号码","旅客来源地",
-            "违规类别","物品种类","藏匿部位","数量"
+            "查获日期","查获时间","部门/队室","工作区域","安检员","安检资质","岗位",
+            "航班号","目的地","进/出港","违规主体","旅客姓名","旅客性别","旅客民族",
+            "旅客年龄","违规类别","违规物品","二级分类","数量","事件简况","查获位置",
+            "处理结果","备注"
         });
 
         // 10. 航站楼加分 (7列)

airport-ledger/src/main/java/com/sundot/airport/ledger/domain/LedgerSeizureStats.java

@@ -24,22 +24,28 @@ public class LedgerSeizureStats extends BaseEntity {
     @Excel(name = "查获日期", width = 20, dateFormat = "yyyy-MM-dd")
     private Date recordDate;
 
+    @Excel(name = "查获时间")
+    private String seizureTime;
+
     @Excel(name = "部门名称")
     private String deptName;
 
     private Long deptId;
 
-    @Excel(name = "队室/班组")
     private String teamName;
 
     private Long teamId;
 
+    private String groupName;
+
+    private Long groupId;
+
     @Excel(name = "工作区域")
     private String workArea;
 
     private Long areaId;
 
-    @Excel(name = "安检资格证书等级")
+    @Excel(name = "安检资质")
     private String qualificationLevel;
 
     @Excel(name = "岗位")
@@ -47,18 +53,22 @@ public class LedgerSeizureStats extends BaseEntity {
 
     private Long positionId;
 
-    @Excel(name = "小组")
-    private String groupName;
-
-    private Long groupId;
-
-    @Excel(name = "查获人")
+    @Excel(name = "安检员")
     private String inspectorName;
 
     private Long inspectorId;
 
-    @Excel(name = "通道号")
-    private String channelNo;
+    @Excel(name = "航班号")
+    private String flightNo;
+
+    @Excel(name = "目的地")
+    private String destination;
+
+    @Excel(name = "进/出港")
+    private String inOutPort;
+
+    @Excel(name = "违规主体")
+    private String violationSubject;
 
     @Excel(name = "旅客姓名")
     private String passengerName;
@@ -72,54 +82,30 @@ public class LedgerSeizureStats extends BaseEntity {
     @Excel(name = "旅客年龄")
     private Integer passengerAge;
 
-    @Excel(name = "航班号")
-    private String flightNo;
-
-    @Excel(name = "目的地")
-    private String destination;
-
-    @Excel(name = "进/出港")
-    private String inOutPort;
-
-    @Excel(name = "违规主体")
-    private String violationSubject;
-
-    @Excel(name = "违规品类别")
+    @Excel(name = "违规类别")
     private String itemCategory;
 
+    @Excel(name = "违规物品")
+    private String itemName;
+
     @Excel(name = "二级分类")
     private String secondaryCategory;
 
-    @Excel(name = "违规品名称")
-    private String itemName;
-
     @Excel(name = "数量")
     private Integer itemQuantity;
 
-    @Excel(name = "查获数量")
-    private Integer seizureQuantity;
-
-    @Excel(name = "藏匿部位")
-    private String concealmentPart;
-
     @Excel(name = "事件简况")
     private String eventBrief;
 
-    @Excel(name = "队室内勤")
-    private String teamInternalDuty;
-
-    @Excel(name = "检查方式")
-    private String checkMethod;
+    @Excel(name = "查获位置")
+    private String concealmentPart;
 
-    @Excel(name = "处置方式")
+    @Excel(name = "处理结果")
     private String handlingMethod;
 
     @Excel(name = "加分")
     private BigDecimal addScore;
 
-    @Excel(name = "叠加分")
-    private BigDecimal stackedScore;
-
     @Excel(name = "评分维度")
     private String scoreDimension;
 
@@ -146,6 +132,9 @@ public class LedgerSeizureStats extends BaseEntity {
     public Date getRecordDate() { return recordDate; }
     public void setRecordDate(Date recordDate) { this.recordDate = recordDate; }
 
+    public String getSeizureTime() { return seizureTime; }
+    public void setSeizureTime(String seizureTime) { this.seizureTime = seizureTime; }
+
     public String getDeptName() { return deptName; }
     public void setDeptName(String deptName) { this.deptName = deptName; }
 
@@ -158,6 +147,12 @@ public class LedgerSeizureStats extends BaseEntity {
     public Long getTeamId() { return teamId; }
     public void setTeamId(Long teamId) { this.teamId = teamId; }
 
+    public String getGroupName() { return groupName; }
+    public void setGroupName(String groupName) { this.groupName = groupName; }
+
+    public Long getGroupId() { return groupId; }
+    public void setGroupId(Long groupId) { this.groupId = groupId; }
+
     public String getWorkArea() { return workArea; }
     public void setWorkArea(String workArea) { this.workArea = workArea; }
 
@@ -173,20 +168,23 @@ public class LedgerSeizureStats extends BaseEntity {
     public Long getPositionId() { return positionId; }
     public void setPositionId(Long positionId) { this.positionId = positionId; }
 
-    public String getGroupName() { return groupName; }
-    public void setGroupName(String groupName) { this.groupName = groupName; }
-
-    public Long getGroupId() { return groupId; }
-    public void setGroupId(Long groupId) { this.groupId = groupId; }
-
     public String getInspectorName() { return inspectorName; }
     public void setInspectorName(String inspectorName) { this.inspectorName = inspectorName; }
 
     public Long getInspectorId() { return inspectorId; }
     public void setInspectorId(Long inspectorId) { this.inspectorId = inspectorId; }
 
-    public String getChannelNo() { return channelNo; }
-    public void setChannelNo(String channelNo) { this.channelNo = channelNo; }
+    public String getFlightNo() { return flightNo; }
+    public void setFlightNo(String flightNo) { this.flightNo = flightNo; }
+
+    public String getDestination() { return destination; }
+    public void setDestination(String destination) { this.destination = destination; }
+
+    public String getInOutPort() { return inOutPort; }
+    public void setInOutPort(String inOutPort) { this.inOutPort = inOutPort; }
+
+    public String getViolationSubject() { return violationSubject; }
+    public void setViolationSubject(String violationSubject) { this.violationSubject = violationSubject; }
 
     public String getPassengerName() { return passengerName; }
     public void setPassengerName(String passengerName) { this.passengerName = passengerName; }
@@ -200,44 +198,23 @@ public class LedgerSeizureStats extends BaseEntity {
     public Integer getPassengerAge() { return passengerAge; }
     public void setPassengerAge(Integer passengerAge) { this.passengerAge = passengerAge; }
 
-    public String getFlightNo() { return flightNo; }
-    public void setFlightNo(String flightNo) { this.flightNo = flightNo; }
-
-    public String getDestination() { return destination; }
-    public void setDestination(String destination) { this.destination = destination; }
-
-    public String getInOutPort() { return inOutPort; }
-    public void setInOutPort(String inOutPort) { this.inOutPort = inOutPort; }
-
-    public String getViolationSubject() { return violationSubject; }
-    public void setViolationSubject(String violationSubject) { this.violationSubject = violationSubject; }
-
     public String getItemCategory() { return itemCategory; }
     public void setItemCategory(String itemCategory) { this.itemCategory = itemCategory; }
 
-    public String getSecondaryCategory() { return secondaryCategory; }
-    public void setSecondaryCategory(String secondaryCategory) { this.secondaryCategory = secondaryCategory; }
-
     public String getItemName() { return itemName; }
     public void setItemName(String itemName) { this.itemName = itemName; }
 
+    public String getSecondaryCategory() { return secondaryCategory; }
+    public void setSecondaryCategory(String secondaryCategory) { this.secondaryCategory = secondaryCategory; }
+
     public Integer getItemQuantity() { return itemQuantity; }
     public void setItemQuantity(Integer itemQuantity) { this.itemQuantity = itemQuantity; }
 
-    public Integer getSeizureQuantity() { return seizureQuantity; }
-    public void setSeizureQuantity(Integer seizureQuantity) { this.seizureQuantity = seizureQuantity; }
-
-    public String getConcealmentPart() { return concealmentPart; }
-    public void setConcealmentPart(String concealmentPart) { this.concealmentPart = concealmentPart; }
-
     public String getEventBrief() { return eventBrief; }
     public void setEventBrief(String eventBrief) { this.eventBrief = eventBrief; }
 
-    public String getTeamInternalDuty() { return teamInternalDuty; }
-    public void setTeamInternalDuty(String teamInternalDuty) { this.teamInternalDuty = teamInternalDuty; }
-
-    public String getCheckMethod() { return checkMethod; }
-    public void setCheckMethod(String checkMethod) { this.checkMethod = checkMethod; }
+    public String getConcealmentPart() { return concealmentPart; }
+    public void setConcealmentPart(String concealmentPart) { this.concealmentPart = concealmentPart; }
 
     public String getHandlingMethod() { return handlingMethod; }
     public void setHandlingMethod(String handlingMethod) { this.handlingMethod = handlingMethod; }
@@ -245,9 +222,6 @@ public class LedgerSeizureStats extends BaseEntity {
     public BigDecimal getAddScore() { return addScore; }
     public void setAddScore(BigDecimal addScore) { this.addScore = addScore; }
 
-    public BigDecimal getStackedScore() { return stackedScore; }
-    public void setStackedScore(BigDecimal stackedScore) { this.stackedScore = stackedScore; }
-
     public String getScoreDimension() { return scoreDimension; }
     public void setScoreDimension(String scoreDimension) { this.scoreDimension = scoreDimension; }
 

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

@@ -781,55 +781,56 @@ public class LedgerCombinedImportServiceImpl implements ILedgerCombinedImportSer
         List<LedgerSeizureStats> list = new ArrayList<>();
         for (Object[] c : dataRows(sheet, 2)) {
             LedgerSeizureStats o = new LedgerSeizureStats();
-            o.setRecordDate(date(c, 0));
-            o.setTeamName(str(c, 3));
-            o.setWorkArea(str(c, 4));
-            String inspectorName = str(c, 5);
+            o.setRecordDate(date(c, 0));         // 查获日期
+            o.setSeizureTime(str(c, 1));         // 查获时间
+            o.setDeptName(str(c, 2));            // 部门/队室
+            o.setWorkArea(str(c, 3));            // 工作区域
+            String inspectorName = str(c, 4);    // 安检员
             o.setInspectorName(inspectorName);
-            o.setQualificationLevel(str(c, 6));
-            o.setPosition(str(c, 7));
-            o.setFlightNo(str(c, 8));
-            o.setDestination(str(c, 9));
-            o.setInOutPort(str(c, 10));
-            o.setViolationSubject(str(c, 11));
-            o.setPassengerName(str(c, 12));
-            o.setPassengerGender(str(c, 13));
-            o.setPassengerEthnicity(str(c, 14));
-            o.setPassengerAge(integer(c, 15));
-            o.setItemCategory(str(c, 16));
-            o.setItemName(str(c, 17));  // 违规物品种类
-            o.setSecondaryCategory(str(c, 18));
-            o.setItemQuantity(integer(c, 19));
-            o.setEventBrief(str(c, 20));
-            o.setConcealmentPart(str(c, 21));   // 查获位置
-            o.setHandlingMethod(str(c, 22));  // 处理结果
-            o.setTeamInternalDuty(str(c, 24));
-            o.setRemark(str(c, 25));
-            o.setSeizureQuantity(integer(c, 26));  // 查获数量
-                
+            o.setQualificationLevel(str(c, 5));  // 安检资质
+            o.setPosition(str(c, 6));            // 岗位
+            o.setFlightNo(str(c, 7));            // 航班号
+            o.setDestination(str(c, 8));         // 目的地
+            o.setInOutPort(str(c, 9));           // 进/出港
+            o.setViolationSubject(str(c, 10));   // 违规主体
+            o.setPassengerName(str(c, 11));      // 旅客姓名
+            o.setPassengerGender(str(c, 12));    // 旅客性别
+            o.setPassengerEthnicity(str(c, 13)); // 旅客民族
+            o.setPassengerAge(integer(c, 14));    // 旅客年龄
+            o.setItemCategory(str(c, 15));       // 违规类别
+            o.setItemName(str(c, 16));           // 违规物品
+            o.setSecondaryCategory(str(c, 17));  // 二级分类
+            o.setItemQuantity(integer(c, 18));    // 数量
+            o.setEventBrief(str(c, 19));         // 事件简况
+            o.setConcealmentPart(str(c, 20));    // 查获位置
+            o.setHandlingMethod(str(c, 21));     // 处理结果
+            o.setRemark(str(c, 22));             // 备注
+
             // 使用缓存查找组织信息和名称
-            Map<String, Object> orgInfo = resolveOrgInfoByNameWithCache(inspectorName);
-            if (!orgInfo.isEmpty()) {
-                o.setInspectorId((Long) orgInfo.get("userId"));
-                o.setDeptId((Long) orgInfo.get("deptId"));
-                o.setDeptName((String) orgInfo.get("deptName"));
-                o.setTeamId((Long) orgInfo.get("teamId"));
-                o.setTeamName((String) orgInfo.get("teamName"));
-                o.setGroupId((Long) orgInfo.get("groupId"));
-                o.setGroupName((String) orgInfo.get("groupName"));
+            if (inspectorName != null && !inspectorName.trim().isEmpty()) {
+                Map<String, Object> orgInfo = resolveOrgInfoByNameWithCache(inspectorName);
+                if (!orgInfo.isEmpty()) {
+                    o.setInspectorId((Long) orgInfo.get("userId"));
+                    o.setDeptId((Long) orgInfo.get("deptId"));
+                    o.setDeptName((String) orgInfo.get("deptName"));
+                    o.setTeamId((Long) orgInfo.get("teamId"));
+                    o.setTeamName((String) orgInfo.get("teamName"));
+                    o.setGroupId((Long) orgInfo.get("groupId"));
+                    o.setGroupName((String) orgInfo.get("groupName"));
+                }
             }
-            
+
             // 根据岗位名称和工作区域名称查找ID
             if (importCache != null) {
-                String positionName = str(c, 7);
+                String positionName = str(c, 6);
                 if (positionName != null && !positionName.trim().isEmpty()) {
                     Long positionId = importCache.getPositionIdByName(positionName.trim());
                     if (positionId != null) {
                         o.setPositionId(positionId);
                     }
                 }
-                
-                String areaName = str(c, 4);
+
+                String areaName = str(c, 3);
                 if (areaName != null && !areaName.trim().isEmpty()) {
                     Long areaId = importCache.getAreaIdByName(areaName.trim());
                     if (areaId != null) {
@@ -837,7 +838,7 @@ public class LedgerCombinedImportServiceImpl implements ILedgerCombinedImportSer
                     }
                 }
             }
-                
+
             o.setImportBatch(batchNo);
             o.setSourceType("1");
             o.setCreateBy(username);

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

@@ -334,11 +334,10 @@ public class LedgerSyncServiceImpl implements ILedgerSyncService {
             if (cat.contains("一类"))      { l3Id = IND_SEIZURE_L3_A; sv = POS_ONE; }
             else if (cat.contains("二类")) { l3Id = IND_SEIZURE_L3_B; sv = POS_HALF; }
             else                           { l3Id = IND_SEIZURE_L3_C; sv = POS_015; }
-            BigDecimal cascade = row.getStackedScore() != null ? row.getStackedScore() : ZERO;
             ScoreIndicator lv3 = getIndicator(l3Id);
             ScoreEvent e = buildEvent(dimId, lv2, lv3, row.getInspectorName(),
                     row.getTeamName(), row.getRecordDate(),
-                    null, sv, cascade,
+                    null, sv, ZERO,
                     row.getItemName(), src, row.getEvidenceFile());
             scoreEventMapper.insert(e);
             ins++;