部门奖惩记录表、请、休假记录表（特殊）、锦旗及感谢信导入功能开发

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

@@ -52,6 +52,10 @@ public class LedgerImportController extends BaseController {
     @Autowired private ILedgerHealthSoldierService healthSoldierService;
     @Autowired private ILedgerDormFireSafetyService dormFireSafetyService;
     @Autowired private ILedgerTrainingIssueService trainingIssueService;
+    @Autowired private ILedgerRewardPenaltyService rewardPenaltyService;
+    @Autowired private ILedgerLeaveSpecialService leaveSpecialService;
+    @Autowired private ILedgerBannerLetterService bannerLetterService;
+
 
     private String generateBatchNo() {
         return DateUtils.dateTimeNow("yyyyMMddHHmmss") + UUID.randomUUID().toString().substring(0, 6).toUpperCase();
@@ -327,6 +331,58 @@ public class LedgerImportController extends BaseController {
     }
 
     /**
+     * 部门奖惩记录表导入
+     * LedgerRewardPenalty
+     */
+    @PreAuthorize("@ss.hasPermi('ledger:import:rewardPenalty')")
+    @Log(title = "台账导入-部门奖惩记录表", businessType = BusinessType.IMPORT)
+    @PostMapping("/rewardPenalty")
+    public AjaxResult importRewardPenalty(@RequestParam("file") MultipartFile file) throws Exception {
+        String batchNo = generateBatchNo();
+        List<LedgerRewardPenalty> list = new ArrayList<>();
+        EasyExcel.read(file.getInputStream(), LedgerRewardPenalty.class,
+                new SimpleListener<>(list)).headRowNumber(2).sheet().doRead();
+        list.forEach(item -> { item.setImportBatch(batchNo); item.setSourceType("1"); item.setCreateBy(getUsername()); });
+        rewardPenaltyService.batchInsert(list);
+        return AjaxResult.success("导入成功，共" + list.size() + "条");
+    }
+
+    /**
+     * 请休假记录（特殊）表导入
+     * LedgerLeaveSpecial
+     */
+    @PreAuthorize("@ss.hasPermi('ledger:import:leaveSpecial')")
+    @Log(title = "台账导入-请休假记录特殊", businessType = BusinessType.IMPORT)
+    @PostMapping("/leaveSpecial")
+    public AjaxResult importLeaveSpecial(@RequestParam("file") MultipartFile file) throws Exception {
+        String batchNo = generateBatchNo();
+        List<LedgerLeaveSpecial> list = new ArrayList<>();
+        EasyExcel.read(file.getInputStream(), LedgerLeaveSpecial.class,
+                new SimpleListener<>(list)).headRowNumber(2).sheet().doRead();
+        list.forEach(item -> { item.setImportBatch(batchNo); item.setSourceType("1"); item.setCreateBy(getUsername()); });
+        leaveSpecialService.batchInsert(list);
+        return AjaxResult.success("导入成功，共" + list.size() + "条");
+    }
+
+    /**
+     * 锦旗及感谢信记录表导入
+     * LedgerBannerLetter
+     */
+    @PreAuthorize("@ss.hasPermi('ledger:import:bannerLetter')")
+    @Log(title = "台账导入-锦旗及感谢信", businessType = BusinessType.IMPORT)
+    @PostMapping("/bannerLetter")
+    public AjaxResult importBannerLetter(@RequestParam("file") MultipartFile file) throws Exception {
+        String batchNo = generateBatchNo();
+        List<LedgerBannerLetter> list = new ArrayList<>();
+        EasyExcel.read(file.getInputStream(), LedgerBannerLetter.class,
+                new SimpleListener<>(list)).headRowNumber(2).sheet().doRead();
+        list.forEach(item -> { item.setImportBatch(batchNo); item.setSourceType("1"); item.setCreateBy(getUsername()); });
+        bannerLetterService.batchInsert(list);
+        return AjaxResult.success("导入成功，共" + list.size() + "条");
+    }
+
+
+    /**
      * 一键全量导入 - 解析多Sheet合并Excel（旅检三部"三三"数字管理平台.xlsx）
      */
     @PreAuthorize("@ss.hasPermi('ledger:import:combined')")
@@ -373,4 +429,4 @@ public class LedgerImportController extends BaseController {
         @Override
         public void doAfterAllAnalysed(AnalysisContext context) {}
     }
-}
+}

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

