处理进展细节完善

commons/src/main/java/com/jzg/commons/entity/vo/ChangeLogDetail.java

@@ -0,0 +1,40 @@
+package com.jzg.commons.entity.vo;
+
+import io.swagger.v3.oas.annotations.media.Schema;
+import lombok.Data;
+
+import java.io.Serial;
+import java.io.Serializable;
+import java.time.LocalDateTime;
+
+@Data
+public class ChangeLogDetail implements Serializable {
+
+    @Serial
+    private static final long serialVersionUID = -4016580596162118096L;
+
+    @Schema(name = "标题")
+    private String title;
+
+    @Schema(name = "时间")
+    private LocalDateTime time;
+
+    // 状态：true-成功, false-失败, null-未完成
+    @Schema(name = "是否勾选")
+    private Boolean show;
+
+    @Schema(name = "审核说明")
+    private String content;
+
+    public ChangeLogDetail(){
+
+    }
+
+    public ChangeLogDetail(String title,LocalDateTime time, Boolean show, String content) {
+        this.title = title;
+        this.time = time;
+        this.show = show;
+        this.content = content;
+    }
+
+}

commons/src/main/java/com/jzg/commons/entity/vo/IncomeAndExpenseList.java

@@ -5,6 +5,7 @@ import lombok.Data;
 
 import java.math.BigDecimal;
 import java.time.LocalDateTime;
+import java.util.List;
 
 @Data
 public class IncomeAndExpenseList {
@@ -41,4 +42,19 @@ public class IncomeAndExpenseList {
 
     @Schema(description = "数据来源")
     private String source;
+
+    @Schema(description = "付款时间")
+    private LocalDateTime paymentTime;
+
+    @Schema(description = "拒绝付款时间")
+    private LocalDateTime rejectTime;
+
+    @Schema(description = "费用审核状态")
+    private String auditingStatus;
+
+    @Schema(description = "处理进度")
+    private List<ChangeLogDetail> stepList;
+
+
+
 }

commons/src/main/java/com/jzg/commons/entity/vo/IncomeAndExpenseVo.java

@@ -65,5 +65,8 @@ public class IncomeAndExpenseVo {
 
         @Schema(description = "数据来源")
         private String source;
+
+        @Schema(description = "处理进度")
+        private List<ChangeLogDetail> stepList;
     }
 }

tenant/organization/src/main/java/com/jzg/organization/service/impl/SysAmountAuditingServiceImpl.java

@@ -350,7 +350,7 @@ public class SysAmountAuditingServiceImpl extends ServiceImpl<SysAmountAuditingM
         audit.setRejectPerson(userName);
         audit.setRejectTime(LocalDateTime.now());
         this.updateById(audit);
-        this.saveChangeLog(audit,param);
+        this.saveChangeLog(audit,param,baseController.getSystemCode());
     }
 
     /**
@@ -359,7 +359,7 @@ public class SysAmountAuditingServiceImpl extends ServiceImpl<SysAmountAuditingM
      * @author lipf
      * @date 2026/7/15 16:48
      */
