修改pdf展示

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

@@ -128,6 +128,7 @@ public class AdminOrderServiceImpl implements AdminOrderService {
 	SysUserMapper userMapper;
 	@Autowired
 	SmsTemplateService smsTemplateService;
+
 	@Override
 	public AppBaseResponse<List<NotaryOrderQueryRsp>> query(NotaryOrderQueryReq req) {
 		AppBaseResponse<List<NotaryOrderQueryRsp>> response = new AppBaseResponse<>();
@@ -225,7 +226,8 @@ public class AdminOrderServiceImpl implements AdminOrderService {
 	@Override
 	public AppBaseResponse<List<PartyEntity>> orderQueryUser(final HashMap<String, String> map) {
 		AppBaseResponse<List<PartyEntity>> response = new AppBaseResponse<>();
-		ContractOrderEntity contractOrderEntity = contractOrderRepository.getContractOrderWithBizNo(map.get("businessNo"));
+		ContractOrderEntity contractOrderEntity = contractOrderRepository
+				.getContractOrderWithBizNo(map.get("businessNo"));
 		List<PartyEntity> partyList = new LinkedList<>();
 		PartyEntity partyA = new PartyEntity();
 		partyA.setUsername(contractOrderEntity.getName());
@@ -233,13 +235,13 @@ public class AdminOrderServiceImpl implements AdminOrderService {
 		if (OrderConstant.CONTRACT_TYPE_BORROWER == contractOrderEntity.getContractType()) {
 			partyA.setRoleId(StatusEnum.StepStatusEnum.BORROWER.getStatus());
 			partyA.setRole(StatusEnum.StepStatusEnum.BORROWER.getProcess());
-		}else if (OrderConstant.CONTRACT_TYPE_MORTGAGE == contractOrderEntity.getContractType()) {
+		} else if (OrderConstant.CONTRACT_TYPE_MORTGAGE == contractOrderEntity.getContractType()) {
 			partyA.setRoleId(StatusEnum.StepStatusEnum.MORTGAGOR.getStatus());
 			partyA.setRole(StatusEnum.StepStatusEnum.MORTGAGOR.getProcess());
-		}else if (OrderConstant.CONTRACT_TYPE_GUARANTEE == contractOrderEntity.getContractType()) {
+		} else if (OrderConstant.CONTRACT_TYPE_GUARANTEE == contractOrderEntity.getContractType()) {
 			partyA.setRoleId(StatusEnum.StepStatusEnum.GUARANTEE.getStatus());
 			partyA.setRole(StatusEnum.StepStatusEnum.GUARANTEE.getProcess());
-		}else if (OrderConstant.CONTRACT_TYPE_CREDIT == contractOrderEntity.getContractType()) {
+		} else if (OrderConstant.CONTRACT_TYPE_CREDIT == contractOrderEntity.getContractType()) {
 			partyA.setRoleId(StatusEnum.StepStatusEnum.CREDIT.getStatus());
 			partyA.setRole(StatusEnum.StepStatusEnum.CREDIT.getProcess());
 		}
@@ -308,11 +310,12 @@ public class AdminOrderServiceImpl implements AdminOrderService {
 	@Override
 	public AppBaseResponse orderReturn(NotaryOrderQueryReq req) {
 		AppBaseResponse response = new AppBaseResponse();
-		ContractOrderEntity contractOrderEntity = contractOrderRepository.getContractOrderWithBizNo(req.getBusinessNo());
+		ContractOrderEntity contractOrderEntity = contractOrderRepository
+				.getContractOrderWithBizNo(req.getBusinessNo());
 		bankOrderService.updateStatus(contractOrderEntity.getBusinessNo(),
 				StatusEnum.NotaryStatusEnum.SUBMIT.getStatus().toString(), req.getReturnReason());
 		response.success("退回成功");
-		//3---审核退回---1个客户经理
+		// 3---审核退回---1个客户经理
 		smsTemplateService.auditBack(req.getBusinessNo());
 		return response;
 	}
@@ -320,7 +323,8 @@ public class AdminOrderServiceImpl implements AdminOrderService {
 	@Override
 	public AppBaseResponse orderReject(NotaryOrderQueryReq req) {
 		AppBaseResponse response = new AppBaseResponse();
-		ContractOrderEntity contractOrderEntity = contractOrderRepository.getContractOrderWithBizNo(req.getBusinessNo());
+		ContractOrderEntity contractOrderEntity = contractOrderRepository
+				.getContractOrderWithBizNo(req.getBusinessNo());
 		bankOrderService.updateStatus(contractOrderEntity.getBusinessNo(),
 				StatusEnum.NotaryStatusEnum.REJECT.getStatus().toString(), req.getRejectReason());
 		response.success("驳回成功");
@@ -338,7 +342,7 @@ public class AdminOrderServiceImpl implements AdminOrderService {
 		contractOrderEntity.setUpdateTime(new Date());
 		contractOrderMapper.updateById(contractOrderEntity);
 		response.success("签发成功");
-		//发送短信
+		// 发送短信
 		smsTemplateService.auditPassed(contractOrderEntity.getBusinessNo());
 		return response;
 	}
@@ -402,7 +406,7 @@ public class AdminOrderServiceImpl implements AdminOrderService {
 		updateStatusPass(contractOrderEntity.getBusinessNo());
 
 		response.success("签发成功");
-		
+
 		smsTemplateService.signNotarialSuccess(contractOrderEntity.getBusinessNo());
 		return response;
 	}
@@ -426,7 +430,7 @@ public class AdminOrderServiceImpl implements AdminOrderService {
 		// 流程走完之后需要把数据插入到order_cochain
 		OrderCochainEntity orderCochain = new OrderCochainEntity();
 		orderCochain.setStatus("0");
-		//设置次数为0
+		// 设置次数为0
 		orderCochain.setCount(0);
 		orderCochain.setBusinessNo(businessNo);
 		orderCochain.setCreateTime(LocalDateTime.now());
@@ -539,6 +543,10 @@ public class AdminOrderServiceImpl implements AdminOrderService {
 	 */
 	public AppBaseResponse<?> getDocList(NotaryOrderQueryReq req) {
 		AppBaseResponse<?> response = new AppBaseResponse<>();
+
+		QueryWrapper<ContractOrderEntity> query = new QueryWrapper<>();
+		query.eq("business_no", req.getBusinessNo());
+		ContractOrderEntity order = contractOrderMapper.selectOne(query);
 		List<OrderFileEntity> orderFileList = orderFileRepository.getOrderFileListWithCodes(req.getBusinessNo(),
 				"1,2,3,4,5,6".split(","));
 		List<Map<String, String>> fileList = new ArrayList<>();
@@ -549,8 +557,8 @@ public class AdminOrderServiceImpl implements AdminOrderService {
 			content.put("name", orderFile.getFileName());
 			content.put("value", getPreviewUrl(fileUrl));
 			fileList.add(content);
-			//TODO 因为签名pdf合并了，所以现在只取一个pdf即可
-			if(fileList.size()>0) {
+			// TODO 因为签名pdf合并了，所以现在只取一个pdf即可
+			if (order.getStatus().equalsIgnoreCase("3") && fileList.size() > 0) {
 				break;
 			}
 		}
@@ -628,18 +636,18 @@ public class AdminOrderServiceImpl implements AdminOrderService {
 		if (notarization != null) {
 			orderDetail.setNotarizationNo(notarization.getDocNo());
 			orderDetail.setNotarizaitonSignTime(notarization.getAxqSignedTime());
-			//判断是否为空
-			if(org.apache.commons.lang3.StringUtils.isNotBlank(notarization.getSignedPdfUrl())) {
+			// 判断是否为空
+			if (org.apache.commons.lang3.StringUtils.isNotBlank(notarization.getSignedPdfUrl())) {
 				orderDetail.setAuthNotarization(FileUploadUtil.getPreviewUrl(notarization.getSignedPdfUrl()));
 			}
-			
+
 		}
 		if (note != null) {
-			//判断是否为空
-			if(org.apache.commons.lang3.StringUtils.isNotBlank(note.getSignedPdfUrl())) {
+			// 判断是否为空
+			if (org.apache.commons.lang3.StringUtils.isNotBlank(note.getSignedPdfUrl())) {
 				orderDetail.setAuthNote(FileUploadUtil.getPreviewUrl(note.getSignedPdfUrl()));
 			}
-		
+
 		}
 		if (!StringUtils.isEmpty(orderDetail.getNotaryUserId())) {
 			SysUserEntity user = userMapper.selectById(orderDetail.getNotaryUserId());