优化

anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesorderborrower/BusSalesOrderBorrower.java

@@ -51,26 +51,26 @@ public class BusSalesOrderBorrower extends BaseEntity {
     private static final long serialVersionUID = 1L;
 
 	@ApiModelProperty("销售订单sid")
-    private String salesOrderSid; // 销售订单sid
+    private String salesOrderSid;
-	@ApiModelProperty("借款人sid（客户sid）")
+	@ApiModelProperty("客户sid")
-    private String borrowerSid; // 借款人sid（客户sid）
+    private String customSid;
 	@ApiModelProperty("借款人名称")
-    private String borrowerName; // 借款人名称
+    private String borrowerName;
 	@ApiModelProperty("手机号码")
-    private String mobile; // 手机号码
+    private String mobile;
 	@ApiModelProperty("台数")
-    private Integer vehCount; // 台数
+    private Integer vehCount;
     @ApiModelProperty("资方sid")
     private String bankSid;
     @ApiModelProperty("资方名称")
     private String bankName;
 	@ApiModelProperty("金融产品名称")
-    private String policyName; // 金融产品名称
+    private String policyName;
 	@ApiModelProperty("业务阶段编码")
-    private String busNo; // 业务阶段编码
+    private String busNo;
 	@ApiModelProperty("业务阶段名称")
-    private String busName; // 业务阶段名称
+    private String busName;
 	@ApiModelProperty("业务状态码")
-    private String busState; // 业务状态码
+    private String busState;
 
 }

anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesorderborrower/BusSalesOrderBorrowerDetailsVo.java

@@ -53,8 +53,8 @@ public class BusSalesOrderBorrowerDetailsVo implements Vo {
 
 	@ApiModelProperty("销售订单sid")
     private String salesOrderSid; // 销售订单sid
-	@ApiModelProperty("借款人sid（客户sid）")
+    @ApiModelProperty("客户sid")
-    private String borrowerSid; // 借款人sid（客户sid）
+    private String customSid;
 	@ApiModelProperty("借款人名称")
     private String borrowerName; // 借款人名称
 	@ApiModelProperty("手机号码")

anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesorderborrower/BusSalesOrderBorrowerDto.java

@@ -53,8 +53,8 @@ public class BusSalesOrderBorrowerDto implements Dto {
 
 	@ApiModelProperty("销售订单sid")
     private String salesOrderSid; // 销售订单sid
-	@ApiModelProperty("借款人sid（客户sid）")
+    @ApiModelProperty("客户sid")
-    private String borrowerSid; // 借款人sid（客户sid）
+    private String customSid;
 	@ApiModelProperty("借款人名称")
     private String borrowerName; // 借款人名称
 	@ApiModelProperty("手机号码")

anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesorderborrower/BusSalesOrderBorrowerQuery.java

@@ -51,8 +51,8 @@ public class BusSalesOrderBorrowerQuery implements Query {
 
 	@ApiModelProperty("销售订单sid")
     private String salesOrderSid; // 销售订单sid
-	@ApiModelProperty("借款人sid（客户sid）")
+    @ApiModelProperty("客户sid")
-    private String borrowerSid; // 借款人sid（客户sid）
+    private String customSid;
 	@ApiModelProperty("借款人名称")
     private String borrowerName; // 借款人名称
 	@ApiModelProperty("手机号码")

anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesorderborrower/BusSalesOrderBorrowerVo.java

@@ -53,8 +53,8 @@ public class BusSalesOrderBorrowerVo implements Vo {
 
 	@ApiModelProperty("销售订单sid")
     private String salesOrderSid; // 销售订单sid
-	@ApiModelProperty("借款人sid（客户sid）")
+    @ApiModelProperty("客户sid")
-    private String borrowerSid; // 借款人sid（客户sid）
+    private String customSid;
 	@ApiModelProperty("借款人名称")
     private String borrowerName; // 借款人名称
 	@ApiModelProperty("手机号码")

anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesorderloancontract/BusSalesOrderLoancontractFeign.java

@@ -75,4 +75,9 @@ public interface BusSalesOrderLoancontractFeign {
     @GetMapping("/fetchDetailsBySid/{sid}")
     @ResponseBody
     public ResultBean<BusSalesOrderLoancontractDetailsVo> fetchDetailsBySid(@PathVariable("sid") String sid);
+
+    @ApiOperation("根据贷款人sid查询贷款人下消贷合同编号")
+    @GetMapping("/selectByBorrowerSid/{saleOrderBorrowerSid}")
+    @ResponseBody
+    ResultBean<List<BusSalesOrderLoancontractDetailsVo>> selectByBorrowerSid(@PathVariable("saleOrderBorrowerSid") String saleOrderBorrowerSid);
 }

anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesorderloancontract/BusSalesOrderLoancontractFeignFallback.java

@@ -69,4 +69,9 @@ public class BusSalesOrderLoancontractFeignFallback implements BusSalesOrderLoan
 		ResultBean rb = ResultBean.fireFail();
 		return rb.setMsg("接口anrui-buscenter/bussalesorderloancontract/fetchDetailsBySid无法访问");
 	}
+
+	@Override
+	public ResultBean<List<BusSalesOrderLoancontractDetailsVo>> selectByBorrowerSid(String saleOrderBorrowerSid) {
+		return null;
+	}
 }

anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesorderloancontract/BusSalesOrderLoancontractMapper.java

@@ -29,6 +29,7 @@ import com.baomidou.mybatisplus.core.conditions.Wrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.baomidou.mybatisplus.core.toolkit.Constants;
+import com.yxt.anrui.buscenter.api.bussalesorderloancontract.BusSalesOrderLoancontractDetailsVo;
 import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
 import org.apache.ibatis.annotations.Select;
@@ -62,4 +63,7 @@ public interface BusSalesOrderLoancontractMapper extends BaseMapper<BusSalesOrde
 	
 	@Select("select * from bus_sales_order_loancontract")
 	List<BusSalesOrderLoancontractVo> selectListVo();
+
+	@Select("select * from bus_sales_order_loancontract where borrowerSid = #{saleOrderBorrowerSid}")
+    List<BusSalesOrderLoancontractDetailsVo> selectByBorrowerSid(String saleOrderBorrowerSid);
 }

anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesorderloancontract/BusSalesOrderLoancontractRest.java

@@ -97,4 +97,11 @@ public class BusSalesOrderLoancontractRest implements BusSalesOrderLoancontractF
 		BusSalesOrderLoancontractDetailsVo vo = busSalesOrderLoancontractService.fetchDetailsVoBySid(sid);
 		return rb.success().setData(vo);
 	}
+
+	@Override
+	public ResultBean<List<BusSalesOrderLoancontractDetailsVo>> selectByBorrowerSid(String saleOrderBorrowerSid) {
+		ResultBean rb = ResultBean.fireFail();
+		List<BusSalesOrderLoancontractDetailsVo> busSalesOrderLoancontractDetailsVos = busSalesOrderLoancontractService.selectByBorrowerSid(saleOrderBorrowerSid);
+		return rb.success().setData(busSalesOrderLoancontractDetailsVos);
+	}
 }

anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesorderloancontract/BusSalesOrderLoancontractService.java

@@ -109,4 +109,8 @@ public class BusSalesOrderLoancontractService extends MybatisBaseService<BusSale
 		BeanUtil.copyProperties(entity, vo);
 		return vo;
 	}
+
+	public List<BusSalesOrderLoancontractDetailsVo> selectByBorrowerSid(String saleOrderBorrowerSid) {
+		return baseMapper.selectByBorrowerSid(saleOrderBorrowerSid);
+	}
 }

anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanhomevisitfileexamine/LoanHomevisitFileexamine.java

@@ -0,0 +1,57 @@
+/*********************************************************
+ *********************************************************
+ ********************                  *******************
+ *************                                ************
+ *******                  _oo0oo_                  *******
+ ***                     o8888888o                     ***
+ *                       88" . "88                       *
+ *                       (| -_- |)                       *
+ *                       0\  =  /0                       *
+ *                     ___/`---'\___                     *
+ *                   .' \\|     |// '.                   *
+ *                  / \\|||  :  |||// \                  *
+ *                 / _||||| -:- |||||- \                 *
+ *                |   | \\\  -  /// |   |                *
+ *                | \_|  ''\---/''  |_/ |                *
+ *                \  .-\__  '-'  ___/-. /                *
+ *              ___'. .'  /--.--\  `. .'___              *
+ *           ."" '<  `.___\_<|>_/___.' >' "".            *
+ *          | | :  `- \`.;`\ _ /`;.`/ - ` : | |          *
+ *          \  \ `_.   \_ __\ /__ _/   .-` /  /          *
+ *      =====`-.____`.___ \_____/___.-`___.-'=====       *
+ *                        `=---='                        *
+ *      ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~      *
+ *********__佛祖保佑__永无BUG__验收通过__钞票多多__*********
+ *********************************************************/
+package com.yxt.anrui.riskcenter.api.loanhomevisitfileexamine;
+
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.yxt.common.core.domain.BaseEntity;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * Project: anrui-riskcenter(家访资料审核) <br/>
+ * File: LoanHomevisitFileexamine.java <br/>
+ * Class: com.yxt.anrui.riskcenter.api.loanhomevisitfileexamine.LoanHomevisitFileexamine <br/>
+ * Description: 家访资料审核. <br/>
+ * Copyright: Copyright (c) 2011 <br/>
+ * Company: https://gitee.com/liuzp315 <br/>
+ * Makedate: 2023-08-24 09:29:41 <br/>
+ *
+ * @author liupopo
+ * @version 1.0
+ * @since 1.0
+ */
+@Data
+@ApiModel(value = "家访资料审核", description = "家访资料审核")
+@TableName("loan_homevisit_fileexamine")
+public class LoanHomevisitFileexamine extends BaseEntity {
+    private static final long serialVersionUID = 1L;
+
+	@ApiModelProperty("家访考察sid")
+    private String homeVisitSid; // 家访考察sid
+    @ApiModelProperty("销售订单sid")
+    private String saleOrderSid;
+}

anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanhomevisitfileexamine/LoanHomevisitFileexamineDetailsVo.java

