Merge remote-tracking branch 'origin/feature-2022.07.29' into feature-2022.07.29

eladmin-system/pom.xml

@@ -219,6 +219,10 @@
 			<artifactId>thumbnailator</artifactId>
 			<version>0.4.16</version>
 		</dependency>
+		<dependency>
+			<groupId>org.springframework.boot</groupId>
+			<artifactId>spring-boot-devtools</artifactId>
+		</dependency>
 	</dependencies>
 
 	<!-- 打包 -->

eladmin-system/src/main/java/me/zhengjie/AppRun.java

@@ -42,7 +42,6 @@ import org.springframework.web.bind.annotation.RestController;
 @EnableJpaAuditing(auditorAwareRef = "auditorAware")
 //@MapperScan(basePackages = "me.zhengjie.appapi.dao")
 public class AppRun {
-	//const String aaa="ddd";
     public static void main(String[] args) {
     	
         SpringApplication.run(AppRun.class, args);

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

@@ -76,6 +76,23 @@ public class AdminOrderController {
         return response;
     }
 
+    
+    /**
+     * 查询订单详情
+     *
+     * @param map
+     * @return
+     */
+    @RequestMapping("/orderDetail")
+    public AppBaseResponse<AdminOrderVO> orderDetail(@RequestBody HashMap<String, String> map) {
+        AppBaseResponse response = new AppBaseResponse();
+        String businessNo = map.get("businessNo");
+        String contractNo = map.get("contractNo");
+        response.setData(new AppResultData<AdminOrderVO>(adminOrderService.info(businessNo, contractNo)));
+        return response;
+    }
+
+    
     /**
      * 公证订单 查询 当事人
      *

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

@@ -1,12 +1,12 @@
 package me.zhengjie.application.admin.controller.vo;
 
+import java.time.LocalDateTime;
+
 import com.fasterxml.jackson.annotation.JsonFormat;
-import lombok.AllArgsConstructor;
-import lombok.Builder;
-import lombok.Data;
-import lombok.NoArgsConstructor;
 
-import java.time.LocalDateTime;
+import groovy.transform.ToString;
+import lombok.Getter;
+import lombok.Setter;
 
 /**
  * @author SONG
@@ -14,98 +14,43 @@ import java.time.LocalDateTime;
  * @company NJCOOL
  * @date 2022/3/29
  */
-@Data
-@Builder
-@NoArgsConstructor
-@AllArgsConstructor
+@Getter
+@Setter
+@ToString
 public class NotaryOrderQueryRsp {
+	// 业务编号
+	private String businessNo;
+	// 产品类型
+	private String prodId;
+	// 合同号
+	private String contractNo;
+	// 当事人
+	private String name;
+	// 当事人手机号
+	private String phone;
+	// 当事人证件号
+	private String idCard;
+	// 合同金额
+	private String contractMoney;
+
+	// 所属银行
+	private String bankName;
+	// 客户经理
+	private String customerName;
+	// 创建时间
+	@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+	private LocalDateTime createTime;
+	// 申请时间
+	@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+	private LocalDateTime applyTime;
+
+	public LocalDateTime getApplyTime() {
+
+		return applyTime = createTime;
+	}
+
+	public void setApplyTime(LocalDateTime applyTime) {
+		this.applyTime = applyTime;
+	}
 
-    private Integer id;
-
-    /**
-     * 业务编号
-     */
-    private String businessNo;
-
-    /**
-     * 借款合同编号
-     */
-    private String contractNo;
-
-    /**
-     * 借款人
-     */
-    private String loanName;
-
-    /**
-     * 手机号
-     */
-    private String phone;
-
-    /**
-     * 借款金额
-     */
-    private String loanMoney;
-
-    /**
-     * 身份证
-     */
-    private String idCard;
-
-    /**
-     * 申请时间
-     */
-    private String applyTime;
-
-    /**
-     * 所属银行id
-     */
-    private String bankId;
-
-
-    /**
-     * 所属银行名称
-     */
-    private String bankName;
-
-
-    /**
-     * 客户经理id
-     */
-    private String customerId;
-
-    /**
-     * 客户经理名称
-     */
-    private String customerName;
-
-    private String customerPhone;
-
-    private String customerGender;
-
-    private String customerLogo;
-    /**
-     * 客户经理身份id
-     */
-    private String customerIdCard;
-
-    private String creator;
-
-    private String updater;
-
-    @JsonFormat(pattern="yyyy-MM-dd HH:mm:ss",timezone = "GMT+8")
-    private LocalDateTime createTime;
-
-    @JsonFormat(pattern="yyyy-MM-dd HH:mm:ss",timezone = "GMT+8")
-    private LocalDateTime updateTime;
-
-    private String returnReason;
-
-    private String previewContent;
-
-    private String rejectReason;
-
-    private String autoGenerate;
-
-    private String prodId;
 }

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

@@ -3,6 +3,7 @@ package me.zhengjie.application.admin.service;
 import me.zhengjie.application.admin.controller.vo.*;
 import me.zhengjie.base.AppBaseResponse;
 import me.zhengjie.application.bank.controller.vo.FileVo;
+import me.zhengjie.application.bank.controller.vo.OrderDetailDto;
 import me.zhengjie.dao.mybatis.entity.BorrowerEntity;
 import me.zhengjie.dao.mybatis.entity.FileInfoEntity;
 import me.zhengjie.dao.mybatis.entity.GuaranteeEntity;
@@ -57,4 +58,6 @@ public interface AdminOrderService {
     AppBaseResponse getDocList(NotaryOrderQueryReq req);
 
     Map<String, FileInfoEntity> getUploadFile(String businessNo);
+    
+	public OrderDetailDto getOrderDetail(String businessNo);
 }

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

@@ -3,12 +3,12 @@ package me.zhengjie.application.admin.service.impl;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+
+import cn.hutool.core.bean.BeanUtil;
 import me.zhengjie.application.admin.controller.vo.*;
 import me.zhengjie.application.bank.controller.vo.OrderDetailDto;
 import me.zhengjie.dao.mybatis.ContractOrderRepository;
 import me.zhengjie.dao.mybatis.entity.*;
-import me.zhengjie.dao.mybatis.entity.ProvinceEntity;
-import me.zhengjie.dao.mybatis.entity.SysUserEntity;
 import me.zhengjie.base.AppBaseResponse;
 import me.zhengjie.base.AppResultData;
 import me.zhengjie.dao.mybatis.mapper.*;
@@ -17,11 +17,11 @@ import me.zhengjie.application.bank.service.BankOrderService;
 import me.zhengjie.application.bank.service.impl.NotaryNoteServiceImpl;
 import me.zhengjie.application.bank.controller.vo.FileVo;
 import me.zhengjie.base.ResultCode;
+import me.zhengjie.base.plus.QueryWrapperUtil;
 import me.zhengjie.base.util.*;
 import me.zhengjie.dao.mybatis.ModelRepository;
 import me.zhengjie.dao.mybatis.OrderFileRepository;
 import me.zhengjie.domain.order.OrderBizCodeMessage;
-import me.zhengjie.dao.mybatis.entity.User;
 import me.zhengjie.domain.order.OrderFileConstant;
 import me.zhengjie.domain.user.UserDomain;
 import me.zhengjie.application.admin.service.AdminOrderService;
@@ -37,6 +37,7 @@ import java.nio.charset.StandardCharsets;
 import java.text.SimpleDateFormat;
 import java.time.LocalDateTime;
 import java.util.*;
+import java.util.stream.Collectors;
 
 /**
  * <p>
@@ -70,7 +71,7 @@ public class AdminOrderServiceImpl implements AdminOrderService {
 	@Autowired
 	private ModelMapper modelMapper;
 	@Autowired
-    SysUserMapper userDao;
+	SysUserMapper userDao;
 	@Autowired
 	UserDomain userDomain;
 	@Autowired
@@ -116,7 +117,8 @@ public class AdminOrderServiceImpl implements AdminOrderService {
 	 * @return
 	 */
 	private QueryWrapper<ContractOrderEntity> getQueryWrapper(NotaryOrderQueryReq req) {
-		QueryWrapper<ContractOrderEntity> qw = new QueryWrapper<>();
+		ContractOrderEntity order = BeanCopyUtils.convertObj(req, ContractOrderEntity.class);
+		QueryWrapper<ContractOrderEntity> qw = QueryWrapperUtil.convertQuery(order);
 		SysUserEntity user = userDao.selectById(contextUtil.getCurrentUserId());
 		String maxRole = userDomain.getUserMaxRole();
 		if ("超级管理员".equals(maxRole)) {
@@ -131,40 +133,41 @@ public class AdminOrderServiceImpl implements AdminOrderService {
 		} else {
 			return null;
 		}
-		if (!StringUtils.isEmpty(req.getStatus())) {
-			qw.eq("status", req.getStatus());
-		}
-		if (!StringUtils.isEmpty(req.getContractNo())) {
-			qw.like("contract_no", req.getContractNo());
-		}
-		if (!StringUtils.isEmpty(req.getLoanName())) {
-			qw.like("loan_name", req.getLoanName());
-		}
-		if (!StringUtils.isEmpty(req.getPhone())) {
-			qw.like("phone", req.getPhone());
-		}
-		if (!StringUtils.isEmpty(req.getIdCard())) {
-			qw.like("id_card", req.getIdCard());
-		}
-		if (!StringUtils.isEmpty(req.getLoanMoneyStart())) {
-			qw.ge("loan_money", req.getLoanMoneyStart());
-		}
-		if (!StringUtils.isEmpty(req.getLoanMoneyEnd())) {
-			qw.le("loan_money", req.getLoanMoneyEnd());
-		}
-		if (!StringUtils.isEmpty(req.getBankName())) {
-			qw.like("bank_name", req.getBankName());
-		}
-		if (!StringUtils.isEmpty(req.getCustomerName())) {
-			qw.like("customer_name", req.getCustomerName());
-		}
-		if (!StringUtils.isEmpty(req.getStartDate())) {
-			qw.ge("createTime", req.getStartDate());
-		}
-		if (!StringUtils.isEmpty(req.getEndDate())) {
-			qw.le("createTime", req.getEndDate());
-		}
-		qw.orderByDesc("createTime");
+
+//		if (!StringUtils.isEmpty(req.getStatus())) {
+//			qw.eq("status", req.getStatus());
+//		}
+//		if (!StringUtils.isEmpty(req.getContractNo())) {
+//			qw.like("contract_no", req.getContractNo());
+//		}
+//		if (!StringUtils.isEmpty(req.getLoanName())) {
+//			qw.like("loan_name", req.getLoanName());
+//		}
+//		if (!StringUtils.isEmpty(req.getPhone())) {
+//			qw.like("phone", req.getPhone());
+//		}
+//		if (!StringUtils.isEmpty(req.getIdCard())) {
+//			qw.like("id_card", req.getIdCard());
+//		}
+//		if (!StringUtils.isEmpty(req.getLoanMoneyStart())) {
+//			qw.ge("loan_money", req.getLoanMoneyStart());
+//		}
+//		if (!StringUtils.isEmpty(req.getLoanMoneyEnd())) {
+//			qw.le("loan_money", req.getLoanMoneyEnd());
+//		}
+//		if (!StringUtils.isEmpty(req.getBankName())) {
+//			qw.like("bank_name", req.getBankName());
+//		}
+//		if (!StringUtils.isEmpty(req.getCustomerName())) {
+//			qw.like("customer_name", req.getCustomerName());
+//		}
+//		if (!StringUtils.isEmpty(req.getStartDate())) {
+//			qw.ge("createTime", req.getStartDate());
+//		}
+//		if (!StringUtils.isEmpty(req.getEndDate())) {
+//			qw.le("createTime", req.getEndDate());
+//		}
+		qw.orderByDesc("create_time");
 		return qw;
 	}
 
@@ -194,18 +197,18 @@ public class AdminOrderServiceImpl implements AdminOrderService {
 				new QueryWrapper<GuaranteeEntity>().eq("business_no", map.get("businessNo")).orderByAsc("order_by"));
 		List<PartyEntity> partyList = new LinkedList<>();
 		borrowerList.forEach((item) -> {
-			partyList.add(PartyEntity.builder().id(item.getId()).username(item.getUsername()).idCard(item.getIdCard()).status(item.getStatus())
-					.roleId(StatusEnum.StepStatusEnum.BORROWER.getStatus())
+			partyList.add(PartyEntity.builder().id(item.getId()).username(item.getUsername()).idCard(item.getIdCard())
+					.status(item.getStatus()).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()).status(item.getStatus())
-					.roleId(StatusEnum.StepStatusEnum.MORTGAGOR.getStatus())
+			partyList.add(PartyEntity.builder().id(item.getId()).username(item.getUsername()).idCard(item.getIdCard())
+					.status(item.getStatus()).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()).status(item.getStatus())
-					.roleId(StatusEnum.StepStatusEnum.GUARANTEE.getStatus())
+			partyList.add(PartyEntity.builder().id(item.getId()).username(item.getUsername()).idCard(item.getIdCard())
+					.status(item.getStatus()).roleId(StatusEnum.StepStatusEnum.GUARANTEE.getStatus())
 					.role(StatusEnum.StepStatusEnum.GUARANTEE.getProcess()).build());
 		});
 		response.setData(new AppResultData<List<PartyEntity>>(partyList));
@@ -223,21 +226,33 @@ public class AdminOrderServiceImpl implements AdminOrderService {
 				new QueryWrapper<GuaranteeEntity>().eq("business_no", map.get("businessNo")).orderByAsc("order_by"));
 		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());
+			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());
+			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());
+			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());
 			}
 		});
 		response.setData(new AppResultData<List<PartyEntity>>(partyList));
