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

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

@@ -57,10 +57,7 @@ public class LedgerTemplateController extends BaseController {
         nm.put("realtimeInterception", "部门实时质控拦截情况记录表");
         hm.put("realtimeInterception", 2);
         cm.put("realtimeInterception", new String[]{
-            "时间","区域","工作点","岗位","责任人","实时质控拦截物品","个数","问题类型","整改措施","问题层级",
-            "班组","附件","问题类别","个人复盘","队室复盘","队室质控员","质控推送队室负责人","开机年限",
-            "责任人开机年龄","发送至相关人员","本月内发生问题次数","上月发生次数","实时图像漏检难易度",
-            "检查人员","部门培训教员","分管质控经理","队室内勤","备注","队室负责人"
+            "时间","区域","工作点","岗位","责任人","实时质控拦截物品","个数","问题层级","附件","检查人员"
         });
 
         // 4. 服务巡查 (22列)

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

@@ -21,23 +21,18 @@ public class LedgerRealtimeInterception extends BaseEntity {
     private Long id;
 
     @JsonFormat(pattern = "yyyy-MM-dd")
-    @Excel(name = "记录日期", width = 20, dateFormat = "yyyy-MM-dd")
+    @Excel(name = "时间", width = 20, dateFormat = "yyyy-MM-dd")
     private Date recordDate;
 
-    @Excel(name = "记录时间")
-    private String recordTime;
-
     @Excel(name = "部门名称")
     private String deptName;
 
     private Long deptId;
 
-    @Excel(name = "队室/班组")
     private String teamName;
 
     private Long teamId;
 
-    @Excel(name = "小组")
     private String groupName;
 
     private Long groupId;
@@ -52,100 +47,28 @@ public class LedgerRealtimeInterception extends BaseEntity {
 
     private Long positionId;
 
-    @Excel(name = "查获人")
+    @Excel(name = "责任人")
     private String inspectorName;
 
     private Long inspectorId;
 
-    @Excel(name = "通道号")
+    @Excel(name = "工作点")
     private String channelNo;
 
-    @Excel(name = "旅客姓名")
-    private String passengerName;
-
-    @Excel(name = "证件号码")
-    private String idCardNo;
-
-    @Excel(name = "航班号")
-    private String flightNo;
-
-    @Excel(name = "物品类别")
-    private String itemCategory;
-
-    @Excel(name = "物品名称")
+    @Excel(name = "实时质控拦截物品")
     private String itemName;
 
-    @Excel(name = "数量")
+    @Excel(name = "个数")
     private Integer itemQuantity;
 
-    @Excel(name = "重量(kg)")
-    private BigDecimal itemWeight;
-
-    @Excel(name = "处置方式")
-    private String handlingMethod;
-
-    @Excel(name = "处理结果")
-    private String resultHandling;
-
-    @Excel(name = "问题类型")
-    private String problemType;
-
-    @Excel(name = "整改措施")
-    private String rectificationMeasures;
-
     @Excel(name = "问题层级")
     private String problemLevel;
 
-    @Excel(name = "附件")
-    private String attachment;
-
-    @Excel(name = "问题类别")
-    private String problemCategory;
-
-    @Excel(name = "个人复盘")
-    private String personalReview;
-
-    @Excel(name = "队室复盘")
-    private String teamReview;
-
-    @Excel(name = "队室质控员")
-    private String qualityOfficer;
-
-    @Excel(name = "质控推送队室负责人")
-    private String qualityPushLeader;
-
-    @Excel(name = "开机年限")
-    private String operationYears;
-
-    @Excel(name = "责任人开机年龄")
-    private String responsibleOperationAge;
-
-    @Excel(name = "发送至相关人员")
-    private String sendToRelevant;
-
-    @Excel(name = "本月内发生问题次数")
-    private Integer monthlyProblemCount;
-
-    @Excel(name = "上月质控问题发生次数")
-    private Integer lastMonthProblemCount;
-
-    @Excel(name = "实时图像漏检难易度")
-    private String imageMissDifficulty;
-
     @Excel(name = "检查人员")
     private String checkPersonnel;
 
-    @Excel(name = "部门培训教员")
-    private String deptTrainingInstructor;
-
-    @Excel(name = "分管质控经理")
-    private String manageQcManager;
-
-    @Excel(name = "队室内勤")
-    private String teamInternalDuty;
-
-    @Excel(name = "队室负责人")
-    private String teamLeader;
+    @Excel(name = "附件")
+    private String evidenceFile;
 
     @Excel(name = "扣分")
     private BigDecimal deductScore;
@@ -159,12 +82,6 @@ public class LedgerRealtimeInterception extends BaseEntity {
     @Excel(name = "评分指标")
     private String scoreIndicator;
 
-    @Excel(name = "佐证附件")
-    private String evidenceFile;
-
-    @Excel(name = "备注")
-    private String remark;
-
     private String importBatch;
 
     @Excel(name = "数据来源")
@@ -179,9 +96,6 @@ public class LedgerRealtimeInterception extends BaseEntity {
     public Date getRecordDate() { return recordDate; }
     public void setRecordDate(Date recordDate) { this.recordDate = recordDate; }
 
-    public String getRecordTime() { return recordTime; }
-    public void setRecordTime(String recordTime) { this.recordTime = recordTime; }
-
     public String getDeptName() { return deptName; }
     public void setDeptName(String deptName) { this.deptName = deptName; }
 
@@ -221,92 +135,20 @@ public class LedgerRealtimeInterception extends BaseEntity {
     public String getChannelNo() { return channelNo; }
     public void setChannelNo(String channelNo) { this.channelNo = channelNo; }
 
-    public String getPassengerName() { return passengerName; }
-    public void setPassengerName(String passengerName) { this.passengerName = passengerName; }
-
-    public String getIdCardNo() { return idCardNo; }
-    public void setIdCardNo(String idCardNo) { this.idCardNo = idCardNo; }
-
-    public String getFlightNo() { return flightNo; }
-    public void setFlightNo(String flightNo) { this.flightNo = flightNo; }
-
-    public String getItemCategory() { return itemCategory; }
-    public void setItemCategory(String itemCategory) { this.itemCategory = itemCategory; }
-
     public String getItemName() { return itemName; }
     public void setItemName(String itemName) { this.itemName = itemName; }
 
     public Integer getItemQuantity() { return itemQuantity; }
     public void setItemQuantity(Integer itemQuantity) { this.itemQuantity = itemQuantity; }
 
-    public BigDecimal getItemWeight() { return itemWeight; }
-    public void setItemWeight(BigDecimal itemWeight) { this.itemWeight = itemWeight; }
-
-    public String getHandlingMethod() { return handlingMethod; }
-    public void setHandlingMethod(String handlingMethod) { this.handlingMethod = handlingMethod; }
-
-    public String getResultHandling() { return resultHandling; }
-    public void setResultHandling(String resultHandling) { this.resultHandling = resultHandling; }
-
-    public String getProblemType() { return problemType; }
-    public void setProblemType(String problemType) { this.problemType = problemType; }
-
-    public String getRectificationMeasures() { return rectificationMeasures; }
-    public void setRectificationMeasures(String rectificationMeasures) { this.rectificationMeasures = rectificationMeasures; }
-
     public String getProblemLevel() { return problemLevel; }
     public void setProblemLevel(String problemLevel) { this.problemLevel = problemLevel; }
 
-    public String getAttachment() { return attachment; }
-    public void setAttachment(String attachment) { this.attachment = attachment; }
-
-    public String getProblemCategory() { return problemCategory; }
-    public void setProblemCategory(String problemCategory) { this.problemCategory = problemCategory; }
-
-    public String getPersonalReview() { return personalReview; }
-    public void setPersonalReview(String personalReview) { this.personalReview = personalReview; }
-
-    public String getTeamReview() { return teamReview; }
-    public void setTeamReview(String teamReview) { this.teamReview = teamReview; }
-
-    public String getQualityOfficer() { return qualityOfficer; }
-    public void setQualityOfficer(String qualityOfficer) { this.qualityOfficer = qualityOfficer; }
-
-    public String getQualityPushLeader() { return qualityPushLeader; }
-    public void setQualityPushLeader(String qualityPushLeader) { this.qualityPushLeader = qualityPushLeader; }
-
-    public String getOperationYears() { return operationYears; }
-    public void setOperationYears(String operationYears) { this.operationYears = operationYears; }
-
-    public String getResponsibleOperationAge() { return responsibleOperationAge; }
-    public void setResponsibleOperationAge(String responsibleOperationAge) { this.responsibleOperationAge = responsibleOperationAge; }
-
-    public String getSendToRelevant() { return sendToRelevant; }
-    public void setSendToRelevant(String sendToRelevant) { this.sendToRelevant = sendToRelevant; }
-
-    public Integer getMonthlyProblemCount() { return monthlyProblemCount; }
-    public void setMonthlyProblemCount(Integer monthlyProblemCount) { this.monthlyProblemCount = monthlyProblemCount; }
-
-    public Integer getLastMonthProblemCount() { return lastMonthProblemCount; }
-    public void setLastMonthProblemCount(Integer lastMonthProblemCount) { this.lastMonthProblemCount = lastMonthProblemCount; }
-
-    public String getImageMissDifficulty() { return imageMissDifficulty; }
-    public void setImageMissDifficulty(String imageMissDifficulty) { this.imageMissDifficulty = imageMissDifficulty; }
-
     public String getCheckPersonnel() { return checkPersonnel; }
     public void setCheckPersonnel(String checkPersonnel) { this.checkPersonnel = checkPersonnel; }
 
-    public String getDeptTrainingInstructor() { return deptTrainingInstructor; }
-    public void setDeptTrainingInstructor(String deptTrainingInstructor) { this.deptTrainingInstructor = deptTrainingInstructor; }
-
-    public String getManageQcManager() { return manageQcManager; }
-    public void setManageQcManager(String manageQcManager) { this.manageQcManager = manageQcManager; }
-
-    public String getTeamInternalDuty() { return teamInternalDuty; }
-    public void setTeamInternalDuty(String teamInternalDuty) { this.teamInternalDuty = teamInternalDuty; }
-
-    public String getTeamLeader() { return teamLeader; }
-    public void setTeamLeader(String teamLeader) { this.teamLeader = teamLeader; }
+    public String getEvidenceFile() { return evidenceFile; }
+    public void setEvidenceFile(String evidenceFile) { this.evidenceFile = evidenceFile; }
 
     public BigDecimal getDeductScore() { return deductScore; }
     public void setDeductScore(BigDecimal deductScore) { this.deductScore = deductScore; }
@@ -320,12 +162,6 @@ public class LedgerRealtimeInterception extends BaseEntity {
     public String getScoreIndicator() { return scoreIndicator; }
     public void setScoreIndicator(String scoreIndicator) { this.scoreIndicator = scoreIndicator; }
 
-    public String getEvidenceFile() { return evidenceFile; }
-    public void setEvidenceFile(String evidenceFile) { this.evidenceFile = evidenceFile; }
-
-    public String getRemark() { return remark; }
-    public void setRemark(String remark) { this.remark = remark; }
-
     public String getImportBatch() { return importBatch; }
     public void setImportBatch(String importBatch) { this.importBatch = importBatch; }
 

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

@@ -324,39 +324,19 @@ public class LedgerCombinedImportServiceImpl implements ILedgerCombinedImportSer
         List<LedgerRealtimeInterception> list = new ArrayList<>();
         for (Object[] c : dataRows(sheet, 2)) {
             LedgerRealtimeInterception o = new LedgerRealtimeInterception();
-            
-            // 按照新的导入顺序映射字段
-            o.setRecordDate(date(c, 0));        // 时间
-            o.setLocation(str(c, 1));           // 区域
-            o.setPosition(str(c, 3));           // 岗位
-            o.setChannelNo(str(c, 2));          // 工作点
-            String inspectorName = str(c, 4);   // 责任人
+
+            o.setRecordDate(date(c, 0));          // 时间
+            o.setLocation(str(c, 1));             // 区域
+            o.setChannelNo(str(c, 2));            // 工作点
+            o.setPosition(str(c, 3));             // 岗位
+            String inspectorName = str(c, 4);     // 责任人
             o.setInspectorName(inspectorName);
-            o.setItemName(str(c, 5));           // 实时质控拦截物品
-            o.setItemQuantity(integer(c, 6));   // 个数
-            o.setProblemType(str(c, 7));        // 问题类型
-            o.setRectificationMeasures(str(c, 8)); // 整改措施
-            o.setProblemLevel(str(c, 9));       // 问题层级
-            o.setTeamName(str(c, 10));          // 班组
-            o.setAttachment(str(c, 11));        // 附件
-            o.setProblemCategory(str(c, 12));   // 问题类别
-            o.setPersonalReview(str(c, 13));    // 个人复盘
-            o.setTeamReview(str(c, 14));        // 队室复盘
-            o.setQualityOfficer(str(c, 15));    // 队室质控员
-            o.setQualityPushLeader(str(c, 16)); // 质控推送队室负责人
-            o.setOperationYears(str(c, 17));    // 开机年限
-            o.setResponsibleOperationAge(str(c, 18)); // 责任人开机年龄
-            o.setSendToRelevant(str(c, 19));    // 发送至相关人员
-            o.setMonthlyProblemCount(integer(c, 20)); // 本月内发生问题次数
-            o.setLastMonthProblemCount(integer(c, 21)); // 上月质控问题发生次数
-            o.setImageMissDifficulty(str(c, 22)); // 实时图像漏检难易度
-            o.setCheckPersonnel(str(c, 23));    // 检查人员
-            o.setDeptTrainingInstructor(str(c, 24)); // 部门培训教员
-            o.setManageQcManager(str(c, 25));   // 分管质控经理
-            o.setTeamInternalDuty(str(c, 26));  // 队室内勤
-            o.setRemark(str(c, 27));            // 备注
-            o.setTeamLeader(str(c, 28));        // 队室负责人
-            
+            o.setItemName(str(c, 5));             // 实时质控拦截物品
+            o.setItemQuantity(integer(c, 6));     // 个数
+            o.setProblemLevel(str(c, 7));         // 问题层级
+            o.setEvidenceFile(str(c, 8));         // 附件
+            o.setCheckPersonnel(str(c, 9));       // 检查人员
+
             // 根据责任人名称查找组织ID和名称
             if (inspectorName != null && !inspectorName.trim().isEmpty()) {
                 Map<String, Object> orgInfo = resolveOrgInfoByNameWithCache(inspectorName);
@@ -370,7 +350,7 @@ public class LedgerCombinedImportServiceImpl implements ILedgerCombinedImportSer
                     o.setGroupName((String) orgInfo.get("groupName"));
                 }
             }
-            
+
             // 根据岗位和区域查找对应ID
             if (importCache != null) {
                 String positionName = str(c, 3);  // 岗位

airport-ledger/src/main/resources/mapper/ledger/LedgerRealtimeInterceptionMapper.xml

@@ -5,7 +5,6 @@
     <resultMap id="BaseResultMap" type="com.sundot.airport.ledger.domain.LedgerRealtimeInterception">
         <id property="id" column="id" />
         <result property="recordDate" column="record_date" />
-        <result property="recordTime" column="record_time" />
         <result property="deptName" column="dept_name" />
         <result property="deptId" column="dept_id" />
         <result property="teamName" column="team_name" />
@@ -19,41 +18,15 @@
         <result property="inspectorName" column="inspector_name" />
         <result property="inspectorId" column="inspector_id" />
         <result property="channelNo" column="channel_no" />
-        <result property="passengerName" column="passenger_name" />
-        <result property="idCardNo" column="id_card_no" />
-        <result property="flightNo" column="flight_no" />
-        <result property="itemCategory" column="item_category" />
         <result property="itemName" column="item_name" />
         <result property="itemQuantity" column="item_quantity" />
-        <result property="itemWeight" column="item_weight" />
-        <result property="handlingMethod" column="handling_method" />
-        <result property="resultHandling" column="result_handling" />
-        <result property="problemType" column="problem_type" />
-        <result property="rectificationMeasures" column="rectification_measures" />
         <result property="problemLevel" column="problem_level" />
-        <result property="attachment" column="attachment" />
-        <result property="problemCategory" column="problem_category" />
-        <result property="personalReview" column="personal_review" />
-        <result property="teamReview" column="team_review" />
-        <result property="qualityOfficer" column="quality_officer" />
-        <result property="qualityPushLeader" column="quality_push_leader" />
-        <result property="operationYears" column="operation_years" />
-        <result property="responsibleOperationAge" column="responsible_operation_age" />
-        <result property="sendToRelevant" column="send_to_relevant" />
-        <result property="monthlyProblemCount" column="monthly_problem_count" />
-        <result property="lastMonthProblemCount" column="last_month_problem_count" />
-        <result property="imageMissDifficulty" column="image_miss_difficulty" />
         <result property="checkPersonnel" column="check_personnel" />
-        <result property="deptTrainingInstructor" column="dept_training_instructor" />
-        <result property="manageQcManager" column="manage_qc_manager" />
-        <result property="teamInternalDuty" column="team_internal_duty" />
-        <result property="remark" column="remark" />
-        <result property="teamLeader" column="team_leader" />
+        <result property="evidenceFile" column="evidence_file" />
         <result property="deductScore" column="deduct_score" />
         <result property="addScore" column="add_score" />
         <result property="scoreDimension" column="score_dimension" />
         <result property="scoreIndicator" column="score_indicator" />
-        <result property="evidenceFile" column="evidence_file" />
         <result property="importBatch" column="import_batch" />
         <result property="sourceType" column="source_type" />
         <result property="createBy"   column="create_by"   />
@@ -64,16 +37,12 @@
     </resultMap>
 
     <sql id="selectVo">
-        SELECT id, record_date, record_time, dept_name, dept_id, team_name, team_id, group_name, group_id, area_id,
+        SELECT id, record_date, dept_name, dept_id, team_name, team_id, group_name, group_id, area_id,
                location, position, position_id,
-               inspector_name, inspector_id, channel_no, passenger_name, id_card_no, flight_no, item_category, item_name,
-               item_quantity, item_weight, handling_method, result_handling, problem_type, rectification_measures,
-               problem_level, attachment, problem_category, personal_review, team_review, quality_officer,
-               quality_push_leader, operation_years, responsible_operation_age, send_to_relevant,
-               monthly_problem_count, last_month_problem_count, image_miss_difficulty, check_personnel,
-               dept_training_instructor, manage_qc_manager, team_internal_duty, remark, team_leader,
-               deduct_score, add_score, score_dimension, score_indicator, evidence_file, import_batch, source_type,
-               create_by, create_time, update_by, update_time, sync_flag
+               inspector_name, inspector_id, channel_no, item_name, item_quantity,
+               problem_level, check_personnel, evidence_file,
+               deduct_score, add_score, score_dimension, score_indicator,
+               import_batch, source_type, create_by, create_time, update_by, update_time, sync_flag
         FROM ledger_realtime_interception
         WHERE del_flag = '0'
     </sql>
@@ -85,10 +54,10 @@
         <if test="inspectorName != null and inspectorName != ''">AND inspector_name LIKE CONCAT('%', #{inspectorName}, '%')</if>
         <if test="syncFlag != null and syncFlag != ''">AND sync_flag = #{syncFlag}</if>
         <if test="params != null and params.beginTime != null and params.beginTime != ''">
-            AND (record_date &gt;= #{params.beginTime} OR approve_date &gt;= #{params.beginTime} OR exam_date &gt;= #{params.beginTime})
+            AND record_date &gt;= #{params.beginTime}
         </if>
         <if test="params != null and params.endTime != null and params.endTime != ''">
-            AND (record_date &lt;= #{params.endTime} OR approve_date &lt;= #{params.endTime} OR exam_date &lt;= #{params.endTime})
+            AND record_date &lt;= #{params.endTime}
         </if>
         ORDER BY id DESC
     </select>