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

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

@@ -27,12 +27,23 @@ public class LedgerTerminalBonus extends BaseEntity {
     @Excel(name = "部门名称")
     private String deptName;
 
+    private Long deptId;
+
     @Excel(name = "队室/班组")
     private String teamName;
 
+    private Long teamId;
+
     @Excel(name = "姓名")
     private String personName;
 
+    private Long personId;
+
+    @Excel(name = "小组")
+    private String groupName;
+
+    private Long groupId;
+
     @Excel(name = "加分类型")
     private String bonusType;
 
@@ -62,12 +73,27 @@ public class LedgerTerminalBonus 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 getPersonName() { return personName; }
     public void setPersonName(String personName) { this.personName = personName; }
 
+    public Long getPersonId() { return personId; }
+    public void setPersonId(Long personId) { this.personId = personId; }
+
+    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 getBonusType() { return bonusType; }
     public void setBonusType(String bonusType) { this.bonusType = bonusType; }
 
@@ -88,4 +114,4 @@ public class LedgerTerminalBonus 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

@@ -868,13 +868,29 @@ public class LedgerCombinedImportServiceImpl implements ILedgerCombinedImportSer
         for (Object[] c : dataRows(sheet, 2)) {
             LedgerTerminalBonus o = new LedgerTerminalBonus();
             o.setApproveDate(date(c, 0) != null ? new java.sql.Date(date(c, 0).getTime()) : null);
-            o.setPersonName(str(c, 1));
+            String personName = str(c, 1);
+            o.setPersonName(personName);
             o.setTeamName(str(c, 2));
             o.setAddScore(decimal(c, 3) != null ? decimal(c, 3) : BigDecimal.ZERO);
             o.setRemark(str(c, 4));
             o.setImportBatch(batchNo);
             o.setSourceType("1");
             o.setCreateBy(username);
+            
+            // 根据人员姓名查找组织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.setGroupId((Long) orgInfo.get("groupId"));
+                    o.setGroupName((String) orgInfo.get("groupName"));
+                }
+            }
+            
             list.add(o);
         }
         terminalBonusService.batchInsert(list);

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

@@ -6,22 +6,28 @@
         <id property="id" column="id" />
         <result property="approveDate" column="approve_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="personName" column="person_name" />
+        <result property="personId" column="person_id" />
         <result property="bonusType" column="bonus_type" />
         <result property="addScore" column="add_score" />
         <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="updateTime" column="update_time" />
         <result property="syncFlag" column="sync_flag" />
+        <result property="groupName" column="group_name" />
+        <result property="groupId" column="group_id" />
     </resultMap>
 
     <sql id="selectVo">
-        SELECT id, approve_date,dept_name,team_name,person_name,bonus_type,add_score,evidence_file,remark,import_batch,source_type, create_by, create_time, update_by, update_time, sync_flag
+        SELECT id, approve_date, dept_name, dept_id, team_name, team_id, person_name, person_id, bonus_type, add_score, evidence_file, remark, import_batch, source_type, create_by, create_time, update_by, update_time, sync_flag, group_name, group_id
         FROM ledger_terminal_bonus
         WHERE del_flag = '0'
     </sql>
@@ -45,4 +51,4 @@
         set sync_flag = '1'
         where sync_flag = '0'
     </update>
-</mapper>
+</mapper>