@@ -53,6 +53,11 @@ public class LedgerBannerLetter extends BaseEntity {
     @Excel(name = "备注")
     private String remark;
 
+    private String importBatch;
+
+    @Excel(name = "数据来源")
+    private String sourceType;
+
     @Excel(name = "同步标志(0=未同步;1=已同步)")
     private String syncFlag;
 
@@ -92,6 +97,12 @@ public class LedgerBannerLetter extends BaseEntity {
     public String getRemark() { return remark; }
     public void setRemark(String remark) { this.remark = remark; }
 
+    public String getImportBatch() { return importBatch; }
+    public void setImportBatch(String importBatch) { this.importBatch = importBatch; }
+
+    public String getSourceType() { return sourceType; }
+    public void setSourceType(String sourceType) { this.sourceType = sourceType; }
+
     public String getSyncFlag() { return syncFlag; }
     public void setSyncFlag(String syncFlag) { this.syncFlag = syncFlag; }
-}
+}

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

@@ -51,6 +51,11 @@ public class LedgerLeaveSpecial extends BaseEntity {
     @Excel(name = "备注")
     private String remark;
 
+    private String importBatch;
+
+    @Excel(name = "数据来源")
+    private String sourceType;
+
     @Excel(name = "同步标志(0=未同步;1=已同步)")
     private String syncFlag;
 
@@ -87,6 +92,12 @@ public class LedgerLeaveSpecial extends BaseEntity {
     public String getRemark() { return remark; }
     public void setRemark(String remark) { this.remark = remark; }
 
+    public String getImportBatch() { return importBatch; }
+    public void setImportBatch(String importBatch) { this.importBatch = importBatch; }
+
+    public String getSourceType() { return sourceType; }
+    public void setSourceType(String sourceType) { this.sourceType = sourceType; }
+
     public String getSyncFlag() { return syncFlag; }
     public void setSyncFlag(String syncFlag) { this.syncFlag = syncFlag; }
-}
+}

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

