兼容邮储产品

eladmin-system/src/main/java/me/zhengjie/application/admin/controller/vo/NotaryOrderQueryRsp.java

@@ -53,4 +53,12 @@ public class NotaryOrderQueryRsp {
 	// 创建时间
 	@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
 	private LocalDateTime createTime;
+	// 申请时间
+	@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+	private LocalDateTime applyTime;
+
+	public LocalDateTime getApplyTime() {
+
+		return applyTime = createTime;
+	}
 }

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

@@ -126,4 +126,6 @@ public class BankOrderVO {
     private Date createTime;
     // 图片URL
     private Map<String,String> fileUrlMap;
+    // 公证流程标记
+    private String notarizedFlag;
 }

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

@@ -7,15 +7,11 @@ import me.zhengjie.application.bank.controller.vo.BankOrderVO;
 import me.zhengjie.application.bank.mq.RedisReceiver;
 import me.zhengjie.application.bank.service.BankOrderService;
 import me.zhengjie.base.ResponseDTO;
-import me.zhengjie.base.ResultCode;
 import me.zhengjie.base.util.BeanCopyUtils;
 import me.zhengjie.base.util.DateFormatUtils;
 import me.zhengjie.base.util.FileUploadUtil;
 import me.zhengjie.base.util.TencentServiceUtil;
-import me.zhengjie.dao.mybatis.ContractOrderRepository;
-import me.zhengjie.dao.mybatis.ModelRepository;
-import me.zhengjie.dao.mybatis.OfficeXbankRepository;
-import me.zhengjie.dao.mybatis.SysUserRepository;
+import me.zhengjie.dao.mybatis.*;
 import me.zhengjie.dao.mybatis.entity.*;
 import me.zhengjie.dao.mybatis.mapper.BankMapper;
 import me.zhengjie.dao.mybatis.mapper.FileInfoMapper;
@@ -31,6 +27,7 @@ import org.springframework.stereotype.Service;
 import org.springframework.web.multipart.MultipartFile;
 
 import java.util.*;
+import java.util.stream.Collectors;
 
 /**
  * <p>
@@ -54,6 +51,7 @@ public class BankOrderServiceImpl implements BankOrderService {
 	private final ContractOrderRepository contractOrderRepository;
 	private final SysUserRepository sysUserRepository;
 	private final OfficeXbankRepository officeXbankRepository;
+	private final OrderFileRepository orderFileRepository;
 
 	@Override
 	public void saveContractOrder(BankOrderVO vo, SysUserEntity userEntity) {
@@ -91,6 +89,12 @@ public class BankOrderServiceImpl implements BankOrderService {
 			List<ContractOrderEntity> entiryList = contractOrderRepository.searchOrderWithContractNo(String.valueOf(user.getUserId()), status, contractNo, index, size);
 			volist = BeanCopyUtils.convertList2List(entiryList, BankOrderVO.class);
 		}
+		List<String> bizNoList = volist.stream().map(BankOrderVO::getBusinessNo).collect(Collectors.toList());
+		List<OrderFileEntity> fileList = orderFileRepository.canBeSignedNotarization(bizNoList);
+		Set<String> set = fileList.stream().map(OrderFileEntity::getBusinessNo).collect(Collectors.toSet());
+		for (BankOrderVO order : volist) {
+			order.setNotarizedFlag(set.contains(order.getBusinessNo()) ? "1" : "0");
+		}
 		return volist;
 	}