@@ -249,9 +264,10 @@ public class AdminOrderServiceImpl implements AdminOrderService {
 		AppBaseResponse<NotaryOrderQueryRsp> response = new AppBaseResponse<>();
 		ContractOrderEntity contractOrderEntity = contractOrderMapper.selectById(map.get("orderId"));
 		User user = userRepository.findById(Long.parseLong(contractOrderEntity.getCustomerId())).orElseGet(User::new);
-		NotaryOrderQueryRsp notaryOrderQueryRsp = NotaryOrderQueryRsp.builder().customerName(user.getUsername())
-				.customerIdCard(user.getIdCard()).build();
-		response.setData(new AppResultData<NotaryOrderQueryRsp>(notaryOrderQueryRsp));
+//		NotaryOrderQueryRsp notaryOrderQueryRsp = new NotaryOrderQueryRsp;
+//		notaryOrderQueryRsp.customerName(user.getUsername())
+//				.customerIdCard(user.getIdCard()).build();
+//		response.setData(new AppResultData<NotaryOrderQueryRsp>(notaryOrderQueryRsp));
 		return response;
 	}
 
@@ -322,7 +338,10 @@ public class AdminOrderServiceImpl implements AdminOrderService {
 			return response;
 		}
 		// 检查面谈笔录是否提交
