ledger_patrol_inspection表字段添加、相关代码修改、导入逻辑修改

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

@@ -80,6 +80,49 @@ public class LedgerPatrolInspection extends BaseEntity {
     @Excel(name = "同步标志(0=未同步;1=已同步)")
     private String syncFlag;
 
+    // ========== 新增字段 ==========
+    @Excel(name = "巡查时间段")
+    private String patrolTimePeriod;
+
+    @Excel(name = "有无问题")
+    private String hasProblem;
+
+    @Excel(name = "整改情况")
+    private String rectificationStatus;
+
+    @Excel(name = "佐证材料")
+    private String evidenceMaterial;
+
+    @Excel(name = "责任组长")
+    private String responsibleLeader;
+
+    @Excel(name = "队室质控员")
+    private String qualityOfficer;
+
+    @Excel(name = "队室负责人")
+    private String teamLeader;
+
+    @Excel(name = "填报人")
+    private String reporter;
+
+    @Excel(name = "队室内勤")
+    private String teamInternalDuty;
+
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    @Excel(name = "填报时间", width = 20, dateFormat = "yyyy-MM-dd HH:mm:ss")
+    private Date reportTime;
+
+    @Excel(name = "发送至相关人员")
+    private String sendToRelevant;
+
+    // ========== ID字段 ==========
+    private Long inspectedId;
+    private Long deptId;
+    private Long teamId;
+    private Long groupId;
+    private Long positionId;
+    private Long areaId;
+
     public Long getId() { return id; }
     public void setId(Long id) { this.id = id; }
 
@@ -142,4 +185,57 @@ public class LedgerPatrolInspection extends BaseEntity {
 
     public String getSyncFlag() { return syncFlag; }
     public void setSyncFlag(String syncFlag) { this.syncFlag = syncFlag; }
-}
+
+    // ========== 新增字段的getter/setter ==========
+    public String getPatrolTimePeriod() { return patrolTimePeriod; }
+    public void setPatrolTimePeriod(String patrolTimePeriod) { this.patrolTimePeriod = patrolTimePeriod; }
+
+    public String getHasProblem() { return hasProblem; }
+    public void setHasProblem(String hasProblem) { this.hasProblem = hasProblem; }
+
+    public String getRectificationStatus() { return rectificationStatus; }
+    public void setRectificationStatus(String rectificationStatus) { this.rectificationStatus = rectificationStatus; }
+
+    public String getEvidenceMaterial() { return evidenceMaterial; }
+    public void setEvidenceMaterial(String evidenceMaterial) { this.evidenceMaterial = evidenceMaterial; }
+
+    public String getResponsibleLeader() { return responsibleLeader; }
+    public void setResponsibleLeader(String responsibleLeader) { this.responsibleLeader = responsibleLeader; }
+
+    public String getQualityOfficer() { return qualityOfficer; }
+    public void setQualityOfficer(String qualityOfficer) { this.qualityOfficer = qualityOfficer; }
+
+    public String getTeamLeader() { return teamLeader; }
+    public void setTeamLeader(String teamLeader) { this.teamLeader = teamLeader; }
+
+    public String getReporter() { return reporter; }
+    public void setReporter(String reporter) { this.reporter = reporter; }
+
+    public String getTeamInternalDuty() { return teamInternalDuty; }
+    public void setTeamInternalDuty(String teamInternalDuty) { this.teamInternalDuty = teamInternalDuty; }
+
+    public Date getReportTime() { return reportTime; }
+    public void setReportTime(Date reportTime) { this.reportTime = reportTime; }
+
+    public String getSendToRelevant() { return sendToRelevant; }
+    public void setSendToRelevant(String sendToRelevant) { this.sendToRelevant = sendToRelevant; }
+
+    // ========== ID字段的getter/setter ==========
+    public Long getInspectedId() { return inspectedId; }
+    public void setInspectedId(Long inspectedId) { this.inspectedId = inspectedId; }
+
+    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 getPositionId() { return positionId; }
+    public void setPositionId(Long positionId) { this.positionId = positionId; }
+
+    public Long getAreaId() { return areaId; }
+    public void setAreaId(Long areaId) { this.areaId = areaId; }
+}

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

