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

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

@@ -53,6 +53,20 @@ public class LedgerRewardApproval extends BaseEntity {
     @Excel(name = "同步标志(0=未同步;1=已同步)")
     private String syncFlag;
 
+    @Excel(name = "查获物品")
+    private String seizedItem;
+
+    @Excel(name = "奖励事由（安全）")
+    private String rewardReason;
+
+    @Excel(name = "人员类别")
+    private String personCategory;
+
+    // ========== ID字段 ==========
+    private Long personId;
+    private Long deptId;
+    private Long teamId;
+
     public Long getId() { return id; }
     public void setId(Long id) { this.id = id; }
 
@@ -88,4 +102,24 @@ public class LedgerRewardApproval extends BaseEntity {
 
     public String getSyncFlag() { return syncFlag; }
     public void setSyncFlag(String syncFlag) { this.syncFlag = syncFlag; }
-}
+
+
+    public String getSeizedItem() { return seizedItem; }
+    public void setSeizedItem(String seizedItem) { this.seizedItem = seizedItem; }
+
+    public String getRewardReason() { return rewardReason; }
+    public void setRewardReason(String rewardReason) { this.rewardReason = rewardReason; }
+
+    public String getPersonCategory() { return personCategory; }
+    public void setPersonCategory(String personCategory) { this.personCategory = personCategory; }
+
+    // ========== ID字段的getter/setter ==========
+    public Long getPersonId() { return personId; }
+    public void setPersonId(Long personId) { this.personId = personId; }
+
+    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; }
+}

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

@@ -859,11 +859,29 @@ public class LedgerCombinedImportServiceImpl implements ILedgerCombinedImportSer
         List<LedgerRewardApproval> list = new ArrayList<>();
         for (Object[] c : dataRows(sheet, 1)) {  // 只跳1行表头
             LedgerRewardApproval o = new LedgerRewardApproval();
-            o.setApproveDate(date(c, 2) != null ? new java.sql.Date(date(c, 2).getTime()) : null);
-            o.setPersonName(str(c, 1));
-            o.setRewardType(str(c, 3));
+            String personName = str(c, 1);      // 姓名
+            o.setPersonName(personName);
+            o.setApproveDate(date(c, 2) != null ? new java.sql.Date(date(c, 1).getTime()) : null);  // 查获时间
+            o.setRewardType(str(c, 3));         // 奖励类别
+            o.setSeizedItem(str(c, 4));         // 查获物品
+            o.setApprovalStatus(str(c, 5));     // 类别
+            o.setRewardReason(str(c, 6));       // 奖励事由
+            o.setPersonCategory(str(c, 7));     // 人员类别
+            o.setRemark(str(c, 8));             // 主要事由简述
+            
+            // 根据姓名查找组织ID和名称
+            if (personName != null && !personName.trim().isEmpty()) {
+                Map<String, Object> orgInfo = resolveOrgInfoByNameWithCache(personName);
+                if (!orgInfo.isEmpty()) {
+                    o.setPersonId((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.setApprovalStatus("待审批");
-            o.setRemark(str(c, 8));
             o.setImportBatch(batchNo);
             o.setSourceType("1");
             o.setCreateBy(username);

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

@@ -13,15 +13,24 @@
         <result property="approvalStatus" column="approval_status" />
         <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="seizedItem" column="seized_item" />
+        <result property="rewardReason" column="reward_reason" />
+        <result property="personCategory" column="person_category" />
+        <!-- ID字段 -->
+        <result property="personId" column="person_id" />
+        <result property="deptId" column="dept_id" />
+        <result property="teamId" column="team_id" />
     </resultMap>
 
     <sql id="selectVo">
-        SELECT id, approve_date,dept_name,team_name,person_name,reward_type,reward_amount,approval_status,remark,import_batch,source_type, create_by, create_time, update_by, update_time, sync_flag
+        SELECT id, approve_date, dept_name, team_name, person_name, reward_type, reward_amount, approval_status, remark, import_batch, source_type, create_by, create_time, update_by, update_time, sync_flag,
+               employee_code, seized_item, reward_reason, person_category, person_id, dept_id, team_id
         FROM ledger_reward_approval
         WHERE del_flag = '0'
     </sql>