ledger_banner_letter表字段修复、相关代码修改、导入逻辑修改

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

@@ -30,11 +30,22 @@ public class LedgerBannerLetter extends BaseEntity {
     @Excel(name = "队室/班组")
     private String teamName;
 
+    @Excel(name = "队室内勤")
+    private String teamInternalDuty;
+
+    private String groupName;
+
+    private Long groupId;
+
     @Excel(name = "姓名")
     private String personName;
 
     private Long personUserId;
 
+    private Long deptId;
+
+    private Long teamId;
+
     @Excel(name = "类型", readConverterExp = "1=锦旗,2=感谢信")
     private String type;
 
@@ -73,12 +84,27 @@ public class LedgerBannerLetter extends BaseEntity {
     public String getTeamName() { return teamName; }
     public void setTeamName(String teamName) { this.teamName = teamName; }
 
+    public String getTeamInternalDuty() { return teamInternalDuty; }
+    public void setTeamInternalDuty(String teamInternalDuty) { this.teamInternalDuty = teamInternalDuty; }
+
+    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; }
 
     public Long getPersonUserId() { return personUserId; }
     public void setPersonUserId(Long personUserId) { this.personUserId = personUserId; }
 
+    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; }
+
     public String getType() { return type; }
     public void setType(String type) { this.type = type; }
 

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

@@ -824,21 +824,37 @@ public class LedgerCombinedImportServiceImpl implements ILedgerCombinedImportSer
     }
 
     /** 15. 锦旗及感谢信 → ledger_banner_letter
-     * R2: 时间(0) 姓名(1) 内容(2) 类别(3) 图片附件(4) 班组(5) 队室内勤(6)
+     * R2: 时间(0) 姓名(1) 获得感谢信的具体内容(2) 类别(3) 图片和附件(4) 班组(5) 队室内勤(6)
      * 类别: 锦旗→'1', 其他→'2'
      */
     private int doBannerLetter(Sheet sheet, String batchNo, String username) {
         List<LedgerBannerLetter> list = new ArrayList<>();
         for (Object[] c : dataRows(sheet, 2)) {
             LedgerBannerLetter o = new LedgerBannerLetter();
-            o.setRecordDate(date(c, 0));
-            o.setPersonName(str(c, 1));
-            o.setContentDesc(str(c, 2));
+            o.setRecordDate(date(c, 0));                        // 时间
+            String personName = str(c, 1);
+            o.setPersonName(personName);                         // 姓名
+            o.setContentDesc(str(c, 2));                        // 获得感谢信的具体内容
             String typeStr = str(c, 3);
-            o.setType("锦旗".equals(typeStr) ? "1" : "2");
-            o.setEvidenceFile(str(c, 4));
-            o.setTeamName(str(c, 5));
-            o.setRemark(str(c, 6));
+            o.setType("锦旗".equals(typeStr) ? "1" : "2");      // 类别
+            o.setEvidenceFile(str(c, 4));                        // 图片和附件
+            o.setTeamName(str(c, 5));                           // 班组
+            o.setTeamInternalDuty(str(c, 6));                    // 队室内勤
+            
+            // 根据姓名查找组织ID
+            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/LedgerBannerLetterMapper.xml

@@ -7,6 +7,9 @@
         <result property="recordDate" column="record_date" />
         <result property="deptName" column="dept_name" />
         <result property="teamName" column="team_name" />
+        <result property="teamInternalDuty" column="team_internal_duty" />
+        <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="type" column="type" />
@@ -15,6 +18,8 @@
         <result property="addScore" column="add_score" />
         <result property="evidenceFile" column="evidence_file" />
         <result property="remark" column="remark" />
+        <result property="deptId" column="dept_id" />
+        <result property="teamId" column="team_id" />
         <result property="importBatch" column="import_batch" />
         <result property="sourceType" column="source_type" />
         <result property="createBy"   column="create_by"   />
@@ -25,7 +30,7 @@
     </resultMap>
 
     <sql id="selectVo">
-        SELECT id, record_date,dept_name,team_name,person_name,person_user_id,type,giver,content_desc,add_score,evidence_file,remark, import_batch, source_type, create_by, create_time, update_by, update_time, sync_flag
+        SELECT id, record_date,dept_name,team_name,team_internal_duty,group_name,group_id,person_name,person_user_id,type,giver,content_desc,add_score,evidence_file,remark, dept_id, team_id, import_batch, source_type, create_by, create_time, update_by, update_time, sync_flag
         FROM ledger_banner_letter
         WHERE del_flag = '0'
     </sql>