问题修复

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

@@ -92,7 +92,7 @@ public class BankOrderServiceImpl implements BankOrderService {
 		List<String> bizNoList = volist.stream().map(BankOrderVO::getBusinessNo).collect(Collectors.toList());
 		if (bizNoList != null && bizNoList.size() > 0) {
 			Set<String> set = new HashSet<>();
-			List<OrderFileEntity> fileList = orderFileRepository.canBeSignedNotarization(bizNoList);
+			List<OrderFileEntity> fileList = orderFileRepository.getOrderNoteList(bizNoList);
 			if (fileList != null && fileList.size() > 0) {
 				set = fileList.stream().map(OrderFileEntity::getBusinessNo).collect(Collectors.toSet());
 			}

eladmin-system/src/main/java/me/zhengjie/dao/mybatis/OrderFileRepository.java

@@ -69,14 +69,28 @@ public class OrderFileRepository {
     }
 
     /**
+     * 获取已签名面谈笔录列表
+     *
+     * @param bizNoList
+     * @return
+     */
+    public List<OrderFileEntity> getOrderNoteList(List<String> bizNoList) {
+        QueryWrapper<OrderFileEntity> qw = new QueryWrapper<>();
+        qw.in("business_no", bizNoList);
+        qw.eq("code", OrderFileConstant.TYPE_CODE_NOTE);
+        qw.isNotNull("signed_pdf_url");
+        return orderFileMapper.selectList(qw);
+    }
+
+    /**
      * 获取指定订单可以签名的公证书列表
      *
-     * @param orderIdList
+     * @param bizNoList
      * @return
      */
-    public List<OrderFileEntity> canBeSignedNotarization(List<String> orderIdList) {
+    public List<OrderFileEntity> canBeSignedNotarization(List<String> bizNoList) {
         QueryWrapper<OrderFileEntity> qw = new QueryWrapper<>();
-        qw.in("business_no", orderIdList);
+        qw.in("business_no", bizNoList);
         qw.in("code", OrderFileConstant.TYPE_CODE_NOTARIZATION);
         qw.isNotNull("doc_no");
         return orderFileMapper.selectList(qw);

eladmin-system/src/main/java/me/zhengjie/domain/model/ModelSynthesizerDomain.java

@@ -219,7 +219,11 @@ public class ModelSynthesizerDomain {
             // 当事人
             Map<String, String> partyMap = new HashMap<>();
             if (order.getContractType() == OrderConstant.CONTRACT_TYPE_BORROWER) {
-                partyMap.put("$Title$", "借款人");
+                if (OrderConstant.PROD_ID_CD.equals(order.getProdId())) {
+                    partyMap.put("Title$", "借款人（抵押人）");
+                } else {
+                    partyMap.put("$Title$", "借款人");
+                }
             } else if (order.getContractType() == OrderConstant.CONTRACT_TYPE_MORTGAGE) {
                 partyMap.put("$Title$", "抵押人");
             } else if (order.getContractType() == OrderConstant.CONTRACT_TYPE_GUARANTEE) {
@@ -237,7 +241,11 @@ public class ModelSynthesizerDomain {
             if (order.getJointFlag() == OrderConstant.JOINT_FLAG_TRUE) {
                 Map<String, String> jointMap = new HashMap<>();
                 if (order.getContractType() == OrderConstant.CONTRACT_TYPE_BORROWER) {
-                    jointMap.put("$Title$", "借款人");
+                    if (OrderConstant.PROD_ID_CD.equals(order.getProdId())) {
+                        partyMap.put("Title$", "借款人（抵押人）");
+                    } else {
+                        partyMap.put("$Title$", "借款人");
+                    }
                 } else if (order.getContractType() == OrderConstant.CONTRACT_TYPE_MORTGAGE) {
                     jointMap.put("$Title$", "抵押人");
                 } else if (order.getContractType() == OrderConstant.CONTRACT_TYPE_GUARANTEE) {