增加主订单状态

eladmin-system/src/main/java/me/zhengjie/appapi/dto/OrderDetailDto.java

@@ -159,9 +159,8 @@ public class OrderDetailDto implements Comparable<OrderDetailDto> {
 	private String housePropertyNo;
 	//房屋位置
 	private String houseLocation;
-	
 	private String status;
-
+	private String mainOrderStatus;
 	private String notarizationNo;
 	private Date notarizaitonSignTime;
 	private String notaryUserName;

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

@@ -375,11 +375,12 @@ 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) {
+		// for (OrderDetailDto orderDetail : entityDto) {
 		// 身份证正面
 		list.add(Integer.parseInt(orderDetail.getCardFront()));
 		// 身份证反面