Merge branch 'feature-2022.07.29' of https://git.flowbb.cn/RK-Dev/fqgz-server into feature-2022.07.29

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

@@ -44,7 +44,9 @@ public class NotaryOrderQueryRsp {
 	// 客户经理
 	private String customerName;
 	//'所属银行id',
-	private String bankId; 
+	private String bankId;
+	// 自动生成公证书标记
+	private String autoGenerate;
 	
 	// 创建时间
 	@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")

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

@@ -234,43 +234,45 @@ public class AdminOrderServiceImpl implements AdminOrderService {
 	@Override
 	public AppBaseResponse<List<PartyEntity>> orderQueryUser(final HashMap<String, String> map) {
 		AppBaseResponse<List<PartyEntity>> response = new AppBaseResponse<>();
-		List<BorrowerEntity> borrowerList = borrowerMapper.selectList(
-				new QueryWrapper<BorrowerEntity>().eq("business_no", map.get("businessNo")).orderByAsc("order_by"));
-		List<MortgageEntity> mortgageList = mortgageMapper.selectList(
-				new QueryWrapper<MortgageEntity>().eq("business_no", map.get("businessNo")).orderByAsc("order_by"));
-		List<GuaranteeEntity> guaranteeList = guaranteeMapper.selectList(
-				new QueryWrapper<GuaranteeEntity>().eq("business_no", map.get("businessNo")).orderByAsc("order_by"));
+		ContractOrderEntity contractOrderEntity = contractOrderRepository.getContractOrderWithBizNo(map.get("businessNo"));
 		List<PartyEntity> partyList = new LinkedList<>();
-		borrowerList.forEach((item) -> {
-			partyList.add(PartyEntity.builder().id(item.getId()).username(item.getUsername()).idCard(item.getIdCard())
-					.roleId(StatusEnum.StepStatusEnum.BORROWER.getStatus())
-					.role(StatusEnum.StepStatusEnum.BORROWER.getProcess()).build());
-			if (item.getJointFlag() == 1) {
-				partyList.add(PartyEntity.builder().id(item.getId()).username(item.getSpouseName())
-						.idCard(item.getSpouseIdCard()).roleId(StatusEnum.StepStatusEnum.BORROWER.getStatus())
-						.role(StatusEnum.StepStatusEnum.BORROWER.getProcess()).build());
-			}
-		});
-		mortgageList.forEach((item) -> {
-			partyList.add(PartyEntity.builder().id(item.getId()).username(item.getUsername()).idCard(item.getIdCard())
-					.roleId(StatusEnum.StepStatusEnum.MORTGAGOR.getStatus())
-					.role(StatusEnum.StepStatusEnum.MORTGAGOR.getProcess()).build());
-			if (item.getJointFlag() == 1) {
-				partyList.add(PartyEntity.builder().id(item.getId()).username(item.getSpouseName())
-						.idCard(item.getSpouseIdCard()).roleId(StatusEnum.StepStatusEnum.MORTGAGOR.getStatus())
-						.role(StatusEnum.StepStatusEnum.MORTGAGOR.getProcess()).build());
-			}
-		});
-		guaranteeList.forEach((item) -> {
-			partyList.add(PartyEntity.builder().id(item.getId()).username(item.getUsername()).idCard(item.getIdCard())
-					.roleId(StatusEnum.StepStatusEnum.GUARANTEE.getStatus())
-					.role(StatusEnum.StepStatusEnum.GUARANTEE.getProcess()).build());
-			if (item.getJointFlag() == 1) {
-				partyList.add(PartyEntity.builder().id(item.getId()).username(item.getSpouseName())
-						.idCard(item.getSpouseIdCard()).roleId(StatusEnum.StepStatusEnum.GUARANTEE.getStatus())
-						.role(StatusEnum.StepStatusEnum.GUARANTEE.getProcess()).build());
+		PartyEntity partyA = new PartyEntity();
+		partyA.setUsername(contractOrderEntity.getName());
+		partyA.setIdCard(contractOrderEntity.getIdCard());
+		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()) {
+			partyA.setRoleId(StatusEnum.StepStatusEnum.MORTGAGOR.getStatus());
+			partyA.setRole(StatusEnum.StepStatusEnum.MORTGAGOR.getProcess());
+		}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()) {
+			partyA.setRoleId(StatusEnum.StepStatusEnum.CREDIT.getStatus());
+			partyA.setRole(StatusEnum.StepStatusEnum.CREDIT.getProcess());
+		}
+		partyList.add(partyA);
+		// 共同责任人
+		if (contractOrderEntity.getJointFlag() == OrderConstant.JOINT_FLAG_TRUE) {
+			PartyEntity partyB = new PartyEntity();
+			partyB.setUsername(contractOrderEntity.getJointName());
+			partyB.setIdCard(contractOrderEntity.getJointIdCard());
+			if (OrderConstant.CONTRACT_TYPE_BORROWER == contractOrderEntity.getContractType()) {
+				partyB.setRoleId(StatusEnum.StepStatusEnum.BORROWER.getStatus());
+				partyB.setRole(StatusEnum.StepStatusEnum.BORROWER.getProcess());
+			} else if (OrderConstant.CONTRACT_TYPE_MORTGAGE == contractOrderEntity.getContractType()) {
+				partyB.setRoleId(StatusEnum.StepStatusEnum.MORTGAGOR.getStatus());
+				partyB.setRole(StatusEnum.StepStatusEnum.MORTGAGOR.getProcess());
+			} else if (OrderConstant.CONTRACT_TYPE_GUARANTEE == contractOrderEntity.getContractType()) {
+				partyB.setRoleId(StatusEnum.StepStatusEnum.GUARANTEE.getStatus());
+				partyB.setRole(StatusEnum.StepStatusEnum.GUARANTEE.getProcess());
+			} else if (OrderConstant.CONTRACT_TYPE_CREDIT == contractOrderEntity.getContractType()) {
+				partyB.setRoleId(StatusEnum.StepStatusEnum.CREDIT.getStatus());
+				partyB.setRole(StatusEnum.StepStatusEnum.CREDIT.getProcess());
 			}
-		});
+			partyList.add(partyB);
+		}
 		response.setData(new AppResultData<List<PartyEntity>>(partyList));
 		return response;
 	}

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

@@ -103,7 +103,7 @@ public class NotaryNoteServiceImpl implements NotaryNoteService {
 			orderFileMapper.updateById(orderFile);
 		}
 		saveNotaryUserId(notary.getBusinessNo());
-		recreateApplyDoc(notary.getBusinessNo(), notary.getContractNo());
+		recreateApplyDoc(notary.getBusinessNo());
 		return response;
 	}
 