@@ -53,6 +53,11 @@ public class LedgerRewardPenalty extends BaseEntity {
     @Excel(name = "备注")
     private String remark;
 
+    private String importBatch;
+
+    @Excel(name = "数据来源")
+    private String sourceType;
+
     @Excel(name = "同步标志(0=未同步;1=已同步)")
     private String syncFlag;
 
@@ -92,6 +97,12 @@ public class LedgerRewardPenalty extends BaseEntity {
     public String getRemark() { return remark; }
     public void setRemark(String remark) { this.remark = remark; }
 
+    public String getImportBatch() { return importBatch; }
+    public void setImportBatch(String importBatch) { this.importBatch = importBatch; }
+
+    public String getSourceType() { return sourceType; }
+    public void setSourceType(String sourceType) { this.sourceType = sourceType; }
+
     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

@@ -145,9 +145,9 @@ public class LedgerCombinedImportServiceImpl implements ILedgerCombinedImportSer
             case "terminalBonus":         return doTerminalBonus(sheet, batchNo, username);
             case "examScore":             return doExamScore(sheet, batchNo, username);
             case "rewardApproval":        return doRewardApproval(sheet, batchNo, username);
-            case "rewardPenalty":         return doRewardPenalty(sheet, username);
-            case "leaveSpecial":          return doLeaveSpecial(sheet, username);
-            case "bannerLetter":          return doBannerLetter(sheet, username);
+            case "rewardPenalty":         return doRewardPenalty(sheet, batchNo, username);
+            case "leaveSpecial":          return doLeaveSpecial(sheet, batchNo, username);
+            case "bannerLetter":          return doBannerLetter(sheet, batchNo, username);
             case "dailyTraining":         return doDailyTraining(sheet, batchNo, username);
             case "leaderDuty":            return doLeaderDuty(sheet, batchNo, username);
             case "healthSoldier":         return doHealthSoldier(sheet, batchNo, username);
@@ -780,7 +780,7 @@ public class LedgerCombinedImportServiceImpl implements ILedgerCombinedImportSer
     /** 13. 部门奖惩记录表 → ledger_reward_penalty
      * R2: 姓名(0) 班组(1) 事由(2) 扣罚金额(3) 最后更新时间(4)
      */
-    private int doRewardPenalty(Sheet sheet, String username) {
+    private int doRewardPenalty(Sheet sheet, String batchNo, String username) {
         List<LedgerRewardPenalty> list = new ArrayList<>();
         for (Object[] c : dataRows(sheet, 2)) {
             LedgerRewardPenalty o = new LedgerRewardPenalty();
@@ -791,6 +791,8 @@ public class LedgerCombinedImportServiceImpl implements ILedgerCombinedImportSer
             o.setScoreChange(amt != null ? amt.negate() : null);
             o.setType("2");  // 扣罚
             o.setRecordDate(date(c, 4));
+            o.setImportBatch(batchNo);
+            o.setSourceType("1");
             o.setCreateBy(username);
             list.add(o);
         }
@@ -802,7 +804,7 @@ public class LedgerCombinedImportServiceImpl implements ILedgerCombinedImportSer
      * R2: 姓名(0) 班组(1) 时间（起）(2) 时间（止）(3) 休假类别(4) 天数/时长(5)
      * 天数/时长列可能是纯数字（天）或"X小时"格式；小时值按8小时/天换算成天数
      */
-    private int doLeaveSpecial(Sheet sheet, String username) {
+    private int doLeaveSpecial(Sheet sheet, String batchNo, String username) {
         List<LedgerLeaveSpecial> list = new ArrayList<>();
         for (Object[] c : dataRows(sheet, 2)) {
             LedgerLeaveSpecial o = new LedgerLeaveSpecial();
@@ -812,6 +814,8 @@ public class LedgerCombinedImportServiceImpl implements ILedgerCombinedImportSer
             o.setStartDate(date(c, 2));
             o.setEndDate(date(c, 3));
             o.setDays(hoursOrDays(c, 5));
+            o.setImportBatch(batchNo);
+            o.setSourceType("1");
             o.setCreateBy(username);
             list.add(o);
         }
@@ -823,7 +827,7 @@ public class LedgerCombinedImportServiceImpl implements ILedgerCombinedImportSer
      * R2: 时间(0) 姓名(1) 内容(2) 类别(3) 图片附件(4) 班组(5) 队室内勤(6)
      * 类别: 锦旗→'1', 其他→'2'
      */
-    private int doBannerLetter(Sheet sheet, String username) {
+    private int doBannerLetter(Sheet sheet, String batchNo, String username) {
         List<LedgerBannerLetter> list = new ArrayList<>();
         for (Object[] c : dataRows(sheet, 2)) {
             LedgerBannerLetter o = new LedgerBannerLetter();
@@ -835,6 +839,8 @@ public class LedgerCombinedImportServiceImpl implements ILedgerCombinedImportSer
             o.setEvidenceFile(str(c, 4));
             o.setTeamName(str(c, 5));
             o.setRemark(str(c, 6));
+            o.setImportBatch(batchNo);
+            o.setSourceType("1");
             o.setCreateBy(username);
             list.add(o);
         }
@@ -1335,4 +1341,4 @@ public class LedgerCombinedImportServiceImpl implements ILedgerCombinedImportSer
     private void clearImportCache() {
         this.importCache = null;
     }
-}
+}

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

@@ -14,7 +14,10 @@
         <result property="contentDesc" column="content_desc" />
         <result property="addScore" column="add_score" />
         <result property="evidenceFile" column="evidence_file" />
-        <result property="remark" column="remark" />        <result property="createBy"   column="create_by"   />
+        <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" />
@@ -22,7 +25,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, create_by, create_time, update_by, update_time, sync_flag
+        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
         FROM ledger_banner_letter
         WHERE del_flag = '0'
     </sql>
@@ -47,4 +50,4 @@
         set sync_flag = '1'
         where sync_flag = '0'
     </update>
-</mapper>
+</mapper>

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

@@ -13,7 +13,10 @@
         <result property="endDate" column="end_date" />
         <result property="days" column="days" />
         <result property="deductScore" column="deduct_score" />
-        <result property="remark" column="remark" />        <result property="createBy"   column="create_by"   />
+        <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" />
@@ -21,7 +24,7 @@
     </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, create_by, create_time, update_by, update_time, sync_flag
+        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
         FROM ledger_leave_special
         WHERE del_flag = '0'
     </sql>
@@ -46,4 +49,4 @@
         set sync_flag = '1'
         where sync_flag = '0'
     </update>
-</mapper>
+</mapper>

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

@@ -14,7 +14,10 @@
         <result property="scoreChange" column="score_change" />
         <result property="scoreDimension" column="score_dimension" />
         <result property="evidenceFile" column="evidence_file" />
-        <result property="remark" column="remark" />        <result property="createBy"   column="create_by"   />
+        <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" />
@@ -22,7 +25,7 @@
     </resultMap>
 
     <sql id="selectVo">
-        SELECT id, record_date,dept_name,team_name,person_name,person_user_id,type,event_desc,score_change,score_dimension,evidence_file,remark, create_by, create_time, update_by, update_time, sync_flag
+        SELECT id, record_date,dept_name,team_name,person_name,person_user_id,type,event_desc,score_change,score_dimension,evidence_file,remark, import_batch, source_type, create_by, create_time, update_by, update_time, sync_flag
         FROM ledger_reward_penalty
         WHERE del_flag = '0'
     </sql>
@@ -47,4 +50,4 @@
         set sync_flag = '1'
         where sync_flag = '0'
     </update>
-</mapper>
+</mapper>