修改客户经理显示

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

@@ -70,7 +70,7 @@ public class NotaryOrderQueryReq extends BaseRequest {
 
 
     // 查询使用
-    private Integer id;
+    private String id;
 
     // 退户原因
     private String returnReason;

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

@@ -18,6 +18,8 @@ import lombok.Setter;
 @Setter
 @ToString
 public class NotaryOrderQueryRsp {
+	//主键
+	private String id;
 	// 业务编号
 	private String businessNo;
 	// 产品类型
@@ -37,6 +39,9 @@ public class NotaryOrderQueryRsp {
 	private String bankName;
 	// 客户经理
 	private String customerName;
+	//'所属银行id',
+	private String bankId; 
+	
 	// 创建时间
 	@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
 	private LocalDateTime createTime;

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

@@ -51,7 +51,7 @@ public interface AdminOrderService {
 
     AppBaseResponse<NotaryOrderQueryRsp> previewNotarization(NotaryOrderQueryReq req);
 
-    AppBaseResponse<NotaryOrderQueryRsp> bankCustomer(NotaryOrderQueryReq req);
+    AppBaseResponse<?> bankCustomer(NotaryOrderQueryReq req);
 
     AppBaseResponse uploadNotarization(FileVo file);
 

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

@@ -15,6 +15,7 @@ import me.zhengjie.dao.mybatis.mapper.*;
 import me.zhengjie.application.bank.service.FileInfoService;
 import me.zhengjie.application.bank.service.BankOrderService;
 import me.zhengjie.application.bank.service.impl.NotaryNoteServiceImpl;
+import me.zhengjie.application.bank.controller.vo.BankCustomerVo;
 import me.zhengjie.application.bank.controller.vo.FileVo;
 import me.zhengjie.base.ResultCode;
 import me.zhengjie.base.plus.QueryWrapperUtil;
@@ -92,7 +93,8 @@ public class AdminOrderServiceImpl implements AdminOrderService {
 	ApplicationContextUtil contextUtil;
 	@Autowired
 	ContractOrderRepository contractOrderRepository;
-
+	@Autowired
+    private  SysUserMapper userMapper;
 	@Override
 	public AppBaseResponse<List<NotaryOrderQueryRsp>> query(NotaryOrderQueryReq req) {
 		AppBaseResponse<List<NotaryOrderQueryRsp>> response = new AppBaseResponse<>();
@@ -632,8 +634,8 @@ public class AdminOrderServiceImpl implements AdminOrderService {
 	 * @return
 	 */
 	@Override
-	public AppBaseResponse<NotaryOrderQueryRsp> bankCustomer(NotaryOrderQueryReq req) {
-		AppBaseResponse response = new AppBaseResponse();
+	public AppBaseResponse<String> bankCustomer(NotaryOrderQueryReq req) {
+		AppBaseResponse<String> response = new AppBaseResponse<>();
 		try {
 			ContractOrderEntity contractOrderEntity = contractOrderMapper.selectById(req.getId());
 			SysUserEntity user = userDao.selectById(contextUtil.getCurrentUserId());
@@ -641,14 +643,15 @@ 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]);
-				NotaryOrderQueryRsp returnData = new NotaryOrderQueryRsp();
-				returnData.setBankName(bankEntity.getBankName());
-//				returnData.setCustomerIdCard(customer.getIdCard());
-//				returnData.setCustomerName(customer.getNickName());
-//				returnData.setCustomerPhone(customer.getPhone());
-//				returnData.setCustomerGender(customer.getGender());
-//				returnData.setCustomerLogo(customer.getAvatarName());
-				response.setData(new AppResultData<NotaryOrderQueryRsp>(returnData));
+			
+				BankCustomerVo customerVo= new BankCustomerVo();
+				customerVo.setBankName(bankEntity.getBankName());
+				customerVo.setCustomerIdCard(customer.getIdCard());
+				customerVo.setCustomerName(customer.getNickName());
+				customerVo.setCustomerPhone(customer.getPhone());
+				customerVo.setCustomerGender(customer.getGender());
+				customerVo.setCustomerLogo(customer.getAvatarName());
+				response.setResult(customerVo);
 			} else {
 				response.fail(ResultCode.INTERFACE_ILLEGAL_REQUEST);
 			}
@@ -788,6 +791,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);
+	        }
 		return orderDetail;
 	}
 

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

@@ -0,0 +1,28 @@
+package me.zhengjie.application.bank.controller.vo;
+
+import lombok.Getter;
+import lombok.Setter;
+import lombok.ToString;
+
+@Getter
+@Setter
+@ToString
+public class BankCustomerVo {
+//	customerVo.setCustomerIdCard(customer.getIdCard());
+//	customerVo.setCustomerName(customer.getNickName());
+//	customerVo.setCustomerPhone(customer.getPhone());
+//	customerVo.setCustomerGender(customer.getGender());
+//	customerVo.setCustomerLogo(customer.getAvatarName());
+	private String bankName;
+	private String CustomerIdCard;
+	private String customerName;
+	private String customerPhone;
+	private String customerGender;
+	private String customerLogo;
+//	returnData.setBankName(bankEntity.getBankName());
+//	returnData.setCustomerIdCard(customer.getIdCard());
+//	returnData.setCustomerName(customer.getNickName());
+//	returnData.setCustomerPhone(customer.getPhone());
+//	returnData.setCustomerGender(customer.getGender());
+//	returnData.setCustomerLogo(customer.getAvatarName());
+}

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

@@ -1,5 +1,6 @@
 package me.zhengjie.application.bank.controller.vo;
 
+import java.util.Date;
 import java.util.List;
 
 import lombok.Getter;
@@ -11,7 +12,7 @@ import lombok.ToString;
 @Setter
 public class OrderDetailDto {
 	// 主键
-	private Integer id;
+	private String id;
 	/**
 	 * 业务编号
 	 */
@@ -150,5 +151,11 @@ public class OrderDetailDto {
 	private String creditLimit; // '授信额度',
 	private String creditStartDate;// '授信起始日期',
 	private String creditEndDate;// '授信结束日期',
-
+	private String notarizationNo;
+	private Date notarizaitonSignTime;
+	private String authNotarization;
+	
+	private String authNote;
+	private String notaryUserName;
+	private Integer notaryFee;
 }