Commit da637bb8 authored by hongguangwu's avatar hongguangwu

Merge remote-tracking branch 'origin/MVP1.6.4' into MVP1.6.4

parents b7e85b0c 3e33377f
...@@ -4471,10 +4471,23 @@ public class TInsuranceDetailServiceImpl extends ServiceImpl<TInsuranceDetailMap ...@@ -4471,10 +4471,23 @@ public class TInsuranceDetailServiceImpl extends ServiceImpl<TInsuranceDetailMap
if (Optional.ofNullable(one).isPresent()) { if (Optional.ofNullable(one).isPresent()) {
byId = this.getById(one.getFromInsuranceDetailId()); byId = this.getById(one.getFromInsuranceDetailId());
if (Optional.ofNullable(byId).isPresent()) { if (Optional.ofNullable(byId).isPresent()) {
//根据项目编码获取项目名称
Map<String, ProjectSetInfoVo> dataReplace = null;
try {
List<String> collect = new ArrayList<>();
collect.add(byId.getDeptNo());
R<SetInfoVo> setInfoByCodes = archivesDaprUtil.getSetInfoByCodes(collect);
if (null != setInfoByCodes && setInfoByCodes.getCode() == CommonConstants.SUCCESS && Common.isNotNull(setInfoByCodes.getData())) {
dataReplace = setInfoByCodes.getData().getProjectSetInfoVoMap();
}
}catch (Exception e){
e.printStackTrace();
dataReplace = null;
}
vo.setCoverEmpName(byId.getEmpName()); vo.setCoverEmpName(byId.getEmpName());
vo.setCoverEmpIdcardNo(byId.getEmpIdcardNo()); vo.setCoverEmpIdcardNo(byId.getEmpIdcardNo());
vo.setCoverProjectName(byId.getDeptName()); vo.setCoverProjectName(byId.getDeptName());
ProjectSetInfoVo coverObject = data.get(vo.getCoverProjectNo()); ProjectSetInfoVo coverObject = dataReplace.get(byId.getDeptNo());
if (null != coverObject) { if (null != coverObject) {
vo.setCoverInvoiceTitle(Optional.ofNullable(coverObject.getInvoiceTitleInsurance()).orElse("")); vo.setCoverInvoiceTitle(Optional.ofNullable(coverObject.getInvoiceTitleInsurance()).orElse(""));
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment