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

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

@@ -36,14 +36,12 @@ public class LedgerTemplateController extends BaseController {
         Map<String, Integer> hm = new LinkedHashMap<>();
         Map<String, String[]> cm = new LinkedHashMap<>();
 
-        // 1. 部门监察问题记录表 (25列)
+        // 1. 部门监察问题记录表 (14列)
         nm.put("supervisionProblem", "部门监察问题记录表");
         hm.put("supervisionProblem", 2);
         cm.put("supervisionProblem", new String[]{
             "时间","区域","工作点","岗位","责任人","问题描述","问题类型","整改措施","依据","问题层级",
-            "班组","队室质控员","质控推送队室负责人","附件","整改情况","佐证材料","本月内发生问题次数",
-            "上月质控问题超过三次人员","检查人员","分管质控经理","录入时间","部门培训教员","队室内勤",
-            "发送至相关人员","队室负责人"
+            "附件","整改情况","整改佐证材料","巡查人员"
         });
 
         // 2. 队室三级质控巡查记录表 (21列)

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

@@ -21,7 +21,7 @@ public class LedgerSupervisionProblem 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 = "部门名称")
@@ -29,22 +29,20 @@ public class LedgerSupervisionProblem 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 = "巡查人")
-    private String inspectorName;
+    @Excel(name = "巡查人员")
+    private String patrolPersonnel;
 
-    @Excel(name = "被查人")
+    @Excel(name = "责任人")
     private String inspectedName;
 
     private Long inspectedId;
@@ -58,10 +56,10 @@ public class LedgerSupervisionProblem extends BaseEntity {
     @Excel(name = "问题描述")
     private String problemDesc;
 
-    @Excel(name = "问题地点")
+    @Excel(name = "区域")
     private String location;
 
-    @Excel(name = "通道号")
+    @Excel(name = "工作点")
     private String channelNo;
 
     @Excel(name = "岗位")
@@ -69,51 +67,20 @@ public class LedgerSupervisionProblem extends BaseEntity {
 
     private Long positionId;
 
-    @Excel(name = "处理结果")
+    @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;
+    @Excel(name = "整改佐证材料")
+    private String rectificationEvidence;
 
-    @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 String evidenceFile;
 
     @Excel(name = "扣分")
     private BigDecimal deductScore;
@@ -127,9 +94,6 @@ public class LedgerSupervisionProblem extends BaseEntity {
     @Excel(name = "评分指标")
     private String scoreIndicator;
 
-    @Excel(name = "佐证附件")
-    private String evidenceFile;
-
     @Excel(name = "备注")
     private String remark;
 
@@ -168,8 +132,8 @@ public class LedgerSupervisionProblem extends BaseEntity {
     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 getPatrolPersonnel() { return patrolPersonnel; }
+    public void setPatrolPersonnel(String patrolPersonnel) { this.patrolPersonnel = patrolPersonnel; }
 
     public String getInspectedName() { return inspectedName; }
     public void setInspectedName(String inspectedName) { this.inspectedName = inspectedName; }
@@ -204,44 +168,14 @@ public class LedgerSupervisionProblem extends BaseEntity {
     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 getRectificationEvidence() { return rectificationEvidence; }
+    public void setRectificationEvidence(String rectificationEvidence) { this.rectificationEvidence = rectificationEvidence; }
 
-    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 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; }
@@ -255,9 +189,6 @@ public class LedgerSupervisionProblem 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; }
 

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

@@ -4,6 +4,7 @@ import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.extension.service.IService;
 import com.sundot.airport.common.core.domain.entity.SysDept;
 import com.sundot.airport.common.core.domain.entity.SysUser;
+import com.sundot.airport.common.enums.DeptType;
 import com.sundot.airport.system.domain.SysPost;
 import com.sundot.airport.system.domain.BasePosition;
 import com.sundot.airport.ledger.domain.*;
@@ -172,8 +173,7 @@ public class LedgerCombinedImportServiceImpl implements ILedgerCombinedImportSer
         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));          // 工作点
@@ -185,22 +185,11 @@ public class LedgerCombinedImportServiceImpl implements ILedgerCombinedImportSer
             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));        // 队室负责人
