Переглянути джерело

平台协议前后端对接

lipf 1 тиждень тому
батько
коміт
b87d811662

+ 1 - 0
tenant/organization/src/main/java/com/jzg/organization/service/impl/ReceivableServiceImpl.java

@@ -1600,6 +1600,7 @@ public class ReceivableServiceImpl extends ServiceImpl<ReceivableMapper, InsPlyI
                     // TODO 后续将手机号转换为姓名
                     //insPlyIncome.setSettlementName();
 
+
                 }
             }
 

+ 6 - 0
tenant/organization/src/main/java/com/jzg/organization/service/impl/SysAmountAuditingServiceImpl.java

@@ -99,6 +99,12 @@ public class SysAmountAuditingServiceImpl extends ServiceImpl<SysAmountAuditingM
             for (AmountAuditVo record : records) {
                 SysUserJzgInfoBankCard bankCard = bankCards.getOrDefault(record.getBankCardNum(), new SysUserJzgInfoBankCard());
                 record.setCardHolderName(bankCard.getCardHolderName());
+                if(StrUtil.isNotEmpty(record.getPicId())){
+                    SysUploadFiles file = sysUploadFilesMapper.selectById(record.getPicId());
+                    if (file != null) {
+                        record.setFileUrl(MinioUtils.getPresignedObjectUrl("jzg", file.getFileName()));
+                    }
+                }
             }
         }
         return page;

+ 1 - 0
tenant/organization/src/main/resources/mapper/finance/SysAmountAuditingMapper.xml

@@ -47,6 +47,7 @@
 
     <select id="queryPage" resultType="com.jzg.commons.entity.vo.AmountAuditVo">
         SELECT
+        saa.pic_id, saa.payment_time,saa.voucher_id,
         saa.receive_user_name,saa.auditing_user_id,saa.auditing_user_name ,
         saa.id,suji.name as name, su.mobile as mobile,suji.type_attr as attrType,
         saa.manager_user_name  as managerName,sum.mobile as managerMobile,saa.create_time as createTime,