ledger_supervision_problem表新增字段和导入功能字段数据新增

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

@@ -27,21 +27,34 @@ public class LedgerSupervisionProblem extends BaseEntity {
     @Excel(name = "部门名称")
     private String deptName;
 
+    private Long deptId;
+
     @Excel(name = "队室/班组")
     private String teamName;
 
+    private Long teamId;
+
     @Excel(name = "小组")
     private String groupName;
 
+    private Long groupId;
+
+    private Long areaId;
+
     @Excel(name = "巡查人")
     private String inspectorName;
 
     @Excel(name = "被查人")
     private String inspectedName;
 
+    private Long inspectedId;
+
     @Excel(name = "问题类型")
     private String problemType;
 
+    @Excel(name = "问题层级")
+    private String problemLevel;
+
     @Excel(name = "问题描述")
     private String problemDesc;
 
@@ -51,9 +64,57 @@ public class LedgerSupervisionProblem extends BaseEntity {
     @Excel(name = "通道号")
     private String channelNo;
 
+    @Excel(name = "岗位")
+    private String position;
+
+    private Long positionId;
+
     @Excel(name = "处理结果")
     private String resultHandling;
 
+    @Excel(name = "依据")
+    private String basis;
+
+    @Excel(name = "队室质控员")
+    private String qualityOfficer;
+
+    @Excel(name = "质控推送队室负责人")
+    private String qualityPushLeader;
+
+    @Excel(name = "整改情况")
+    private String rectificationStatus;
+
+    @Excel(name = "佐证材料")
+    private String evidenceMaterial;
+
+    @Excel(name = "发送至相关人员")
+    private String sendToRelevant;
+
+    @Excel(name = "本月内发生问题次数")
+    private Integer monthlyProblemCount;
+
+    @Excel(name = "上月质控问题超过三次人员")
+    private String lastMonthExceedThree;
+
+    @Excel(name = "检查人员")
+    private String checkPersonnel;
+
+    @Excel(name = "分管质控经理")
+    private String manageQcManager;
+
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    @Excel(name = "录入时间", width = 20, dateFormat = "yyyy-MM-dd HH:mm:ss")
+    private Date inputTime;
+
+    @Excel(name = "部门培训教员")
+    private String deptTrainingInstructor;
+
+    @Excel(name = "队室内勤")
+    private String teamInternalDuty;
+
+    @Excel(name = "队室负责人")
+    private String teamLeader;
+
     @Excel(name = "扣分")
     private BigDecimal deductScore;
 
@@ -86,21 +147,39 @@ public class LedgerSupervisionProblem extends BaseEntity {
     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 getInspectorName() { return inspectorName; }
     public void setInspectorName(String inspectorName) { this.inspectorName = inspectorName; }
 
     public String getInspectedName() { return inspectedName; }
     public void setInspectedName(String inspectedName) { this.inspectedName = inspectedName; }
 
+    public Long getInspectedId() { return inspectedId; }
+    public void setInspectedId(Long inspectedId) { this.inspectedId = inspectedId; }
+
     public String getProblemType() { return problemType; }
     public void setProblemType(String problemType) { this.problemType = problemType; }
 
+    public String getProblemLevel() { return problemLevel; }
+    public void setProblemLevel(String problemLevel) { this.problemLevel = problemLevel; }
+
     public String getProblemDesc() { return problemDesc; }
     public void setProblemDesc(String problemDesc) { this.problemDesc = problemDesc; }
 
@@ -110,9 +189,57 @@ public class LedgerSupervisionProblem extends BaseEntity {
     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 Long getPositionId() { return positionId; }
+    public void setPositionId(Long positionId) { this.positionId = positionId; }
+
     public String getResultHandling() { return resultHandling; }
     public void setResultHandling(String resultHandling) { this.resultHandling = resultHandling; }
 
+    public String getBasis() { return basis; }
+    public void setBasis(String basis) { this.basis = basis; }
+
+    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 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 getLastMonthExceedThree() { return lastMonthExceedThree; }
+    public void setLastMonthExceedThree(String lastMonthExceedThree) { this.lastMonthExceedThree = lastMonthExceedThree; }
+
+    public String getCheckPersonnel() { return checkPersonnel; }
+    public void setCheckPersonnel(String checkPersonnel) { this.checkPersonnel = checkPersonnel; }
+
+    public String getManageQcManager() { return manageQcManager; }
+    public void setManageQcManager(String manageQcManager) { this.manageQcManager = manageQcManager; }
+
+    public Date getInputTime() { return inputTime; }
+    public void setInputTime(Date inputTime) { this.inputTime = inputTime; }
+
+    public String getDeptTrainingInstructor() { return deptTrainingInstructor; }
+    public void setDeptTrainingInstructor(String deptTrainingInstructor) { this.deptTrainingInstructor = deptTrainingInstructor; }
+
+    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 BigDecimal getDeductScore() { return deductScore; }
     public void setDeductScore(BigDecimal deductScore) { this.deductScore = deductScore; }
 

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

@@ -162,25 +162,77 @@ public class LedgerCombinedImportServiceImpl implements ILedgerCombinedImportSer
     // ════════════════════════════════════════════════════════════════
 
     /** 1. 部门监察问题记录表 → ledger_supervision_problem
-     * R2: 时间(0) 区域(1) 工作点(2) 岗位(3) 责任人(4) 问题描述(5)
-     *     问题类型(6) 整改措施(7) 依据(8) 问题层级(9) 班组(10)
-     *     队室质控员(11) ... 附件(13)
+     * 导入顺序：时间(0) 区域(1) 工作点(2) 岗位(3) 责任人(4) 问题描述(5)
+     *          问题类型(6) 整改措施(7) 依据(8) 问题层级(9) 班组(10)
+     *          队室质控员(11) 质控推送队室负责人(12) 附件(13) 整改情况(14) 佐证材料(15)
+     *          发送至相关人员(16) 本月内发生问题次数(17) 上月质控问题超过三次人员(18)
+     *          检查人员(19) 分管质控经理(20) 录入时间(21) 部门培训教员(22) 队室内勤(23) 队室负责人(24)
      */
     private int doSupervisionProblem(Sheet sheet, String batchNo, String username) {
         List<LedgerSupervisionProblem> list = new ArrayList<>();
         for (Object[] c : dataRows(sheet, 2)) {
             LedgerSupervisionProblem o = new LedgerSupervisionProblem();
-            o.setRecordDate(date(c, 0));
-            o.setLocation(str(c, 1));
-            o.setChannelNo(str(c, 2));
-            o.setInspectedName(str(c, 4));
-            o.setProblemDesc(str(c, 5));
-            o.setProblemType(str(c, 6));
-            o.setResultHandling(str(c, 7));
-            o.setRemark(str(c, 8));
-            o.setTeamName(str(c, 10));
-            o.setInspectorName(str(c, 11));
-            o.setEvidenceFile(str(c, 13));
+            
+            // 按导入顺序映射字段
+            o.setRecordDate(date(c, 0));        // 时间
+            o.setLocation(str(c, 1));           // 区域
+            o.setChannelNo(str(c, 2));          // 工作点
+            o.setPosition(str(c, 3));           // 岗位
+            String inspectedName = str(c, 4);   // 责任人
+            o.setInspectedName(inspectedName);
+            o.setProblemDesc(str(c, 5));        // 问题描述
+            o.setProblemType(str(c, 6));        // 问题类型
+            o.setResultHandling(str(c, 7));     // 整改措施
+            o.setBasis(str(c, 8));              // 依据
+            o.setProblemLevel(str(c, 9));       // 问题层级
+            o.setTeamName(str(c, 10));          // 班组
+            o.setQualityOfficer(str(c, 11));    // 队室质控员
+            o.setQualityPushLeader(str(c, 12)); // 质控推送队室负责人
+            o.setEvidenceFile(str(c, 13));      // 附件
+            o.setRectificationStatus(str(c, 14)); // 整改情况
+            o.setEvidenceMaterial(str(c, 15));  // 佐证材料
+            o.setSendToRelevant(str(c, 16));    // 发送至相关人员
+            o.setMonthlyProblemCount(integer(c, 17)); // 本月内发生问题次数
+            o.setLastMonthExceedThree(str(c, 18)); // 上月质控问题超过三次人员
+            o.setCheckPersonnel(str(c, 19));    // 检查人员
+            o.setManageQcManager(str(c, 20));   // 分管质控经理
+            o.setInputTime(date(c, 21));        // 录入时间
+            o.setDeptTrainingInstructor(str(c, 22)); // 部门培训教员
+            o.setTeamInternalDuty(str(c, 23));  // 队室内勤
+            o.setTeamLeader(str(c, 24));        // 队室负责人
+            
+            // 根据责任人名称查找组织ID
+            if (inspectedName != null && !inspectedName.trim().isEmpty()) {
+                Map<String, Long> orgInfo = resolveOrgInfoByNameWithCache(inspectedName);
+                if (!orgInfo.isEmpty()) {
+                    o.setInspectedId(orgInfo.get("userId"));
+                    o.setDeptId(orgInfo.get("deptId"));
+                    o.setTeamId(orgInfo.get("teamId"));
+                    o.setGroupId(orgInfo.get("groupId"));
+                }
+            }
+            
+            // 根据岗位和区域查找对应ID
+            if (importCache != null) {
+                // 岗位ID
+                String positionName = o.getPosition();
+                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

@@ -182,8 +182,8 @@ public class LedgerSyncServiceImpl implements ILedgerSyncService {
             String src = "supervision_problem:" + row.getId();
             if (existsBySrc(src)) { skip++; continue; }
             if (!hasName(row.getInspectedName())) { skip++; continue; }
-            // 按问题层级选取L3指标和默认分值
-            String level = row.getProblemType() != null ? row.getProblemType() : "";
+            // 按问题层级选取L3指标和默认分值（修正：取problemLevel字段）
+            String level = row.getProblemLevel() != null ? row.getProblemLevel() : "";
             long l3Id; BigDecimal defaultSv;
             if (level.contains("上级")) { l3Id = IND_SUPERVISION_L3_LEADER; defaultSv = BigDecimal.valueOf(-1.20); }
             else if (level.contains("部门")) { l3Id = IND_SUPERVISION_L3_DEPT; defaultSv = BigDecimal.valueOf(-0.80); }

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

@@ -6,15 +6,37 @@
         <id     property="id"               column="id"               />
         <result property="recordDate"       column="record_date"      />
         <result property="deptName"         column="dept_name"        />
+        <result property="deptId"           column="dept_id"          />
         <result property="teamName"         column="team_name"        />
+        <result property="teamId"           column="team_id"          />
         <result property="groupName"        column="group_name"       />
+        <result property="groupId"          column="group_id"         />
+        <result property="areaId"           column="area_id"          />
         <result property="inspectorName"    column="inspector_name"   />
         <result property="inspectedName"    column="inspected_name"   />
+        <result property="inspectedId"      column="inspected_id"     />
         <result property="problemType"      column="problem_type"     />
+        <result property="problemLevel"     column="problem_level"    />
         <result property="problemDesc"      column="problem_desc"     />
         <result property="location"         column="location"         />
         <result property="channelNo"        column="channel_no"       />
+        <result property="position"         column="position"         />
+        <result property="positionId"       column="position_id"      />
         <result property="resultHandling"   column="result_handling"  />
+        <result property="basis"            column="basis"            />
+        <result property="qualityOfficer"   column="quality_officer"  />
+        <result property="qualityPushLeader" column="quality_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="lastMonthExceedThree" column="last_month_exceed_three" />
+        <result property="checkPersonnel"   column="check_personnel"  />
+        <result property="manageQcManager"  column="manage_qc_manager" />
+        <result property="inputTime"        column="input_time"       />
+        <result property="deptTrainingInstructor" column="dept_training_instructor" />
+        <result property="teamInternalDuty" column="team_internal_duty" />
+        <result property="teamLeader"       column="team_leader"      />
         <result property="deductScore"      column="deduct_score"     />
         <result property="addScore"         column="add_score"        />
         <result property="scoreDimension"   column="score_dimension"  />
@@ -30,10 +52,12 @@
     </resultMap>
 
     <sql id="selectVo">
-        SELECT id, record_date, dept_name, team_name, group_name,
-               inspector_name, inspected_name, problem_type, problem_desc, location,
-               channel_no, result_handling, deduct_score, add_score,
-               score_dimension, score_indicator, evidence_file, remark,
+        SELECT id, record_date, dept_name, dept_id, team_name, team_id, group_name, group_id, area_id,
+               inspector_name, inspected_name, inspected_id, problem_type, problem_level, problem_desc, location,
+               channel_no, position, position_id, result_handling, basis, quality_officer, quality_push_leader,
+               rectification_status, evidence_material, send_to_relevant, monthly_problem_count, last_month_exceed_three,
+               check_personnel, manage_qc_manager, input_time, dept_training_instructor, team_internal_duty, 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
         FROM ledger_supervision_problem
         WHERE del_flag = '0'