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

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

@@ -77,6 +77,54 @@ public class LedgerServicePatrol extends BaseEntity {
     @Excel(name = "同步标志(0=未同步;1=已同步)")
     private String syncFlag;
 
+    // ========== 新增字段 ==========
+    @Excel(name = "工作点")
+    private String channelNo;
+
+    @Excel(name = "岗位")
+    private String position;
+
+    @Excel(name = "问题层级")
+    private String problemLevel;
+
+    @Excel(name = "队室服务联络人")
+    private String serviceContactPerson;
+
+    @Excel(name = "服务推送队室负责人")
+    private String servicePushLeader;
+
+    @Excel(name = "整改情况")
+    private String rectificationStatus;
+
+    @Excel(name = "佐证材料")
+    private String evidenceMaterial;
+
+    @Excel(name = "发送至相关人员")
+    private String sendToRelevant;
+
+    @Excel(name = "本月内发生问题次数")
+    private Integer monthlyProblemCount;
+
+    @Excel(name = "检查人员")
+    private String checkPersonnel;
+
+    @Excel(name = "分管服务经理")
+    private String manageServiceManager;
+
+    @Excel(name = "队室内勤")
+    private String teamInternalDuty;
+
+    @Excel(name = "队室负责人")
+    private String teamLeader;
+
+    // ========== 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; }
 
@@ -136,4 +184,63 @@ public class LedgerServicePatrol extends BaseEntity {
 
     public String getSyncFlag() { return syncFlag; }
     public void setSyncFlag(String syncFlag) { this.syncFlag = syncFlag; }
-}
+
+    // ========== 新增字段的getter/setter ==========
+    public String getChannelNo() { return channelNo; }
+    public void setChannelNo(String channelNo) { this.channelNo = channelNo; }
+
+    public String getPosition() { return position; }
+    public void setPosition(String position) { this.position = position; }
+
+    public String getProblemLevel() { return problemLevel; }
+    public void setProblemLevel(String problemLevel) { this.problemLevel = problemLevel; }
+
+    public String getServiceContactPerson() { return serviceContactPerson; }
+    public void setServiceContactPerson(String serviceContactPerson) { this.serviceContactPerson = serviceContactPerson; }
+
+    public String getServicePushLeader() { return servicePushLeader; }
+    public void setServicePushLeader(String servicePushLeader) { this.servicePushLeader = servicePushLeader; }
+
+    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 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 String getCheckPersonnel() { return checkPersonnel; }
+    public void setCheckPersonnel(String checkPersonnel) { this.checkPersonnel = checkPersonnel; }
+
+    public String getManageServiceManager() { return manageServiceManager; }
+    public void setManageServiceManager(String manageServiceManager) { this.manageServiceManager = manageServiceManager; }
+
+    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; }
+
+    // ========== 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

