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

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

@@ -81,7 +81,7 @@ public class LedgerTemplateController extends BaseController {
         hm.put("securityTest", 2);
         cm.put("securityTest", new String[]{
             "开展时间","测试区域","测试通道","测试人员","测试项目","被测试人员","被测试岗位",
-            "测试物品","图片或视频","是否通过","层级","整改措施","","整改材料"
+            "测试物品","图片或视频","是否通过","层级","整改措施","整改材料"
         });
 
         // 7. 通道过检率 (横向月份列, 2行表头)
@@ -145,7 +145,7 @@ public class LedgerTemplateController extends BaseController {
         nm.put("leaveSpecial", "请、休假记录表（特殊）");
         hm.put("leaveSpecial", 2);
         cm.put("leaveSpecial", new String[]{
-            "姓名","班组","时间（起）","时间（止）","休假类别","天数/时长"
+            "姓名","时间（起）","时间（止）","休假类别","天数/时长"
         });
 
         // 15. 锦旗及感谢信 (7列)

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

@@ -11,7 +11,7 @@ import com.sundot.airport.common.annotation.Excel;
 import com.sundot.airport.common.core.domain.BaseEntity;
 
 /**
- * 请休假记录（特殊）对象（页面录入）ledger_leave_special
+ * 请休假记录（特殊）对象 ledger_leave_special
  */
 @TableName("ledger_leave_special")
 public class LedgerLeaveSpecial extends BaseEntity {
@@ -23,9 +23,16 @@ public class LedgerLeaveSpecial extends BaseEntity {
     @Excel(name = "部门名称")
     private String deptName;
 
-    @Excel(name = "队室/班组")
+    private Long deptId;
+
     private String teamName;
 
+    private Long teamId;
+
+    private String groupName;
+
+    private Long groupId;
+
     @Excel(name = "姓名")
     private String personName;
 
@@ -65,9 +72,21 @@ public class LedgerLeaveSpecial 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 String getPersonName() { return personName; }
     public void setPersonName(String personName) { this.personName = personName; }
 
@@ -100,4 +119,4 @@ public class LedgerLeaveSpecial extends BaseEntity {
 
     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

@@ -489,7 +489,7 @@ public class LedgerCombinedImportServiceImpl implements ILedgerCombinedImportSer
     /** 6. 安保测试记录表（部门）→ ledger_security_test
      * 导入顺序：开展时间(0) 测试区域(1) 测试通道(2) 测试人员(3) 测试项目(4)
      *          被测试人员(5) 被测试岗位(6) 测试物品(7) 图片或视频(8) 是否通过(9)
-     *          层级(10) 整改措施(11) (12空) 整改材料(13)
+     *          层级(10) 整改措施(11) 整改材料(12)
      */
     private int doSecurityTest(Sheet sheet, String batchNo, String username) {
         List<LedgerSecurityTest> list = new ArrayList<>();
@@ -509,7 +509,7 @@ public class LedgerCombinedImportServiceImpl implements ILedgerCombinedImportSer
             o.setProblemDesc(str(c, 9));        // 是否通过
             o.setTestLevel(str(c, 10));          // 层级
             o.setResultHandling(str(c, 11));    // 整改措施
-            o.setReviewMaterial(str(c, 13));    // 整改材料
+            o.setReviewMaterial(str(c, 12));    // 整改材料
 
             // 使用缓存查找组织信息（根据被测人名称）
             if (testedName != null && !testedName.trim().isEmpty()) {
@@ -891,19 +891,34 @@ public class LedgerCombinedImportServiceImpl implements ILedgerCombinedImportSer
 //    }
 
     /** 14. 请、休假记录表（特殊）→ ledger_leave_special
-     * R2: 姓名(0) 班组(1) 时间（起）(2) 时间（止）(3) 休假类别(4) 天数/时长(5)
+     * R2: 姓名(0) 时间（起）(1) 时间（止）(2) 休假类别(3) 天数/时长(4)
      * 天数/时长列可能是纯数字（天）或"X小时"格式；小时值按8小时/天换算成天数
      */
     private int doLeaveSpecial(Sheet sheet, String batchNo, String username) {
         List<LedgerLeaveSpecial> list = new ArrayList<>();
         for (Object[] c : dataRows(sheet, 2)) {
             LedgerLeaveSpecial o = new LedgerLeaveSpecial();
-            o.setPersonName(str(c, 0));
-            o.setTeamName(str(c, 1));
-            o.setLeaveType(str(c, 4));
-            o.setStartDate(date(c, 2));
-            o.setEndDate(date(c, 3));
-            o.setDays(hoursOrDays(c, 5));
+            String personName = str(c, 0);
+            o.setPersonName(personName);
+            o.setStartDate(date(c, 1));
+            o.setEndDate(date(c, 2));
+            o.setLeaveType(str(c, 3));
+            o.setDays(hoursOrDays(c, 4));
+
+            // 根据姓名查找组织信息
+            if (personName != null && !personName.trim().isEmpty()) {
+                Map<String, Object> orgInfo = resolveOrgInfoByNameWithCache(personName);
+                if (!orgInfo.isEmpty()) {
+                    o.setPersonUserId((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"));
+                }
+            }
+
             o.setImportBatch(batchNo);
             o.setSourceType("1");
             o.setCreateBy(username);

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

@@ -5,7 +5,11 @@
     <resultMap id="BaseResultMap" type="com.sundot.airport.ledger.domain.LedgerLeaveSpecial">
         <id property="id" column="id" />
         <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="personName" column="person_name" />
         <result property="personUserId" column="person_user_id" />
         <result property="leaveType" column="leave_type" />
@@ -24,7 +28,10 @@
     </resultMap>
 
     <sql id="selectVo">
-        SELECT id, dept_name,team_name,person_name,person_user_id,leave_type,start_date,end_date,days,deduct_score,remark, import_batch, source_type, create_by, create_time, update_by, update_time, sync_flag
+        SELECT id, dept_name, dept_id, team_name, team_id, group_name, group_id,
+               person_name, person_user_id, leave_type, start_date, end_date, days,
+               deduct_score, remark,
+               import_batch, source_type, create_by, create_time, update_by, update_time, sync_flag
         FROM ledger_leave_special
         WHERE del_flag = '0'
     </sql>
@@ -36,10 +43,10 @@
         <if test="personName != null and personName != ''">AND person_name LIKE CONCAT('%', #{personName}, '%')</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>
@@ -49,4 +56,4 @@
         set sync_flag = '1'
         where sync_flag = '0'
     </update>
-</mapper>
+</mapper>