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/AdminOrderController.java

@@ -131,6 +131,16 @@ public class AdminOrderController {
     }
 
     /**
+     * 订单问询人列表
+     *
+     * @return
+     */
+    @RequestMapping("/orderQueryUser")
+    public AppBaseResponse<List<PartyEntity>> orderQueryUser(@RequestBody HashMap<String, String> map) {
+        return adminOrderService.orderQueryUser(map);
+    }
+
+    /**
      * 公证订单 退回
      *
      * @return

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

@@ -30,6 +30,8 @@ public interface AdminOrderService {
 
     AppBaseResponse<List<PartyEntity>> partys(HashMap<String, String> map);
 
+    AppBaseResponse<List<PartyEntity>> orderQueryUser(HashMap<String, String> map);
+
     AppBaseResponse<BorrowerEntity> borrowerInfo(HashMap<String, String> map);
 
     AppBaseResponse<MortgageEntity> mortgageInfo(HashMap<String, String> map);

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

@@ -196,30 +196,47 @@ public class AdminOrderServiceImpl implements AdminOrderService {
 			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());
-			if (item.getJointFlag() == 1) {
-				partyList.add(PartyEntity.builder().id(item.getId()).username(item.getSpouseName()).idCard(item.getSpouseIdCard()).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())
 					.role(StatusEnum.StepStatusEnum.MORTGAGOR.getProcess()).build());
-			if (item.getJointFlag() == 1) {
-				partyList.add(PartyEntity.builder().id(item.getId()).username(item.getSpouseName()).idCard(item.getSpouseIdCard()).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())
 					.role(StatusEnum.StepStatusEnum.GUARANTEE.getProcess()).build());
-			if (item.getJointFlag() == 1) {
-				partyList.add(PartyEntity.builder().id(item.getId()).username(item.getUsername()).idCard(item.getSpouseIdCard()).status(item.getStatus())
-						.roleId(StatusEnum.StepStatusEnum.GUARANTEE.getStatus())
-						.role(StatusEnum.StepStatusEnum.GUARANTEE.getProcess()).build());
+		});
+		response.setData(new AppResultData<List<PartyEntity>>(partyList));
+		return response;
+	}
+
+	@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"));
+		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());
 			}
 		});
 		response.setData(new AppResultData<List<PartyEntity>>(partyList));