@@ -413,22 +413,76 @@ public class LedgerCombinedImportServiceImpl implements ILedgerCombinedImportSer
     }
 
     /** 4. 服务巡查 → ledger_service_patrol
-     * R2: 时间(0) 区域(1) 工作点(2) 岗位(3) 责任人(4) 问题描述(5)
-     *     问题类型(6) 整改措施(7) 班组(8) ... 附件(12) ... 检查人员(17)
+     * 导入顺序：时间(0) 区域(1) 工作点(2) 岗位(3) 责任人(4) 问题描述(5)
+     *          问题类型(6) 整改措施(7) 班组(8) 问题层级(9) 队室服务联络人(10)
+     *          服务推送队室负责人(11) 附件(12) 整改情况(13) 佐证材料(14)
+     *          发送至相关人员(15) 本月内发生问题次数(16) 检查人员(17)
+     *          分管服务经理(18) 队室内勤(19) 队室负责人(20)
      */
     private int doServicePatrol(Sheet sheet, String batchNo, String username) {
         List<LedgerServicePatrol> list = new ArrayList<>();
         for (Object[] c : dataRows(sheet, 2)) {
             LedgerServicePatrol o = new LedgerServicePatrol();
-            o.setRecordDate(date(c, 0));
-            o.setLocation(str(c, 1));
-            o.setInspectedName(str(c, 4));
-            o.setProblemDesc(str(c, 5));
-            o.setServiceType(str(c, 6));
-            o.setResultHandling(str(c, 7));
-            o.setTeamName(str(c, 8));
-            o.setEvidenceFile(str(c, 12));
-            o.setInspectorName(str(c, 17));
+            
+            // 按照新的导入顺序映射字段
+            o.setRecordDate(date(c, 0));              // 时间
+            o.setLocation(str(c, 1));                 // 区域
+            o.setChannelNo(str(c, 2));                // 工作点
+            String positionName = str(c, 3);          // 岗位
+            o.setPosition(positionName);
+            String inspectedName = str(c, 4);         // 责任人
+            o.setInspectedName(inspectedName);
+            o.setProblemDesc(str(c, 5));              // 问题描述
+            o.setServiceType(str(c, 6));              // 问题类型
+            o.setResultHandling(str(c, 7));           // 整改措施
+            o.setTeamName(str(c, 8));                 // 班组
+            o.setProblemLevel(str(c, 9));             // 问题层级
+            o.setServiceContactPerson(str(c, 10));    // 队室服务联络人
+            o.setServicePushLeader(str(c, 11));       // 服务推送队室负责人
+            o.setEvidenceFile(str(c, 12));            // 附件
+            o.setRectificationStatus(str(c, 13));     // 整改情况
+            o.setEvidenceMaterial(str(c, 14));        // 佐证材料
+            o.setSendToRelevant(str(c, 15));          // 发送至相关人员
+            o.setMonthlyProblemCount(integer(c, 16)); // 本月内发生问题次数
+            o.setCheckPersonnel(str(c, 17));          // 检查人员
+            o.setManageServiceManager(str(c, 18));    // 分管服务经理
+            o.setTeamInternalDuty(str(c, 19));        // 队室内勤
+            o.setTeamLeader(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/java/com/sundot/airport/ledger/service/impl/LedgerSyncServiceImpl.java

@@ -388,7 +388,7 @@ public class LedgerSyncServiceImpl implements ILedgerSyncService {
             String src = "service_patrol:" + row.getId();
             if (existsBySrc(src)) { skip++; continue; }
             if (!hasName(row.getInspectedName())) { skip++; continue; }
-            String level = row.getServiceType() != null ? row.getServiceType() : "";
+            String level = row.getProblemLevel() != null ? row.getProblemLevel() : "";
             long l3Id; BigDecimal defaultSv;
             if (level.contains("航站楼")) { l3Id = IND_SVCPATROL_L3_TERMINAL; defaultSv = BigDecimal.valueOf(-1.20); }
             else if (level.contains("站层级") || level.contains("站级")) { l3Id = IND_SVCPATROL_L3_STATION; defaultSv = NEG_ONE; }

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

@@ -21,15 +21,39 @@
         <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="sourceType" column="source_type" />
+        <result property="createBy" column="create_by" />
         <result property="createTime" column="create_time" />
-        <result property="updateBy"   column="update_by"   />
+        <result property="updateBy" column="update_by" />
         <result property="updateTime" column="update_time" />
         <result property="syncFlag" column="sync_flag" />
+        <!-- 新增字段 -->
+        <result property="channelNo" column="channel_no" />
+        <result property="position" column="position" />
+        <result property="problemLevel" column="problem_level" />
+        <result property="serviceContactPerson" column="service_contact_person" />
+        <result property="servicePushLeader" column="service_push_leader" />
+        <result property="rectificationStatus" column="rectification_status" />
+        <result property="evidenceMaterial" column="evidence_material" />
+        <result property="sendToRelevant" column="send_to_relevant" />
+        <result property="monthlyProblemCount" column="monthly_problem_count" />
+        <result property="checkPersonnel" column="check_personnel" />
+        <result property="manageServiceManager" column="manage_service_manager" />
+        <result property="teamInternalDuty" column="team_internal_duty" />
+        <result property="teamLeader" column="team_leader" />
+        <!-- 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,service_type,problem_desc,location,result_handling,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
+        SELECT id, record_date, dept_name, team_name, group_name, inspector_name, inspected_name, service_type, problem_desc, location, result_handling, 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,
+               channel_no, position, problem_level, service_contact_person, service_push_leader, rectification_status, evidence_material, send_to_relevant, monthly_problem_count, check_personnel, manage_service_manager, team_internal_duty, team_leader,
+               inspected_id, dept_id, team_id, group_id, position_id, area_id
         FROM ledger_service_patrol
         WHERE del_flag = '0'
     </sql>
@@ -54,4 +78,4 @@
         set sync_flag = '1'
         where sync_flag = '0'
     </update>
-</mapper>
+</mapper>