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

@@ -38,7 +38,6 @@ public class NotaryOrderQueryRsp {
 	private String idCard;
 	// 合同金额
 	private String contractMoney;
-
 	// 所属银行
 	private String bankName;
 	// 客户经理
@@ -47,7 +46,10 @@ public class NotaryOrderQueryRsp {
 	private String bankId;
 	// 自动生成公证书标记
 	private String autoGenerate;
-	
+	// 返回原因
+	private String returnReason;
+	// 驳回原因
+	private String rejectReason;
 	// 创建时间
 	@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
 	private LocalDateTime createTime;
@@ -59,9 +61,4 @@ public class NotaryOrderQueryRsp {
 
 		return applyTime = createTime;
 	}
-
-	public void setApplyTime(LocalDateTime applyTime) {
-		this.applyTime = applyTime;
-	}
-
 }

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

@@ -317,16 +317,17 @@ public class AdminOrderServiceImpl implements AdminOrderService {
 	@Override
 	public AppBaseResponse orderReturn(NotaryOrderQueryReq req) {
 		AppBaseResponse response = new AppBaseResponse();
-		ContractOrderEntity contractOrderEntity = contractOrderMapper.selectById(req.getId());
+		ContractOrderEntity contractOrderEntity = contractOrderRepository.getContractOrderWithBizNo(req.getBusinessNo());
 		bankOrderService.updateStatus(contractOrderEntity.getBusinessNo(),
 				StatusEnum.NotaryStatusEnum.SUBMIT.getStatus().toString(), req.getReturnReason());
 		response.success("退回成功");
 		return response;
 	}
 
+	@Override
 	public AppBaseResponse orderReject(NotaryOrderQueryReq req) {
 		AppBaseResponse response = new AppBaseResponse();
-		ContractOrderEntity contractOrderEntity = contractOrderMapper.selectById(req.getId());
+		ContractOrderEntity contractOrderEntity = contractOrderRepository.getContractOrderWithBizNo(req.getBusinessNo());
 		bankOrderService.updateStatus(contractOrderEntity.getBusinessNo(),
 				StatusEnum.NotaryStatusEnum.REJECT.getStatus().toString(), req.getRejectReason());
 		response.success("驳回成功");

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,17 @@ 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());
+		if (bizNoList != null && bizNoList.size() > 0) {
+			Set<String> set = new HashSet<>();
+			List<OrderFileEntity> fileList = orderFileRepository.canBeSignedNotarization(bizNoList);
+			if (fileList != null && fileList.size() > 0) {
+				set = fileList.stream().map(OrderFileEntity::getBusinessNo).collect(Collectors.toSet());
+			}
+			for (BankOrderVO order : volist) {
+				order.setNotarizedFlag(set.contains(order.getBusinessNo()) ? "1" : "0");
+			}
+		}
 		return volist;
 	}
 

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

@@ -215,11 +215,11 @@ public class StatusEnum {
             this.sex = sex;
         }
 		private String status;
-        private String sex;      
+        private String sex;
 
         public static String getValue(String status) {
             for (SexStatusEnum statusEnum : values()) {
-                if (statusEnum.status == status) {
+                if (statusEnum.status.equals(status)) {
                     return statusEnum.sex;
                 }
             }