From d281d0d8bda64e2296f7fce8268cfc10bc5b23d0 Mon Sep 17 00:00:00 2001 From: k94314517 <8417338+k94314517@user.noreply.gitee.com> Date: 星期一, 01 四月 2024 19:38:56 +0800 Subject: [PATCH] Merge remote-tracking branch 'origin/1.0.1' into 1.0.1 --- server/service/src/main/java/com/doumee/service/business/impl/InsuranceApplyServiceImpl.java | 46 +++++++++++++++++++++++----------------------- 1 files changed, 23 insertions(+), 23 deletions(-) diff --git a/server/service/src/main/java/com/doumee/service/business/impl/InsuranceApplyServiceImpl.java b/server/service/src/main/java/com/doumee/service/business/impl/InsuranceApplyServiceImpl.java index 59661ba..fe292ef 100644 --- a/server/service/src/main/java/com/doumee/service/business/impl/InsuranceApplyServiceImpl.java +++ b/server/service/src/main/java/com/doumee/service/business/impl/InsuranceApplyServiceImpl.java @@ -2017,32 +2017,32 @@ if(multifiles!=null && multifiles.size()>0){ String path = systemDictDataBiz.queryByCode(Constants.OSS,Constants.RESOURCE_PATH).getCode() +systemDictDataBiz.queryByCode(Constants.OSS,Constants.APPLY_FILE).getCode(); - for(InsuranceApply model : list){ - for(Multifile f : multifiles) { - if (StringUtils.isBlank(f.getFileurl())) { - continue; - } - f.setFileurlFull(path+f.getFileurl()); - if(Constants.equalsInteger(f.getObjId(), model.getId()) ){ - if (Constants.equalsInteger(f.getObjType(), Constants.MultiFile.BD_APPLY_PDF.getKey())) { - //绛剧讲鍓嶇殑鎶曚繚鍗� - model.setToubaodanFile(f); - } else if (Constants.equalsInteger(f.getObjType(), Constants.MultiFile.BD_SIGNED_PDF.getKey())) { - //绛剧讲鍚庣殑鎶曚繚鍗� - model.setToubaodanSignedFile(f); - } else if (Constants.equalsInteger(f.getObjType(), Constants.MultiFile.BD_DONE_PDF.getKey())) { - //鏈�绲備繚闄╁崟 - model.setBaoxiandanFile(f); - } else if (Constants.equalsInteger(f.getObjType(), Constants.MultiFile.MEMBER_LIST_LATTER.getKey())) { - //鐢宠鍗� - model.setShenqingdanFile(f); - } else if (Constants.equalsInteger(f.getObjType(), Constants.MultiFile.WTB_CONFIRMATION_LATTER.getKey())) { - //绛剧讲鍚庣‘璁や功 - model.setFanganFile(f); - } + for(InsuranceApply model : list){ + for(Multifile f : multifiles) { + if (StringUtils.isBlank(f.getFileurl())) { + continue; + } + f.setFileurlFull(path+f.getFileurl()); + if(Constants.equalsInteger(f.getObjId(), model.getId()) ){ + if (Constants.equalsInteger(f.getObjType(), Constants.MultiFile.BD_APPLY_PDF.getKey())) { + //绛剧讲鍓嶇殑鎶曚繚鍗� + model.setToubaodanFile(f); + } else if (Constants.equalsInteger(f.getObjType(), Constants.MultiFile.BD_SIGNED_PDF.getKey())) { + //绛剧讲鍚庣殑鎶曚繚鍗� + model.setToubaodanSignedFile(f); + } else if (Constants.equalsInteger(f.getObjType(), Constants.MultiFile.BD_DONE_PDF.getKey())) { + //鏈�绲備繚闄╁崟 + model.setBaoxiandanFile(f); + } else if (Constants.equalsInteger(f.getObjType(), Constants.MultiFile.MEMBER_LIST_LATTER.getKey())) { + //鐢宠鍗� + model.setShenqingdanFile(f); + } else if (Constants.equalsInteger(f.getObjType(), Constants.MultiFile.WTB_CONFIRMATION_LATTER.getKey())) { + //绛剧讲鍚庣‘璁や功 + model.setFanganFile(f); } } } + } } } -- Gitblit v1.9.3