@@ -0,0 +1,98 @@
+/*********************************************************
+ *********************************************************
+ ********************                  *******************
+ *************                                ************
+ *******                  _oo0oo_                  *******
+ ***                     o8888888o                     ***
+ *                       88" . "88                       *
+ *                       (| -_- |)                       *
+ *                       0\  =  /0                       *
+ *                     ___/`---'\___                     *
+ *                   .' \\|     |// '.                   *
+ *                  / \\|||  :  |||// \                  *
+ *                 / _||||| -:- |||||- \                 *
+ *                |   | \\\  -  /// |   |                *
+ *                | \_|  ''\---/''  |_/ |                *
+ *                \  .-\__  '-'  ___/-. /                *
+ *              ___'. .'  /--.--\  `. .'___              *
+ *           ."" '<  `.___\_<|>_/___.' >' "".            *
+ *          | | :  `- \`.;`\ _ /`;.`/ - ` : | |          *
+ *          \  \ `_.   \_ __\ /__ _/   .-` /  /          *
+ *      =====`-.____`.___ \_____/___.-`___.-'=====       *
+ *                        `=---='                        *
+ *      ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~      *
+ *********__佛祖保佑__永无BUG__验收通过__钞票多多__*********
+ *********************************************************/
+package com.yxt.anrui.riskcenter.api.loanhomevisitfileexamine;
+
+
+import com.yxt.common.core.vo.Vo;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.util.List;
+
+/**
+ * Project: anrui-riskcenter(家访资料审核) <br/>
+ * File: LoanHomevisitFileexamineVo.java <br/>
+ * Class: com.yxt.anrui.riskcenter.api.loanhomevisitfileexamine.LoanHomevisitFileexamineVo <br/>
+ * Description: 家访资料审核 视图数据对象. <br/>
+ * Copyright: Copyright (c) 2011 <br/>
+ * Company: https://gitee.com/liuzp315 <br/>
+ * Makedate: 2023-08-24 09:29:41 <br/>
+ *
+ * @author liupopo
+ * @version 1.0
+ * @since 1.0
+ */
+@Data
+@ApiModel(value = "家访资料审核 视图数据详情", description = "家访资料审核 视图数据详情")
+public class LoanHomevisitFileexamineDetailsVo implements Vo {
+
+    private String sid;
+    private String remarks;
+
+    @ApiModelProperty("定位信息")
+    private List<String> location;
+    @ApiModelProperty("房屋照片")
+    private List<String> house;
+    @ApiModelProperty("门口照片")
+    private List<String> doorway;
+    @ApiModelProperty("客厅卧室")
+    private List<String> indoor;
+    @ApiModelProperty("合影照等")
+    private List<String> groupPhoto;
+
+    @ApiModelProperty("贷款人身份证")
+    private List<String> lenderIdCard;
+    @ApiModelProperty("贷款人户口本")
+    private List<String> lenderAccount;
+    @ApiModelProperty("贷款人婚姻证明")
+    private List<String> lenderMarriageCertificate;
+    @ApiModelProperty("贷款人驾驶本")
+    private List<String> lenderDriverBook;
+    @ApiModelProperty("贷款人银行流水")
+    private List<String> lenderBankStatement;
+    @ApiModelProperty("配偶身份证")
+    private List<String> spouseIdCard;
+    @ApiModelProperty("配偶户口本")
+    private List<String> spouseAccount;
+    @ApiModelProperty("担保人身份证")
+    private List<String> guarantorIdCard;
+    @ApiModelProperty("担保人户口本")
+    private List<String> guarantorAccount;
+
+    @ApiModelProperty("银行卡")
+    private List<String> yhkImages;
+    @ApiModelProperty("房产")
+    private List<String> houseProperty;
+    @ApiModelProperty("车辆")
+    private List<String> carProperty;
+
+    @ApiModelProperty("消贷合同编号")
+    private List<String> loanCotractNos;
+    @ApiModelProperty("资方合同编号")
+    private List<String> bankContractNos;
+}

anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanhomevisitfileexamine/LoanHomevisitFileexamineDto.java

@@ -0,0 +1,58 @@
+/*********************************************************
+ *********************************************************
+ ********************                  *******************
+ *************                                ************
+ *******                  _oo0oo_                  *******
+ ***                     o8888888o                     ***
+ *                       88" . "88                       *
+ *                       (| -_- |)                       *
+ *                       0\  =  /0                       *
+ *                     ___/`---'\___                     *
+ *                   .' \\|     |// '.                   *
+ *                  / \\|||  :  |||// \                  *
+ *                 / _||||| -:- |||||- \                 *
+ *                |   | \\\  -  /// |   |                *
+ *                | \_|  ''\---/''  |_/ |                *
+ *                \  .-\__  '-'  ___/-. /                *
+ *              ___'. .'  /--.--\  `. .'___              *
+ *           ."" '<  `.___\_<|>_/___.' >' "".            *
+ *          | | :  `- \`.;`\ _ /`;.`/ - ` : | |          *
+ *          \  \ `_.   \_ __\ /__ _/   .-` /  /          *
+ *      =====`-.____`.___ \_____/___.-`___.-'=====       *
+ *                        `=---='                        *
+ *      ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~      *
+ *********__佛祖保佑__永无BUG__验收通过__钞票多多__*********
+ *********************************************************/
+package com.yxt.anrui.riskcenter.api.loanhomevisitfileexamine;
+
+
+import com.yxt.common.core.dto.Dto;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * Project: anrui-riskcenter(家访资料审核) <br/>
+ * File: LoanHomevisitFileexamineDto.java <br/>
+ * Class: com.yxt.anrui.riskcenter.api.loanhomevisitfileexamine.LoanHomevisitFileexamineDto <br/>
+ * Description: 家访资料审核 数据传输对象. <br/>
+ * Copyright: Copyright (c) 2011 <br/>
+ * Company: https://gitee.com/liuzp315 <br/>
+ * Makedate: 2023-08-24 09:29:41 <br/>
+ *
+ * @author liupopo
+ * @version 1.0
+ * @since 1.0
+ */
+@Data
+@ApiModel(value = "家访资料审核 数据传输对象", description = "家访资料审核 数据传输对象")
+public class LoanHomevisitFileexamineDto implements Dto {
+
+    private String sid; // sid
+
+	@ApiModelProperty("家访考察sid")
+    private String homeVisitSid; // 家访考察sid
+    @ApiModelProperty("销售订单sid")
+    private String saleOrderSid;
+}

anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanhomevisitfileexamine/LoanHomevisitFileexamineFeign.java

@@ -0,0 +1,80 @@
+/*********************************************************
+ *********************************************************
+ ********************                  *******************
+ *************                                ************
+ *******                  _oo0oo_                  *******
+ ***                     o8888888o                     ***
+ *                       88" . "88                       *
+ *                       (| -_- |)                       *
+ *                       0\  =  /0                       *
+ *                     ___/`---'\___                     *
+ *                   .' \\|     |// '.                   *
+ *                  / \\|||  :  |||// \                  *
+ *                 / _||||| -:- |||||- \                 *
+ *                |   | \\\  -  /// |   |                *
+ *                | \_|  ''\---/''  |_/ |                *
+ *                \  .-\__  '-'  ___/-. /                *
+ *              ___'. .'  /--.--\  `. .'___              *
+ *           ."" '<  `.___\_<|>_/___.' >' "".            *
+ *          | | :  `- \`.;`\ _ /`;.`/ - ` : | |          *
+ *          \  \ `_.   \_ __\ /__ _/   .-` /  /          *
+ *      =====`-.____`.___ \_____/___.-`___.-'=====       *
+ *                        `=---='                        *
+ *      ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~      *
+ *********__佛祖保佑__永无BUG__验收通过__钞票多多__*********
+ *********************************************************/
+package com.yxt.anrui.riskcenter.api.loanhomevisitfileexamine;
+
+import com.yxt.anrui.riskcenter.api.loanhomevisitinvestigate.LoanHomevisitInvestigateQuery;
+import com.yxt.anrui.riskcenter.api.loanhomevisitinvestigate.LoanHomevisitInvestigateVo;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import com.yxt.common.core.query.PagerQuery;
+import com.yxt.common.core.result.ResultBean;
+import com.yxt.common.core.vo.PagerVo;
+import org.springframework.cloud.openfeign.FeignClient;
+import org.springframework.web.bind.annotation.*;
+
+import java.util.List;
+
+/**
+ * Project: anrui-riskcenter(家访资料审核) <br/>
+ * File: LoanHomevisitFileexamineFeign.java <br/>
+ * Class: com.yxt.anrui.riskcenter.api.loanhomevisitfileexamine.LoanHomevisitFileexamineFeign <br/>
+ * Description: 家访资料审核. <br/>
+ * Copyright: Copyright (c) 2011 <br/>
+ * Company: https://gitee.com/liuzp315 <br/>
+ * Makedate: 2023-08-24 09:29:41 <br/>
+ *
+ * @author liupopo
+ * @version 1.0
+ * @since 1.0
+ */
+@Api(tags = "家访资料审核")
+@FeignClient(
+        contextId = "anrui-riskcenter-LoanHomevisitFileexamine",
+        name = "anrui-riskcenter",
+        path = "v1/loanhomevisitfileexamine",
+        fallback = LoanHomevisitFileexamineFeignFallback.class)
+public interface LoanHomevisitFileexamineFeign {
+
+    @ApiOperation("家访资料审核列表")
+    @PostMapping("/homeInforListPage")
+    @ResponseBody
+    public ResultBean<PagerVo<LoanHomevisitFileexamineVo>> homeInforListPage(@RequestBody PagerQuery<LoanHomevisitFileexamineQuery> pq);
+
+    @ApiOperation("新增或修改")
+    @PostMapping("/save")
+    @ResponseBody
+    public ResultBean save(@RequestBody LoanHomevisitFileexamineDto dto);
+        
+    @ApiOperation("根据sid删除记录")
+    @DeleteMapping("/delBySids")
+    @ResponseBody
+    public ResultBean delBySids(@RequestBody String[] sids);
+      
+    @ApiOperation("根据SID获取一条记录")
+    @GetMapping("/fetchDetailsBySid/{sid}")
+    @ResponseBody
+    public ResultBean<LoanHomevisitFileexamineDetailsVo> fetchDetailsBySid(@PathVariable("sid") String sid);
+}

anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanhomevisitfileexamine/LoanHomevisitFileexamineFeignFallback.java