-		OrderFileEntity orderFile = orderFileRepository.getOrderFileWithCode(contractOrderEntity.getBusinessNo(), OrderFileConstant.TYPE_CODE_NOTE);
+
+		OrderFileEntity orderFile = orderFileRepository.getOrderFileWithCode(contractOrderEntity.getProdId(),
+				contractOrderEntity.getBusinessNo(), OrderFileConstant.TYPE_CODE_NOTE);
+
 		if (orderFile == null) {
 			response.fail(ResultCode.INTERVIEW_NOTE_UNSUBMIT);
 			return response;
@@ -336,7 +355,8 @@ public class AdminOrderServiceImpl implements AdminOrderService {
 		} else {
 			code = "11";
 		}
-		if (modelRepository.existModelInEditing(contractOrderEntity.getProdId(), contractOrderEntity.getNotaryOfficeId(), code)) {
+		if (modelRepository.existModelInEditing(contractOrderEntity.getProdId(),
+				contractOrderEntity.getNotaryOfficeId(), code)) {
 			response.fail(OrderBizCodeMessage.MODEL_IN_EDITING);
 			return response;
 		}
@@ -410,7 +430,7 @@ public class AdminOrderServiceImpl implements AdminOrderService {
 		QueryWrapper<MortgageEntity> mortgageQw = new QueryWrapper<>();
 		mortgageQw.eq("business_no", contractOrderEntity.getBusinessNo());
 		MortgageEntity mortgageEntity = mortgageMapper.selectOne(mortgageQw);
-		if(mortgageEntity!=null) {
+		if (mortgageEntity != null) {
 			map.put("$MortgageName$", mortgageEntity.getUsername());
 			map.put("$MortgageIDNo$", mortgageEntity.getIdCard());
 			map.put("$MortgageSex$", "1".equals(mortgageEntity.getSex()) ? "男" : "女");
@@ -421,7 +441,7 @@ public class AdminOrderServiceImpl implements AdminOrderService {
 		QueryWrapper<GuaranteeEntity> guaranteeQw = new QueryWrapper<>();
 		guaranteeQw.eq("business_no", contractOrderEntity.getBusinessNo());
 		GuaranteeEntity guaranteeEntity = guaranteeMapper.selectOne(guaranteeQw);
-		if(guaranteeEntity!=null) {
+		if (guaranteeEntity != null) {
 			map.put("$GuaranteeName$", guaranteeEntity.getUsername());
 			map.put("$GuaranteeIDNo$", guaranteeEntity.getIdCard());
 			map.put("$GuaranteeSex$", "1".equals(guaranteeEntity.getSex()) ? "男" : "女");
@@ -449,7 +469,8 @@ public class AdminOrderServiceImpl implements AdminOrderService {
 		SimpleDateFormat dayFormatter = new SimpleDateFormat("yyyy-MM-dd");
 		map.put("$Date$", dayFormatter.format(new Date()));
 		// 生成并保存未签名公证书
-		ModelEntity modelEntity = modelRepository.getModelEntity(contractOrderEntity.getProdId(), contractOrderEntity.getNotaryOfficeId(), code, "1");
+		ModelEntity modelEntity = modelRepository.getModelEntity(contractOrderEntity.getProdId(),
+				contractOrderEntity.getNotaryOfficeId(), code, "1");
 		String result = "";
 		String htmlPath = "";
 		String pdfPath = "";
@@ -595,9 +616,9 @@ public class AdminOrderServiceImpl implements AdminOrderService {
 			ModelEntity modelEntity = modelMapper.selectOne(modelQw);
 			String content = TextTempletUtil.replaceContent(modelEntity.getContent(), map);
 
-			NotaryOrderQueryRsp notaryOrderQueryRsp = new NotaryOrderQueryRsp();
-			notaryOrderQueryRsp.setPreviewContent(content);
-			response.setData(new AppResultData<NotaryOrderQueryRsp>(notaryOrderQueryRsp));
+//			NotaryOrderQueryRsp notaryOrderQueryRsp = new NotaryOrderQueryRsp();
+//			notaryOrderQueryRsp.setPreviewContent(content);
+//			response.setData(new AppResultData<NotaryOrderQueryRsp>(notaryOrderQueryRsp));
 		} catch (Exception e) {
 			e.printStackTrace();
 		}
@@ -622,11 +643,11 @@ public class AdminOrderServiceImpl implements AdminOrderService {
 				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());
+//				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));
 			} else {
 				response.fail(ResultCode.INTERFACE_ILLEGAL_REQUEST);
@@ -688,7 +709,10 @@ public class AdminOrderServiceImpl implements AdminOrderService {
 				put("6", "面谈笔录");
 			}
 		};
+
+
 		List<OrderFileEntity> orderFileList = orderFileRepository.getOrderFileListWithCodes(req.getBusinessNo(),"1,2,3,4,5,6".split(","));
+
 		List<Map<String, String>> fileList = new ArrayList<>();
 		for (OrderFileEntity orderFile : orderFileList) {
 			Map<String, String> content = new HashMap<>();
@@ -707,7 +731,7 @@ public class AdminOrderServiceImpl implements AdminOrderService {
 	}
 
 	@Override
-	public AdminOrderVO info(String businessNo,String contractNo) {
+	public AdminOrderVO info(String businessNo, String contractNo) {
 		ContractOrderEntity order = contractOrderRepository.getContractOrderWithBizNo(businessNo);
 		BorrowerEntity borrower = contractOrderRepository.getBorrowerWithBizNoAndContractNo(businessNo, contractNo);
 		MortgageEntity mortgage = contractOrderRepository.getMortgageWithBizNoAndContractNo(businessNo, contractNo);
@@ -719,6 +743,53 @@ public class AdminOrderServiceImpl implements AdminOrderService {
 		return orderVO;
 	}
 
+	public OrderDetailDto getOrderDetail(String businessNo) {
+		ContractOrderEntity order = new ContractOrderEntity();
+		order.setBusinessNo(businessNo);
+		QueryWrapper<ContractOrderEntity> queryWrapper = QueryWrapperUtil.convertQuery(order);
+		order = contractOrderMapper.selectOne(queryWrapper);
+		OrderDetailDto orderDetail = BeanCopyUtils.convertObj(order, OrderDetailDto.class);
+		// 将所有图片查询出来
+		// 取出所有的图片
+		List<FileInfoEntity> fileInfo = getFileInfo(orderDetail);
+		Map<Integer, FileInfoEntity> map = new HashMap<>();
+		Map<String, String> returnMap = new HashMap<>();
+		for (FileInfoEntity file : fileInfo) {
+			map.put(file.getId(), file);
+			returnMap.put(String.valueOf(file.getId()), FileUploadUtil.getFileUrl(file.getPath()));
+		}
+		// 进行图片拼接，按上传顺序处理
+		// 身份证正面
+		String cardFrontImageUrl = fileInfoService.getImageUrl(orderDetail.getIdCardFrontPic(), map);
+		orderDetail.setCardFrontUrl(cardFrontImageUrl);
+		// 身份证反面
+		String cardBackImageUrl = fileInfoService.getImageUrl(orderDetail.getIdCardBackPic(), map);
+		orderDetail.setCardBackUrl(cardBackImageUrl);
+		// 3.结婚证
+		List<String> marragePicUrl = fileInfoService.getImageUrlList(orderDetail.getMarragePic(), map);
+		orderDetail.setMarragePicUrl(marragePicUrl);
+		// 4.合同附件
+		List<String> compactPicUrl = fileInfoService.getImageUrlList(orderDetail.getContractAttachment(), map);
+		orderDetail.setContractAttachmentUrl(compactPicUrl);
+		// 5.抵押物
+		List<String> mortgagePic = fileInfoService.getImageUrlList(orderDetail.getMortgagePic(), map);
+		orderDetail.setMortgagePicUrl(mortgagePic);
+
+		List<String> hkbPicUrl = fileInfoService.getImageUrlList(orderDetail.getHkbPic(), map);
+		orderDetail.setHkbPicUrl(hkbPicUrl);
+		// 其他内容
+		String otherUpload = orderDetail.getOtherUpload();
+		List<String> otherUploadUrl = fileInfoService.getImageUrlList(otherUpload, map);
+		orderDetail.setOtherUploadUrl(otherUploadUrl);
+		// 共同责任人身份证正面照片
+		String jointIdCardFront = fileInfoService.getImageUrl(orderDetail.getJointIdCardFrontPic(), map);
+		orderDetail.setJointIdCardFrontPic(jointIdCardFront);
+		// 共同责任人身份证反面照片
+		String jointIdCardBack = fileInfoService.getImageUrl(orderDetail.getJointIdCardBackPic(), map);
+		orderDetail.setJointIdCardBackPic(jointIdCardBack);
+		return orderDetail;
+	}
+
 	@Override
 	public Map<String, FileInfoEntity> getUploadFile(String businessNo) {
 		Map<String, FileInfoEntity> fileInfo = new HashMap<String, FileInfoEntity>();
@@ -740,7 +811,7 @@ public class AdminOrderServiceImpl implements AdminOrderService {
 		for (MortgageEntity input : mortgage) {
 			OrderDetailDto orderDto = BeanCopyUtils.convertObj(input, OrderDetailDto.class);
 			List<FileInfoEntity> list = getFileInfo(orderDto);
-			for (FileInfoEntity f: list) {
+			for (FileInfoEntity f : list) {
 				fileInfo.put(String.valueOf(f.getId()), f);
 			}
 		}
@@ -762,40 +833,23 @@ public class AdminOrderServiceImpl implements AdminOrderService {
 		// 将所有图片查询出来
 		// 1.身份证正面 2.身份证反面 3.结婚证 4.合同附件 5.房产证6.户口本 7.其他内容
 		List<Integer> list = new ArrayList<Integer>();
-		// for (OrderDetailDto orderDetail : entityDto) {
+
 		// 身份证正面
-		list.add(Integer.parseInt(orderDetail.getCardFront()));
+		list.add(Integer.parseInt(orderDetail.getIdCardFrontPic()));
 		// 身份证反面
-		list.add(Integer.parseInt(orderDetail.getCardBack()));
+		list.add(Integer.parseInt(orderDetail.getIdCardBackPic()));
 		// 3.结婚证
-		// 判断是否有数据
-		if (org.apache.commons.lang3.StringUtils.isNotBlank(orderDetail.getMarragePic())) {
-			String[] marrage = orderDetail.getMarragePic().split(",");
-			list.addAll(toIntList(marrage));
-		}
-
+		addImageId(list, orderDetail.getMarragePic());
 		// 4.合同附件
-		if (org.apache.commons.lang3.StringUtils.isNotBlank(orderDetail.getCompactPic())) {
-			String[] CompactPic = orderDetail.getCompactPic().split(",");
-			list.addAll(toIntList(CompactPic));
-		}
+		addImageId(list, orderDetail.getContractAttachment());
 		// 5.抵押物
-		if (org.apache.commons.lang3.StringUtils.isNotBlank(orderDetail.getMortgagePic())) {
-			list.add(Integer.parseInt(orderDetail.getMortgagePic()));
-		}
+		addImageId(list, orderDetail.getMortgagePic());
 		// 6.户口本
-		if (org.apache.commons.lang3.StringUtils.isNotBlank(orderDetail.getHkbPic())) {
-			String[] hkbPic = orderDetail.getHkbPic().split(",");
-			list.addAll(toIntList(hkbPic));
-		}
-		// 7.配偶身份证正面
-		if (org.apache.commons.lang3.StringUtils.isNotBlank(orderDetail.getSpouseIdcardFrontPic())) {
-			list.add(Integer.parseInt(orderDetail.getSpouseIdcardFrontPic()));
-		}
-		// 8.配偶身份证反面
-		if (org.apache.commons.lang3.StringUtils.isNotBlank(orderDetail.getSpouseIdcardBackPic())) {
-			list.add(Integer.parseInt(orderDetail.getSpouseIdcardBackPic()));
-		}
+		addImageId(list, orderDetail.getHkbPic());
+		// 7.共同责任人身份证正面照片
+		addImageId(list, orderDetail.getJointIdCardFrontPic());
+		// 8.共同责任人身份证反面照片
+		addImageId(list, orderDetail.getJointIdCardBackPic());
 		// 其他内容
 		String otherUpload = orderDetail.getOtherUpload();
 		if (org.apache.commons.lang3.StringUtils.isNotBlank(otherUpload)) {
@@ -807,6 +861,18 @@ public class AdminOrderServiceImpl implements AdminOrderService {
 		return fileInfo;
 	}
 
+	private void addImageId(List<Integer> list, String imageId) {
+		if (!StringUtils.isEmpty(imageId)) {
+			if (imageId.contains(",")) {
+				String[] array = imageId.split(",");
+				list.addAll(toIntList(array));
+			} else {
+				list.add(Integer.parseInt(imageId));
+			}
+
+		}
+	}
+
 	private List<Integer> toIntList(String[] array) {
 		Integer[] intArray = Arrays.stream(array).mapToInt(Integer::parseInt).boxed().toArray(Integer[]::new);
 		return Arrays.asList(intArray);

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

@@ -1,72 +1,66 @@
 package me.zhengjie.application.bank.controller.vo;
 
+import java.util.List;
+
 import lombok.Getter;
 import lombok.Setter;
 import lombok.ToString;
 
-import java.util.Date;
-import java.util.List;
-import java.util.Map;
-
 @ToString
 @Getter
 @Setter
 public class OrderDetailDto {
-	// 订单id
-	private String orderId;
-	private String prodId;
-	/**
-	 * 主键id
-	 */
-
+	// 主键
 	private Integer id;
-
 	/**
 	 * 业务编号
 	 */
-
 	private String businessNo;
-
+	// 产品ID
+	private String prodId;
+	// 合同类型ID
+	private String contractTypeId;
 	/**
-	 * 借款合同编号
+	 * 合同编号
 	 */
-
 	private String contractNo;
-
+	// 合同类型（1:借款合同,2:抵押合同,3:担保合同）',
+	private String contractType;
+	// 合同起始日
+	private String startDate;
+	// 合同起始日
+	private String endDate;
+	// 合同金额
+	private String contractMoney;
 	/**
-	 * 借款起始日：
+	 * 利率
 	 */
-
-	private String startDate;
+	private String rate;
 
 	/**
-	 * 借款终止日
+	 * 合同附件
 	 */
-
-	private String endDate;
+	private String contractAttachment;
 
 	/**
-	 * 借款金额
+	 * 合同附件url
 	 */
-
-	private String sumMoney;
+	private List<String> contractAttachmentUrl;
 
 	/**
-	 * 利率
+	 * 抵押物
 	 */
-
-	private String rate;
-
+	private String mortgagePic;
+	// 抵押物图片地址
+	private List<String> mortgagePicUrl;
 	/**
 	 * 姓名
 	 */
-
-	private String username;
+	private String name;
 
 	/**
 	 * 性别
 	 */
-
 	private String sex;
 
 	/**
@@ -74,108 +68,87 @@ public class OrderDetailDto {
 	 */
 
 	private String birth;
-
 	/**
 	 * 身份证号码
 	 */
-
 	private String idCard;
 
 	/**
-	 * 居住地
-	 */
-
-	private String residence;
-
-	/**
-	 * 手机号
-	 */
-
-	private String phone;
-
-	/**
-	 * 婚姻状态
+	 * 身份证正面照片
 	 */
-
-	private String marriage;
-
-	/**
-	 * 身份证正面
-	 */
-
-	private String cardFront;
+	private String idCardFrontPic;
 	/**
 	 * 身份证正面pic
 	 */
 	private String cardFrontUrl;
-
 	/**
 	 * 身份证反面
 	 */
-
-	private String cardBack;
+	private String idCardBackPic;
 
 	private String cardBackUrl;
+
+	/**
+	 * 居住地
+	 */
+	private String residence;
 	/**
-	 * 合同上传
+	 * 手机号
 	 */
+	private String phone;
 
-	private String compactPic;
-	// 合同上传
-	private List<String> compactPicUrl;
 	/**
-	 * 抵押物
+	 * 婚姻状态(1:未婚,2:已婚)
 	 */
-	private String mortgagePic;
-	// 抵押物图片地址
-	private List<String> mortgagePicUrl;
+	private String marriage;
+
 	/**
 	 * 结婚证
 	 */
 
 	private String marragePic;
+
 	// 结婚证图片地址
 	private List<String> marragePicUrl;
 
 	/**
-	 * 其他上传
-	 */
-
-	private String otherUpload;
-	// 其他上传预览地址
-	private List<String> otherUploadUrl;
-	/**
 	 * 户口本
 	 */
 	private String hkbPic;
 	// 户口本预览地址
 	private List<String> hkbPicUrl;
 
-	private String orderBy;
-
-	private String type;
-	//房屋产权编号
-	private String housePropertyNo;
-	//房屋位置
-	private String houseLocation;
-	private String status;
-	private String mainOrderStatus;
-	private String notarizationNo;
-	private Date notarizaitonSignTime;
-	private String notaryUserName;
-	private Integer notaryFee;
-	private String authNotarization;
-	private String authNote;
-	private Map<String, String> fileMap;
+	/**
+	 * 其他上传
+	 */
+
+	private String otherUpload;
+	// 其他上传预览地址
+	private List<String> otherUploadUrl;
+	// 共同责任标记（0：非共同，1：共同）
 	private Integer jointFlag;
-	private String spouseIdCard;
-	private String spouseName;
-	private String spousePhone;
-	private String spouseIdcardFrontPic;
-	private String spouseIdcardFrontPicUrl;
-	private String spouseIdcardBackPic;
-	private String spouseIdcardBackPicUrl;
-	private String notarizedIdcard;
-	//配偶
-	private String spouseSex;
+	private String jointIdcard; // '共同责任人身份证号码',
+	private String jointName; // '共同责任人姓名',
+	private String jointPhone;// '共同责任人手机号',
+	private String jointIdCardFrontPic; // '共同责任人身份证正面照片',
+	private String jointIdCardFrontPicUrl; // '共同责任人身份证正面照片',
+	private String jointIdCardBackPic; // '共同责任人身份证反面照片',
+	private String jointIdCardBackPicUrl; // '共同责任人身份证反面照片',
+	private String jointSex;// '共同责任人性别(1:男,2:女)',
+	private String bankId; // '所属银行id',
+	private String bankName; // '所属银行',
+	private String customerId; // '地址',
+	private String customerName; // '客户经理',
+	private String notaryOfficeid; // '公证处ID',
+	private String notaryUserId; // '公证员ID',
+	private String autoGenerate; // '自动生成公证书 0: 手动生成；1:自动生成',
+	private String returnReason; // '退回理由',
+	private String rejectReason; // '驳回理由',
+	private String status; // '0.待提交 1.待审核 2.待公证 3.已签发 4.已驳回',
+
+	private String mainContractNo; // '主合同号',
+	private String creditLimit; // '授信额度',
+	private String creditStartDate;// '授信起始日期',
+	private String creditEndDate;// '授信结束日期',
+
 }

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

@@ -32,4 +32,13 @@ public interface FileInfoService extends IService<FileInfoEntity> {
 	Map<String, String> getFilePath(List<Integer> idList);
 
 	public JSONObject saveFileToMinio(FileUploadVo file, String filePath);
+	/**
+	 * 
+	 * @param imagePath 
+	 * @param map
+	 * @return
+	 */
+	public String getImageUrl(String imageId, Map<Integer, FileInfoEntity> map);
+	
+	public List<String> getImageUrlList(String imagePath, Map<Integer, FileInfoEntity> map);
 }

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

@@ -2,9 +2,12 @@ package me.zhengjie.application.bank.service.impl;
 
 import java.io.File;
 import java.time.LocalDateTime;
+import java.util.ArrayList;
+import java.util.Comparator;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
+import java.util.stream.Collectors;
 
 import org.springframework.stereotype.Service;
 
@@ -12,7 +15,6 @@ import com.alibaba.fastjson.JSONObject;
 import com.baomidou.mybatisplus.core.toolkit.CollectionUtils;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 
-
 import me.zhengjie.dao.mybatis.entity.FileInfoEntity;
 import me.zhengjie.dao.mybatis.mapper.FileInfoMapper;
 import me.zhengjie.application.bank.service.FileInfoService;
@@ -86,6 +88,7 @@ public class FileInfoServiceImpl extends ServiceImpl<FileInfoMapper, FileInfoEnt
 		json.put("imageId", fileInfo.getId().toString());
 		return json;
 	}
+
 	@Override
 	public JSONObject saveFileToMinio(FileUploadVo file, String filePath) {
 		// 保存图片
@@ -111,10 +114,11 @@ public class FileInfoServiceImpl extends ServiceImpl<FileInfoMapper, FileInfoEnt
 		json.put("imageId", fileInfo.getId().toString());
 		return json;
 	}
+
 	@Override
 	public Map<String, String> getFilePath(List<Integer> idList) {
 		Map<String, String> result = new HashMap<>();
-		if(CollectionUtils.isNotEmpty(idList)) {
+		if (CollectionUtils.isNotEmpty(idList)) {
 			List<FileInfoEntity> fileInfos = this.listByIds(idList);
 			if (fileInfos != null) {
 				for (FileInfoEntity file : fileInfos) {
@@ -126,4 +130,28 @@ public class FileInfoServiceImpl extends ServiceImpl<FileInfoMapper, FileInfoEnt
 		return result;
 	}
 
+	public String getImageUrl(String imageId, Map<Integer, FileInfoEntity> map) {
+		FileInfoEntity info = map.get(Integer.parseInt(imageId));
+		String imageUrl = FileUploadUtil.getFileUrl(info.getPath());
+		return imageUrl;
+	}
+
+	public List<String> getImageUrlList(String imagePath, Map<Integer, FileInfoEntity> map) {
+		List<String> imageList = new ArrayList<>();
+		if (imagePath != null && imagePath.length() > 0) {
+			String[] images = imagePath.split(",");
+			List<FileInfoEntity> fileInfos = new ArrayList<>();
+			for (String image : images) {
+				fileInfos.add(map.get(Integer.parseInt(image)));
+			}
+			fileInfos = fileInfos.stream().sorted(Comparator.comparing(FileInfoEntity::getOrderBy))
+					.collect(Collectors.toList());
+			for (FileInfoEntity fileinfo : fileInfos) {
+				String path = FileUploadUtil.getFileUrl(fileinfo.getPath());
+				imageList.add(path);
+			}
+		}
+
+		return imageList;
+	}
 }

eladmin-system/src/main/java/me/zhengjie/base/mq/MessagePushConfig.java

@@ -23,16 +23,16 @@ public class MessagePushConfig implements InitializingBean {
 	@Resource
 	private WebSocketEventListenner eventListenner;
 
-	@Autowired
-	private SocketIOServer socketIOServer;
+//	@Autowired
+//	private SocketIOServer socketIOServer;
 
 	@Override
 	public void afterPropertiesSet() throws Exception {
-		socketIOServer.start();
-		System.out.println("启动正常");
+//		socketIOServer.start();
+//		System.out.println("启动正常");
 	}
 
-	@Bean
+//	@Bean
 	public SocketIOServer socketIOServer() {
 		Configuration config = new Configuration();
 		config.setPort(Integer.parseInt(AppConfigInfo.APP_PUSH_PORT));

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

@@ -1,11 +1,18 @@
 package me.zhengjie.base.util;
 
+import java.math.BigDecimal;
 import java.util.List;
 
 import org.apache.commons.collections.CollectionUtils;
 import org.springframework.beans.BeanUtils;
 
 import com.google.common.collect.Lists;
+import com.sun.jna.platform.win32.Netapi32Util.User;
+
+import cn.hutool.core.bean.BeanUtil;
+import lombok.Getter;
+import lombok.Setter;
+import lombok.ToString;
 
 public class BeanCopyUtils {
 	/**
@@ -15,12 +22,11 @@ public class BeanCopyUtils {
 	 * @param <T>   输出集合类型
 	 * @return 返回集合
 	 */
-	public static <E, T> List<T> convertList2List(List<E> input, Class<T> clzz) {
+	public static <E, T> List<T> convertList2List(List<E> input, Class<T> tClass, String... ignoreProperties) {
 		List<T> output = Lists.newArrayList();
 		if (CollectionUtils.isNotEmpty(input)) {
 			for (E source : input) {
-				T target = BeanUtils.instantiateClass(clzz);
-				BeanUtils.copyProperties(source, target);
+				T target = BeanUtil.copyProperties(source, tClass);
 				output.add(target);
 			}
 		}
@@ -34,11 +40,9 @@ public class BeanCopyUtils {
 	 * @param <T>   输出集合类型
 	 * @return 返回集合
 	 */
-	public static <E, T> T convertObj(E input, Class<T> clzz) {
+	public static <E, T> T convertObj(Object input, Class<T> tClass, String... ignoreProperties) {
 
-		T target = BeanUtils.instantiateClass(clzz);
-		BeanUtils.copyProperties(input, target);
-		return target;
+		return BeanUtil.copyProperties(input, tClass);
 
 	}
 

eladmin-system/src/main/resources/config/application.yml

@@ -3,7 +3,7 @@ spring:
   freemarker:
     check-template-location: false
   profiles:
-    active: dev
+    active: prod
   jackson:
     time-zone: GMT+8
   data: