kaifabu/qichenweapp
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

更新代码

Browse Source
This commit is contained in:
RuicyWu
2026-04-21 20:04:59 +08:00
parent 65bfa963f8
commit b394cc6d13
75 changed files with 3143 additions and 192 deletions
Download Patch File Download Diff File Expand all files Collapse all files

28
src/main/java/org/chenyon/contract/ContractService.java
View File

@@ -61,9 +61,9 @@ public class ContractService {
if(oaContractVo.getAssetsVos() != null) {
List<OaAssetsVo> assetsVos = oaContractVo.getAssetsVos();
OaAssetsVo assetsVo = assetsVos.get(0);
List<String> assetsDetailImgs = oaFileHandlerService.getUrls(true,assetsVo.getAssetsNo(), assetsVo.getFormId(), "AssetsDetailImg", assetsVo.getDetailImg());
if(assetsDetailImgs != null) {
contractVo.setCoverImgUrl(assetsDetailImgs.get(0));
List<String> assetsCoverImg = oaFileHandlerService.getUrls(true, assetsVo.getAssetsNo(), assetsVo.getFormId(), "AssetsCoverImg", assetsVo.getCoverImg());
if(assetsCoverImg != null && assetsCoverImg.size() >= 1) {
contractVo.setCoverImgUrl(assetsCoverImg.get(0));
}
}
contractVo.setSignStatus(convertSignStatus(contractVo.getSignStatus()));
@@ -82,6 +82,16 @@ public class ContractService {
for (OaContractVo oaContractVo : oaContractVos) {
ContractVo contractVo = new ContractVo();
BeanUtils.copyProperties(oaContractVo, contractVo);
if(oaContractVo.getAssetsVos() != null) {
List<ContractAssetsVo> contractAssetsVos = new ArrayList<>();
for (OaAssetsVo assetsVo : oaContractVo.getAssetsVos()) {
ContractAssetsVo contractAssetsVo = new ContractAssetsVo();
contractAssetsVo.setAssetsNo(assetsVo.getAssetsNo());
contractAssetsVo.setAssetsName(assetsVo.getAssetsName());
contractAssetsVos.add(contractAssetsVo);
}
contractVo.setAssetsInfos(contractAssetsVos);
}
contractVos.add(contractVo);
}
return contractVos;
@@ -93,7 +103,7 @@ public class ContractService {
condition.setPageNo(pageNo);
condition.setPageSize(pageSize);
OaAssetsVo assetsVo = oaContractService.pageQueryContractAssets(condition);
List<String> assetsDetailImgs = oaFileHandlerService.getUrls(true,assetsVo.getAssetsNo(), assetsVo.getFormId(), "AssetsDetailImg", assetsVo.getDetailImg());
List<String> assetsCoverImgs = oaFileHandlerService.getUrls(true, assetsVo.getAssetsNo(), assetsVo.getFormId(), "AssetsCoverImg", assetsVo.getCoverImg());
ContractAssetsVo assetsInfo = new ContractAssetsVo();
BeanUtils.copyProperties(assetsVo, assetsInfo);
RentFeeInfo rentFeeInfo = new RentFeeInfo();
@@ -101,8 +111,8 @@ public class ContractService {
rentFeeInfo.setRentFee(Double.parseDouble(assetsVo.getRentFee()));
}
assetsInfo.setFeeInfo(rentFeeInfo);
if(assetsDetailImgs != null) {
assetsInfo.setCover(assetsDetailImgs.get(0));
if(assetsCoverImgs != null) {
assetsInfo.setCover(assetsCoverImgs.get(0));
}
return assetsInfo;
}
@@ -122,7 +132,7 @@ public class ContractService {
BeanUtils.copyProperties(oaContractVo, contractVo);
List<OaAssetsVo> assetsVos = oaContractVo.getAssetsVos();
OaAssetsVo assetsVo = assetsVos.get(0);
List<String> assetsDetailImgs = oaFileHandlerService.getUrls(true,assetsVo.getAssetsNo(), assetsVo.getFormId(), "AssetsDetailImg", assetsVo.getDetailImg());
List<String> assetsCoverImgs = oaFileHandlerService.getUrls(true, assetsVo.getAssetsNo(), assetsVo.getFormId(), "AssetsCoverImg", assetsVo.getCoverImg());
List<String> eContractUrl = oaFileHandlerService.getUrls(false,cusNo,oaContractVo.getContractNo(),oaContractVo.getFormId(),"eContractFile",oaContractVo.geteContractFile());
ContractAssetsVo assetsInfo = new ContractAssetsVo();
BeanUtils.copyProperties(assetsVo, assetsInfo);
@@ -131,8 +141,8 @@ public class ContractService {
rentFeeInfo.setRentFee(Double.parseDouble(assetsVo.getRentFee()));
}
assetsInfo.setFeeInfo(rentFeeInfo);
if(assetsDetailImgs != null) {
assetsInfo.setCover(assetsDetailImgs.get(0));
if(assetsCoverImgs != null) {
assetsInfo.setCover(assetsCoverImgs.get(0));
}
if(eContractUrl != null) {
contractVo.seteContractUrl(eContractUrl.get(0));