修改预览工作书

eladmin-system/src/main/java/me/zhengjie/application/admin/service/impl/NotaryOrderServiceImpl.java

@@ -90,12 +90,12 @@ public class NotaryOrderServiceImpl extends ServiceImpl<NotaryOrderMapper, Notar
 	ICityDao cityDao;
 	@Autowired
 	OrderCochainService orderCochainService;
-	
+
 	@Autowired
 	FileInfoService fileInfoService;
 	@Autowired
 	ApplicationContextUtil contextUtil;
-	
+
 	@Override
 	public AppBaseResponse<List<NotaryOrderQueryRsp>> query(NotaryOrderQueryReq req) {
 		AppBaseResponse<List<NotaryOrderQueryRsp>> response = new AppBaseResponse<>();
@@ -335,7 +335,8 @@ public class NotaryOrderServiceImpl extends ServiceImpl<NotaryOrderMapper, Notar
 			return response;
 		}
 		// 检查面谈笔录是否提交
-		List<OrderFileEntity> orderFileList = orderFileRepository.getOrderFileListByCodes(req.getPartyId(), "6,7,8,9".split(","));
+		List<OrderFileEntity> orderFileList = orderFileRepository.getOrderFileListByCodes(req.getPartyId(),
+				"6,7,8,9".split(","));
 		if (orderFileList == null || orderFileList.size() == 0) {
 			response.fail(ResultCode.INTERVIEW_NOTE_UNSUBMIT);
 			return response;
@@ -423,19 +424,24 @@ public class NotaryOrderServiceImpl extends ServiceImpl<NotaryOrderMapper, Notar
 		QueryWrapper<MortgageEntity> mortgageQw = new QueryWrapper<>();
 		mortgageQw.eq("business_no", notaryOrderEntity.getBusinessNo());
 		MortgageEntity mortgageEntity = mortgageMapper.selectOne(mortgageQw);
-		map.put("$MortgageName$", mortgageEntity.getUsername());
-		map.put("$MortgageIDNo$", mortgageEntity.getIdCard());
-		map.put("$MortgageSex$", "1".equals(mortgageEntity.getSex()) ? "男" : "女");
-		map.put("$MortgageBirthdday$", mortgageEntity.getBirth());
-		map.put("$HouseAddr$", mortgageEntity.getHouseLocation());
+		if(mortgageEntity!=null) {
+			map.put("$MortgageName$", mortgageEntity.getUsername());
+			map.put("$MortgageIDNo$", mortgageEntity.getIdCard());
+			map.put("$MortgageSex$", "1".equals(mortgageEntity.getSex()) ? "男" : "女");
+			map.put("$MortgageBirthdday$", mortgageEntity.getBirth());
+			map.put("$HouseAddr$", mortgageEntity.getHouseLocation());
+		}
 		// 担保人信息
 		QueryWrapper<GuaranteeEntity> guaranteeQw = new QueryWrapper<>();
 		guaranteeQw.eq("business_no", notaryOrderEntity.getBusinessNo());
 		GuaranteeEntity guaranteeEntity = guaranteeMapper.selectOne(guaranteeQw);
-		map.put("$GuaranteeName$", guaranteeEntity.getUsername());
-		map.put("$GuaranteeIDNo$", guaranteeEntity.getIdCard());
-		map.put("$GuaranteeSex$", "1".equals(guaranteeEntity.getSex()) ? "男" : "女");
-		map.put("$GuaranteeBirthdday$", guaranteeEntity.getBirth());
+		if(guaranteeEntity!=null) {
+			map.put("$GuaranteeName$", guaranteeEntity.getUsername());
+			map.put("$GuaranteeIDNo$", guaranteeEntity.getIdCard());
+			map.put("$GuaranteeSex$", "1".equals(guaranteeEntity.getSex()) ? "男" : "女");
+			map.put("$GuaranteeBirthdday$", guaranteeEntity.getBirth());
+		}
+
 		// 银行信息
 		BankEntity bankEntity = bankMapper.selectById(notaryOrderEntity.getBankId());
 		map.put("$Bank$", bankEntity.getBankName());
@@ -450,9 +456,11 @@ public class NotaryOrderServiceImpl extends ServiceImpl<NotaryOrderMapper, Notar
 		String htmlPath = "";
 		String pdfPath = "";
 		try {
-			InputStream inputStream = NotaryNoteServiceImpl.class.getClassLoader().getResourceAsStream("template/note/notary-model.html");
+			InputStream inputStream = NotaryNoteServiceImpl.class.getClassLoader()
+					.getResourceAsStream("template/note/notary-model.html");
 			result = IOUtils.toString(inputStream, StandardCharsets.UTF_8);
-			String content = result.replace("${ModelContent}", TextTempletUtil.replaceContent(modelEntity.getContent(), map));
+			String content = result.replace("${ModelContent}",
+					TextTempletUtil.replaceContent(modelEntity.getContent(), map));
 			htmlPath = FileUploadUtil.saveHtml(content, notaryOrderEntity.getBusinessNo(), req.getPartyId());
 			pdfPath = FileUploadUtil.savePdf(content, notaryOrderEntity.getBusinessNo(), req.getPartyId());
 		} catch (Exception e) {
@@ -540,8 +548,8 @@ public class NotaryOrderServiceImpl extends ServiceImpl<NotaryOrderMapper, Notar
 			saveOrder.setUpdater(contextUtil.getCurrentUserId().toString());
 			saveOrder.setStatus(StatusEnum.NotaryStatusEnum.PASS.getStatus().toString());
 			notaryOrderMapper.updateById(saveOrder);
-			//流程走完之后需要把数据插入到order_cochain
-			OrderCochainEntity orderCochain=new OrderCochainEntity();
+			// 流程走完之后需要把数据插入到order_cochain
+			OrderCochainEntity orderCochain = new OrderCochainEntity();
 			orderCochain.setStatus("0");
 			orderCochain.setBusinessNo(businessNo);
 			orderCochain.setCreateTime(LocalDateTime.now());
@@ -590,19 +598,26 @@ public class NotaryOrderServiceImpl extends ServiceImpl<NotaryOrderMapper, Notar
 			QueryWrapper<MortgageEntity> mortgageQw = new QueryWrapper<>();
 			mortgageQw.eq("business_no", req.getBusinessNo());
 			MortgageEntity mortgageEntity = mortgageMapper.selectOne(mortgageQw);
-			map.put("$MortgageName$", mortgageEntity.getUsername());
-			map.put("$MortgageIDNo$", mortgageEntity.getIdCard());
-			map.put("$MortgageSex$", "1".equals(mortgageEntity.getSex()) ? "男" : "女");
-			map.put("$MortgageBirthdday$", mortgageEntity.getBirth());
-			map.put("$HouseAddr$", mortgageEntity.getHouseLocation());
+			if (mortgageEntity != null) {
+				map.put("$MortgageName$", mortgageEntity.getUsername());
+				map.put("$MortgageIDNo$", mortgageEntity.getIdCard());
+				map.put("$MortgageSex$", "1".equals(mortgageEntity.getSex()) ? "男" : "女");
+				map.put("$MortgageBirthdday$", mortgageEntity.getBirth());
+				map.put("$HouseAddr$", mortgageEntity.getHouseLocation());
+			}
+
 			// 获取担保人信息
 			QueryWrapper<GuaranteeEntity> guaranteeQw = new QueryWrapper<>();
 			guaranteeQw.eq("business_no", req.getBusinessNo());
+
 			GuaranteeEntity guaranteeEntity = guaranteeMapper.selectOne(guaranteeQw);
-			map.put("$GuaranteeName$", guaranteeEntity.getUsername());
-			map.put("$GuaranteeIDNo$", guaranteeEntity.getIdCard());
-			map.put("$GuaranteeSex$", "1".equals(guaranteeEntity.getSex()) ? "男" : "女");
-			map.put("$GuaranteeBirthdday$", guaranteeEntity.getBirth());
+			if (guaranteeEntity != null) {
+				map.put("$GuaranteeName$", guaranteeEntity.getUsername());
+				map.put("$GuaranteeIDNo$", guaranteeEntity.getIdCard());
+				map.put("$GuaranteeSex$", "1".equals(guaranteeEntity.getSex()) ? "男" : "女");
+				map.put("$GuaranteeBirthdday$", guaranteeEntity.getBirth());
+			}
+
 			// 获取银行信息
 			BankEntity bankEntity = bankMapper.selectById(orderEntity.getBankId());
 			map.put("$Bank$", bankEntity.getBankName());
@@ -722,11 +737,13 @@ public class NotaryOrderServiceImpl extends ServiceImpl<NotaryOrderMapper, Notar
 				put("9", "面谈笔录");
 			}
 		};
-		List<OrderFileEntity> orderFileList = orderFileRepository.getOrderFileListByCodes(req.getPartyId(), "1,2,3,4,5,6,7,8,9".split(","));
+		List<OrderFileEntity> orderFileList = orderFileRepository.getOrderFileListByCodes(req.getPartyId(),
+				"1,2,3,4,5,6,7,8,9".split(","));
 		List<Map<String, String>> fileList = new ArrayList<>();
 		for (OrderFileEntity orderFile : orderFileList) {
 			Map<String, String> content = new HashMap<>();
-			String fileUrl = StringUtils.isEmpty(orderFile.getSignedPdfUrl()) ? orderFile.getPdfUrl() : orderFile.getSignedPdfUrl();
+			String fileUrl = StringUtils.isEmpty(orderFile.getSignedPdfUrl()) ? orderFile.getPdfUrl()
+					: orderFile.getSignedPdfUrl();
 			content.put("name", map.get(orderFile.getCode()));
 			content.put("value", getPreviewUrl(fileUrl));
 			fileList.add(content);