-            
+            o.setEvidenceFile(str(c, 10));      // 附件
+            o.setRectificationStatus(str(c, 11)); // 整改情况
+            o.setRectificationEvidence(str(c, 12)); // 整改佐证材料
+            o.setPatrolPersonnel(str(c, 13));    // 巡查人员
+
             // 根据责任人名称查找组织ID和名称
             if (inspectedName != null && !inspectedName.trim().isEmpty()) {
                 Map<String, Object> orgInfo = resolveOrgInfoByNameWithCache(inspectedName);
@@ -214,10 +203,9 @@ public class LedgerCombinedImportServiceImpl implements ILedgerCombinedImportSer
                     o.setGroupName((String) orgInfo.get("groupName"));
                 }
             }
-            
+
             // 根据岗位和区域查找对应ID
             if (importCache != null) {
-                // 岗位ID
                 String positionName = o.getPosition();
                 if (positionName != null && !positionName.trim().isEmpty()) {
                     Long positionId = importCache.getPositionIdByName(positionName.trim());
@@ -225,8 +213,7 @@ public class LedgerCombinedImportServiceImpl implements ILedgerCombinedImportSer
                         o.setPositionId(positionId);
                     }
                 }
-                
-                // 区域ID
+
                 String areaName = o.getLocation();
                 if (areaName != null && !areaName.trim().isEmpty()) {
                     Long areaId = importCache.getAreaIdByName(areaName.trim());
@@ -235,7 +222,7 @@ public class LedgerCombinedImportServiceImpl implements ILedgerCombinedImportSer
                     }
                 }
             }
-            
+
             o.setImportBatch(batchNo);
             o.setSourceType("1");
             o.setCreateBy(username);
@@ -1412,8 +1399,9 @@ public class LedgerCombinedImportServiceImpl implements ILedgerCombinedImportSer
 
     /**
      * 根据人员名称查找用户，并补充组织架构ID
+     * 层级：STATION(机构站) → BRIGADE(部门) → MANAGER(班组) → TEAMS(小组)
      * @param personName 人员名称
-     * @return Map包含: userId, deptId(BRIGADE), teamId(MANAGER), groupId(TEAMS)
+     * @return Map包含: userId, stationId, stationName, deptId, deptName, teamId, teamName, groupId, groupName
      */
     private Map<String, Object> resolveOrgInfoByNameWithCache(String personName) {
         Map<String, Object> result = new HashMap<>();
@@ -1422,8 +1410,7 @@ public class LedgerCombinedImportServiceImpl implements ILedgerCombinedImportSer
         }
 
         String name = personName.trim();
