|
|
@@ -14,10 +14,7 @@ import com.jzg.commons.entity.account.po.InvAccountCard;
|
|
|
import com.jzg.commons.entity.account.po.SysUserAccountChangeLog;
|
|
|
import com.jzg.commons.entity.account.vo.AccountCardVo;
|
|
|
import com.jzg.commons.entity.dto.*;
|
|
|
-import com.jzg.commons.entity.po.SysAmountAuditing;
|
|
|
-import com.jzg.commons.entity.po.SysUserAccount;
|
|
|
-import com.jzg.commons.entity.po.SysUserJzgInfo;
|
|
|
-import com.jzg.commons.entity.po.SysUserJzgInfoBankCard;
|
|
|
+import com.jzg.commons.entity.po.*;
|
|
|
import com.jzg.commons.entity.userinfo.ManagerUserInfo;
|
|
|
import com.jzg.commons.entity.vo.AmountAuditVo;
|
|
|
import com.jzg.commons.entity.vo.IncomeAndExpenseList;
|
|
|
@@ -25,6 +22,7 @@ import com.jzg.commons.exception.SystemException;
|
|
|
import com.jzg.commons.util.*;
|
|
|
import com.jzg.organization.client.summary.InsFeeOrdersClient;
|
|
|
import com.jzg.organization.mapper.SysAmountAuditingMapper;
|
|
|
+import com.jzg.organization.mapper.SysUploadFilesMapper;
|
|
|
import com.jzg.organization.service.*;
|
|
|
import com.jzg.organization.state.AuditState;
|
|
|
import com.jzg.organization.state.listener.AuditStateListener;
|
|
|
@@ -86,6 +84,8 @@ public class SysAmountAuditingServiceImpl extends ServiceImpl<SysAmountAuditingM
|
|
|
|
|
|
@Autowired
|
|
|
private InsFeeOrdersClient insFeeOrdersClient;
|
|
|
+ @Autowired
|
|
|
+ private SysUploadFilesMapper sysUploadFilesMapper;
|
|
|
|
|
|
private static final String AMOUNT_LOCK_PREFIX = "amountLock:";
|
|
|
|
|
|
@@ -412,6 +412,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 amountAuditVoPage;
|