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

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

@@ -130,8 +130,7 @@ public class LedgerTemplateController extends BaseController {
         nm.put("rewardApproval", "小额奖励审批单-安检-质控");
         hm.put("rewardApproval", 1);
         cm.put("rewardApproval", new String[]{
-            "员工编码","姓名","查获（事件）时间","奖励类别","查获物品","类别（一类/二类）",
-            "奖励事由（安全）","人员类别","主要事由简述"
+            "姓名","查获（事件）时间","奖励类别","查获物品","人员类别","主要事由简述","处置结果","证明材料"
         });
 
         // 13. 部门奖惩记录表 (5列)

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

@@ -20,30 +20,45 @@ public class LedgerRewardApproval 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;
 
-    @Excel(name = "队室/班组")
+    private Long deptId;
+
     private String teamName;
 
+    private Long teamId;
+
+    private String groupName;
+
+    private Long groupId;
+
     @Excel(name = "姓名")
     private String personName;
 
-    @Excel(name = "奖励类型")
+    private Long personId;
+
+    @JsonFormat(pattern = "yyyy-MM-dd")
+    @Excel(name = "查获（事件）时间", width = 20, dateFormat = "yyyy-MM-dd")
+    private Date approveDate;
+
+    @Excel(name = "奖励类别")
     private String rewardType;
 
-    @Excel(name = "奖励金额")
-    private BigDecimal rewardAmount;
+    @Excel(name = "查获物品")
+    private String seizedItem;
+
+    @Excel(name = "人员类别")
+    private String personCategory;
 
-    @Excel(name = "审批状态")
-    private String approvalStatus;
+    @Excel(name = "主要事由简述")
+    private String rewardReason;
 
-    @Excel(name = "备注")
-    private String remark;
+    @Excel(name = "处置结果")
+    private String disposalResult;
+
+    @Excel(name = "证明材料")
+    private String proofMaterial;
 
     private String importBatch;
 
@@ -53,46 +68,53 @@ 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; }
 
-    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; }
 
+    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 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 getPersonId() { return personId; }
+    public void setPersonId(Long personId) { this.personId = personId; }
+
+    public Date getApproveDate() { return approveDate; }
+    public void setApproveDate(Date approveDate) { this.approveDate = approveDate; }
+
     public String getRewardType() { return rewardType; }
     public void setRewardType(String rewardType) { this.rewardType = rewardType; }
 
-    public BigDecimal getRewardAmount() { return rewardAmount; }
-    public void setRewardAmount(BigDecimal rewardAmount) { this.rewardAmount = rewardAmount; }
+    public String getSeizedItem() { return seizedItem; }
+    public void setSeizedItem(String seizedItem) { this.seizedItem = seizedItem; }
+
+    public String getPersonCategory() { return personCategory; }
+    public void setPersonCategory(String personCategory) { this.personCategory = personCategory; }
+
+    public String getRewardReason() { return rewardReason; }
+    public void setRewardReason(String rewardReason) { this.rewardReason = rewardReason; }
 
-    public String getApprovalStatus() { return approvalStatus; }
-    public void setApprovalStatus(String approvalStatus) { this.approvalStatus = approvalStatus; }
+    public String getDisposalResult() { return disposalResult; }
+    public void setDisposalResult(String disposalResult) { this.disposalResult = disposalResult; }
 
-    public String getRemark() { return remark; }
-    public void setRemark(String remark) { this.remark = remark; }
+    public String getProofMaterial() { return proofMaterial; }
+    public void setProofMaterial(String proofMaterial) { this.proofMaterial = proofMaterial; }
 
     public String getImportBatch() { return importBatch; }
     public void setImportBatch(String importBatch) { this.importBatch = importBatch; }
@@ -102,24 +124,4 @@ 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

@@ -843,23 +843,23 @@ public class LedgerCombinedImportServiceImpl implements ILedgerCombinedImportSer
 
     /** 12. 小额奖励审批单-安检-质控 → ledger_reward_approval
      * 特殊：只有1行表头（headerRow=1）
-     * R1: 员工编码(0) 姓名(1) 查获时间(2) 奖励类别(3) 查获物品(4)
-     *     类别(5) 奖励事由(6) 人员类别(7) 主要事由简述(8)
+     * R1: 姓名(0) 查获（事件）时间(1) 奖励类别(2) 查获物品(3) 人员类别(4)
+     *     主要事由简述(5) 处置结果(6) 证明材料(7)
      */
     private int doRewardApproval(Sheet sheet, String batchNo, String username) {
         List<LedgerRewardApproval> list = new ArrayList<>();
         for (Object[] c : dataRows(sheet, 1)) {  // 只跳1行表头
             LedgerRewardApproval o = new LedgerRewardApproval();
-            String personName = str(c, 1);      // 姓名
+            String personName = str(c, 0);       // 姓名
             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));             // 主要事由简述
