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

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

@@ -116,7 +116,7 @@ public class LedgerTemplateController extends BaseController {
         nm.put("terminalBonus", "航站楼加分");
         hm.put("terminalBonus", 2);
         cm.put("terminalBonus", new String[]{
-            "审核日期","姓名","班组","加分分数","队室内勤","总加分数","队室负责人"
+            "姓名","所属航站楼","记分值","记分日期","捡到物品金额","记分条款"
         });
 
         // 11. 成绩收集 (9列)

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

@@ -20,42 +20,43 @@ public class LedgerTerminalBonus extends BaseEntity {
     @TableId(type = IdType.AUTO)
     private Long id;
 
-    @JsonFormat(pattern = "yyyy-MM-dd")
-    @Excel(name = "审核日期", width = 20, dateFormat = "yyyy-MM-dd")
-    private Date approveDate;
-
     @Excel(name = "部门名称")
     private String deptName;
 
     private Long deptId;
 
-    @Excel(name = "队室/班组")
     private String teamName;
 
     private Long teamId;
 
+    private String groupName;
+
+    private Long groupId;
+
     @Excel(name = "姓名")
     private String personName;
 
     private Long personId;
 
-    @Excel(name = "小组")
-    private String groupName;
+    @Excel(name = "所属航站楼")
+    private String terminalBuilding;
 
-    private Long groupId;
+    @Excel(name = "记分值")
+    private BigDecimal addScore;
+
+    @JsonFormat(pattern = "yyyy-MM-dd")
+    @Excel(name = "记分日期", width = 20, dateFormat = "yyyy-MM-dd")
+    private Date scoreDate;
 
-    @Excel(name = "加分类型")
-    private String bonusType;
+    @Excel(name = "捡到物品金额")
+    private BigDecimal itemAmount;
 
-    @Excel(name = "加分")
-    private BigDecimal addScore;
+    @Excel(name = "记分条款")
+    private String scoreClause;
 
     @Excel(name = "佐证附件")
     private String evidenceFile;
 
-    @Excel(name = "备注")
-    private String remark;
-
     private String importBatch;
 
     @Excel(name = "数据来源")
@@ -67,9 +68,6 @@ public class LedgerTerminalBonus extends BaseEntity {
     public Long getId() { return id; }
     public void setId(Long id) { this.id = id; }
 
-    public Date getApproveDate() { return approveDate; }
-    public void setApproveDate(Date approveDate) { this.approveDate = approveDate; }
-
     public String getDeptName() { return deptName; }
     public void setDeptName(String deptName) { this.deptName = deptName; }
 
@@ -82,30 +80,36 @@ public class LedgerTerminalBonus extends BaseEntity {
     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; }
+    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 getTerminalBuilding() { return terminalBuilding; }
+    public void setTerminalBuilding(String terminalBuilding) { this.terminalBuilding = terminalBuilding; }
 
     public BigDecimal getAddScore() { return addScore; }
     public void setAddScore(BigDecimal addScore) { this.addScore = addScore; }
 
+    public Date getScoreDate() { return scoreDate; }
+    public void setScoreDate(Date scoreDate) { this.scoreDate = scoreDate; }
+
+    public BigDecimal getItemAmount() { return itemAmount; }
+    public void setItemAmount(BigDecimal itemAmount) { this.itemAmount = itemAmount; }
+
+    public String getScoreClause() { return scoreClause; }
+    public void setScoreClause(String scoreClause) { this.scoreClause = scoreClause; }
+
     public String getEvidenceFile() { return evidenceFile; }
     public void setEvidenceFile(String evidenceFile) { this.evidenceFile = evidenceFile; }
 
-    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; }
 
@@ -114,4 +118,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

@@ -767,18 +767,19 @@ public class LedgerCombinedImportServiceImpl implements ILedgerCombinedImportSer
     }
 
     /** 10. 航站楼加分 → ledger_terminal_bonus
-     * R2: 审核日期(0) 姓名(1) 班组(2) 加分分数(3) 队室内勤(4)
+     * R2: 姓名(0) 所属航站楼(1) 记分值(2) 记分日期(3) 捡到物品金额(4) 记分条款(5)
      */
     private int doTerminalBonus(Sheet sheet, String batchNo, String username) {
         List<LedgerTerminalBonus> list = new ArrayList<>();
         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);
-            String personName = str(c, 1);
+            String personName = str(c, 0);
             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.setTerminalBuilding(str(c, 1));
+            o.setAddScore(decimal(c, 2));
+            o.setScoreDate(date(c, 3));
+            o.setItemAmount(decimal(c, 4));
+            o.setScoreClause(str(c, 5));
             o.setImportBatch(batchNo);
             o.setSourceType("1");
             o.setCreateBy(username);

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

@@ -445,7 +445,7 @@ public class LedgerSyncServiceImpl implements ILedgerSyncService {
             if (!hasName(row.getPersonName())) { skip++; continue; }
             BigDecimal sv = row.getAddScore() != null ? row.getAddScore() : POS_07;
             ScoreEvent e = buildEvent(dimId, lv2, lv3, row.getPersonName(),
-                    row.getTeamName(), row.getApproveDate() != null ? new java.util.Date(row.getApproveDate().getTime()) : null,
+                    row.getTeamName(), row.getScoreDate(),
                     null, sv, ZERO,
                     "航站楼加分", src, null);
             scoreEventMapper.insert(e);

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

@@ -4,17 +4,20 @@
 
     <resultMap id="BaseResultMap" type="com.sundot.airport.ledger.domain.LedgerTerminalBonus">
         <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="groupName" column="group_name" />
+        <result property="groupId" column="group_id" />
         <result property="personName" column="person_name" />
         <result property="personId" column="person_id" />
-        <result property="bonusType" column="bonus_type" />
+        <result property="terminalBuilding" column="terminal_building" />
         <result property="addScore" column="add_score" />
+        <result property="scoreDate" column="score_date" />
+        <result property="itemAmount" column="item_amount" />
+        <result property="scoreClause" column="score_clause" />
         <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"   />
@@ -22,12 +25,13 @@
         <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, 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
+        SELECT id, dept_name, dept_id, team_name, team_id, group_name, group_id,
+               person_name, person_id, terminal_building, add_score, score_date,
+               item_amount, score_clause, evidence_file,
+               import_batch, source_type, create_by, create_time, update_by, update_time, sync_flag
         FROM ledger_terminal_bonus
         WHERE del_flag = '0'
     </sql>
@@ -38,10 +42,10 @@
         <if test="teamName != null and teamName != ''">AND team_name LIKE CONCAT('%', #{teamName}, '%')</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>
@@ -51,4 +55,4 @@
         set sync_flag = '1'
         where sync_flag = '0'
     </update>
-</mapper>
+</mapper>