-    private void saveChangeLog(SysAmountAuditing audit, AmountAuditRejectParam param) {
+    private void saveChangeLog(SysAmountAuditing audit, AmountAuditRejectParam param, String systemCode) {
         log.info("提现申请不通过的时候，向changeLog表中插入一条状态为90的数据。audit=[{}],param=[{}]", JSONUtil.toJsonStr(audit), JSONUtil.toJsonStr(param));
         SysUserAccountChangeLog log = new SysUserAccountChangeLog();
         log.setRelatedAmountAuditingId(audit.getId());
@@ -370,6 +370,17 @@ public class SysAmountAuditingServiceImpl extends ServiceImpl<SysAmountAuditingM
         log.setUserId(audit.getUserId());
         log.setOperType(4);
         log.setIsDelete(1);
+        SysAmountAuditing sysAmountAuditing = baseMapper.selectById(param.getId());
+        if(sysAmountAuditing != null){
+            log.setRelatedAmountAuditingId(sysAmountAuditing.getId());
+            String bankCardNum = sysAmountAuditing.getBankCardNum();
+            List<SysUserJzgInfoBankCard> sysUserJzgInfoBankCards =  sysUserJzgInfoBankCardService.queryBankCardBybankCardNum(bankCardNum,systemCode);
+            if(CollUtil.isNotEmpty(sysUserJzgInfoBankCards)){
+                SysUserJzgInfoBankCard sysUserJzgInfoBankCard = sysUserJzgInfoBankCards.get(0);
+                log.setBankCardIdTo(sysUserJzgInfoBankCard.getId());
+                log.setBankCardNoTo(sysUserJzgInfoBankCard.getBankCardNumber());
+            }
+        }
         sysUserAccountIncomeLogService.save(log);
     }
 

tenant/organization/src/main/java/com/jzg/organization/service/impl/SysUserAccountServiceImpl.java

@@ -317,6 +317,32 @@ public class SysUserAccountServiceImpl extends ServiceImpl<SysUserAccountMapper,
             if("0".equals(action.getStatus())){
                 action.setRemark("提现审核中");
             }
+            List<ChangeLogDetail> stepList = new ArrayList<>();
+            if("0".equals(action.getAuditingStatus())){
+                stepList.add(new ChangeLogDetail("提交提现申请",action.getCreateTime(),true, null));
+                stepList.add(new ChangeLogDetail("财务人员审核",null, null,null));
+                stepList.add(new ChangeLogDetail("财务人员打款", null, null, null));
+            }else if("1".equals(action.getAuditingStatus())){
+                stepList.add(new ChangeLogDetail("提交提现申请",action.getCreateTime(),true, null));
+                stepList.add(new ChangeLogDetail("财务人员审核",action.getPaymentTime(), true,null));
+                stepList.add(new ChangeLogDetail("财务人员打款", action.getPaymentTime(), true, null));
+            }else if("2".equals(action.getAuditingStatus())){
+                stepList.add(new ChangeLogDetail("提交提现申请",action.getCreateTime(),true, null));
+                stepList.add(new ChangeLogDetail("财务人员审核",action.getPaymentTime(), true,null));
+                stepList.add(new ChangeLogDetail("财务审核不通过", action.getRejectTime(), false, null));
+            }else if(StrUtil.isEmpty(action.getAuditingStatus())){
+                if("".equals(action.getStatus())){
+                    stepList.add(new ChangeLogDetail("费用审核通过",action.getCreateTime(),true, null));
+                    stepList.add(new ChangeLogDetail());
+                    stepList.add(new ChangeLogDetail());
+                }else if("1".equals(action.getStatus())){
+                    stepList.add(new ChangeLogDetail("费用审核通过",action.getCreateTime(),true, null));
+                    stepList.add(new ChangeLogDetail());
+                    stepList.add(new ChangeLogDetail());
+                }
+            }
+            action.setStepList(stepList);
+
         }).toList();
         allRecords= new ArrayList<>(allRecords);
         // 排序

tenant/organization/src/main/resources/mapper/SysAmountAuditingMapper.xml

@@ -297,7 +297,8 @@
         suacl.create_time,
         suacl.update_by,
         suacl.update_time,
-        ioci.license_no
+        ioci.license_no,
+        null as payment_time , null as reject_time ,  null as auditing_status
         from
         sys_user_account_change_log suacl
         left join sys_amount_auditing saa on
@@ -316,13 +317,14 @@
         saa.reject_reason,
         saa.bank_name,
         saa.bank_num as userName,
-        null as bankCardNum,
+        saa.bank_card_num,
         saa.user_id,
         saa.create_by,
         saa.create_time,
         saa.update_by,
         saa.update_time,
-        null as license_no
+        null as license_no,
+        saa.payment_time , saa.reject_time ,  saa.auditing_status
         from
         sys_amount_auditing saa
         where