面谈笔录

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

@@ -94,7 +94,8 @@ public class AdminOrderServiceImpl implements AdminOrderService {
 	@Autowired
 	ContractOrderRepository contractOrderRepository;
 	@Autowired
-    private  SysUserMapper userMapper;
+	private SysUserMapper userMapper;
+
 	@Override
 	public AppBaseResponse<List<NotaryOrderQueryRsp>> query(NotaryOrderQueryReq req) {
 		AppBaseResponse<List<NotaryOrderQueryRsp>> response = new AppBaseResponse<>();
@@ -318,8 +319,8 @@ public class AdminOrderServiceImpl implements AdminOrderService {
 	}
 
 	@Override
-	public AppBaseResponse checkInfoPass(NotaryOrderQueryReq req) {
-		AppBaseResponse response = new AppBaseResponse();
+	public AppBaseResponse<?> checkInfoPass(NotaryOrderQueryReq req) {
+		AppBaseResponse<?> response = new AppBaseResponse();
 		String currentUserId = String.valueOf(contextUtil.getCurrentUserId());
 		ContractOrderEntity contractOrderEntity = contractOrderMapper.selectById(req.getId());
 		contractOrderEntity.setStatus(StatusEnum.NotaryStatusEnum.NOTARIZED.getStatus().toString());
@@ -340,9 +341,7 @@ public class AdminOrderServiceImpl implements AdminOrderService {
 			return response;
 		}
 		// 检查面谈笔录是否提交
-		OrderFileEntity orderFile = null;
-//		OrderFileEntity orderFile = orderFileRepository.getOrderFileWithCode(contractOrderEntity.getProdId(),
-//				contractOrderEntity.getBusinessNo(), OrderFileConstant.TYPE_CODE_NOTE);
+		OrderFileEntity orderFile = orderFileRepository.getOrderNote(contractOrderEntity.getBusinessNo());
 
 		if (orderFile == null) {
 			response.fail(ResultCode.INTERVIEW_NOTE_UNSUBMIT);
@@ -643,8 +642,8 @@ public class AdminOrderServiceImpl implements AdminOrderService {
 					&& contractOrderEntity.getNotaryOfficeId().equals(user.getOrgId().split("_")[1])) {
 				SysUserEntity customer = userDao.selectById(contractOrderEntity.getCustomerId());
 				BankEntity bankEntity = bankMapper.selectById(customer.getOrgId().split("_")[1]);
-			
-				BankCustomerVo customerVo= new BankCustomerVo();
+
+				BankCustomerVo customerVo = new BankCustomerVo();
 				customerVo.setBankName(bankEntity.getBankName());
 				customerVo.setCustomerIdCard(customer.getIdCard());
 				customerVo.setCustomerName(customer.getNickName());
@@ -791,21 +790,21 @@ public class AdminOrderServiceImpl implements AdminOrderService {
 		// 共同责任人身份证反面照片
 		String jointIdCardBack = fileInfoService.getImageUrl(orderDetail.getJointIdcardBackPic(), map);
 		orderDetail.setJointIdcardBackPic(jointIdCardBack);
-		 OrderFileEntity notarization = orderFileRepository.getOrderNotarization(businessNo);
-	     OrderFileEntity note = orderFileRepository.getOrderNote(businessNo);
-	        if (notarization != null) {
-	        	orderDetail.setNotarizationNo(notarization.getDocNo());
-	        	orderDetail.setNotarizaitonSignTime(notarization.getAxqSignedTime());
-	        	orderDetail.setAuthNotarization(FileUploadUtil.getPreviewUrl(notarization.getSignedPdfUrl()));
-	        }
-	        if (note != null) {
-	        	orderDetail.setAuthNote(FileUploadUtil.getPreviewUrl(note.getSignedPdfUrl()));
-	        }
-	        if (!StringUtils.isEmpty(orderDetail.getNotaryUserId())) {
-	            SysUserEntity user = userMapper.selectById(orderDetail.getNotaryUserId());
-	            orderDetail.setNotaryUserName(user.getNickName());
-	            orderDetail.setNotaryFee(200);
-	        }
+		OrderFileEntity notarization = orderFileRepository.getOrderNotarization(businessNo);
+		OrderFileEntity note = orderFileRepository.getOrderNote(businessNo);
+		if (notarization != null) {
+			orderDetail.setNotarizationNo(notarization.getDocNo());
+			orderDetail.setNotarizaitonSignTime(notarization.getAxqSignedTime());
+			orderDetail.setAuthNotarization(FileUploadUtil.getPreviewUrl(notarization.getSignedPdfUrl()));
+		}
+		if (note != null) {
+			orderDetail.setAuthNote(FileUploadUtil.getPreviewUrl(note.getSignedPdfUrl()));
+		}
+		if (!StringUtils.isEmpty(orderDetail.getNotaryUserId())) {
+			SysUserEntity user = userMapper.selectById(orderDetail.getNotaryUserId());
+			orderDetail.setNotaryUserName(user.getNickName());
+			orderDetail.setNotaryFee(200);
+		}
 		return orderDetail;
 	}