手机端显示凭证

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

@@ -58,6 +58,7 @@ public class IncomeAndExpenseList {
     @Schema(description = "支付凭证")
     private String paymentVoucher;
 
+    private String bucketName;
     @Schema(description = "支付凭证的id")
     private String picId;
 }

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

@@ -20,10 +20,7 @@ import com.jzg.commons.entity.po.SysUserJzgInfoBankCard;
 import com.jzg.commons.entity.vo.AmountAuditVo;
 import com.jzg.commons.entity.vo.IncomeAndExpenseList;
 import com.jzg.commons.exception.SystemException;
-import com.jzg.commons.util.AssertionUtils;
-import com.jzg.commons.util.BigDecimalUtil;
-import com.jzg.commons.util.DateTimeUtils;
-import com.jzg.commons.util.StringUtils;
+import com.jzg.commons.util.*;
 import com.jzg.organization.mapper.SysAmountAuditingMapper;
 import com.jzg.organization.service.*;
 import com.jzg.organization.state.AuditState;
@@ -530,6 +527,12 @@ public class SysAmountAuditingServiceImpl extends ServiceImpl<SysAmountAuditingM
     public List<IncomeAndExpenseList> getIncomeAndExpense(IncomeAndExpenseParam param) {
         log.info("查询收支明细queryIncomeANdExpense:param=[{}]", JSONUtil.toJsonStr(param));
         List<IncomeAndExpenseList>  incomeAndExpenseLists =  baseMapper.getIncomeAndExpense(param);
+        incomeAndExpenseLists = incomeAndExpenseLists.stream().peek(action->{
+            if(StrUtil.isNotEmpty(action.getPaymentVoucher())){
+                var res = MinioUtils.getPresignedObjectUrl("jzg", action.getPaymentVoucher());
+                action.setPaymentVoucher(res);
+            }
+        }).toList();
         log.info("查询收支明细queryIncomeANdExpense:param=[{}],incomeAndExpenseLists.size()=[{}]",JSONUtil.toJsonStr(param), CollUtil.size(incomeAndExpenseLists));
         return incomeAndExpenseLists;
     }

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

@@ -303,7 +303,7 @@
         suacl.update_time,
         ioci.license_no,
         null as payment_time , null as reject_time ,  null as auditing_status,
-        suf.file_name as paymentVoucher, saa.pic_id as picId
+        suf.file_name as paymentVoucher, saa.pic_id as picId, suf.bucket_name
         from
         sys_user_account_change_log suacl
         left join sys_amount_auditing saa on suacl.related_amount_auditing_id = saa.id
@@ -328,7 +328,7 @@
         saa.update_by,
         saa.update_time,
         null as license_no,
-        saa.payment_time , saa.reject_time ,  saa.auditing_status, null as paymentVoucher, null as picId
+        saa.payment_time , saa.reject_time ,  saa.auditing_status, null as paymentVoucher, null as picId, null as bucket_name
         from
         sys_amount_auditing saa
         where