-        
-        // 1. 从缓存中查找用户
+
         SysUser user = importCache.getUserByNickName(name);
         if (user == null || user.getDeptId() == null) {
             return result;
@@ -1431,7 +1418,6 @@ public class LedgerCombinedImportServiceImpl implements ILedgerCombinedImportSer
 
         result.put("userId", user.getUserId());
 
-        // 2. 从缓存中获取用户部门信息
         SysDept userDept = importCache.getDeptById(user.getDeptId());
         if (userDept == null) {
             return result;
@@ -1439,39 +1425,56 @@ public class LedgerCombinedImportServiceImpl implements ILedgerCombinedImportSer
 
         String deptType = userDept.getDeptType();
 
-        // 3. 根据部门类型递归获取各级组织ID和名称
-        if ("BRIGADE".equals(deptType)) {
-            // 用户部门是大队
+        if (DeptType.STATION.getCode().equals(deptType)) {
+            result.put("stationId", user.getDeptId());
+            result.put("stationName", userDept.getDeptName());
+        } else if (DeptType.BRIGADE.getCode().equals(deptType)) {
             result.put("deptId", user.getDeptId());
             result.put("deptName", userDept.getDeptName());
-        } else if ("MANAGER".equals(deptType)) {
-            // 用户部门是队室/班组，向上找大队
+            if (userDept.getParentId() != null && userDept.getParentId() != 0) {
+                SysDept parentDept = importCache.getDeptById(userDept.getParentId());
+                if (parentDept != null) {
+                    result.put("stationId", parentDept.getDeptId());
+                    result.put("stationName", parentDept.getDeptName());
+                }
+            }
+        } else if (DeptType.MANAGER.getCode().equals(deptType)) {
             result.put("teamId", user.getDeptId());
             result.put("teamName", userDept.getDeptName());
             if (userDept.getParentId() != null && userDept.getParentId() != 0) {
-                result.put("deptId", userDept.getParentId());
-                // 从缓存中获取父级部门（大队）
                 SysDept parentDept = importCache.getDeptById(userDept.getParentId());
                 if (parentDept != null) {
+                    result.put("deptId", parentDept.getDeptId());
                     result.put("deptName", parentDept.getDeptName());
+                    if (parentDept.getParentId() != null && parentDept.getParentId() != 0) {
+                        SysDept grandParentDept = importCache.getDeptById(parentDept.getParentId());
+                        if (grandParentDept != null) {
+                            result.put("stationId", grandParentDept.getDeptId());
+                            result.put("stationName", grandParentDept.getDeptName());
+                        }
+                    }
                 }
             }
-        } else if ("TEAMS".equals(deptType)) {
-            // 用户部门是小组，向上找队室和大队
+        } else if (DeptType.TEAMS.getCode().equals(deptType)) {
             result.put("groupId", user.getDeptId());
             result.put("groupName", userDept.getDeptName());
             if (userDept.getParentId() != null && userDept.getParentId() != 0) {
-                result.put("teamId", userDept.getParentId());
-                // 从缓存中获取父级部门（队室）
                 SysDept parentDept = importCache.getDeptById(userDept.getParentId());
                 if (parentDept != null) {
+                    result.put("teamId", parentDept.getDeptId());
                     result.put("teamName", parentDept.getDeptName());
                     if (parentDept.getParentId() != null && parentDept.getParentId() != 0) {
-                        result.put("deptId", parentDept.getParentId());
-                        // 从缓存中获取祖父级部门（大队）
                         SysDept grandParentDept = importCache.getDeptById(parentDept.getParentId());
                         if (grandParentDept != null) {
+                            result.put("deptId", grandParentDept.getDeptId());
                             result.put("deptName", grandParentDept.getDeptName());
+                            if (grandParentDept.getParentId() != null && grandParentDept.getParentId() != 0) {
+                                SysDept greatGrandParentDept = importCache.getDeptById(grandParentDept.getParentId());
+                                if (greatGrandParentDept != null) {
+                                    result.put("stationId", greatGrandParentDept.getDeptId());
+                                    result.put("stationName", greatGrandParentDept.getDeptName());
+                                }
+                            }
                         }
                     }
                 }

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

@@ -205,7 +205,7 @@ public class LedgerSyncServiceImpl implements ILedgerSyncService {
             BigDecimal sv = row.getDeductScore() != null ? row.getDeductScore().negate() : defaultSv;
             ScoreIndicator lv3 = getIndicator(l3Id);
             ScoreEvent e = buildEvent(dimId, lv2, lv3, row.getInspectedName(),
-                    row.getTeamName(), row.getRecordDate(),
+                    null, row.getRecordDate(),
                     row.getLocation(), sv, ZERO,
                     row.getProblemDesc(), src, row.getEvidenceFile());
             scoreEventMapper.insert(e);

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

@@ -3,62 +3,50 @@
 <mapper namespace="com.sundot.airport.ledger.mapper.LedgerSupervisionProblemMapper">
 
     <resultMap id="BaseResultMap" type="com.sundot.airport.ledger.domain.LedgerSupervisionProblem">
-        <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"  />
-        <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" />
+        <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="patrolPersonnel"        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="rectificationStatus"    column="rectification_status" />
+        <result property="rectificationEvidence"  column="rectification_evidence" />
+        <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="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"        />
     </resultMap>
 
     <sql id="selectVo">
         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,
+               channel_no, position, position_id, result_handling, basis,
+               rectification_status, rectification_evidence, evidence_file,
+               deduct_score, add_score, score_dimension, score_indicator, remark,
                import_batch, source_type, create_by, create_time, update_by, update_time, sync_flag
         FROM ledger_supervision_problem
         WHERE del_flag = '0'