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

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

@@ -80,9 +80,8 @@ public class LedgerTemplateController extends BaseController {
         nm.put("securityTest", "安保测试记录表（部门）");
         hm.put("securityTest", 2);
         cm.put("securityTest", new String[]{
-            "开展时间","测试区域","测试通道","测试项目","被测试人员","被测试岗位","测试物品","图片或视频",
-            "是否通过","层级","整改措施","扣分","整改材料","班组","推送队室质控员","推送质控队长",
-            "队室内勤","推送按钮","队室负责人"
+            "开展时间","测试区域","测试通道","测试人员","测试项目","被测试人员","被测试岗位",
+            "测试物品","图片或视频","是否通过","层级","整改措施","","整改材料"
         });
 
         // 7. 通道过检率 (横向月份列, 2行表头)

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

@@ -21,7 +21,7 @@ public class LedgerSecurityTest 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 = "测试区域")
@@ -35,24 +35,22 @@ public class LedgerSecurityTest extends BaseEntity {
 
     private Long deptId;
 
-    @Excel(name = "队室/班组")
     private String teamName;
 
     private Long teamId;
 
-    @Excel(name = "小组")
     private String groupName;
 
     private Long groupId;
 
     private Long areaId;
 
-    @Excel(name = "测试人")
+    @Excel(name = "测试人员")
     private String testerName;
 
     private Long testerId;
 
-    @Excel(name = "被测人")
+    @Excel(name = "被测试人员")
     private String testedName;
 
     private Long testedId;
@@ -65,36 +63,24 @@ public class LedgerSecurityTest extends BaseEntity {
     @Excel(name = "测试项目")
     private String testItem;
 
-    @Excel(name = "测试结果")
+    @Excel(name = "测试物品")
     private String testResult;
 
-    @Excel(name = "问题描述")
+    @Excel(name = "图片或视频")
+    private String evidenceFile;
+
+    @Excel(name = "是否通过")
     private String problemDesc;
 
-    @Excel(name = "处理结果")
-    private String resultHandling;
+    @Excel(name = "层级")
+    private String testLevel;
 
-    @Excel(name = "复查地点及时间")
-    private String reviewLocationTime;
+    @Excel(name = "整改措施")
+    private String resultHandling;
 
     @Excel(name = "整改材料")
     private String reviewMaterial;
 
-    @Excel(name = "推送队室质控员")
-    private String pushTeamQc;
-
-    @Excel(name = "推送质控队长")
-    private String pushQcCaptain;
-
-    @Excel(name = "队室内勤")
-    private String teamInternalDuty;
-
-    @Excel(name = "点击推送至相关人员")
-    private String pushToRelevant;
-
-    @Excel(name = "队室负责人")
-    private String teamLeader;
-
     @Excel(name = "扣分")
     private BigDecimal deductScore;
 
@@ -107,12 +93,6 @@ public class LedgerSecurityTest extends BaseEntity {
     @Excel(name = "评分指标")
     private String scoreIndicator;
 
-    @Excel(name = "佐证附件")
-    private String evidenceFile;
-
-    @Excel(name = "备注")
-    private String remark;
-
     private String importBatch;
 
     @Excel(name = "数据来源")
@@ -127,36 +107,72 @@ public class LedgerSecurityTest extends BaseEntity {
     public Date getRecordDate() { return recordDate; }
     public void setRecordDate(Date recordDate) { this.recordDate = recordDate; }
 
+    public String getRegion() { return region; }
+    public void setRegion(String region) { this.region = region; }
+
+    public String getChannel() { return channel; }
+    public void setChannel(String channel) { this.channel = channel; }
+
     public String getDeptName() { return deptName; }
     public void setDeptName(String deptName) { this.deptName = deptName; }
 
+    public Long getDeptId() { return deptId; }
+    public void setDeptId(Long deptId) { this.deptId = deptId; }
+
     public String getTeamName() { return teamName; }
     public void setTeamName(String teamName) { this.teamName = teamName; }
 
+    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 Long getAreaId() { return areaId; }
+    public void setAreaId(Long areaId) { this.areaId = areaId; }
+
     public String getTesterName() { return testerName; }
     public void setTesterName(String testerName) { this.testerName = testerName; }
 
+    public Long getTesterId() { return testerId; }
+    public void setTesterId(Long testerId) { this.testerId = testerId; }
+
     public String getTestedName() { return testedName; }
     public void setTestedName(String testedName) { this.testedName = testedName; }
 
+    public Long getTestedId() { return testedId; }
+    public void setTestedId(Long testedId) { this.testedId = testedId; }
+
     public String getTestType() { return testType; }
     public void setTestType(String testType) { this.testType = testType; }
 
+    public Long getPositionId() { return positionId; }
+    public void setPositionId(Long positionId) { this.positionId = positionId; }
+
     public String getTestItem() { return testItem; }
     public void setTestItem(String testItem) { this.testItem = testItem; }
 
     public String getTestResult() { return testResult; }
     public void setTestResult(String testResult) { this.testResult = testResult; }
 
+    public String getEvidenceFile() { return evidenceFile; }
+    public void setEvidenceFile(String evidenceFile) { this.evidenceFile = evidenceFile; }
+
     public String getProblemDesc() { return problemDesc; }
     public void setProblemDesc(String problemDesc) { this.problemDesc = problemDesc; }
 
+    public String getTestLevel() { return testLevel; }
+    public void setTestLevel(String testLevel) { this.testLevel = testLevel; }
+
     public String getResultHandling() { return resultHandling; }
     public void setResultHandling(String resultHandling) { this.resultHandling = resultHandling; }
 
+    public String getReviewMaterial() { return reviewMaterial; }
+    public void setReviewMaterial(String reviewMaterial) { this.reviewMaterial = reviewMaterial; }
+
     public BigDecimal getDeductScore() { return deductScore; }
     public void setDeductScore(BigDecimal deductScore) { this.deductScore = deductScore; }
 
@@ -169,66 +185,12 @@ public class LedgerSecurityTest 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; }
 
     public String getSourceType() { return sourceType; }
     public void setSourceType(String sourceType) { this.sourceType = sourceType; }
 
-    public String getRegion() { return region; }
-    public void setRegion(String region) { this.region = region; }
-
-    public String getChannel() { return channel; }
-    public void setChannel(String channel) { this.channel = channel; }
-
-    public Long getDeptId() { return deptId; }
-    public void setDeptId(Long deptId) { this.deptId = deptId; }
-
-    public Long getTeamId() { return teamId; }
-    public void setTeamId(Long teamId) { this.teamId = teamId; }
-
-    public Long getGroupId() { return groupId; }
-    public void setGroupId(Long groupId) { this.groupId = groupId; }
-
-    public Long getAreaId() { return areaId; }
-    public void setAreaId(Long areaId) { this.areaId = areaId; }
-
-    public Long getTesterId() { return testerId; }
-    public void setTesterId(Long testerId) { this.testerId = testerId; }
-
-    public Long getTestedId() { return testedId; }
-    public void setTestedId(Long testedId) { this.testedId = testedId; }
-
-    public Long getPositionId() { return positionId; }
-    public void setPositionId(Long positionId) { this.positionId = positionId; }
-
-    public String getReviewLocationTime() { return reviewLocationTime; }
-    public void setReviewLocationTime(String reviewLocationTime) { this.reviewLocationTime = reviewLocationTime; }
-
-    public String getReviewMaterial() { return reviewMaterial; }
-    public void setReviewMaterial(String reviewMaterial) { this.reviewMaterial = reviewMaterial; }
-
-    public String getPushTeamQc() { return pushTeamQc; }
-    public void setPushTeamQc(String pushTeamQc) { this.pushTeamQc = pushTeamQc; }
-
-    public String getPushQcCaptain() { return pushQcCaptain; }
-    public void setPushQcCaptain(String pushQcCaptain) { this.pushQcCaptain = pushQcCaptain; }
-
-    public String getTeamInternalDuty() { return teamInternalDuty; }
-    public void setTeamInternalDuty(String teamInternalDuty) { this.teamInternalDuty = teamInternalDuty; }
-
-    public String getPushToRelevant() { return pushToRelevant; }
-    public void setPushToRelevant(String pushToRelevant) { this.pushToRelevant = pushToRelevant; }
-
-    public String getTeamLeader() { return teamLeader; }
-    public void setTeamLeader(String teamLeader) { this.teamLeader = teamLeader; }
-
     public String getSyncFlag() { return syncFlag; }
     public void setSyncFlag(String syncFlag) { this.syncFlag = syncFlag; }
 }

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

@@ -487,69 +487,30 @@ public class LedgerCombinedImportServiceImpl implements ILedgerCombinedImportSer
     }
 
     /** 6. 安保测试记录表（部门）→ ledger_security_test
-     * 导入顺序：开展时间(0) 测试区域(1) 测试通道(2) 测试项目(3) 被测试人员(4) 被测试岗位(5)
-     *          测试物品(6) 开展项目图片或视频(7) 是否通过(8) 层级(9) 整改措施(10)
-     *          复查地点及时间(11) 整改材料(12) 班组(13) 推送队室质控员(14) 推送质控队长(15)
-     *          队室内勤(16) 点击推送至相关人员(17) 队室负责人(18)
+     * 导入顺序：开展时间(0) 测试区域(1) 测试通道(2) 测试人员(3) 测试项目(4)
+     *          被测试人员(5) 被测试岗位(6) 测试物品(7) 图片或视频(8) 是否通过(9)
+     *          层级(10) 整改措施(11) (12空) 整改材料(13)
      */
     private int doSecurityTest(Sheet sheet, String batchNo, String username) {
         List<LedgerSecurityTest> list = new ArrayList<>();
         for (Object[] c : dataRows(sheet, 2)) {
             LedgerSecurityTest o = new LedgerSecurityTest();
-            
-            // 按照新的导入顺序映射字段
-            o.setRecordDate(date(c, 0));  // 开展时间
-            o.setRegion(str(c, 1));       // 测试区域
-            o.setChannel(str(c, 2));      // 测试通道
-            o.setTestItem(str(c, 3));     // 测试项目
-            
-            // 被测试人员
-            String testedName = str(c, 4);
+
+            o.setRecordDate(date(c, 0));        // 开展时间
+            o.setRegion(str(c, 1));             // 测试区域
+            o.setChannel(str(c, 2));            // 测试通道
+            o.setTesterName(str(c, 3));         // 测试人员
+            o.setTestItem(str(c, 4));           // 测试项目
+            String testedName = str(c, 5);      // 被测试人员
             o.setTestedName(testedName);
-            
-            // 被测试岗位
-            o.setTestType(str(c, 5));
-            
-            // 测试物品→problemDesc
-            o.setProblemDesc(str(c, 6));
-            
-            // 开展项目图片或视频→evidenceFile
-            o.setEvidenceFile(str(c, 7));
-            
-            // 是否通过→testResult
-            o.setTestResult(str(c, 8));
-            
-            // 层级→scoreIndicator
-            o.setScoreIndicator(str(c, 9));
-            
-            // 整改措施→resultHandling
-            o.setResultHandling(str(c, 10));
-            
-            // 复查地点及时间
-            o.setReviewLocationTime(str(c, 11));
-            
-            // 整改材料
-            o.setReviewMaterial(str(c, 12));
-            
-            // 班组→teamName
-            String teamName = str(c, 13);
-            o.setTeamName(teamName);
-            
-            // 推送队室质控员
-            o.setPushTeamQc(str(c, 14));
-            
-            // 推送质控队长
-            o.setPushQcCaptain(str(c, 15));
-            
-            // 队室内勤
-            o.setTeamInternalDuty(str(c, 16));
-            
-            // 点击推送至相关人员
-            o.setPushToRelevant(str(c, 17));
-            
-            // 队室负责人
-            o.setTeamLeader(str(c, 18));
-            
+            o.setTestType(str(c, 6));           // 被测试岗位
+            o.setTestResult(str(c, 7));         // 测试物品
+            o.setEvidenceFile(str(c, 8));       // 图片或视频
+            o.setProblemDesc(str(c, 9));        // 是否通过
+            o.setTestLevel(str(c, 10));          // 层级
+            o.setResultHandling(str(c, 11));    // 整改措施
+            o.setReviewMaterial(str(c, 13));    // 整改材料
+
             // 使用缓存查找组织信息（根据被测人名称）
             if (testedName != null && !testedName.trim().isEmpty()) {
                 Map<String, Object> orgInfo = resolveOrgInfoByNameWithCache(testedName);

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

@@ -22,21 +22,15 @@
         <result property="positionId" column="position_id" />
         <result property="testItem" column="test_item" />
         <result property="testResult" column="test_result" />
+        <result property="evidenceFile" column="evidence_file" />
         <result property="problemDesc" column="problem_desc" />
+        <result property="testLevel" column="test_level" />
         <result property="resultHandling" column="result_handling" />
-        <result property="reviewLocationTime" column="review_location_time" />
         <result property="reviewMaterial" column="review_material" />
-        <result property="pushTeamQc" column="push_team_qc" />
-        <result property="pushQcCaptain" column="push_qc_captain" />
-        <result property="teamInternalDuty" column="team_internal_duty" />
-        <result property="pushToRelevant" column="push_to_relevant" />
-        <result property="teamLeader" column="team_leader" />
         <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="remark" column="remark" />
         <result property="importBatch" column="import_batch" />
         <result property="sourceType" column="source_type" />
         <result property="createBy"   column="create_by"   />
@@ -49,9 +43,9 @@
     <sql id="selectVo">
         SELECT id, record_date, region, channel, dept_name, dept_id, team_name, team_id, group_name, group_id, area_id,
                tester_name, tester_id, tested_name, tested_id, test_type, position_id, test_item, test_result,
-               problem_desc, result_handling, review_location_time, review_material, push_team_qc, push_qc_captain,
-               team_internal_duty, push_to_relevant, team_leader, deduct_score, add_score, score_dimension,
-               score_indicator, evidence_file, remark, import_batch, source_type, create_by, create_time, update_by, update_time, sync_flag
+               evidence_file, problem_desc, test_level, result_handling, review_material,
+               deduct_score, add_score, score_dimension, score_indicator,
+               import_batch, source_type, create_by, create_time, update_by, update_time, sync_flag
         FROM ledger_security_test
         WHERE del_flag = '0'
     </sql>
@@ -63,10 +57,10 @@
         <if test="testedName != null and testedName != ''">AND tested_name LIKE CONCAT('%', #{testedName}, '%')</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>