@@ -246,25 +246,76 @@ public class LedgerCombinedImportServiceImpl implements ILedgerCombinedImportSer
     }
 
     /** 2. 队室三级质控巡查记录表 → ledger_patrol_inspection
-     * R2: 巡查日期(0) 区域(1) 工作点(2) 时间段(3) 巡查岗位(4)
-     *     被检查人员(5) 有无问题(6) 检查情况描述(7) 类型(8) 整改措施(9)
-     *     附件(10) 整改情况(11) 佐证材料(12) 班组(13) 责任组长(14)
+     * 导入顺序：巡查日期(0) 巡查区域(1) 巡查工作点(2) 巡查时间段(3) 巡查岗位(4)
+     *          被检查人员(5) 有无问题(6) 检查情况描述(7) 类型(8) 整改措施(9)
+     *          附件(10) 整改情况(11) 佐证材料(12) 班组(13) 责任组长(14)
+     *          队室质控员(15) 队室负责人(16) 填报人(17) 队室内勤(18) 填报时间(19)
+     *          发送至相关人员(20)
      */
     private int doPatrolInspection(Sheet sheet, String batchNo, String username) {
         List<LedgerPatrolInspection> list = new ArrayList<>();
         for (Object[] c : dataRows(sheet, 2)) {
             LedgerPatrolInspection o = new LedgerPatrolInspection();
-            o.setRecordDate(date(c, 0));
-            o.setLocation(str(c, 1));
-            o.setChannelNo(str(c, 2));
-            o.setInspectedName(str(c, 5));
-            o.setPatrolType(str(c, 8));
-            o.setPatrolItem(str(c, 4));
-            o.setProblemDesc(str(c, 7));
-            o.setResultHandling(str(c, 9));
-            o.setEvidenceFile(str(c, 10));
-            o.setTeamName(str(c, 13));
-            o.setInspectorName(str(c, 14));
+            
+            // 按照新的导入顺序映射字段
+            o.setRecordDate(date(c, 0));           // 巡查日期
+            o.setLocation(str(c, 1));              // 巡查区域
+            o.setChannelNo(str(c, 2));             // 巡查工作点
+            o.setPatrolTimePeriod(str(c, 3));      // 巡查时间段
+            String positionName = str(c, 4);       // 巡查岗位
+            o.setPatrolItem(positionName);
+            String inspectedName = str(c, 5);      // 被检查人员
+            o.setInspectedName(inspectedName);
+            o.setHasProblem(str(c, 6));            // 有无问题
+            o.setProblemDesc(str(c, 7));           // 检查情况描述
+            o.setPatrolType(str(c, 8));            // 类型
+            o.setResultHandling(str(c, 9));        // 整改措施
+            o.setEvidenceFile(str(c, 10));         // 附件
+            o.setRectificationStatus(str(c, 11));  // 整改情况
+            o.setEvidenceMaterial(str(c, 12));     // 佐证材料
+            o.setTeamName(str(c, 13));             // 班组
+            o.setResponsibleLeader(str(c, 14));    // 责任组长
+            o.setQualityOfficer(str(c, 15));       // 队室质控员
+            o.setTeamLeader(str(c, 16));           // 队室负责人
+            o.setReporter(str(c, 17));             // 填报人
+            o.setTeamInternalDuty(str(c, 18));     // 队室内勤
+            o.setReportTime(date(c, 19));          // 填报时间
+            o.setSendToRelevant(str(c, 20));       // 发送至相关人员
+            
+            // 根据被查人名称查找组织ID和名称
+            if (inspectedName != null && !inspectedName.trim().isEmpty()) {
+                Map<String, Object> orgInfo = resolveOrgInfoByNameWithCache(inspectedName);
+                if (!orgInfo.isEmpty()) {
+                    o.setInspectedId((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) {
+                // 岗位ID
+                if (positionName != null && !positionName.trim().isEmpty()) {
+                    Long positionId = importCache.getPositionIdByName(positionName.trim());
+                    if (positionId != null) {
+                        o.setPositionId(positionId);
+                    }
+                }
+                
+                // 区域ID
+                String areaName = o.getLocation();
+                if (areaName != null && !areaName.trim().isEmpty()) {
+                    Long areaId = importCache.getAreaIdByName(areaName.trim());
+                    if (areaId != null) {
+                        o.setAreaId(areaId);
+                    }
+                }
+            }
+            
             o.setImportBatch(batchNo);
             o.setSourceType("1");
             o.setCreateBy(username);

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

@@ -4,34 +4,55 @@
 
     <resultMap id="BaseResultMap" type="com.sundot.airport.ledger.domain.LedgerPatrolInspection">
         <id property="id" column="id" />
-        <result property="recordDate"     column="record_date"     />
-        <result property="deptName"       column="dept_name"       />
-        <result property="teamName"       column="team_name"       />
-        <result property="groupName"      column="group_name"      />
-        <result property="inspectorName"  column="inspector_name"  />
-        <result property="inspectedName"  column="inspected_name"  />
-        <result property="patrolType"     column="patrol_type"     />
-        <result property="patrolItem"     column="patrol_item"     />
-        <result property="problemDesc"    column="problem_desc"    />
-        <result property="location"       column="location"        />
-        <result property="channelNo"      column="channel_no"      />
-        <result property="resultHandling" column="result_handling" />
-        <result property="deductScore"    column="deduct_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"   />
-        <result property="createTime" column="create_time" />
-        <result property="updateBy"   column="update_by"   />
-        <result property="updateTime" column="update_time" />
-        <result property="syncFlag" column="sync_flag" />
+        <result property="recordDate"           column="record_date"           />
+        <result property="deptName"             column="dept_name"             />
+        <result property="teamName"             column="team_name"             />
+        <result property="groupName"            column="group_name"            />
+        <result property="inspectorName"        column="inspector_name"        />
+        <result property="inspectedName"        column="inspected_name"        />
+        <result property="patrolType"           column="patrol_type"           />
+        <result property="patrolItem"           column="patrol_item"           />
+        <result property="problemDesc"          column="problem_desc"          />
+        <result property="location"             column="location"              />
+        <result property="channelNo"            column="channel_no"            />
+        <result property="resultHandling"       column="result_handling"       />
+        <result property="deductScore"          column="deduct_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"             />
+        <result property="createTime"           column="create_time"           />
+        <result property="updateBy"             column="update_by"             />
+        <result property="updateTime"           column="update_time"           />
+        <result property="syncFlag"             column="sync_flag"             />
+        <!-- 新增字段 -->
+        <result property="patrolTimePeriod"     column="patrol_time_period"    />
+        <result property="hasProblem"           column="has_problem"           />
+        <result property="rectificationStatus"  column="rectification_status"  />
+        <result property="evidenceMaterial"     column="evidence_material"     />
+        <result property="responsibleLeader"    column="responsible_leader"    />
+        <result property="qualityOfficer"       column="quality_officer"       />
+        <result property="teamLeader"           column="team_leader"           />
+        <result property="reporter"             column="reporter"              />
+        <result property="teamInternalDuty"     column="team_internal_duty"    />
+        <result property="reportTime"           column="report_time"           />
+        <result property="sendToRelevant"       column="send_to_relevant"      />
+        <!-- ID字段 -->
+        <result property="inspectedId"          column="inspected_id"          />
+        <result property="deptId"               column="dept_id"               />
+        <result property="teamId"               column="team_id"               />
+        <result property="groupId"              column="group_id"              />
+        <result property="positionId"           column="position_id"           />
+        <result property="areaId"               column="area_id"               />
     </resultMap>
 
     <sql id="selectVo">
-        SELECT id, record_date, dept_name, team_name, group_name, inspector_name, inspected_name, patrol_type, patrol_item, problem_desc, location, channel_no, result_handling, deduct_score, score_dimension, score_indicator, evidence_file, remark, import_batch, source_type, create_by, create_time, update_by, update_time, sync_flag
+        SELECT id, record_date, dept_name, team_name, group_name, inspector_name, inspected_name, patrol_type, patrol_item, problem_desc, location, channel_no, result_handling, deduct_score, score_dimension, score_indicator, evidence_file, remark, import_batch, source_type, create_by, create_time, update_by, update_time, sync_flag,
+               patrol_time_period, has_problem, rectification_status, evidence_material, responsible_leader, quality_officer, team_leader, reporter, team_internal_duty, report_time, send_to_relevant,
+               inspected_id, dept_id, team_id, group_id, position_id, area_id
         FROM ledger_patrol_inspection
         WHERE del_flag = '0'
     </sql>
@@ -70,4 +91,4 @@
           </if>
     </select>
 
-</mapper>
+</mapper>