抵押物图片

eladmin-system/src/main/java/me/zhengjie/application/bank/controller/vo/OrderDetailDto.java

@@ -123,12 +123,11 @@ public class OrderDetailDto implements Comparable<OrderDetailDto> {
 	// 合同上传
 	private List<String> compactPicUrl;
 	/**
-	 * 房产证
+	 * 抵押物
 	 */
-
-	private String estatesPic;
-	// 房产证图片地址
-	private List<String> estatesPicUrl;
+	private String mortgagePic;
+	// 抵押物图片地址
+	private List<String> mortgagePicUrl;
 	/**
 	 * 结婚证
 	 */

eladmin-system/src/main/java/me/zhengjie/application/bank/service/impl/OrderServiceImpl.java

@@ -384,45 +384,7 @@ public class OrderServiceImpl extends ServiceImpl<NotaryOrderMapper, NotaryOrder
 	public OrderDetailDto getOrderDetail(OrderDetailDto orderDetail) {
 		NotaryOrderEntity orderEntity = orderRepository.getOrderEntityByBizNo(orderDetail.getBusinessNo());
 		orderDetail.setMainOrderStatus(orderEntity.getStatus());
-		// 将所有图片查询出来
-		// 1.身份证正面 2.身份证反面 3.结婚证 4.合同附件 5.房产证6.户口本 7.其他内容
-//		List<Integer> list = new ArrayList<Integer>();
-//		// for (OrderDetailDto orderDetail : entityDto) {
-//		// 身份证正面
-//		list.add(Integer.parseInt(orderDetail.getCardFront()));
-//		// 身份证反面
-//		list.add(Integer.parseInt(orderDetail.getCardBack()));
-//		// 3.结婚证
-//		// 判断是否有数据
-//		if (StringUtils.isNotBlank(orderDetail.getMarragePic())) {
-//			String[] marrage = orderDetail.getMarragePic().split(",");
-//			list.addAll(toIntList(marrage));
-//		}
-//
-//		// 4.合同附件
-//		if (StringUtils.isNotBlank(orderDetail.getCompactPic())) {
-//			String[] CompactPic = orderDetail.getCompactPic().split(",");
-//			list.addAll(toIntList(CompactPic));
-//		}
-//		// 5.房产证
-//		if (StringUtils.isNotBlank(orderDetail.getEstatesPic())) {
-//			String[] estatesPic = orderDetail.getEstatesPic().split(",");
-//			list.addAll(toIntList(estatesPic));
-//		}
-//		// 6.户口本
-//		if (StringUtils.isNotBlank(orderDetail.getHkbPic())) {
-//			String[] hkbPic = orderDetail.getHkbPic().split(",");
-//			list.addAll(toIntList(hkbPic));
-//		}
-//
-//		// 其他内容
-//		String otherUpload = orderDetail.getOtherUpload();
-//		if (StringUtils.isNotBlank(otherUpload)) {
-//			String[] otherArray = otherUpload.split(",");
-//			list.addAll(toIntList(otherArray));
-//		}
 
-//		}
 		// 取出所有的图片
 		List<FileInfoEntity> fileInfo = getFileInfo(orderDetail);
 		Map<Integer, FileInfoEntity> map = new HashMap<>();
@@ -446,13 +408,11 @@ public class OrderServiceImpl extends ServiceImpl<NotaryOrderMapper, NotaryOrder
 		orderDetail.setMarragePicUrl(marragePicUrl);
 //			
 //			// 4.合同附件
-//			String[] CompactPic = borrower.getCompactPic().split(",");
 		List<String> compactPicUrl = getImageUrl(orderDetail.getCompactPic(), map);
 		orderDetail.setCompactPicUrl(compactPicUrl);
-//			// 5.房产证
-//			String[] estatesPic = borrower.getEstatesPic().split(",");
-		List<String> estatesPicUrl = getImageUrl(orderDetail.getEstatesPic(), map);
-		orderDetail.setEstatesPicUrl(estatesPicUrl);
+//			// 5.抵押物
+		List<String> mortgagePicUrl = getImageUrl(orderDetail.getMortgagePic(), map);
+		orderDetail.setMortgagePicUrl(mortgagePicUrl);
 
 //			// 6.户口本
 //			String[] hkbPic = borrower.getHkbPic().split(",");
@@ -491,9 +451,9 @@ public class OrderServiceImpl extends ServiceImpl<NotaryOrderMapper, NotaryOrder
 			list.addAll(toIntList(CompactPic));
 		}
 		// 5.房产证
-		if (StringUtils.isNotBlank(orderDetail.getEstatesPic())) {
-			String[] estatesPic = orderDetail.getEstatesPic().split(",");
-			list.addAll(toIntList(estatesPic));
+		if (StringUtils.isNotBlank(orderDetail.getMortgagePic())) {
+			String[] mortgagePic = orderDetail.getMortgagePic().split(",");
+			list.addAll(toIntList(mortgagePic));
 		}
 		// 6.户口本
 		if (StringUtils.isNotBlank(orderDetail.getHkbPic())) {