bonus
/
Bonus-Cloud-Material
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

优化

This commit is contained in:
mashuai 2025-08-11 11:02:32 +08:00
parent da3cc8fbaf
commit f29ae556fc
3 changed files with 25 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
bonus-modules/bonus-material/src/main/java/com/bonus/material/lease/service/impl/LeaseApplyInfoServiceImpl.java
View File

@ -363,7 +363,9 @@ public class LeaseApplyInfoServiceImpl implements ILeaseApplyInfoService {
// 电子签名进行base64拼接 // 电子签名进行base64拼接
if (StringUtils.isNotBlank(info.getLeaseSignUrl())) { if (StringUtils.isNotBlank(info.getLeaseSignUrl())) {
info.setLeaseSignUrl("data:image/png;base64," + info.getLeaseSignUrl()); if (!info.getLeaseSignUrl().startsWith("http")) {
info.setLeaseSignUrl("data:image/png;base64," + info.getLeaseSignUrl());
}
} }
/** 设置发料单位 防止代码冲突 **/ /** 设置发料单位 防止代码冲突 **/
@ -388,7 +390,9 @@ public class LeaseApplyInfoServiceImpl implements ILeaseApplyInfoService {
if (!CollectionUtils.isEmpty(approveSignList)) { if (!CollectionUtils.isEmpty(approveSignList)) {
for (LeaseOutSign leaseOutSign : approveSignList) { for (LeaseOutSign leaseOutSign : approveSignList) {
if (StringUtils.isNotBlank(leaseOutSign.getOutSignUrl())) { if (StringUtils.isNotBlank(leaseOutSign.getOutSignUrl())) {
leaseOutSign.setOutSignUrl("data:image/png;base64," + leaseOutSign.getOutSignUrl()); if (!leaseOutSign.getOutSignUrl().startsWith("http")) {
leaseOutSign.setOutSignUrl("data:image/png;base64," + leaseOutSign.getOutSignUrl());
}
} }
} }
leaseApplyRequestVo.setApproveSignList(approveSignList); leaseApplyRequestVo.setApproveSignList(approveSignList);
@ -400,7 +404,9 @@ public class LeaseApplyInfoServiceImpl implements ILeaseApplyInfoService {
if (!CollectionUtils.isEmpty(outSignList)) { if (!CollectionUtils.isEmpty(outSignList)) {
for (LeaseOutSign applyInfo : outSignList) { for (LeaseOutSign applyInfo : outSignList) {
if (StringUtils.isNotBlank(applyInfo.getOutSignUrl())) { if (StringUtils.isNotBlank(applyInfo.getOutSignUrl())) {
applyInfo.setOutSignUrl("data:image/png;base64," + applyInfo.getOutSignUrl()); if (!applyInfo.getOutSignUrl().startsWith("http")) {
applyInfo.setOutSignUrl("data:image/png;base64," + applyInfo.getOutSignUrl());
}
} }
} }
leaseApplyRequestVo.setKgSignList(outSignList); leaseApplyRequestVo.setKgSignList(outSignList);
@ -410,7 +416,11 @@ public class LeaseApplyInfoServiceImpl implements ILeaseApplyInfoService {
bean.setConfirmPerson(details.get(0).getConfirmPerson()); bean.setConfirmPerson(details.get(0).getConfirmPerson());
LeaseConfirmSign confirmSign = leaseApplyInfoMapper.getLeaseConfirmSign(bean); LeaseConfirmSign confirmSign = leaseApplyInfoMapper.getLeaseConfirmSign(bean);
if(confirmSign != null){ if(confirmSign != null){
confirmSign.setConfirmSignUrl("data:image/png;base64," + confirmSign.getConfirmSignUrl()); if (StringUtils.isNotBlank(confirmSign.getConfirmSignUrl())) {
if (!confirmSign.getConfirmSignUrl().startsWith("http")) {
confirmSign.setConfirmSignUrl("data:image/png;base64," + confirmSign.getConfirmSignUrl());
}
}
leaseApplyRequestVo.setConfirmSign(confirmSign); leaseApplyRequestVo.setConfirmSign(confirmSign);
} }
} }
@ -420,7 +430,9 @@ public class LeaseApplyInfoServiceImpl implements ILeaseApplyInfoService {
if (!CollectionUtils.isEmpty(signList)) { if (!CollectionUtils.isEmpty(signList)) {
for (LeaseOutSign applyInfo : signList) { for (LeaseOutSign applyInfo : signList) {
if (StringUtils.isNotBlank(applyInfo.getOutSignUrl())) { if (StringUtils.isNotBlank(applyInfo.getOutSignUrl())) {
applyInfo.setOutSignUrl("data:image/png;base64," + applyInfo.getOutSignUrl()); if (!applyInfo.getOutSignUrl().startsWith("http")) {
applyInfo.setOutSignUrl("data:image/png;base64," + applyInfo.getOutSignUrl());
}
} }
} }
leaseApplyRequestVo.setOutSignList(signList); leaseApplyRequestVo.setOutSignList(signList);

6
bonus-modules/bonus-material/src/main/java/com/bonus/material/materialStation/service/impl/ProAuthorizeServiceImpl.java
View File

@ -231,7 +231,11 @@ public class ProAuthorizeServiceImpl implements ProAuthorizeService {
// 电子签名进行base64拼接 // 电子签名进行base64拼接
if(!detailsList.isEmpty()){ if(!detailsList.isEmpty()){
detailsList.forEach(details -> { detailsList.forEach(details -> {
details.setSignName("data:image/png;base64," + details.getSignName()); if (StringUtils.isNotBlank(details.getSignName())) {
if (!details.getSignName().startsWith("http")) {
details.setSignName("data:image/png;base64," + details.getSignName());
}
}
}); });
} }
info.setDetailsList(detailsList); info.setDetailsList(detailsList);

4
bonus-modules/bonus-material/src/main/java/com/bonus/material/purchase/service/impl/PurchaseCheckInfoServiceImpl.java
View File

@ -914,7 +914,9 @@ public class PurchaseCheckInfoServiceImpl implements IPurchaseCheckInfoService {
purchaseSignRecordUserSignList = signProcessMapper.getPurchaseSignUrlListByTaskId(purchaseCheckDetails.getTaskId()); purchaseSignRecordUserSignList = signProcessMapper.getPurchaseSignUrlListByTaskId(purchaseCheckDetails.getTaskId());
for (PurchaseSignRecord purchaseSignRecord : purchaseSignRecordUserSignList) { for (PurchaseSignRecord purchaseSignRecord : purchaseSignRecordUserSignList) {
if (StringUtils.isNotBlank(purchaseSignRecord.getSignUrl())) { if (StringUtils.isNotBlank(purchaseSignRecord.getSignUrl())) {
purchaseSignRecord.setSignUrl("data:image/png;base64," + purchaseSignRecord.getSignUrl()); if (!purchaseSignRecord.getSignUrl().startsWith("http")) {
purchaseSignRecord.setSignUrl("data:image/png;base64," + purchaseSignRecord.getSignUrl());
}
} }
purchaseSignRecordMap.put(purchaseSignRecord.getSignUrl(), purchaseSignRecord); purchaseSignRecordMap.put(purchaseSignRecord.getSignUrl(), purchaseSignRecord);
} }