@@ -0,0 +1,74 @@
+/*********************************************************
+ *********************************************************
+ ********************                  *******************
+ *************                                ************
+ *******                  _oo0oo_                  *******
+ ***                     o8888888o                     ***
+ *                       88" . "88                       *
+ *                       (| -_- |)                       *
+ *                       0\  =  /0                       *
+ *                     ___/`---'\___                     *
+ *                   .' \\|     |// '.                   *
+ *                  / \\|||  :  |||// \                  *
+ *                 / _||||| -:- |||||- \                 *
+ *                |   | \\\  -  /// |   |                *
+ *                | \_|  ''\---/''  |_/ |                *
+ *                \  .-\__  '-'  ___/-. /                *
+ *              ___'. .'  /--.--\  `. .'___              *
+ *           ."" '<  `.___\_<|>_/___.' >' "".            *
+ *          | | :  `- \`.;`\ _ /`;.`/ - ` : | |          *
+ *          \  \ `_.   \_ __\ /__ _/   .-` /  /          *
+ *      =====`-.____`.___ \_____/___.-`___.-'=====       *
+ *                        `=---='                        *
+ *      ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~      *
+ *********__佛祖保佑__永无BUG__验收通过__钞票多多__*********
+ *********************************************************/
+package com.yxt.anrui.riskcenter.api.loanhomevisitfileexamine;
+
+import com.yxt.anrui.riskcenter.api.loanhomevisitinvestigate.LoanHomevisitInvestigateQuery;
+import com.yxt.anrui.riskcenter.api.loanhomevisitinvestigate.LoanHomevisitInvestigateVo;
+import com.yxt.common.core.query.PagerQuery;
+import com.yxt.common.core.result.ResultBean;
+import com.yxt.common.core.vo.PagerVo;
+import org.springframework.stereotype.Component;
+
+import java.util.List;
+
+/**
+ * Project: anrui-riskcenter(家访资料审核) <br/>
+ * File: LoanHomevisitFileexamineFeignFallback.java <br/>
+ * Class: com.yxt.anrui.riskcenter.api.loanhomevisitfileexamine.LoanHomevisitFileexamineFeignFallback <br/>
+ * Description: 家访资料审核. <br/>
+ * Copyright: Copyright (c) 2011 <br/>
+ * Company: https://gitee.com/liuzp315 <br/>
+ * Makedate: 2023-08-24 09:29:41 <br/>
+ *
+ * @author liupopo
+ * @version 1.0
+ * @since 1.0
+ */
+@Component
+public class LoanHomevisitFileexamineFeignFallback implements LoanHomevisitFileexamineFeign {
+
+	@Override
+	public ResultBean<PagerVo<LoanHomevisitFileexamineVo>> homeInforListPage(PagerQuery<LoanHomevisitFileexamineQuery> pq) {
+		ResultBean rb = ResultBean.fireFail();
+		return rb.setMsg("接口anrui-riskcenter/loanhomevisitfileexamine/homeInforListPage无法访问");
+	}
+
+	@Override
+	public ResultBean save(LoanHomevisitFileexamineDto dto){
+		return ResultBean.fireFail().setMsg("接口anrui-riskcenter/loanhomevisitfileexamine/save无法访问");
+	}
+
+	@Override
+	public ResultBean delBySids( String[] sids){
+		return ResultBean.fireFail().setMsg("接口anrui-riskcenter/loanhomevisitfileexamine/delBySids无法访问");
+	}
+
+	@Override
+	public ResultBean<LoanHomevisitFileexamineDetailsVo> fetchDetailsBySid(String sid){
+		ResultBean rb = ResultBean.fireFail();
+		return rb.setMsg("接口anrui-riskcenter/loanhomevisitfileexamine/fetchDetailsBySid无法访问");
+	}
+}

anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanhomevisitfileexamine/LoanHomevisitFileexamineQuery.java

@@ -0,0 +1,81 @@
+/*********************************************************
+ *********************************************************
+ ********************                  *******************
+ *************                                ************
+ *******                  _oo0oo_                  *******
+ ***                     o8888888o                     ***
+ *                       88" . "88                       *
+ *                       (| -_- |)                       *
+ *                       0\  =  /0                       *
+ *                     ___/`---'\___                     *
+ *                   .' \\|     |// '.                   *
+ *                  / \\|||  :  |||// \                  *
+ *                 / _||||| -:- |||||- \                 *
+ *                |   | \\\  -  /// |   |                *
+ *                | \_|  ''\---/''  |_/ |                *
+ *                \  .-\__  '-'  ___/-. /                *
+ *              ___'. .'  /--.--\  `. .'___              *
+ *           ."" '<  `.___\_<|>_/___.' >' "".            *
+ *          | | :  `- \`.;`\ _ /`;.`/ - ` : | |          *
+ *          \  \ `_.   \_ __\ /__ _/   .-` /  /          *
+ *      =====`-.____`.___ \_____/___.-`___.-'=====       *
+ *                        `=---='                        *
+ *      ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~      *
+ *********__佛祖保佑__永无BUG__验收通过__钞票多多__*********
+ *********************************************************/
+package com.yxt.anrui.riskcenter.api.loanhomevisitfileexamine;
+
+
+import com.yxt.common.core.query.Query;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * Project: anrui-riskcenter(家访资料审核) <br/>
+ * File: LoanHomevisitFileexamineQuery.java <br/>
+ * Class: com.yxt.anrui.riskcenter.api.loanhomevisitfileexamine.LoanHomevisitFileexamineQuery <br/>
+ * Description: 家访资料审核 查询条件. <br/>
+ * Copyright: Copyright (c) 2011 <br/>
+ * Company: https://gitee.com/liuzp315 <br/>
+ * Makedate: 2023-08-24 09:29:41 <br/>
+ *
+ * @author liupopo
+ * @version 1.0
+ * @since 1.0
+ */
+@Data
+@ApiModel(value = "家访资料审核 查询条件", description = "家访资料审核 查询条件")
+public class LoanHomevisitFileexamineQuery implements Query {
+
+    @ApiModelProperty("用户sid")
+    private String userSid;
+    @ApiModelProperty("分公司名称")
+    private String useOrgName;
+    @ApiModelProperty("销售部门名称")
+    private String saleDeptName;
+    @ApiModelProperty("销售专员名称")
+    private String staffName;
+    @ApiModelProperty("订单开始日期")
+    private String orderStartDate;
+    @ApiModelProperty("订单结束日期")
+    private String orderEndDate;
+    @ApiModelProperty("预约家访开始时间")
+    private String resHomeVisStartDate;
+    @ApiModelProperty("预约家访结束时间")
+    private String resHomeVisEndDate;
+    @ApiModelProperty("合同编号")
+    private String contractNo;
+    @ApiModelProperty("贷款人名称")
+    private String loanPeoName;
+    @ApiModelProperty("金融产品名称")
+    private String policyName;
+    @ApiModelProperty("家访专员姓名")
+    private String homeVisStaffName;
+    @ApiModelProperty("组织全路径")
+    private String orgSidPath;
+    private String menuUrl;
+    private String type;
+    private String names;
+}

anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanhomevisitfileexamine/LoanHomevisitFileexamineVo.java

@@ -0,0 +1,81 @@
+/*********************************************************
+ *********************************************************
+ ********************                  *******************
+ *************                                ************
+ *******                  _oo0oo_                  *******
+ ***                     o8888888o                     ***
+ *                       88" . "88                       *
+ *                       (| -_- |)                       *
+ *                       0\  =  /0                       *
+ *                     ___/`---'\___                     *
+ *                   .' \\|     |// '.                   *
+ *                  / \\|||  :  |||// \                  *
+ *                 / _||||| -:- |||||- \                 *
+ *                |   | \\\  -  /// |   |                *
+ *                | \_|  ''\---/''  |_/ |                *
+ *                \  .-\__  '-'  ___/-. /                *
+ *              ___'. .'  /--.--\  `. .'___              *
+ *           ."" '<  `.___\_<|>_/___.' >' "".            *
+ *          | | :  `- \`.;`\ _ /`;.`/ - ` : | |          *
+ *          \  \ `_.   \_ __\ /__ _/   .-` /  /          *
+ *      =====`-.____`.___ \_____/___.-`___.-'=====       *
+ *                        `=---='                        *
+ *      ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~      *
+ *********__佛祖保佑__永无BUG__验收通过__钞票多多__*********
+ *********************************************************/
+package com.yxt.anrui.riskcenter.api.loanhomevisitfileexamine;
+
+
+import com.yxt.common.core.vo.Vo;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * Project: anrui-riskcenter(家访资料审核) <br/>
+ * File: LoanHomevisitFileexamineVo.java <br/>
+ * Class: com.yxt.anrui.riskcenter.api.loanhomevisitfileexamine.LoanHomevisitFileexamineVo <br/>
+ * Description: 家访资料审核 视图数据对象. <br/>
+ * Copyright: Copyright (c) 2011 <br/>
+ * Company: https://gitee.com/liuzp315 <br/>
+ * Makedate: 2023-08-24 09:29:41 <br/>
+ *
+ * @author liupopo
+ * @version 1.0
+ * @since 1.0
+ */
+@Data
+@ApiModel(value = "家访资料审核 视图数据对象", description = "家访资料审核 视图数据对象")
+public class LoanHomevisitFileexamineVo implements Vo {
+
+    private String sid; // sid
+
+    @ApiModelProperty("家访资料审核状态")
+    private String state;
+    @ApiModelProperty("订单日期")
+    private String createDate;
+    @ApiModelProperty("预约家访时间")
+    private String resHomeVisDate;
+    @ApiModelProperty("家访地点")
+    private String homeVisAddress;
+    @ApiModelProperty("分公司名称")
+    private String useOrgName;
+    @ApiModelProperty("销售部门名称")
+    private String orgName;
+    @ApiModelProperty("销售专员名称")
+    private String staffName;
+    @ApiModelProperty("合同编号")
+    private String contractNo;
+    @ApiModelProperty("贷款人名称")
+    private String borrowerName;
+    @ApiModelProperty("手机号码")
+    private String mobile;
+    @ApiModelProperty("金融产品名称")
+    private String policyName;
+    @ApiModelProperty("家访专员姓名")
+    private String homeVisStaffName;
+    @ApiModelProperty("考察结果value")
+    private String investigateValue;
+
+}

anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanhomevisitinvestigatecustomer/LoanHomeVisitInvestigateInitCustomerVo.java