-            
+            o.setApproveDate(date(c, 1));         // 查获（事件）时间
+            o.setRewardType(str(c, 2));           // 奖励类别
+            o.setSeizedItem(str(c, 3));           // 查获物品
+            o.setPersonCategory(str(c, 4));       // 人员类别
+            o.setRewardReason(str(c, 5));         // 主要事由简述
+            o.setDisposalResult(str(c, 6));       // 处置结果
+            o.setProofMaterial(str(c, 7));        // 证明材料
+
             // 根据姓名查找组织ID和名称
             if (personName != null && !personName.trim().isEmpty()) {
                 Map<String, Object> orgInfo = resolveOrgInfoByNameWithCache(personName);
@@ -872,7 +872,6 @@ public class LedgerCombinedImportServiceImpl implements ILedgerCombinedImportSer
                 }
             }
             
-            o.setApprovalStatus("待审批");
             o.setImportBatch(batchNo);
             o.setSourceType("1");
             o.setCreateBy(username);

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

@@ -346,7 +346,11 @@ public class LedgerSyncServiceImpl implements ILedgerSyncService {
         return new SyncResult(ins, skip, "");
     }
 
-    /** 6. 小额奖励审批单（安全类查获加分，按类别选L3） */
+    /** 6. 小额奖励审批单（安全类查获加分，按处置结果选L3）
+     *  一类：移交公安处置
+     *  二类：公安批评教育放行
+     *  特殊查获：其他
+     */
     private SyncResult syncRewardApproval() {
         LedgerRewardApproval query = new LedgerRewardApproval();
         query.setSyncFlag(LedgerSyncFlagEnum.ZERO.getCode());
@@ -358,16 +362,16 @@ public class LedgerSyncServiceImpl implements ILedgerSyncService {
             String src = "reward_approval:" + row.getId();
             if (existsBySrc(src)) { skip++; continue; }
             if (!hasName(row.getPersonName())) { skip++; continue; }
-            String cat = row.getRewardType() != null ? row.getRewardType() : "";
+            String result = row.getDisposalResult() != null ? row.getDisposalResult() : "";
             long l3Id; BigDecimal sv;
-            if (cat.contains("一类"))      { l3Id = IND_SEIZURE_L3_A; sv = POS_ONE; }
-            else if (cat.contains("二类")) { l3Id = IND_SEIZURE_L3_B; sv = POS_HALF; }
-            else                           { l3Id = IND_SEIZURE_L3_C; sv = POS_015; }
+            if (result.contains("移交公安处置"))        { l3Id = IND_SEIZURE_L3_A; sv = POS_ONE; }
+            else if (result.contains("公安批评教育放行")) { l3Id = IND_SEIZURE_L3_B; sv = POS_HALF; }
+            else                                       { l3Id = IND_SEIZURE_L3_C; sv = POS_015; }
             ScoreIndicator lv3 = getIndicator(l3Id);
             ScoreEvent e = buildEvent(dimId, lv2, lv3, row.getPersonName(),
                     row.getTeamName(), row.getApproveDate() != null ? new java.util.Date(row.getApproveDate().getTime()) : null,
                     null, sv, ZERO,
-                    row.getRemark(), src, null);
+                    row.getRewardReason(), src, null);
             scoreEventMapper.insert(e);
             ins++;
         }

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

@@ -6,12 +6,19 @@
         <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="rewardType" column="reward_type" />
-        <result property="rewardAmount" column="reward_amount" />
-        <result property="approvalStatus" column="approval_status" />
-        <result property="remark" column="remark" />
+        <result property="seizedItem" column="seized_item" />
+        <result property="personCategory" column="person_category" />
+        <result property="rewardReason" column="reward_reason" />
+        <result property="disposalResult" column="disposal_result" />
+        <result property="proofMaterial" column="proof_material" />
         <result property="importBatch" column="import_batch" />
         <result property="sourceType" column="source_type" />
         <result property="createBy" column="create_by" />
@@ -19,18 +26,13 @@
         <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,
-               employee_code, seized_item, reward_reason, person_category, person_id, dept_id, team_id
+        SELECT id, approve_date, dept_name, dept_id, team_name, team_id, group_name, group_id,
+               person_name, person_id, reward_type, seized_item, person_category,
+               reward_reason, disposal_result, proof_material,
+               import_batch, source_type, create_by, create_time, update_by, update_time, sync_flag
         FROM ledger_reward_approval
         WHERE del_flag = '0'
     </sql>
@@ -42,10 +44,10 @@
         <if test="personName != null and personName != ''">AND person_name LIKE CONCAT('%', #{personName}, '%')</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>