@@ -126,13 +126,13 @@ public class NotaryNoteServiceImpl implements NotaryNoteService {
 	 *
 	 * @param businessNo
 	 */
-	private void recreateApplyDoc(String businessNo,String contractNo) {
+	private void recreateApplyDoc(String businessNo) {
 		ContractOrderEntity contractOrderEntity = contractOrderRepository.getContractOrderWithBizNo(businessNo);
 		ModelEntity model = modelRepository.getModelEntity(contractOrderEntity.getProdId(), contractOrderEntity.getContractType(), contractOrderEntity.getNotaryOfficeId(), ModelConstant.MODEL_TYPE_APPLY, ModelConstant.MODEL_STATUS_ENABLE);
 		OrderFileEntity fileEntity = orderFileRepository.getOrderFileWithCode(businessNo, ModelConstant.MODEL_TYPE_APPLY);
 		OrderFileEntity saveFile = new OrderFileEntity();
 		saveFile.setId(fileEntity.getId());
-		String html = modelSynthesizerDomain.composeCommonTemplateWithData(businessNo, model.getContent());
+		String html = modelSynthesizerDomain.composeCommonTemplateWithData(businessNo, model.getContent(), contextUtil.getCurrentUser().getNickName());
 		String htmlPath = FileUploadUtil.saveHtml(html, businessNo);
 		String pdfPath = FileUploadUtil.savePdf(html, businessNo);
 		fileEntity.setHtmlUrl(htmlPath);

eladmin-system/src/main/java/me/zhengjie/application/bank/mq/RedisReceiver.java

@@ -55,7 +55,7 @@ public class RedisReceiver implements MessageListener {
 			fileEntity.setBusinessNo(businessNo);
 			fileEntity.setCode(m.getCode());
 			fileEntity.setSortNum(m.getSort());
-			String html = modelSynthesizerDomain.composeCommonTemplateWithData(businessNo, m.getContent());
+			String html = modelSynthesizerDomain.composeCommonTemplateWithData(businessNo, m.getContent(),"");
 			String htmlPath = FileUploadUtil.saveHtml(html, businessNo);
 			String pdfPath = FileUploadUtil.savePdf(html, businessNo);
 			fileEntity.setHtmlUrl(htmlPath);

eladmin-system/src/main/java/me/zhengjie/application/user/app/mq/WebSocketReceiver.java

@@ -73,7 +73,8 @@ public class WebSocketReceiver implements MessageListener {
 						obj.put("accountId", userDto.getUsername());
 						obj.put("orderId", orderId);
 						obj.put("roomId", roomId);
-						obj.put("prodId",notaryOrder.getProdId());
+						obj.put("prodId", notaryOrder.getProdId());
+						obj.put("contractType", notaryOrder.getContractType());
 						obj.put("businessNo", businessNo);
 						obj.put("customerIdCard", sysUser.getIdCard());
 						obj.put("userId", sysUser.getUserId());

eladmin-system/src/main/java/me/zhengjie/base/util/StatusEnum.java

@@ -159,9 +159,10 @@ public class StatusEnum {
     }
 
     public enum StepStatusEnum {
-     	BORROWER(1, "借款人","borrower","10"),
-    	MORTGAGOR(2, "抵押人","mortgagor","11"),
-    	GUARANTEE(3, "担保人","guarantee","12");
+        BORROWER(1, "借款人", "borrower", "10"),
+        MORTGAGOR(2, "抵押人", "mortgagor", "11"),
+        GUARANTEE(3, "保证人", "guarantee", "12"),
+        CREDIT(4, "授信人", "credit", "13");
     	StepStatusEnum(Integer status, String process,String orderType,String prefix) {
             this.status = status;
             this.process = process;

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

@@ -339,8 +339,8 @@ public class ModelSynthesizerDomain {
      * @param content
      * @return
      */
-    public String composeCommonTemplateWithData(String businessNo, String content) {
-        String replaceContent = TextTempletUtil.replaceContent(content, prepareCommonTemplateData(businessNo, content));
+    public String composeCommonTemplateWithData(String businessNo, String content, String userName) {
+        String replaceContent = TextTempletUtil.replaceContent(content, prepareCommonTemplateData(businessNo, content, userName));
         String result = "";
         try {
             InputStream inputStream = ModelSynthesizerDomain.class.getClassLoader().getResourceAsStream("template/note/notary-model.html");
@@ -355,12 +355,15 @@ public class ModelSynthesizerDomain {
      * 准备通用模板替换数据
      *
      * @param businessNo
+     * @param contractNo
+     * @param userName
      * @return
      */
-    private Map<String, String> prepareCommonTemplateData(String businessNo, String contractNo) {
+    private Map<String, String> prepareCommonTemplateData(String businessNo, String contractNo,String userName) {
         ContractOrderEntity contractOrderEntity = contractOrderRepository.getContractOrderWithBizNo(businessNo);
         //
         Map<String, String> map = new HashMap<>();
+        map.put("$Greffier$", userName);
         map.put("$Date$", DateUtils.date2String(new Date(), 1));
         map.put("$BusinessOrderNo$", contractOrderEntity.getBusinessNo());
         map.put("$Name$", contractOrderEntity.getName());