@@ -50,12 +50,14 @@ public class LoanHomeVisitInvestigateInitCustomerVo implements Vo {
     private String spouseIdCard;
     @ApiModelProperty("配偶电话")
     private String spouseMobile;
+    @ApiModelProperty("配偶职业key")
+    private String spouseJobKey;
     @ApiModelProperty("配偶职业")
     private String spouseJob;
     @ApiModelProperty("配偶户籍地址")
-    private String spouseDomAddress;
+    private String spouseRegisterAddress;
     @ApiModelProperty("配偶现住址")
-    private String spousePreAddress;
+    private String spouseAddress;
     @ApiModelProperty("其他人员")
     private List<LoanHomeVisitInvestigateInitOtherPeoVo> otherPersonnel = new ArrayList<>();
     @ApiModelProperty("紧急联系人姓名")
@@ -66,4 +68,6 @@ public class LoanHomeVisitInvestigateInitCustomerVo implements Vo {
     private String emergencyContactType;
     @ApiModelProperty("紧急联系人类型key")
     private String emergencyContactTypeKey;
+    @ApiModelProperty("家访考察表sid")
+    private String mainSid;
 }

anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanhomevisitinvestigatecustomer/LoanHomeVisitInvestigateSaveCustomerDto.java

@@ -50,8 +50,14 @@ public class LoanHomeVisitInvestigateSaveCustomerDto implements Dto {
     private String spouseIdCard;
     @ApiModelProperty("配偶电话")
     private String spouseMobile;
+    @ApiModelProperty("配偶职业key")
+    private String spouseJobKey;
     @ApiModelProperty("配偶职业")
     private String spouseJob;
+    @ApiModelProperty("配偶户籍地址")
+    private String spouseRegisterAddress;
+    @ApiModelProperty("配偶现住址")
+    private String spouseAddress;
     @ApiModelProperty("其他人员")
     private List<LoanHomeVisitInvestigateSaveOtherPeoDto> otherPersonnel = new ArrayList<>();
     @ApiModelProperty("紧急联系人姓名")

anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanhomevisitinvestigateotherpeo/LoanHomeVisitInvestigateInitOtherPeoVo.java

@@ -19,7 +19,7 @@ public class LoanHomeVisitInvestigateInitOtherPeoVo implements Vo {
     @ApiModelProperty("身份证")
     private String idCard;
     @ApiModelProperty("户籍地址")
-    private String peoDomAddress;
+    private String residentAddress;
     @ApiModelProperty("现住址")
     private String address;
     @ApiModelProperty("公司")

anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanhomevisitinvestigateotherpeo/LoanHomeVisitInvestigateSaveOtherPeoDto.java

@@ -19,7 +19,7 @@ public class LoanHomeVisitInvestigateSaveOtherPeoDto implements Vo {
     @ApiModelProperty("身份证")
     private String idCard;
     @ApiModelProperty("户籍地址")
-    private String peoDomAddress;
+    private String residentAddress;
     @ApiModelProperty("现住址")
     private String address;
     @ApiModelProperty("公司")

anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanhomevisitinvestigateotherpeo/LoanHomevisitInvestigateOtherpeo.java

@@ -50,6 +50,8 @@ import lombok.Data;
 public class LoanHomevisitInvestigateOtherpeo extends BaseEntity {
     private static final long serialVersionUID = 1L;
 
+    @ApiModelProperty("人员身份key")
+    private String peoTypeKey;
 	@ApiModelProperty("人员身份")
     private String peoType; // 人员身份
 	@ApiModelProperty("姓名")

anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanhomevisitinvestigateotherpeo/LoanHomevisitInvestigateOtherpeoDetailsVo.java

@@ -51,6 +51,8 @@ public class LoanHomevisitInvestigateOtherpeoDetailsVo implements Vo {
 
     private String sid; // sid
 
+    @ApiModelProperty("人员身份key")
+    private String peoTypeKey;
 	@ApiModelProperty("人员身份")
     private String peoType; // 人员身份
 	@ApiModelProperty("姓名")

anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanhomevisitinvestigateotherpeo/LoanHomevisitInvestigateOtherpeoDto.java

@@ -51,6 +51,8 @@ public class LoanHomevisitInvestigateOtherpeoDto implements Dto {
 
     private String sid; // sid
 
+    @ApiModelProperty("人员身份key")
+    private String peoTypeKey;
 	@ApiModelProperty("人员身份")
     private String peoType; // 人员身份
 	@ApiModelProperty("姓名")

anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanhomevisitfileexamine/LoanHomevisitFileexamineMapper.java

@@ -0,0 +1,64 @@
+/*********************************************************
+ *********************************************************
+ ********************                  *******************
+ *************                                ************
+ *******                  _oo0oo_                  *******
+ ***                     o8888888o                     ***
+ *                       88" . "88                       *
+ *                       (| -_- |)                       *
+ *                       0\  =  /0                       *
+ *                     ___/`---'\___                     *
+ *                   .' \\|     |// '.                   *
+ *                  / \\|||  :  |||// \                  *
+ *                 / _||||| -:- |||||- \                 *
+ *                |   | \\\  -  /// |   |                *
+ *                | \_|  ''\---/''  |_/ |                *
+ *                \  .-\__  '-'  ___/-. /                *
+ *              ___'. .'  /--.--\  `. .'___              *
+ *           ."" '<  `.___\_<|>_/___.' >' "".            *
+ *          | | :  `- \`.;`\ _ /`;.`/ - ` : | |          *
+ *          \  \ `_.   \_ __\ /__ _/   .-` /  /          *
+ *      =====`-.____`.___ \_____/___.-`___.-'=====       *
+ *                        `=---='                        *
+ *      ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~      *
+ *********__佛祖保佑__永无BUG__验收通过__钞票多多__*********
+ *********************************************************/
+package com.yxt.anrui.riskcenter.biz.loanhomevisitfileexamine;
+
+import com.baomidou.mybatisplus.core.conditions.Wrapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.baomidou.mybatisplus.core.toolkit.Constants;
+import com.yxt.anrui.riskcenter.api.loanhomevisitinvestigate.LoanHomevisitInvestigate;
+import com.yxt.anrui.riskcenter.api.loanhomevisitinvestigate.LoanHomevisitInvestigateVo;
+import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Param;
+import org.apache.ibatis.annotations.Select;
+import com.yxt.anrui.riskcenter.api.loanhomevisitfileexamine.LoanHomevisitFileexamine;
+import com.yxt.anrui.riskcenter.api.loanhomevisitfileexamine.LoanHomevisitFileexamineVo;
+
+import java.util.List;
+
+/**
+ * Project: anrui-riskcenter(家访资料审核) <br/>
+ * File: LoanHomevisitFileexamineMapper.java <br/>
+ * Class: com.yxt.anrui.riskcenter.biz.loanhomevisitfileexamine.LoanHomevisitFileexamineMapper <br/>
+ * Description: 家访资料审核. <br/>
+ * Copyright: Copyright (c) 2011 <br/>
+ * Company: https://gitee.com/liuzp315 <br/>
+ * Makedate: 2023-08-24 09:29:41 <br/>
+ *
+ * @author liupopo
+ * @version 1.0
+ * @since 1.0
+ */
+@Mapper
+public interface LoanHomevisitFileexamineMapper extends BaseMapper<LoanHomevisitFileexamine> {
+
+	IPage<LoanHomevisitFileexamineVo> selectPageVo(IPage<LoanHomevisitFileexamine> page, @Param(Constants.WRAPPER) Wrapper<LoanHomevisitFileexamine> qw);
+	
+	List<LoanHomevisitFileexamineVo> selectListAllVo(@Param(Constants.WRAPPER) Wrapper<LoanHomevisitFileexamine> qw);
+	
+	@Select("select * from loan_homevisit_fileexamine")
+	List<LoanHomevisitFileexamineVo> selectListVo();
+}

anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanhomevisitfileexamine/LoanHomevisitFileexamineMapper.xml

@@ -0,0 +1,40 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.yxt.anrui.riskcenter.biz.loanhomevisitfileexamine.LoanHomevisitFileexamineMapper">
+    <select id="selectPageVo"
+            resultType="com.yxt.anrui.riskcenter.api.loanhomevisitfileexamine.LoanHomevisitFileexamineVo">
+        SELECT
+        lf.`sid`,
+        lf.state,
+        bo.createDate,
+        li.`resHomeVisDate`,
+        li.`homeVisAddress`,
+        bo.`useOrgName`,
+        bo.`orgName`,
+        bo.`staffName`,
+        bo.`contractNo`,
+        bb.`borrowerName`,
+        bb.`mobile`,
+        bb.`policyName`,
+        li.`homeVisStaffName`,
+        li.investigateValue
+        FROM loan_homevisit_fileexamine lf
+        LEFT JOIN loan_homevisit_investigate li
+        ON lf.homeVisitSid = li.sid
+        LEFT JOIN anrui_buscenter.`bus_sales_order_borrower` bb
+        ON li.`saleOrderBorrowerSid` = bb.`sid`
+        LEFT JOIN anrui_buscenter.`bus_sales_order` bo
+        ON li.`saleOrderSid` = bo.`sid`
+        <where>
+            ${ew.sqlSegment}
+        </where>
+    </select>
+
+    <select id="selectListAllVo"
+            resultType="com.yxt.anrui.riskcenter.api.loanhomevisitfileexamine.LoanHomevisitFileexamineVo">
+        SELECT * FROM loan_homevisit_fileexamine
+        <where>
+            ${ew.sqlSegment}
+        </where>
+    </select>
+</mapper>

anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanhomevisitfileexamine/LoanHomevisitFileexamineRest.java

@@ -0,0 +1,100 @@
+/*********************************************************
+ *********************************************************
+ ********************                  *******************
+ *************                                ************
+ *******                  _oo0oo_                  *******
+ ***                     o8888888o                     ***
+ *                       88" . "88                       *
+ *                       (| -_- |)                       *
+ *                       0\  =  /0                       *
+ *                     ___/`---'\___                     *
+ *                   .' \\|     |// '.                   *
+ *                  / \\|||  :  |||// \                  *
+ *                 / _||||| -:- |||||- \                 *
+ *                |   | \\\  -  /// |   |                *
+ *                | \_|  ''\---/''  |_/ |                *
+ *                \  .-\__  '-'  ___/-. /                *
+ *              ___'. .'  /--.--\  `. .'___              *
+ *           ."" '<  `.___\_<|>_/___.' >' "".            *
+ *          | | :  `- \`.;`\ _ /`;.`/ - ` : | |          *
+ *          \  \ `_.   \_ __\ /__ _/   .-` /  /          *
+ *      =====`-.____`.___ \_____/___.-`___.-'=====       *
+ *                        `=---='                        *
+ *      ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~      *
+ *********__佛祖保佑__永无BUG__验收通过__钞票多多__*********
+ *********************************************************/
+package com.yxt.anrui.riskcenter.biz.loanhomevisitfileexamine;
+
+import com.yxt.anrui.riskcenter.api.loanhomevisitinvestigate.LoanHomevisitInvestigateQuery;
+import com.yxt.anrui.riskcenter.api.loanhomevisitinvestigate.LoanHomevisitInvestigateVo;
+import com.yxt.common.core.query.PagerQuery;
+import com.yxt.common.core.result.ResultBean;
+import com.yxt.common.core.vo.PagerVo;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
+
+import java.util.List;
+import com.yxt.anrui.riskcenter.api.loanhomevisitfileexamine.LoanHomevisitFileexamine;
+import com.yxt.anrui.riskcenter.api.loanhomevisitfileexamine.LoanHomevisitFileexamineQuery;
+import com.yxt.anrui.riskcenter.api.loanhomevisitfileexamine.LoanHomevisitFileexamineVo;
+import com.yxt.anrui.riskcenter.api.loanhomevisitfileexamine.LoanHomevisitFileexamineDetailsVo;
+import com.yxt.anrui.riskcenter.api.loanhomevisitfileexamine.LoanHomevisitFileexamineDto;
+import com.yxt.anrui.riskcenter.api.loanhomevisitfileexamine.LoanHomevisitFileexamineFeign;
+
+/**
+ * Project: anrui-riskcenter(家访资料审核) <br/>
+ * File: LoanHomevisitFileexamineFeignFallback.java <br/>
+ * Class: com.yxt.anrui.riskcenter.biz.loanhomevisitfileexamine.LoanHomevisitFileexamineRest <br/>
+ * Description: 家访资料审核. <br/>
+ * Copyright: Copyright (c) 2011 <br/>
+ * Company: https://gitee.com/liuzp315 <br/>
+ * Makedate: 2023-08-24 09:29:41 <br/>
+ *
+ * @author liupopo
+ * @version 1.0
+ * @since 1.0
+ */
+@Api(tags = "家访资料审核")
+@RestController("com.yxt.anrui.riskcenter.biz.loanhomevisitfileexamine.LoanHomevisitFileexamineRest")
+@RequestMapping("v1/loanhomevisitfileexamine")
+public class LoanHomevisitFileexamineRest implements LoanHomevisitFileexamineFeign {
+
+	@Autowired
+	private LoanHomevisitFileexamineService loanHomevisitFileexamineService;
+
+	@Override
+	public ResultBean<PagerVo<LoanHomevisitFileexamineVo>> homeInforListPage(PagerQuery<LoanHomevisitFileexamineQuery> pq) {
+		ResultBean rb = ResultBean.fireFail();
+		PagerVo<LoanHomevisitFileexamineVo> pv = loanHomevisitFileexamineService.homeInforListPage(pq);
+		return rb.success().setData(pv);
+	}
+
+	@Override
+	@ApiOperation("新增或修改")
+	@PostMapping("/save")
+	public ResultBean save(@RequestBody LoanHomevisitFileexamineDto dto){
+		ResultBean rb = ResultBean.fireFail();
+		loanHomevisitFileexamineService.saveOrUpdateDto(dto);
+		return rb.success();
+	}
+
+	@Override
+	@ApiOperation("根据sid批量删除")
+    @PostMapping("/delBySids")
+    public ResultBean delBySids(@RequestBody String[] sids){
+		ResultBean rb = ResultBean.fireFail();
+		loanHomevisitFileexamineService.delBySids(sids);
+		return rb.success();
+	}
+
+	@Override
+	@ApiOperation("根据SID获取一条记录")
+    @GetMapping("/fetchDetailsBySid/{sid}")
+    public ResultBean<LoanHomevisitFileexamineDetailsVo> fetchDetailsBySid(@PathVariable("sid") String sid){
+		ResultBean rb = ResultBean.fireFail();
+		LoanHomevisitFileexamineDetailsVo vo = loanHomevisitFileexamineService.fetchDetailsVoBySid(sid);
+		return rb.success().setData(vo);
+	}
+}

anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanhomevisitfileexamine/LoanHomevisitFileexamineService.java

@@ -0,0 +1,366 @@
+/*********************************************************
+ *********************************************************
+ ********************                  *******************
+ *************                                ************
+ *******                  _oo0oo_                  *******
+ ***                     o8888888o                     ***
+ *                       88" . "88                       *
+ *                       (| -_- |)                       *
+ *                       0\  =  /0                       *
+ *                     ___/`---'\___                     *
+ *                   .' \\|     |// '.                   *
+ *                  / \\|||  :  |||// \                  *
+ *                 / _||||| -:- |||||- \                 *
+ *                |   | \\\  -  /// |   |                *
+ *                | \_|  ''\---/''  |_/ |                *
+ *                \  .-\__  '-'  ___/-. /                *
+ *              ___'. .'  /--.--\  `. .'___              *
+ *           ."" '<  `.___\_<|>_/___.' >' "".            *
+ *          | | :  `- \`.;`\ _ /`;.`/ - ` : | |          *
+ *          \  \ `_.   \_ __\ /__ _/   .-` /  /          *
+ *      =====`-.____`.___ \_____/___.-`___.-'=====       *
+ *                        `=---='                        *
+ *      ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~      *
+ *********__佛祖保佑__永无BUG__验收通过__钞票多多__*********
+ *********************************************************/
+package com.yxt.anrui.riskcenter.biz.loanhomevisitfileexamine;
+
+import cn.hutool.core.bean.BeanUtil;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.yxt.anrui.buscenter.api.bussalesorderloancontract.BusSalesOrderLoancontractDetailsVo;
+import com.yxt.anrui.buscenter.api.bussalesorderloancontract.BusSalesOrderLoancontractFeign;
+import com.yxt.anrui.portal.api.sysuser.PrivilegeQuery;
+import com.yxt.anrui.portal.api.sysuser.SysUserFeign;
+import com.yxt.anrui.riskcenter.api.loanhomevisitinvestigate.LoanHomevisitInvestigate;
+import com.yxt.anrui.riskcenter.api.loanhomevisitinvestigate.LoanHomevisitInvestigateDetailsVo;
+import com.yxt.anrui.riskcenter.api.loanhomevisitinvestigate.LoanHomevisitInvestigateQuery;
+import com.yxt.anrui.riskcenter.api.loanhomevisitinvestigate.LoanHomevisitInvestigateVo;
+import com.yxt.anrui.riskcenter.api.loanhomevisitinvestigatefile.LoanAttachTypeEnum;
+import com.yxt.anrui.riskcenter.api.loanhomevisitinvestigatefile.LoanHomevisitInvestigateFileDetailsVo;
+import com.yxt.anrui.riskcenter.biz.loanhomevisitinvestigate.LoanHomevisitInvestigateService;
+import com.yxt.anrui.riskcenter.biz.loanhomevisitinvestigatefile.LoanHomevisitInvestigateFileService;
+import org.apache.commons.lang3.StringUtils;
+import com.yxt.common.base.service.MybatisBaseService;
+import com.yxt.common.base.utils.PagerUtil;
+import com.yxt.common.core.query.PagerQuery;
+import com.yxt.common.core.result.ResultBean;
+import com.yxt.common.core.vo.PagerVo;
+import com.yxt.anrui.riskcenter.api.loanhomevisitfileexamine.LoanHomevisitFileexamine;
+import com.yxt.anrui.riskcenter.api.loanhomevisitfileexamine.LoanHomevisitFileexamineQuery;
+import com.yxt.anrui.riskcenter.api.loanhomevisitfileexamine.LoanHomevisitFileexamineVo;
+import com.yxt.anrui.riskcenter.api.loanhomevisitfileexamine.LoanHomevisitFileexamineDetailsVo;
+import com.yxt.anrui.riskcenter.api.loanhomevisitfileexamine.LoanHomevisitFileexamineDto;
+import com.yxt.anrui.riskcenter.api.loanhomevisitfileexamine.LoanHomevisitFileexamineFeign;
+
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+import java.util.ArrayList;
+import java.util.List;
+
+/**
+ * Project: anrui-riskcenter(家访资料审核) <br/>
+ * File: LoanHomevisitFileexamineService.java <br/>
+ * Class: com.yxt.anrui.riskcenter.biz.loanhomevisitfileexamine.LoanHomevisitFileexamineService <br/>
+ * Description: 家访资料审核 业务逻辑. <br/>
+ * Copyright: Copyright (c) 2011 <br/>
+ * Company: https://gitee.com/liuzp315 <br/>
+ * Makedate: 2023-08-24 09:29:41 <br/>
+ *
+ * @author liupopo
+ * @version 1.0
+ * @since 1.0
+ */
+@Service
+public class LoanHomevisitFileexamineService extends MybatisBaseService<LoanHomevisitFileexamineMapper, LoanHomevisitFileexamine> {
+
+	@Autowired
+	private SysUserFeign sysUserFeign;
+	@Autowired
+	private LoanHomevisitInvestigateFileService loanHomevisitInvestigateFileService;
+	@Autowired
+	private LoanHomevisitInvestigateService loanHomevisitInvestigateService;
+	@Autowired
+	private BusSalesOrderLoancontractFeign busSalesOrderLoancontractFeign;
+
+	public PagerVo<LoanHomevisitFileexamineVo> homeInforListPage(PagerQuery<LoanHomevisitFileexamineQuery> pq) {
+		LoanHomevisitFileexamineQuery query = pq.getParams();
+		QueryWrapper<LoanHomevisitFileexamine> qw = new QueryWrapper<>();
+		qw.eq("li.state", query.getType());
+		qw.eq("bb.busNo", 303);
+		if (StringUtils.isNotBlank(query.getMenuUrl())) {
+			//=======================
+			PrivilegeQuery privilegeQuery = new PrivilegeQuery();
+			privilegeQuery.setOrgPath(query.getOrgSidPath());
+			privilegeQuery.setMenuUrl(query.getMenuUrl());
+			privilegeQuery.setUserSid(query.getUserSid());
+			ResultBean<String> defaultIdReltBean = sysUserFeign.selectPrivilegeLevel(privilegeQuery);
+			if (StringUtils.isNotBlank(defaultIdReltBean.getData())) {
+				//数据权限ID(1集团、2事业部、3分公司、4部门、5个人)
+				String orgSidPath = query.getOrgSidPath();
+				orgSidPath = orgSidPath + "/";
+				int i1 = orgSidPath.indexOf("/");
+				int i2 = orgSidPath.indexOf("/", i1 + 1);
+				int i3 = orgSidPath.indexOf("/", i2 + 1);
+				int i4 = orgSidPath.indexOf("/", i3 + 1);
+				String orgLevelKey = defaultIdReltBean.getData();
+				if ("1".equals(orgLevelKey)) {
+					orgSidPath = orgSidPath.substring(0, i1);
+					qw.like("bo.orgSidPath", orgSidPath);
+				} else if ("2".equals(orgLevelKey)) {
+					orgSidPath = orgSidPath.substring(0, i2);
+					qw.like("bo.orgSidPath", orgSidPath);
+				} else if ("3".equals(orgLevelKey)) {
+					orgSidPath = orgSidPath.substring(0, i3);
+					qw.like("bo.orgSidPath", orgSidPath);
+				} else if ("4".equals(orgLevelKey)) {
+					orgSidPath = orgSidPath.substring(0, i4);
+					qw.like("bo.orgSidPath", orgSidPath);
+				} else if ("5".equals(orgLevelKey)) {
+					qw.eq("bo.createBySid", query.getUserSid());
+				} else {
+					PagerVo<LoanHomevisitFileexamineVo> p = new PagerVo<>();
+					return p;
+				}
+			} else {
+				PagerVo<LoanHomevisitFileexamineVo> p = new PagerVo<>();
+				return p;
+			}
+		}
+		if (StringUtils.isNotBlank(query.getUseOrgName())) {
+			qw.like("bo.useOrgName", query.getUseOrgName());
+		}
+		if (StringUtils.isNotBlank(query.getSaleDeptName())) {
+			qw.like("bo.orgName", query.getSaleDeptName());
+		}
+		if (StringUtils.isNotBlank(query.getStaffName())) {
+			qw.like("bo.staffName", query.getStaffName());
+		}
+		if (StringUtils.isNotBlank(query.getContractNo())) {
+			qw.like("bo.contractNo", query.getContractNo());
+		}
+		if (StringUtils.isNotBlank(query.getLoanPeoName())) {
+			qw.like("bb.borrowerName", query.getLoanPeoName());
+		}
+		if (StringUtils.isNotBlank(query.getPolicyName())) {
+			qw.like("bb.policyName", query.getPolicyName());
+		}
+		if (StringUtils.isNotBlank(query.getHomeVisStaffName())) {
+			qw.like("li.homeVisStaffName", query.getHomeVisStaffName());
+		}
+		String orderStartDate = query.getOrderStartDate();
+		String orderEndDate = query.getOrderEndDate();
+		qw.apply(StringUtils.isNotBlank(orderStartDate), "date_format (bo.createDate,'%Y-%m-%d') >= date_format('" + orderStartDate + "','%Y-%m-%d')").
+				apply(StringUtils.isNotBlank(orderEndDate), "date_format (bo.createDate,'%Y-%m-%d') <= date_format('" + orderEndDate + "','%Y-%m-%d')"
+				);
+		String resHomeVisStartDate = query.getResHomeVisStartDate();
+		String resHomeVisEndDate = query.getResHomeVisEndDate();
+		qw.apply(StringUtils.isNotBlank(resHomeVisStartDate), "date_format (li.resHomeVisDate,'%Y-%m-%d') >= date_format('" + resHomeVisStartDate + "','%Y-%m-%d')").
+				apply(StringUtils.isNotBlank(resHomeVisEndDate), "date_format (li.resHomeVisDate,'%Y-%m-%d') <= date_format('" + resHomeVisEndDate + "','%Y-%m-%d')"
+				);
+		IPage<LoanHomevisitFileexamine> page = PagerUtil.queryToPage(pq);
+		IPage<LoanHomevisitFileexamineVo> pagging = baseMapper.selectPageVo(page, qw);
+		PagerVo<LoanHomevisitFileexamineVo> p = PagerUtil.pageToVo(pagging, null);
+		return p;
+	}
+	
+	public void saveOrUpdateDto(LoanHomevisitFileexamineDto dto){
+        String dtoSid = dto.getSid();
+        if (StringUtils.isBlank(dtoSid)) {
+            this.insertByDto(dto);
+            return; 
+        } 
+		this.updateByDto(dto);
+	}
+	
+	public void insertByDto(LoanHomevisitFileexamineDto dto){
+		LoanHomevisitFileexamine entity = new LoanHomevisitFileexamine();
+		BeanUtil.copyProperties(dto, entity, "id", "sid");
+		baseMapper.insert(entity);
+	}
+	
+	public void updateByDto(LoanHomevisitFileexamineDto dto){
+          String dtoSid = dto.getSid();
+        if (StringUtils.isBlank(dtoSid)) {
+            return;
+        } 
+		LoanHomevisitFileexamine entity = fetchBySid(dtoSid);
+		BeanUtil.copyProperties(dto, entity, "id", "sid");
+		baseMapper.updateById(entity);
+	}
+	
+	public LoanHomevisitFileexamineDetailsVo fetchDetailsVoBySid(String sid){
+		LoanHomevisitFileexamineDetailsVo vo = new LoanHomevisitFileexamineDetailsVo();
+		LoanHomevisitFileexamine loanHomevisitFileexamine = fetchBySid(sid);
+		vo.setRemarks(loanHomevisitFileexamine.getRemarks());
+		LoanHomevisitInvestigateDetailsVo loanHomevisitInvestigateDetailsVo = loanHomevisitInvestigateService.fetchDetailsVoBySid(loanHomevisitFileexamine.getHomeVisitSid());
+		List<BusSalesOrderLoancontractDetailsVo> busSalesOrderLoancontractDetailsVos = busSalesOrderLoancontractFeign.selectByBorrowerSid(loanHomevisitInvestigateDetailsVo.getSaleOrderBorrowerSid()).getData();
+		List<String> loanCotractNos = new ArrayList<>();
+		List<String> bankContractNos = new ArrayList<>();
+		for (BusSalesOrderLoancontractDetailsVo busSalesOrderLoancontractDetailsVo : busSalesOrderLoancontractDetailsVos) {
+			loanCotractNos.add("消贷合同号" + "(" +busSalesOrderLoancontractDetailsVo.getLoanCotractNo() + ")");
+			if (StringUtils.isBlank(busSalesOrderLoancontractDetailsVo.getBankContractNo())){
+				bankContractNos.add("资方合同号(暂无)");
+			}else {
+				bankContractNos.add("资方合同号" + "(" +busSalesOrderLoancontractDetailsVo.getLoanCotractNo() + ")");
+			}
+		}
+		vo.setLoanCotractNos(loanCotractNos);
+		vo.setBankContractNos(bankContractNos);
+		//定位信息
+		List<LoanHomevisitInvestigateFileDetailsVo> dwxxImages = loanHomevisitInvestigateFileService.selByMainSidAndTypeKey(sid, LoanAttachTypeEnum.DWXX.getAttachType());
+		List<String> location = new ArrayList<>();
+		if (dwxxImages != null && dwxxImages.size() > 0){
+			for (LoanHomevisitInvestigateFileDetailsVo dwxxImage : dwxxImages) {
+				location.add(dwxxImage.getFileUrl());
+			}
+		}
+		vo.setLocation(location);
+		//房屋照片
+		List<LoanHomevisitInvestigateFileDetailsVo> fwzpImages = loanHomevisitInvestigateFileService.selByMainSidAndTypeKey(sid, LoanAttachTypeEnum.FWZP.getAttachType());
+		List<String> house = new ArrayList<>();
+		if (fwzpImages != null && fwzpImages.size() > 0){
+			for (LoanHomevisitInvestigateFileDetailsVo fwzpImage : fwzpImages) {
+				house.add(fwzpImage.getFileUrl());
+			}
+		}
+		vo.setHouse(house);
+		//门口照片
+		List<LoanHomevisitInvestigateFileDetailsVo> mkzpImages = loanHomevisitInvestigateFileService.selByMainSidAndTypeKey(sid, LoanAttachTypeEnum.MKZP.getAttachType());
+		List<String> doorway = new ArrayList<>();
+		if (mkzpImages != null && mkzpImages.size() > 0){
+			for (LoanHomevisitInvestigateFileDetailsVo mkzpImage : mkzpImages) {
+				doorway.add(mkzpImage.getFileUrl());
+			}
+		}
+		vo.setDoorway(doorway);
+		//客厅卧室照片
+		List<LoanHomevisitInvestigateFileDetailsVo> ktwszpImages = loanHomevisitInvestigateFileService.selByMainSidAndTypeKey(sid, LoanAttachTypeEnum.KTWSZP.getAttachType());
+		List<String> indoor = new ArrayList<>();
+		if (ktwszpImages != null && ktwszpImages.size() > 0){
+			for (LoanHomevisitInvestigateFileDetailsVo ktwszpImage : ktwszpImages) {
+				indoor.add(ktwszpImage.getFileUrl());
+			}
+		}
+		vo.setIndoor(indoor);
+		//合影照等
+		List<LoanHomevisitInvestigateFileDetailsVo> hyzdImages = loanHomevisitInvestigateFileService.selByMainSidAndTypeKey(sid, LoanAttachTypeEnum.HYZD.getAttachType());
+		List<String> groupPhoto = new ArrayList<>();
+		if (hyzdImages != null && hyzdImages.size() > 0){
+			for (LoanHomevisitInvestigateFileDetailsVo hyzdImage : hyzdImages) {
+				groupPhoto.add(hyzdImage.getFileUrl());
+			}
+		}
+		vo.setGroupPhoto(groupPhoto);
+		//贷款人身份证
+		List<LoanHomevisitInvestigateFileDetailsVo> dkrsfzImages = loanHomevisitInvestigateFileService.selByMainSidAndTypeKey(sid, LoanAttachTypeEnum.DKRSFZ.getAttachType());
+		List<String> lenderIdCard = new ArrayList<>();
+		if (dkrsfzImages != null && dkrsfzImages.size() > 0){
+			for (LoanHomevisitInvestigateFileDetailsVo dkrsfzImage : dkrsfzImages) {
+				lenderIdCard.add(dkrsfzImage.getFileUrl());
+			}
+		}
+		vo.setLenderIdCard(lenderIdCard);
+		//贷款人户口本
+		List<LoanHomevisitInvestigateFileDetailsVo> dkrhkbImages = loanHomevisitInvestigateFileService.selByMainSidAndTypeKey(sid, LoanAttachTypeEnum.DKRHKB.getAttachType());
+		List<String> lenderAccount = new ArrayList<>();
+		if (dkrhkbImages != null && dkrhkbImages.size() > 0){
+			for (LoanHomevisitInvestigateFileDetailsVo dkrhkbImage : dkrhkbImages) {
+				lenderAccount.add(dkrhkbImage.getFileUrl());
+			}
+		}
+		vo.setLenderAccount(lenderAccount);
+		//贷款人婚姻证明
+		List<LoanHomevisitInvestigateFileDetailsVo> dkrhyzmImages = loanHomevisitInvestigateFileService.selByMainSidAndTypeKey(sid, LoanAttachTypeEnum.DKRHYZM.getAttachType());
+		List<String> lenderMarriageCertificate = new ArrayList<>();
+		if (dkrhyzmImages != null && dkrhyzmImages.size() > 0){
+			for (LoanHomevisitInvestigateFileDetailsVo dkrhyzmImage : dkrhyzmImages) {
+				lenderMarriageCertificate.add(dkrhyzmImage.getFileUrl());
+			}
+		}
+		vo.setLenderMarriageCertificate(lenderMarriageCertificate);
+		//贷款人驾驶本
+		List<LoanHomevisitInvestigateFileDetailsVo> dkrjsbImages = loanHomevisitInvestigateFileService.selByMainSidAndTypeKey(sid, LoanAttachTypeEnum.DKRJSB.getAttachType());
+		List<String> lenderDriverBook = new ArrayList<>();
+		if (dkrjsbImages != null && dkrjsbImages.size() > 0){
+			for (LoanHomevisitInvestigateFileDetailsVo dkrjsbImage : dkrjsbImages) {
+				lenderDriverBook.add(dkrjsbImage.getFileUrl());
+			}
+		}
+		vo.setLenderDriverBook(lenderDriverBook);
+		//贷款人银行流水
+		List<LoanHomevisitInvestigateFileDetailsVo> dkryhlsImages = loanHomevisitInvestigateFileService.selByMainSidAndTypeKey(sid, LoanAttachTypeEnum.DKRYHLS.getAttachType());
+		List<String> lenderBankStatement = new ArrayList<>();
+		if (dkryhlsImages != null && dkryhlsImages.size() > 0){
+			for (LoanHomevisitInvestigateFileDetailsVo dkryhlsImage : dkryhlsImages) {
+				lenderBankStatement.add(dkryhlsImage.getFileUrl());
+			}
+		}
+		vo.setLenderBankStatement(lenderBankStatement);
+		//配偶身份证
+		List<LoanHomevisitInvestigateFileDetailsVo> posfzImages = loanHomevisitInvestigateFileService.selByMainSidAndTypeKey(sid, LoanAttachTypeEnum.POSFZ.getAttachType());
+		List<String> spouseIdCard = new ArrayList<>();
+		if (posfzImages != null && posfzImages.size() > 0){
+			for (LoanHomevisitInvestigateFileDetailsVo posfzImage : posfzImages) {
+				spouseIdCard.add(posfzImage.getFileUrl());
+			}
+		}
+		vo.setSpouseIdCard(spouseIdCard);
+		//配偶户口本
+		List<LoanHomevisitInvestigateFileDetailsVo> pohkbImages = loanHomevisitInvestigateFileService.selByMainSidAndTypeKey(sid, LoanAttachTypeEnum.POHKB.getAttachType());
+		List<String> spouseAccount = new ArrayList<>();
+		if (pohkbImages != null && pohkbImages.size() > 0){
+			for (LoanHomevisitInvestigateFileDetailsVo pohkbImage : pohkbImages) {
+				spouseAccount.add(pohkbImage.getFileUrl());
+			}
+		}
+		vo.setSpouseAccount(spouseAccount);
+		//担保人身份证
+		List<LoanHomevisitInvestigateFileDetailsVo> dbrsfzImages = loanHomevisitInvestigateFileService.selByMainSidAndTypeKey(sid, LoanAttachTypeEnum.DBRSFZ.getAttachType());
+		List<String> pohkbImage = new ArrayList<>();
+		if (dbrsfzImages != null && dbrsfzImages.size() > 0){
+			for (LoanHomevisitInvestigateFileDetailsVo dbrsfzImage : dbrsfzImages) {
+				pohkbImage.add(dbrsfzImage.getFileUrl());
+			}
+		}
+		vo.setGuarantorIdCard(pohkbImage);
+		//担保人户口本
+		List<LoanHomevisitInvestigateFileDetailsVo> dbrhkbImages = loanHomevisitInvestigateFileService.selByMainSidAndTypeKey(sid, LoanAttachTypeEnum.DBRHKB.getAttachType());
+		List<String> guarantorAccount = new ArrayList<>();
+		if (dbrhkbImages != null && dbrhkbImages.size() > 0){
+			for (LoanHomevisitInvestigateFileDetailsVo dbrhkbImage : dbrhkbImages) {
+				guarantorAccount.add(dbrhkbImage.getFileUrl());
+			}
+		}
+		vo.setGuarantorAccount(guarantorAccount);
+		//银行卡
+		List<LoanHomevisitInvestigateFileDetailsVo> yhkImages = loanHomevisitInvestigateFileService.selByMainSidAndTypeKey(sid, LoanAttachTypeEnum.YHK.getAttachType());
+		List<String> yhkImagess = new ArrayList<>();
+		if (yhkImages != null && yhkImages.size() > 0){
+			for (LoanHomevisitInvestigateFileDetailsVo yhkImage : yhkImages) {
+				yhkImagess.add(yhkImage.getFileUrl());
+			}
+		}
+		vo.setYhkImages(yhkImagess);
+		//房产
+		List<LoanHomevisitInvestigateFileDetailsVo> fcImages = loanHomevisitInvestigateFileService.selByMainSidAndTypeKey(sid, LoanAttachTypeEnum.FC.getAttachType());
+		List<String> houseProperty = new ArrayList<>();
+		if (fcImages != null && fcImages.size() > 0){
+			for (LoanHomevisitInvestigateFileDetailsVo fcImage : fcImages) {
+				houseProperty.add(fcImage.getFileUrl());
+			}
+		}
+		vo.setHouseProperty(houseProperty);
+		//车辆
+		List<LoanHomevisitInvestigateFileDetailsVo> clImages = loanHomevisitInvestigateFileService.selByMainSidAndTypeKey(sid, LoanAttachTypeEnum.CL.getAttachType());
+		List<String> carProperty = new ArrayList<>();
+		if (clImages != null && clImages.size() > 0){
+			for (LoanHomevisitInvestigateFileDetailsVo clImage : clImages) {
+				carProperty.add(clImage.getFileUrl());
+			}
+		}
+		vo.setCarProperty(carProperty);
+		return vo;
+	}
+}

anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanhomevisitinvestigate/LoanHomevisitInvestigateMapper.xml

@@ -60,13 +60,15 @@
                spouseName,
                spouseIdNumber      AS spouseIdCard,
                spouseMobile,
+               spouseCareerKey     AS spouseJobKey,
                spouseCareerValue   AS spouseJob,
-               spouseDomAddress,
+               spouseDomAddress    AS spouseRegisterAddress,
-               spousePreAddress,
+               spousePreAddress    AS spouseAddress,
                emergencyContact    AS emergencyContactName,
                emergencyMobile     AS emergencyContactMobile,
                relationshipKey     AS emergencyContactTypeKey,
-               relationshipValue   AS emergencyContactType
+               relationshipValue   AS emergencyContactType,
+               mainSid
         FROM loan_homevisit_investigate_customer
         WHERE mainSid = #{sid}
     </select>

anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanhomevisitinvestigate/LoanHomevisitInvestigateService.java

@@ -45,6 +45,8 @@ import com.yxt.anrui.riskcenter.api.loanhomevisitinvestigateorder.LoanHomeVisitI
 import com.yxt.anrui.riskcenter.api.loanhomevisitinvestigateorder.LoanHomevisitInvestigateOrderDetailsVo;
 import com.yxt.anrui.riskcenter.api.loanhomevisitinvestigateorder.LoanHomevisitInvestigateOrderDto;
 import com.yxt.anrui.riskcenter.api.loanhomevisitinvestigateotherpeo.LoanHomeVisitInvestigateInitOtherPeoVo;
+import com.yxt.anrui.riskcenter.api.loanhomevisitinvestigateotherpeo.LoanHomeVisitInvestigateSaveOtherPeoDto;
+import com.yxt.anrui.riskcenter.api.loanhomevisitinvestigateotherpeo.LoanHomevisitInvestigateOtherpeoDto;
 import com.yxt.anrui.riskcenter.api.loanhomevisitinvestigateproperty.LoanHomeVisitInvestigateSavePropDto;
 import com.yxt.anrui.riskcenter.api.loanhomevisitinvestigateproperty.LoanHomeVisitInvestigateInitPropVo;
 import com.yxt.anrui.riskcenter.api.loanhomevisitinvestigateproperty.LoanHomevisitInvestigatePropertyDetailsVo;
@@ -467,6 +469,7 @@ public class LoanHomevisitInvestigateService extends MybatisBaseService<LoanHome
     public ResultBean saveHomeVisitCustomerInfo(LoanHomeVisitInvestigateSaveCustomerDto dto) {
         ResultBean rb = ResultBean.fireFail();
         LoanHomevisitInvestigateCustomerDto loanHomevisitInvestigateCustomerDto = new LoanHomevisitInvestigateCustomerDto();
+        List<LoanHomeVisitInvestigateSaveOtherPeoDto> otherPersonnel = dto.getOtherPersonnel();
         BeanUtil.copyProperties(dto,loanHomevisitInvestigateCustomerDto);
         loanHomevisitInvestigateCustomerDto.setIsConfirmRealBuyer(dto.getActualBuyer());
         loanHomevisitInvestigateCustomerDto.setBorrowerSid(dto.getLenderSid());
@@ -484,12 +487,30 @@ public class LoanHomevisitInvestigateService extends MybatisBaseService<LoanHome
         loanHomevisitInvestigateCustomerDto.setBankCardNo(dto.getBankNumber());
         loanHomevisitInvestigateCustomerDto.setDepositBank(dto.getInvoBank());
         loanHomevisitInvestigateCustomerDto.setSpouseIdNumber(dto.getSpouseIdCard());
+        loanHomevisitInvestigateCustomerDto.setSpouseCareerKey(dto.getSpouseJobKey());
         loanHomevisitInvestigateCustomerDto.setSpouseCareerValue(dto.getSpouseJob());
+        loanHomevisitInvestigateCustomerDto.setSpouseDomAddress(dto.getSpouseRegisterAddress());
+        loanHomevisitInvestigateCustomerDto.setSpousePreAddress(dto.getSpouseAddress());
         loanHomevisitInvestigateCustomerDto.setEmergencyContact(dto.getEmergencyContactName());
         loanHomevisitInvestigateCustomerDto.setEmergencyMobile(dto.getEmergencyContactMobile());
         loanHomevisitInvestigateCustomerDto.setRelationshipKey(dto.getEmergencyContactTypeKey());
         loanHomevisitInvestigateCustomerDto.setRelationshipValue(dto.getEmergencyContactType());
         loanHomevisitInvestigateCustomerService.saveOrUpdateDto(loanHomevisitInvestigateCustomerDto);
+        loanHomevisitInvestigateOtherpeoService.delByMainSid(dto.getMainSid());
+        for (LoanHomeVisitInvestigateSaveOtherPeoDto loanHomeVisitInvestigateSaveOtherPeoDto : otherPersonnel) {
+            LoanHomevisitInvestigateOtherpeoDto loanHomevisitInvestigateOtherpeoDto = new LoanHomevisitInvestigateOtherpeoDto();
+            BeanUtil.copyProperties(loanHomeVisitInvestigateSaveOtherPeoDto,loanHomevisitInvestigateOtherpeoDto);
+            loanHomevisitInvestigateOtherpeoDto.setPeoTypeKey(loanHomeVisitInvestigateSaveOtherPeoDto.getPersonnelKey());
+            loanHomevisitInvestigateOtherpeoDto.setPeoType(loanHomeVisitInvestigateSaveOtherPeoDto.getPersonnelType());
+            loanHomevisitInvestigateOtherpeoDto.setPeoName(loanHomeVisitInvestigateSaveOtherPeoDto.getName());
+            loanHomevisitInvestigateOtherpeoDto.setIdNumber(loanHomeVisitInvestigateSaveOtherPeoDto.getIdCard());
+            loanHomevisitInvestigateOtherpeoDto.setPeoDomAddress(loanHomeVisitInvestigateSaveOtherPeoDto.getResidentAddress());
+            loanHomevisitInvestigateOtherpeoDto.setPeoPreAddress(loanHomeVisitInvestigateSaveOtherPeoDto.getAddress());
+            loanHomevisitInvestigateOtherpeoDto.setWorkUnit(loanHomeVisitInvestigateSaveOtherPeoDto.getCompany());
+            loanHomevisitInvestigateOtherpeoDto.setPeoCareerValue(loanHomeVisitInvestigateSaveOtherPeoDto.getJob());
+            loanHomevisitInvestigateOtherpeoDto.setMainSid(dto.getMainSid());
+            loanHomevisitInvestigateOtherpeoService.saveOrUpdateDto(loanHomevisitInvestigateOtherpeoDto);
+        }
         return rb.success();
     }
 

anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanhomevisitinvestigateoperations/LoanHomevisitInvestigateOperationsMapper.xml

@@ -26,7 +26,8 @@
                driveProTypeKey    AS driveKey,
                driveProTypeValue  AS driveType,
                beforeOpeTypeKey   AS operationKey,
-               beforeOpeTypeValue AS operationType
+               beforeOpeTypeValue AS operationType,
+               mainSid
         FROM loan_homevisit_investigate_operations
         WHERE mainSid = #{sid}
     </select>

anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanhomevisitinvestigateorder/LoanHomevisitInvestigateOrderMapper.xml

@@ -31,7 +31,8 @@
                lo.finRemarks        AS financeRemarks,
                lo.finDownPayKey     AS paymentRatiokey,
                lo.finDownPay        AS paymentRatio,
-               lo.finDownPayRemarks AS paymentRemarks
+               lo.finDownPayRemarks AS paymentRemarks,
+               lo.mainSid
         FROM loan_homevisit_investigate_order lo
                      LEFT JOIN loan_homevisit_investigate li
                 ON lo.`mainSid` = li.`sid`

anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanhomevisitinvestigateotherpeo/LoanHomevisitInvestigateOtherpeoMapper.java

@@ -31,6 +31,7 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.baomidou.mybatisplus.core.toolkit.Constants;
 import com.yxt.anrui.riskcenter.api.loanhomevisitinvestigateotherpeo.LoanHomeVisitInvestigateInitOtherPeoVo;
 import com.yxt.anrui.riskcenter.api.loanhomevisitinvestigateotherpeo.LoanHomevisitInvestigateOtherpeoDetailsVo;
+import org.apache.ibatis.annotations.Delete;
 import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
 import org.apache.ibatis.annotations.Select;
@@ -66,4 +67,7 @@ public interface LoanHomevisitInvestigateOtherpeoMapper extends BaseMapper<LoanH
 	List<LoanHomevisitInvestigateOtherpeoVo> selectListVo();
 
     List<LoanHomeVisitInvestigateInitOtherPeoVo> selByMainSid(String sid);
+
+	@Delete("DELETE FROM loan_homevisit_investigate_otherpeo WHERE mainSid = #{sid}")
+	void delByMainSid(String sid);
 }

anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanhomevisitinvestigateotherpeo/LoanHomevisitInvestigateOtherpeoMapper.xml

@@ -26,7 +26,7 @@
                peoType        AS personnelKey,
                mobile,
                idNumber       AS idCard,
-               peoDomAddress,
+               peoDomAddress  AS residentAddress,
                peoPreAddress  AS address,
                workUnit       AS company,
                peoCareerValue AS job

anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanhomevisitinvestigateotherpeo/LoanHomevisitInvestigateOtherpeoService.java

@@ -106,4 +106,8 @@ public class LoanHomevisitInvestigateOtherpeoService extends MybatisBaseService<
 	public List<LoanHomeVisitInvestigateInitOtherPeoVo> selByMainSid(String sid) {
 		return baseMapper.selByMainSid(sid);
 	}
+
+	public void delByMainSid(String sid) {
+		baseMapper.delByMainSid(sid);
+	}
 }

anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanhomevisitinvestigateproperty/LoanHomevisitInvestigatePropertyMapper.xml

@@ -35,7 +35,8 @@
                downPaySourceKey     AS downPaymentKey,
                downPaySourceValue   AS downPayment,
                otherSourceKey       AS otherIncomeKey,
-                otherSourceValue       AS otherIncome
+               otherSourceValue     AS otherIncome,
+               mainSid
         FROM loan_homevisit_investigate_property
         WHERE mainSid = #{sid}
     </select>

anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanhomevisitinvestigatetransport/LoanHomevisitInvestigateTransportMapper.xml

@@ -36,7 +36,8 @@
                toll                   AS roadToll,
                maintenance,
                expectedRevenue        AS income,
-               netIncome
+               netIncome,
+               mainSid
         FROM loan_homevisit_investigate_transport
         WHERE mainSid = #{sid}
     </select>

anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanhomevisitprep/LoanHomevisitPrepService.java

@@ -210,7 +210,7 @@ public class LoanHomevisitPrepService extends MybatisBaseService<LoanHomevisitPr
             for (BusSalesOrderVehicle busSalesOrderVehicle : busSalesOrderVehicles) {
                 BusSalesOrderLoancontractDto busSalesOrderLoancontractDto = new BusSalesOrderLoancontractDto();
                 busSalesOrderLoancontractDto.setSalesOrderSid(loanHomevisitPrepVo.getSaleOrderSid());
-                busSalesOrderLoancontractDto.setBorrowerSid(loanHomevisitPrepVo.getBorrowerSid());
+                busSalesOrderLoancontractDto.setBorrowerSid(loanHomevisitPrepVo.getSid());
                 busSalesOrderLoancontractDto.setBorrowerName(loanHomevisitPrepVo.getBorrowerName());
                 busSalesOrderLoancontractDto.setVehCount(loanHomevisitPrepVo.getVehCount());
                 BusSalesOrder busSalesOrder = busSalesOrderFeign.fetchBySid(loanHomevisitPrepVo.getSaleOrderSid()).getData();
@@ -227,7 +227,7 @@ public class LoanHomevisitPrepService extends MybatisBaseService<LoanHomevisitPr
         } else if (conSetUpKey.equals("002")) {//一人一合同
             BusSalesOrderLoancontractDto busSalesOrderLoancontractDto = new BusSalesOrderLoancontractDto();
             busSalesOrderLoancontractDto.setSalesOrderSid(loanHomevisitPrepVo.getSaleOrderSid());
-            busSalesOrderLoancontractDto.setBorrowerSid(loanHomevisitPrepVo.getBorrowerSid());
+            busSalesOrderLoancontractDto.setBorrowerSid(loanHomevisitPrepVo.getSid());
             busSalesOrderLoancontractDto.setBorrowerName(loanHomevisitPrepVo.getBorrowerName());
             busSalesOrderLoancontractDto.setVehCount(loanHomevisitPrepVo.getVehCount());
             BusSalesOrder busSalesOrder = busSalesOrderFeign.fetchBySid(loanHomevisitPrepVo.getSaleOrderSid()).getData();
@@ -238,7 +238,7 @@ public class LoanHomevisitPrepService extends MybatisBaseService<LoanHomevisitPr
             busSalesOrderLoancontractDto.setBusName("资方终审确认");
             String loanContractSid = busSalesOrderLoancontractFeign.save(busSalesOrderLoancontractDto).getData();
             for (BusSalesOrderVehicle busSalesOrderVehicle : busSalesOrderVehicles) {
-                busSalesOrderVehicleFeign.updateXDCon(busSalesOrderVehicle.getSid(), loanHomevisitPrepVo.getBorrowerSid(), loanContractSid);
+                busSalesOrderVehicleFeign.updateXDCon(busSalesOrderVehicle.getSid(), loanHomevisitPrepVo.getSid(), loanContractSid);
             }
         }
         return rb.success();

anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/risk/loanhomevisitinvestigate/AppLoanHomeVisitInvestigateInitCustomerVo.java

@@ -48,12 +48,14 @@ public class AppLoanHomeVisitInvestigateInitCustomerVo implements Vo {
     private String spouseIdCard;
     @ApiModelProperty("配偶电话")
     private String spouseMobile;
+    @ApiModelProperty("配偶职业key")
+    private String spouseJobKey;
     @ApiModelProperty("配偶职业")
     private String spouseJob;
     @ApiModelProperty("配偶户籍地址")
-    private String spouseDomAddress;
+    private String spouseRegisterAddress;
     @ApiModelProperty("配偶现住址")
-    private String spousePreAddress;
+    private String spouseAddress;
     @ApiModelProperty("其他人员")
     private List<AppLoanHomeVisitInvestigateInitOtherPeoVo> otherPersonnel;
     @ApiModelProperty("紧急联系人姓名")
@@ -64,4 +66,6 @@ public class AppLoanHomeVisitInvestigateInitCustomerVo implements Vo {
     private String emergencyContactType;
     @ApiModelProperty("紧急联系人类型key")
     private String emergencyContactTypeKey;
+    @ApiModelProperty("家访考察表sid")
+    private String mainSid;
 }

anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/risk/loanhomevisitinvestigate/AppLoanHomeVisitInvestigateInitOtherPeoVo.java

@@ -19,11 +19,13 @@ public class AppLoanHomeVisitInvestigateInitOtherPeoVo implements Vo {
     @ApiModelProperty("身份证")
     private String idCard;
     @ApiModelProperty("户籍地址")
-    private String peoDomAddress;
+    private String residentAddress;
     @ApiModelProperty("现住址")
     private String address;
     @ApiModelProperty("公司")
     private String company;
     @ApiModelProperty("职业")
     private String job;
+    @ApiModelProperty("家访考察表sid")
+    private String mainSid;
 }

anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/risk/loanhomevisitinvestigate/AppLoanHomeVisitInvestigateInitReportStateVo.java

@@ -17,4 +17,6 @@ public class AppLoanHomeVisitInvestigateInitReportStateVo implements Vo {
     private String transportState;
     @ApiModelProperty("资产情况")
     private String assetsState;
+    @ApiModelProperty("家访考察表sid")
+    private String mainSid;
 }

anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/risk/loanhomevisitinvestigate/AppLoanHomeVisitInvestigateSaveCustomerDto.java

@@ -49,12 +49,14 @@ public class AppLoanHomeVisitInvestigateSaveCustomerDto implements Dto {
     private String spouseIdCard;
     @ApiModelProperty("配偶电话")
     private String spouseMobile;
+    @ApiModelProperty("配偶职业key")
+    private String spouseJobKey;
     @ApiModelProperty("配偶职业")
     private String spouseJob;
     @ApiModelProperty("配偶户籍地址")
-    private String spouseDomAddress;
+    private String spouseRegisterAddress;
     @ApiModelProperty("配偶现住址")
-    private String spousePreAddress;
+    private String spouseAddress;
     @ApiModelProperty("其他人员")
     private List<AppLoanHomeVisitInvestigateSaveOtherPeoDto> otherPersonnel = new ArrayList<>();
     @ApiModelProperty("紧急联系人姓名")

anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/risk/loanhomevisitinvestigate/AppLoanHomeVisitInvestigateSaveOtherPeoDto.java

@@ -19,7 +19,7 @@ public class AppLoanHomeVisitInvestigateSaveOtherPeoDto implements Vo {
     @ApiModelProperty("身份证")
     private String idCard;
     @ApiModelProperty("户籍地址")
-    private String peoDomAddress;
+    private String residentAddress;
     @ApiModelProperty("现住址")
     private String address;
     @ApiModelProperty("公司")