家访

anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finfundscarriedforwardapply/FinFundsCarriedForwardApplyService.java

@@ -320,6 +320,7 @@ public class FinFundsCarriedForwardApplyService extends MybatisBaseService<FinFu
             String subscriptionMoney = finSelectedReceivablesDetailedVo.getSubscriptionMoney();
             BigDecimal surplusReceivable = new BigDecimal(currentReceivableMoney).subtract(new BigDecimal(subscriptionMoney));
             appFinFundsCarriedForwardYXYSKXVo.setSurplusReceivable(surplusReceivable.toString());
+            appFinFundsCarriedForwardYXYSKXVo.setState(finSelectedReceivablesDetailedVo.getKxState());
             appFinFundsCarriedForwardYXYSKXVoList.add(appFinFundsCarriedForwardYXYSKXVo);
         }
         vo.setYxysFinFundsCarriedForwardYXYSKXVos(appFinFundsCarriedForwardYXYSKXVoList);

anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanhomevisitinvestigate/LoanHomeVisitInvestigateInitInformationStateVo.java

@@ -0,0 +1,16 @@
+package com.yxt.anrui.riskcenter.api.loanhomevisitinvestigate;
+
+import com.yxt.common.core.vo.Vo;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+@Data
+public class LoanHomeVisitInvestigateInitInformationStateVo implements Vo {
+
+    @ApiModelProperty("家访见证类")
+    private int witnessState;
+    @ApiModelProperty("证明文件")
+    private int proofState;
+    @ApiModelProperty("资产情况")
+    private int assetsInfo;
+}

anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanhomevisitinvestigate/LoanHomeVisitInvestigateInitReportStateVo.java

@@ -0,0 +1,20 @@
+package com.yxt.anrui.riskcenter.api.loanhomevisitinvestigate;
+
+import com.yxt.common.core.vo.Vo;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+@Data
+public class LoanHomeVisitInvestigateInitReportStateVo implements Vo {
+
+    @ApiModelProperty("客户信息")
+    private int customerState;
+    @ApiModelProperty("订单信息")
+    private int orderState;
+    @ApiModelProperty("运营经历")
+    private int operationState;
+    @ApiModelProperty("运输情况")
+    private int transportState;
+    @ApiModelProperty("资产情况")
+    private int assetsState;
+}

anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanhomevisitinvestigate/LoanHomeVisitInvestigateReservationDto.java

@@ -0,0 +1,16 @@
+package com.yxt.anrui.riskcenter.api.loanhomevisitinvestigate;
+
+import com.yxt.common.core.dto.Dto;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+@Data
+public class LoanHomeVisitInvestigateReservationDto implements Dto {
+
+    @ApiModelProperty("sid")
+    private String sid;
+    @ApiModelProperty("预约时间")
+    private String times;
+    @ApiModelProperty("预约地址")
+    private String adress;
+}

anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanhomevisitinvestigate/LoanHomevisitInvestigateFeign.java

@@ -33,7 +33,7 @@ import com.yxt.common.core.vo.PagerVo;
 import org.springframework.cloud.openfeign.FeignClient;
 import org.springframework.web.bind.annotation.*;
 
-import java.util.List;
+import javax.validation.Valid;
 
 /**
  * Project: anrui-riskcenter(家访考察) <br/>
@@ -80,4 +80,19 @@ public interface LoanHomevisitInvestigateFeign {
     @GetMapping("/fetchDetailsBySid/{sid}")
     @ResponseBody
     public ResultBean<LoanHomevisitInvestigateDetailsVo> fetchDetailsBySid(@PathVariable("sid") String sid);
+
+    @ApiOperation("保存预约信息")
+    @PostMapping("/saveAppointmentInfo")
+    @ResponseBody
+    public ResultBean saveAppointmentInfo(@Valid @RequestBody LoanHomeVisitInvestigateReservationDto dto);
+
+    @ApiOperation("初始化家访考察报告状态")
+    @GetMapping("/getHomeVisitReportInfo")
+    @ResponseBody
+    public ResultBean<LoanHomeVisitInvestigateInitReportStateVo> getHomeVisitReportInfo(@RequestParam("sid") String sid);
+
+    @ApiOperation("初始化家访考察资料状态")
+    @GetMapping("/getHomeVisitDataInfo")
+    @ResponseBody
+    public ResultBean<LoanHomeVisitInvestigateInitInformationStateVo> getHomeVisitDataInfo(@RequestParam("sid") String sid);
 }

anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanhomevisitinvestigate/LoanHomevisitInvestigateFeignFallback.java

@@ -74,4 +74,19 @@ public class LoanHomevisitInvestigateFeignFallback implements LoanHomevisitInves
 		ResultBean rb = ResultBean.fireFail();
 		return rb.setMsg("接口anrui-riskcenter/loanhomevisitinvestigate/fetchDetailsBySid无法访问");
 	}
+
+	@Override
+	public ResultBean saveAppointmentInfo(LoanHomeVisitInvestigateReservationDto dto) {
+		return null;
+	}
+
+	@Override
+	public ResultBean<LoanHomeVisitInvestigateInitReportStateVo> getHomeVisitReportInfo(String sid) {
+		return null;
+	}
+
+	@Override
+	public ResultBean<LoanHomeVisitInvestigateInitInformationStateVo> getHomeVisitDataInfo(String sid) {
+		return null;
+	}
 }

anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanhomevisitinvestigate/LoanHomevisitInvestigateQuery.java

@@ -77,4 +77,5 @@ public class LoanHomevisitInvestigateQuery implements Query {
     private String orgSidPath;
     private String menuSid;
     private String type;
+    private String names;
 }

anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanhomevisitinvestigate/LoanHomevisitInvestigateVo.java

@@ -54,11 +54,12 @@ public class LoanHomevisitInvestigateVo implements Vo {
 
     private String sid; // sid
 
+    @ApiModelProperty("考察状态")
+    private String state;
     @ApiModelProperty("订单日期")
     private String createDate;
 	@ApiModelProperty("预约家访时间")
-    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone = "GMT+8")
-    private Date resHomeVisDate;
+    private String resHomeVisDate;
 	@ApiModelProperty("家访地点")
     private String homeVisAddress;
     @ApiModelProperty("分公司名称")

anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanhomevisitinvestigate/LoanHomevisitInvestigateMapper.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.riskcenter.api.loanhomevisitinvestigate.LoanHomeVisitInvestigateInitReportStateVo;
 import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
 import org.apache.ibatis.annotations.Select;
@@ -66,4 +67,7 @@ public interface LoanHomevisitInvestigateMapper extends BaseMapper<LoanHomevisit
 
     @Update("update loan_homevisit_investigate set state = '2',investigateKey = #{investigateKey},investigateValue = #{investigateValue} where sid = #{sid}")
     void isPassThrough(@Param("sid") String sid, @Param("investigateKey") String investigateKey, @Param("investigateValue") String investigateValue);
+
+    @Update("update loan_homevisit_investigate set resHomeVisDate = #{times},homeVisAddress = #{adress} where sid = #{sid}")
+    void saveAppointmentInfo(@Param("sid") String sid, @Param("times") String times, @Param("adress") String adress);
 }

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

@@ -7,6 +7,7 @@
             resultType="com.yxt.anrui.riskcenter.api.loanhomevisitinvestigate.LoanHomevisitInvestigateVo">
         SELECT
         li.`sid`,
+        li.state,
         bo.createDate,
         li.`resHomeVisDate`,
         li.`homeVisAddress`,

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

@@ -25,6 +25,7 @@
  *********************************************************/
 package com.yxt.anrui.riskcenter.biz.loanhomevisitinvestigate;
 
+import com.yxt.anrui.riskcenter.api.loanhomevisitinvestigate.*;
 import com.yxt.common.core.query.PagerQuery;
 import com.yxt.common.core.result.ResultBean;
 import com.yxt.common.core.vo.PagerVo;
@@ -34,12 +35,6 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 
 import java.util.List;
-import com.yxt.anrui.riskcenter.api.loanhomevisitinvestigate.LoanHomevisitInvestigate;
-import com.yxt.anrui.riskcenter.api.loanhomevisitinvestigate.LoanHomevisitInvestigateQuery;
-import com.yxt.anrui.riskcenter.api.loanhomevisitinvestigate.LoanHomevisitInvestigateVo;
-import com.yxt.anrui.riskcenter.api.loanhomevisitinvestigate.LoanHomevisitInvestigateDetailsVo;
-import com.yxt.anrui.riskcenter.api.loanhomevisitinvestigate.LoanHomevisitInvestigateDto;
-import com.yxt.anrui.riskcenter.api.loanhomevisitinvestigate.LoanHomevisitInvestigateFeign;
 
 /**
  * Project: anrui-riskcenter(家访考察) <br/>
@@ -102,4 +97,19 @@ public class LoanHomevisitInvestigateRest implements LoanHomevisitInvestigateFei
 		LoanHomevisitInvestigateDetailsVo vo = loanHomevisitInvestigateService.fetchDetailsVoBySid(sid);
 		return rb.success().setData(vo);
 	}
+
+	@Override
+	public ResultBean saveAppointmentInfo(LoanHomeVisitInvestigateReservationDto dto) {
+		return loanHomevisitInvestigateService.saveAppointmentInfo(dto);
+	}
+
+	@Override
+	public ResultBean<LoanHomeVisitInvestigateInitReportStateVo> getHomeVisitReportInfo(String sid) {
+		return loanHomevisitInvestigateService.getHomeVisitReportInfo(sid);
+	}
+
+	@Override
+	public ResultBean<LoanHomeVisitInvestigateInitInformationStateVo> getHomeVisitDataInfo(String sid) {
+		return loanHomevisitInvestigateService.getHomeVisitDataInfo(sid);
+	}
 }

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

@@ -30,19 +30,27 @@ import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.yxt.anrui.portal.api.sysuser.PrivilegeQuery;
 import com.yxt.anrui.portal.api.sysuser.SysUserFeign;
+import com.yxt.anrui.riskcenter.api.loanhomevisitinvestigate.*;
+import com.yxt.anrui.riskcenter.api.loanhomevisitinvestigatecustomer.LoanHomevisitInvestigateCustomerDetailsVo;
+import com.yxt.anrui.riskcenter.api.loanhomevisitinvestigatefile.LoanAttachTypeEnum;
+import com.yxt.anrui.riskcenter.api.loanhomevisitinvestigatefile.LoanHomevisitInvestigateFileDetailsVo;
+import com.yxt.anrui.riskcenter.api.loanhomevisitinvestigateoperations.LoanHomevisitInvestigateOperationsDetailsVo;
+import com.yxt.anrui.riskcenter.api.loanhomevisitinvestigateorder.LoanHomevisitInvestigateOrderDetailsVo;
+import com.yxt.anrui.riskcenter.api.loanhomevisitinvestigateproperty.LoanHomevisitInvestigatePropertyDetailsVo;
+import com.yxt.anrui.riskcenter.api.loanhomevisitinvestigatetransport.LoanHomevisitInvestigateTransportDetailsVo;
 import com.yxt.anrui.riskcenter.api.loanhomevisitprep.LoanHomevisitPrepVo;
+import com.yxt.anrui.riskcenter.biz.loanhomevisitinvestigatecustomer.LoanHomevisitInvestigateCustomerService;
+import com.yxt.anrui.riskcenter.biz.loanhomevisitinvestigatefile.LoanHomevisitInvestigateFileService;
+import com.yxt.anrui.riskcenter.biz.loanhomevisitinvestigateoperations.LoanHomevisitInvestigateOperationsService;
+import com.yxt.anrui.riskcenter.biz.loanhomevisitinvestigateorder.LoanHomevisitInvestigateOrderService;
+import com.yxt.anrui.riskcenter.biz.loanhomevisitinvestigateproperty.LoanHomevisitInvestigatePropertyService;
+import com.yxt.anrui.riskcenter.biz.loanhomevisitinvestigatetransport.LoanHomevisitInvestigateTransportService;
 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.loanhomevisitinvestigate.LoanHomevisitInvestigate;
-import com.yxt.anrui.riskcenter.api.loanhomevisitinvestigate.LoanHomevisitInvestigateQuery;
-import com.yxt.anrui.riskcenter.api.loanhomevisitinvestigate.LoanHomevisitInvestigateVo;
-import com.yxt.anrui.riskcenter.api.loanhomevisitinvestigate.LoanHomevisitInvestigateDetailsVo;
-import com.yxt.anrui.riskcenter.api.loanhomevisitinvestigate.LoanHomevisitInvestigateDto;
-import com.yxt.anrui.riskcenter.api.loanhomevisitinvestigate.LoanHomevisitInvestigateFeign;
 
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
@@ -65,129 +73,274 @@ import java.util.List;
 @Service
 public class LoanHomevisitInvestigateService extends MybatisBaseService<LoanHomevisitInvestigateMapper, LoanHomevisitInvestigate> {
 
-	@Autowired
-	private SysUserFeign sysUserFeign;
+    @Autowired
+    private SysUserFeign sysUserFeign;
+    @Autowired
+    private LoanHomevisitInvestigateCustomerService loanHomevisitInvestigateCustomerService;
+    @Autowired
+    private LoanHomevisitInvestigateOrderService loanHomevisitInvestigateOrderService;
+    @Autowired
+    private LoanHomevisitInvestigateOperationsService loanHomevisitInvestigateOperationsService;
+    @Autowired
+    private LoanHomevisitInvestigateTransportService loanHomevisitInvestigateTransportService;
+    @Autowired
+    private LoanHomevisitInvestigatePropertyService loanHomevisitInvestigatePropertyService;
+    @Autowired
+    private LoanHomevisitInvestigateFileService loanHomevisitInvestigateFileService;
 
-	public PagerVo<LoanHomevisitInvestigateVo> listPageVo(PagerQuery<LoanHomevisitInvestigateQuery> pq) {
-		LoanHomevisitInvestigateQuery query = pq.getParams();
-		QueryWrapper<LoanHomevisitInvestigate> qw = new QueryWrapper<>();
-		qw.eq("li.state", query.getType());
-		qw.eq("bb.busNo", 302);
-		if (StringUtils.isNotBlank(query.getMenuSid())) {
-			//=======================
-			PrivilegeQuery privilegeQuery = new PrivilegeQuery();
-			privilegeQuery.setOrgPath(query.getOrgSidPath());
-			privilegeQuery.setMenuUrl(query.getMenuSid());
-			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<LoanHomevisitInvestigateVo> p = new PagerVo<>();
-					return p;
-				}
-			} else {
-				PagerVo<LoanHomevisitInvestigateVo> 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<LoanHomevisitInvestigate> page = PagerUtil.queryToPage(pq);
-		IPage<LoanHomevisitInvestigateVo> pagging = baseMapper.selectPageVo(page, qw);
-		PagerVo<LoanHomevisitInvestigateVo> p = PagerUtil.pageToVo(pagging, null);
-		return p;
-	}
-	
-	public void saveOrUpdateDto(LoanHomevisitInvestigateDto dto){
+    public PagerVo<LoanHomevisitInvestigateVo> listPageVo(PagerQuery<LoanHomevisitInvestigateQuery> pq) {
+        LoanHomevisitInvestigateQuery query = pq.getParams();
+        QueryWrapper<LoanHomevisitInvestigate> qw = new QueryWrapper<>();
+        qw.eq("li.state", query.getType());
+        qw.eq("bb.busNo", 302);
+        if (StringUtils.isNotBlank(query.getMenuSid())) {
+            //=======================
+            PrivilegeQuery privilegeQuery = new PrivilegeQuery();
+            privilegeQuery.setOrgPath(query.getOrgSidPath());
+            privilegeQuery.setMenuUrl(query.getMenuSid());
+            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<LoanHomevisitInvestigateVo> p = new PagerVo<>();
+                    return p;
+                }
+            } else {
+                PagerVo<LoanHomevisitInvestigateVo> 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<LoanHomevisitInvestigate> page = PagerUtil.queryToPage(pq);
+        IPage<LoanHomevisitInvestigateVo> pagging = baseMapper.selectPageVo(page, qw);
+        PagerVo<LoanHomevisitInvestigateVo> p = PagerUtil.pageToVo(pagging, null);
+        return p;
+    }
+
+    public void saveOrUpdateDto(LoanHomevisitInvestigateDto dto) {
         String dtoSid = dto.getSid();
         if (StringUtils.isBlank(dtoSid)) {
             this.insertByDto(dto);
-            return; 
-        } 
-		this.updateByDto(dto);
-	}
-	
-	public void insertByDto(LoanHomevisitInvestigateDto dto){
-		LoanHomevisitInvestigate entity = new LoanHomevisitInvestigate();
-		BeanUtil.copyProperties(dto, entity, "id", "sid");
-		baseMapper.insert(entity);
-	}
-	
-	public void updateByDto(LoanHomevisitInvestigateDto dto){
-          String dtoSid = dto.getSid();
+            return;
+        }
+        this.updateByDto(dto);
+    }
+
+    public void insertByDto(LoanHomevisitInvestigateDto dto) {
+        LoanHomevisitInvestigate entity = new LoanHomevisitInvestigate();
+        BeanUtil.copyProperties(dto, entity, "id", "sid");
+        baseMapper.insert(entity);
+    }
+
+    public void updateByDto(LoanHomevisitInvestigateDto dto) {
+        String dtoSid = dto.getSid();
         if (StringUtils.isBlank(dtoSid)) {
             return;
-        } 
-		LoanHomevisitInvestigate entity = fetchBySid(dtoSid);
-		BeanUtil.copyProperties(dto, entity, "id", "sid");
-		baseMapper.updateById(entity);
-	}
-	
-	public LoanHomevisitInvestigateDetailsVo fetchDetailsVoBySid(String sid){
-		LoanHomevisitInvestigate entity = fetchBySid(sid);
-		LoanHomevisitInvestigateDetailsVo vo = new LoanHomevisitInvestigateDetailsVo();
-		BeanUtil.copyProperties(entity, vo);
-		return vo;
-	}
+        }
+        LoanHomevisitInvestigate entity = fetchBySid(dtoSid);
+        BeanUtil.copyProperties(dto, entity, "id", "sid");
+        baseMapper.updateById(entity);
+    }
+
+    public LoanHomevisitInvestigateDetailsVo fetchDetailsVoBySid(String sid) {
+        LoanHomevisitInvestigate entity = fetchBySid(sid);
+        LoanHomevisitInvestigateDetailsVo vo = new LoanHomevisitInvestigateDetailsVo();
+        BeanUtil.copyProperties(entity, vo);
+        return vo;
+    }
+
+    public ResultBean isPassThrough(String sid, String pass) {
+        ResultBean rb = ResultBean.fireFail();
+        if ("1".equals(pass)) {//1通过 2不通过
+            baseMapper.isPassThrough(sid, "001", "通过");
+        } else {
+            baseMapper.isPassThrough(sid, "002", "不通过");
+        }
+        return rb.success();
+    }
+
+    public ResultBean saveAppointmentInfo(LoanHomeVisitInvestigateReservationDto dto) {
+        ResultBean rb = ResultBean.fireFail();
+        baseMapper.saveAppointmentInfo(dto.getSid(), dto.getTimes(), dto.getAdress());
+        return rb.success();
+    }
+
+    public ResultBean<LoanHomeVisitInvestigateInitReportStateVo> getHomeVisitReportInfo(String sid) {
+        ResultBean rb = ResultBean.fireFail();
+        LoanHomeVisitInvestigateInitReportStateVo loanHomeVisitInvestigateInitReportStateVo = new LoanHomeVisitInvestigateInitReportStateVo();
+        //客户信息状态
+        LoanHomevisitInvestigateCustomerDetailsVo loanHomevisitInvestigateCustomerDetailsVo = loanHomevisitInvestigateCustomerService.selByMainSid(sid);
+        if (loanHomevisitInvestigateCustomerDetailsVo == null) {
+            loanHomeVisitInvestigateInitReportStateVo.setCustomerState(0);
+        } else {
+            loanHomeVisitInvestigateInitReportStateVo.setCustomerState(1);
+        }
+        //订单信息状态
+        LoanHomevisitInvestigateOrderDetailsVo loanHomevisitInvestigateOrderDetailsVo = loanHomevisitInvestigateOrderService.selByMainSid(sid);
+        if (loanHomevisitInvestigateOrderDetailsVo == null) {
+            loanHomeVisitInvestigateInitReportStateVo.setOrderState(0);
+        } else {
+            loanHomeVisitInvestigateInitReportStateVo.setOrderState(1);
+        }
+        //运营经历信息
+        LoanHomevisitInvestigateOperationsDetailsVo loanHomevisitInvestigateOperationsDetailsVo = loanHomevisitInvestigateOperationsService.selByMainSid(sid);
+        if (loanHomevisitInvestigateOperationsDetailsVo == null) {
+            loanHomeVisitInvestigateInitReportStateVo.setOperationState(0);
+        } else {
+            loanHomeVisitInvestigateInitReportStateVo.setOperationState(1);
+        }
+        //运输情况信息
+        LoanHomevisitInvestigateTransportDetailsVo loanHomevisitInvestigateTransportDetailsVo = loanHomevisitInvestigateTransportService.selByMainSid(sid);
+        if (loanHomevisitInvestigateTransportDetailsVo == null) {
+            loanHomeVisitInvestigateInitReportStateVo.setTransportState(0);
+        } else {
+            loanHomeVisitInvestigateInitReportStateVo.setTransportState(1);
+        }
+        //资产情况信息
+        LoanHomevisitInvestigatePropertyDetailsVo loanHomevisitInvestigatePropertyDetailsVo = loanHomevisitInvestigatePropertyService.selByMainSid(sid);
+        if (loanHomevisitInvestigatePropertyDetailsVo == null) {
+            loanHomeVisitInvestigateInitReportStateVo.setAssetsState(0);
+        } else {
+            loanHomeVisitInvestigateInitReportStateVo.setAssetsState(1);
+        }
+        return rb.success().setData(loanHomeVisitInvestigateInitReportStateVo);
+    }
 
-	public ResultBean isPassThrough(String sid, String pass) {
-		ResultBean rb = ResultBean.fireFail();
-		if ("1".equals(pass)){//1通过 2不通过
-			baseMapper.isPassThrough(sid,"001","通过");
-		}else {
-			baseMapper.isPassThrough(sid,"002","不通过");
-		}
-		return rb.success();
-	}
+    public ResultBean<LoanHomeVisitInvestigateInitInformationStateVo> getHomeVisitDataInfo(String sid) {
+        ResultBean rb = ResultBean.fireFail();
+        LoanHomeVisitInvestigateInitInformationStateVo loanHomeVisitInvestigateInitInformationStateVo = new LoanHomeVisitInvestigateInitInformationStateVo();
+        //定位信息
+        List<LoanHomevisitInvestigateFileDetailsVo> dwxxImages = loanHomevisitInvestigateFileService.selByMainSidAndTypeKey(sid, LoanAttachTypeEnum.DWXX.getAttachType());
+        //房屋照片
+        List<LoanHomevisitInvestigateFileDetailsVo> fwzpImages = loanHomevisitInvestigateFileService.selByMainSidAndTypeKey(sid, LoanAttachTypeEnum.FWZP.getAttachType());
+        //门口照片
+        List<LoanHomevisitInvestigateFileDetailsVo> mkzpImages = loanHomevisitInvestigateFileService.selByMainSidAndTypeKey(sid, LoanAttachTypeEnum.MKZP.getAttachType());
+        //客厅卧室照片
+        List<LoanHomevisitInvestigateFileDetailsVo> ktwszpImages = loanHomevisitInvestigateFileService.selByMainSidAndTypeKey(sid, LoanAttachTypeEnum.KTWSZP.getAttachType());
+        //合影照等
+        List<LoanHomevisitInvestigateFileDetailsVo> hyzdImages = loanHomevisitInvestigateFileService.selByMainSidAndTypeKey(sid, LoanAttachTypeEnum.HYZD.getAttachType());
+        //贷款人身份证
+        List<LoanHomevisitInvestigateFileDetailsVo> dkrsfzImages = loanHomevisitInvestigateFileService.selByMainSidAndTypeKey(sid, LoanAttachTypeEnum.DKRSFZ.getAttachType());
+        //贷款人户口本
+        List<LoanHomevisitInvestigateFileDetailsVo> dkrhkbImages = loanHomevisitInvestigateFileService.selByMainSidAndTypeKey(sid, LoanAttachTypeEnum.DKRHKB.getAttachType());
+        //贷款人婚姻证明
+        List<LoanHomevisitInvestigateFileDetailsVo> dkrhyzmImages = loanHomevisitInvestigateFileService.selByMainSidAndTypeKey(sid, LoanAttachTypeEnum.DKRHYZM.getAttachType());
+        //贷款人驾驶本
+        List<LoanHomevisitInvestigateFileDetailsVo> dkrjsbImages = loanHomevisitInvestigateFileService.selByMainSidAndTypeKey(sid, LoanAttachTypeEnum.DKRJSB.getAttachType());
+        //贷款人银行流水
+        List<LoanHomevisitInvestigateFileDetailsVo> dkryhlsImages = loanHomevisitInvestigateFileService.selByMainSidAndTypeKey(sid, LoanAttachTypeEnum.DKRYHLS.getAttachType());
+        //配偶身份证
+        List<LoanHomevisitInvestigateFileDetailsVo> posfzImages = loanHomevisitInvestigateFileService.selByMainSidAndTypeKey(sid, LoanAttachTypeEnum.POSFZ.getAttachType());
+        //配偶户口本
+        List<LoanHomevisitInvestigateFileDetailsVo> pohkbImages = loanHomevisitInvestigateFileService.selByMainSidAndTypeKey(sid, LoanAttachTypeEnum.POHKB.getAttachType());
+        //担保人身份证
+        List<LoanHomevisitInvestigateFileDetailsVo> dbrsfzImages = loanHomevisitInvestigateFileService.selByMainSidAndTypeKey(sid, LoanAttachTypeEnum.DBRSFZ.getAttachType());
+        //担保人户口本
+        List<LoanHomevisitInvestigateFileDetailsVo> dbrhkbImages = loanHomevisitInvestigateFileService.selByMainSidAndTypeKey(sid, LoanAttachTypeEnum.DBRHKB.getAttachType());
+        //银行卡
+        List<LoanHomevisitInvestigateFileDetailsVo> yhkImages = loanHomevisitInvestigateFileService.selByMainSidAndTypeKey(sid, LoanAttachTypeEnum.YHK.getAttachType());
+        //房产
+        List<LoanHomevisitInvestigateFileDetailsVo> fcImages = loanHomevisitInvestigateFileService.selByMainSidAndTypeKey(sid, LoanAttachTypeEnum.FC.getAttachType());
+        //车辆
+        List<LoanHomevisitInvestigateFileDetailsVo> clImages = loanHomevisitInvestigateFileService.selByMainSidAndTypeKey(sid, LoanAttachTypeEnum.CL.getAttachType());
+        //家访见证类
+        if (dwxxImages == null || dwxxImages.size() == 0) {
+            loanHomeVisitInvestigateInitInformationStateVo.setWitnessState(0);
+        } else if (fwzpImages == null || fwzpImages.size() == 0) {
+            loanHomeVisitInvestigateInitInformationStateVo.setWitnessState(0);
+        } else if (mkzpImages == null || mkzpImages.size() == 0) {
+            loanHomeVisitInvestigateInitInformationStateVo.setWitnessState(0);
+        } else if (ktwszpImages == null || ktwszpImages.size() == 0) {
+            loanHomeVisitInvestigateInitInformationStateVo.setWitnessState(0);
+        } else if (hyzdImages == null || hyzdImages.size() == 0) {
+            loanHomeVisitInvestigateInitInformationStateVo.setWitnessState(0);
+        } else {
+            loanHomeVisitInvestigateInitInformationStateVo.setWitnessState(1);
+        }
+        //证明文件
+        if (dkrsfzImages == null || dkrsfzImages.size() == 0) {
+            loanHomeVisitInvestigateInitInformationStateVo.setProofState(0);
+        } else if (dkrhkbImages == null || dkrhkbImages.size() == 0) {
+            loanHomeVisitInvestigateInitInformationStateVo.setProofState(0);
+        } else if (dkrhyzmImages == null || dkrhyzmImages.size() == 0) {
+            loanHomeVisitInvestigateInitInformationStateVo.setProofState(0);
+        } else if (dkrjsbImages == null || dkrjsbImages.size() == 0) {
+            loanHomeVisitInvestigateInitInformationStateVo.setProofState(0);
+        } else if (dkryhlsImages == null || dkryhlsImages.size() == 0) {
+            loanHomeVisitInvestigateInitInformationStateVo.setProofState(0);
+        } else if (posfzImages == null || posfzImages.size() == 0) {
+            loanHomeVisitInvestigateInitInformationStateVo.setProofState(0);
+        } else if (pohkbImages == null || pohkbImages.size() == 0) {
+            loanHomeVisitInvestigateInitInformationStateVo.setProofState(0);
+        } else if (dbrsfzImages == null || dbrsfzImages.size() == 0) {
+            loanHomeVisitInvestigateInitInformationStateVo.setProofState(0);
+        } else if (dbrhkbImages == null || dbrhkbImages.size() == 0) {
+            loanHomeVisitInvestigateInitInformationStateVo.setProofState(0);
+        } else {
+            loanHomeVisitInvestigateInitInformationStateVo.setProofState(1);
+        }
+        //资产类
+        if (yhkImages == null || yhkImages.size() == 0) {
+            loanHomeVisitInvestigateInitInformationStateVo.setAssetsInfo(0);
+        } else if (fcImages == null || fcImages.size() == 0) {
+            loanHomeVisitInvestigateInitInformationStateVo.setAssetsInfo(0);
+        } else if (clImages == null || clImages.size() == 0) {
+            loanHomeVisitInvestigateInitInformationStateVo.setAssetsInfo(0);
+        } else {
+            loanHomeVisitInvestigateInitInformationStateVo.setAssetsInfo(1);
+        }
+        return rb.success().setData(loanHomeVisitInvestigateInitInformationStateVo);
+    }
 }

anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanhomevisitinvestigatecustomer/LoanHomevisitInvestigateCustomerMapper.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.riskcenter.api.loanhomevisitinvestigatecustomer.LoanHomevisitInvestigateCustomerDetailsVo;
 import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
 import org.apache.ibatis.annotations.Select;
@@ -62,4 +63,7 @@ public interface LoanHomevisitInvestigateCustomerMapper extends BaseMapper<LoanH
 	
 	@Select("select * from loan_homevisit_investigate_customer")
 	List<LoanHomevisitInvestigateCustomerVo> selectListVo();
+
+	@Select("select * from loan_homevisit_investigate_customer where mainSid = #{sid}")
+    LoanHomevisitInvestigateCustomerDetailsVo selByMainSid(String sid);
 }

anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanhomevisitinvestigatecustomer/LoanHomevisitInvestigateCustomerService.java

@@ -107,4 +107,8 @@ public class LoanHomevisitInvestigateCustomerService extends MybatisBaseService<
 		BeanUtil.copyProperties(entity, vo);
 		return vo;
 	}
+
+	public LoanHomevisitInvestigateCustomerDetailsVo selByMainSid(String sid) {
+		return baseMapper.selByMainSid(sid);
+	}
 }

anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanhomevisitinvestigatefile/LoanHomevisitInvestigateFileMapper.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.riskcenter.api.loanhomevisitinvestigatefile.LoanHomevisitInvestigateFileDetailsVo;
 import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
 import org.apache.ibatis.annotations.Select;
@@ -62,4 +63,7 @@ public interface LoanHomevisitInvestigateFileMapper extends BaseMapper<LoanHomev
 	
 	@Select("select * from loan_homevisit_investigate_file")
 	List<LoanHomevisitInvestigateFileVo> selectListVo();
+
+	@Select("select * from loan_homevisit_investigate_file where mainSid = #{sid} and attachType = #{attachType}")
+    List<LoanHomevisitInvestigateFileDetailsVo> selByMainSidAndTypeKey(@Param("sid") String sid,@Param("attachType") String attachType);
 }

anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanhomevisitinvestigatefile/LoanHomevisitInvestigateFileService.java

@@ -300,4 +300,8 @@ public class LoanHomevisitInvestigateFileService extends MybatisBaseService<Loan
 		}
 		return rb.success();
 	}
+
+	public List<LoanHomevisitInvestigateFileDetailsVo> selByMainSidAndTypeKey(String sid, String attachType) {
+		return baseMapper.selByMainSidAndTypeKey(sid,attachType);
+	}
 }

anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanhomevisitinvestigateoperations/LoanHomevisitInvestigateOperationsMapper.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.riskcenter.api.loanhomevisitinvestigateoperations.LoanHomevisitInvestigateOperationsDetailsVo;
 import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
 import org.apache.ibatis.annotations.Select;
@@ -62,4 +63,7 @@ public interface LoanHomevisitInvestigateOperationsMapper extends BaseMapper<Loa
 	
 	@Select("select * from loan_homevisit_investigate_operations")
 	List<LoanHomevisitInvestigateOperationsVo> selectListVo();
+
+	@Select("select * from loan_homevisit_investigate_operations where mainSid = #{sid}")
+    LoanHomevisitInvestigateOperationsDetailsVo selByMainSid(String sid);
 }

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

@@ -107,4 +107,8 @@ public class LoanHomevisitInvestigateOperationsService extends MybatisBaseServic
 		BeanUtil.copyProperties(entity, vo);
 		return vo;
 	}
+
+	public LoanHomevisitInvestigateOperationsDetailsVo selByMainSid(String sid) {
+		return baseMapper.selByMainSid(sid);
+	}
 }

anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanhomevisitinvestigateorder/LoanHomevisitInvestigateOrderMapper.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.riskcenter.api.loanhomevisitinvestigateorder.LoanHomevisitInvestigateOrderDetailsVo;
 import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
 import org.apache.ibatis.annotations.Select;
@@ -62,4 +63,7 @@ public interface LoanHomevisitInvestigateOrderMapper extends BaseMapper<LoanHome
 	
 	@Select("select * from loan_homevisit_investigate_order")
 	List<LoanHomevisitInvestigateOrderVo> selectListVo();
+
+	@Select("select * from loan_homevisit_investigate_order where mainSid = #{sid}")
+    LoanHomevisitInvestigateOrderDetailsVo selByMainSid(String sid);
 }

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

@@ -107,4 +107,8 @@ public class LoanHomevisitInvestigateOrderService extends MybatisBaseService<Loa
 		BeanUtil.copyProperties(entity, vo);
 		return vo;
 	}
+
+	public LoanHomevisitInvestigateOrderDetailsVo selByMainSid(String sid) {
+		return baseMapper.selByMainSid(sid);
+	}
 }

anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanhomevisitinvestigateproperty/LoanHomevisitInvestigatePropertyMapper.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.riskcenter.api.loanhomevisitinvestigateproperty.LoanHomevisitInvestigatePropertyDetailsVo;
 import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
 import org.apache.ibatis.annotations.Select;
@@ -62,4 +63,7 @@ public interface LoanHomevisitInvestigatePropertyMapper extends BaseMapper<LoanH
 	
 	@Select("select * from loan_homevisit_investigate_property")
 	List<LoanHomevisitInvestigatePropertyVo> selectListVo();
+
+	@Select("select * from loan_homevisit_investigate_property where mainSid = #{sid}")
+    LoanHomevisitInvestigatePropertyDetailsVo selByMainSid(String sid);
 }

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

@@ -107,4 +107,8 @@ public class LoanHomevisitInvestigatePropertyService extends MybatisBaseService<
 		BeanUtil.copyProperties(entity, vo);
 		return vo;
 	}
+
+	public LoanHomevisitInvestigatePropertyDetailsVo selByMainSid(String sid) {
+		return baseMapper.selByMainSid(sid);
+	}
 }

anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanhomevisitinvestigatetransport/LoanHomevisitInvestigateTransportMapper.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.riskcenter.api.loanhomevisitinvestigatetransport.LoanHomevisitInvestigateTransportDetailsVo;
 import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
 import org.apache.ibatis.annotations.Select;
@@ -62,4 +63,7 @@ public interface LoanHomevisitInvestigateTransportMapper extends BaseMapper<Loan
 	
 	@Select("select * from loan_homevisit_investigate_transport")
 	List<LoanHomevisitInvestigateTransportVo> selectListVo();
+
+	@Select("select * from loan_homevisit_investigate_transport where mainSid = #{sid}")
+    LoanHomevisitInvestigateTransportDetailsVo selByMainSid(String sid);
 }

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

@@ -107,4 +107,8 @@ public class LoanHomevisitInvestigateTransportService extends MybatisBaseService
 		BeanUtil.copyProperties(entity, vo);
 		return vo;
 	}
+
+	public LoanHomevisitInvestigateTransportDetailsVo selByMainSid(String sid) {
+		return baseMapper.selByMainSid(sid);
+	}
 }

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

@@ -0,0 +1,16 @@
+package com.yxt.anrui.terminal.api.risk.loanhomevisitinvestigate;
+
+import com.yxt.common.core.vo.Vo;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+@Data
+public class AppLoanHomeVisitInvestigateInitInformationStateVo implements Vo {
+
+    @ApiModelProperty("家访见证类")
+    private String witnessState;
+    @ApiModelProperty("证明文件")
+    private String proofState;
+    @ApiModelProperty("资产情况")
+    private String assetsInfo;
+}

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

@@ -0,0 +1,20 @@
+package com.yxt.anrui.terminal.api.risk.loanhomevisitinvestigate;
+
+import com.yxt.common.core.vo.Vo;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+@Data
+public class AppLoanHomeVisitInvestigateInitReportStateVo implements Vo {
+
+    @ApiModelProperty("客户信息")
+    private String customerState;
+    @ApiModelProperty("订单信息")
+    private String orderState;
+    @ApiModelProperty("运营经历")
+    private String operationState;
+    @ApiModelProperty("运输情况")
+    private String transportState;
+    @ApiModelProperty("资产情况")
+    private String assetsState;
+}

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

@@ -0,0 +1,16 @@
+package com.yxt.anrui.terminal.api.risk.loanhomevisitinvestigate;
+
+import com.yxt.common.core.dto.Dto;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+@Data
+public class AppLoanHomeVisitInvestigateReservationDto implements Dto {
+
+    @ApiModelProperty("sid")
+    private String sid;
+    @ApiModelProperty("预约时间")
+    private String times;
+    @ApiModelProperty("预约地址")
+    private String adress;
+}

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

@@ -0,0 +1,46 @@
+package com.yxt.anrui.terminal.api.risk.loanhomevisitinvestigate;
+
+
+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.cloud.openfeign.FeignClient;
+import org.springframework.web.bind.annotation.*;
+
+import javax.validation.Valid;
+
+/**
+ * @Author
+ * @Date
+ * @Description
+ */
+@Api(tags = "家访考察")
+@FeignClient(
+        contextId = "terminal-LoanHomeVisitInvestigate",
+        name = "anrui-terminal",
+        path = "/riskcenter/v1/homeVisit",
+        fallback = LoanHomeVisitInvestigateFeignFallback.class)
+public interface LoanHomeVisitInvestigateFeign {
+
+    @ApiOperation("获取家访考察列表")
+    @PostMapping("/getHomeVisitList")
+    @ResponseBody
+    ResultBean<PagerVo<LoanHomeVisitInvestigatePageVo>> getHomeVisitList(@RequestBody PagerQuery<LoanHomeVisitInvestigatePageQuery> pagerQuery);
+
+    @ApiOperation("保存预约信息")
+    @PostMapping("/saveAppointmentInfo")
+    @ResponseBody
+    public ResultBean saveAppointmentInfo(@Valid @RequestBody AppLoanHomeVisitInvestigateReservationDto dto);
+
+    @ApiOperation("初始化家访考察报告状态")
+    @GetMapping("/getHomeVisitReportInfo")
+    @ResponseBody
+    public ResultBean<AppLoanHomeVisitInvestigateInitReportStateVo> getHomeVisitReportInfo(@RequestParam("sid") String sid);
+
+    @ApiOperation("初始化家访考察资料状态")
+    @GetMapping("/getHomeVisitDataInfo")
+    @ResponseBody
+    public ResultBean<AppLoanHomeVisitInvestigateInitInformationStateVo> getHomeVisitDataInfo(@RequestParam("sid") String sid);
+}

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

@@ -0,0 +1,12 @@
+package com.yxt.anrui.terminal.api.risk.loanhomevisitinvestigate;
+
+import org.springframework.stereotype.Component;
+
+/**
+ * @description:
+ * @author: dimengzhe
+ * @date: 2023/8/8
+ **/
+@Component
+public class LoanHomeVisitInvestigateFeignFallback {
+}

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

@@ -0,0 +1,21 @@
+package com.yxt.anrui.terminal.api.risk.loanhomevisitinvestigate;
+
+import com.yxt.common.core.query.Query;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+@Data
+public class LoanHomeVisitInvestigatePageQuery implements Query {
+    private static final long serialVersionUID = -7435351433058437187L;
+
+    @ApiModelProperty("用户sid")
+    private String userSid;
+    @ApiModelProperty("客户名称字段 合同编号字段")
+    private String names;
+    @ApiModelProperty("组织全路径")
+    private String orgPath;
+    @ApiModelProperty("1待办2已办")
+    private String type;
+    @ApiModelProperty("菜单sid")
+    private String menuSid;
+}

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

@@ -0,0 +1,32 @@
+package com.yxt.anrui.terminal.api.risk.loanhomevisitinvestigate;
+
+import com.yxt.common.core.vo.Vo;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+@Data
+public class LoanHomeVisitInvestigatePageVo implements Vo {
+
+    @ApiModelProperty("sid")
+    private String sid;
+    @ApiModelProperty("合同编号")
+    private String contractId;
+    @ApiModelProperty("预约状态")
+    private String nodeState;
+    @ApiModelProperty("销售专员")
+    private String salesName;
+    @ApiModelProperty("订单日期")
+    private String createDate;
+    @ApiModelProperty("贷款人姓名")
+    private String lenderName;
+    @ApiModelProperty("联系电话")
+    private String mobile;
+    @ApiModelProperty("预约家访日期")
+    private String times;
+    @ApiModelProperty("家访地址")
+    private String address;
+    @ApiModelProperty("是否显示办理按钮")
+    private Boolean showHandleBtn;
+    @ApiModelProperty("是否显示预约按钮")
+    private Boolean showAppointmentBtn;
+}

anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/risk/loanhomevisitinvestigate/LoanHomeVisitInvestigateRest.java

@@ -0,0 +1,60 @@
+/*********************************************************
+ *********************************************************
+ ********************                  *******************
+ *************                                ************
+ *******                  _oo0oo_                  *******
+ ***                     o8888888o                     ***
+ *                       88" . "88                       *
+ *                       (| -_- |)                       *
+ *                       0\  =  /0                       *
+ *                     ___/`---'\___                     *
+ *                   .' \\|     |// '.                   *
+ *                  / \\|||  :  |||// \                  *
+ *                 / _||||| -:- |||||- \                 *
+ *                |   | \\\  -  /// |   |                *
+ *                | \_|  ''\---/''  |_/ |                *
+ *                \  .-\__  '-'  ___/-. /                *
+ *              ___'. .'  /--.--\  `. .'___              *
+ *           ."" '<  `.___\_<|>_/___.' >' "".            *
+ *          | | :  `- \`.;`\ _ /`;.`/ - ` : | |          *
+ *          \  \ `_.   \_ __\ /__ _/   .-` /  /          *
+ *      =====`-.____`.___ \_____/___.-`___.-'=====       *
+ *                        `=---='                        *
+ *      ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~      *
+ *********__佛祖保佑__永无BUG__验收通过__钞票多多__*********
+ *********************************************************/
+package com.yxt.anrui.terminal.biz.risk.loanhomevisitinvestigate;
+
+import com.yxt.anrui.terminal.api.risk.loanhomevisitinvestigate.*;
+import com.yxt.common.core.query.PagerQuery;
+import com.yxt.common.core.result.ResultBean;
+import com.yxt.common.core.vo.PagerVo;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.RestController;
+
+@RestController("家访考察")
+public class LoanHomeVisitInvestigateRest implements LoanHomeVisitInvestigateFeign {
+
+    @Autowired
+    private LoanHomeVisitInvestigateService loanHomeVisitInvestigateService;
+
+    @Override
+    public ResultBean<PagerVo<LoanHomeVisitInvestigatePageVo>> getHomeVisitList(PagerQuery<LoanHomeVisitInvestigatePageQuery> pagerQuery) {
+        return loanHomeVisitInvestigateService.getHomeVisitList(pagerQuery);
+    }
+
+    @Override
+    public ResultBean saveAppointmentInfo(AppLoanHomeVisitInvestigateReservationDto dto) {
+        return loanHomeVisitInvestigateService.saveAppointmentInfo(dto);
+    }
+
+    @Override
+    public ResultBean<AppLoanHomeVisitInvestigateInitReportStateVo> getHomeVisitReportInfo(String sid) {
+        return loanHomeVisitInvestigateService.getHomeVisitReportInfo(sid);
+    }
+
+    @Override
+    public ResultBean<AppLoanHomeVisitInvestigateInitInformationStateVo> getHomeVisitDataInfo(String sid) {
+        return loanHomeVisitInvestigateService.getHomeVisitDataInfo(sid);
+    }
+}

anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/risk/loanhomevisitinvestigate/LoanHomeVisitInvestigateService.java

@@ -0,0 +1,113 @@
+/*********************************************************
+ *********************************************************
+ ********************                  *******************
+ *************                                ************
+ *******                  _oo0oo_                  *******
+ ***                     o8888888o                     ***
+ *                       88" . "88                       *
+ *                       (| -_- |)                       *
+ *                       0\  =  /0                       *
+ *                     ___/`---'\___                     *
+ *                   .' \\|     |// '.                   *
+ *                  / \\|||  :  |||// \                  *
+ *                 / _||||| -:- |||||- \                 *
+ *                |   | \\\  -  /// |   |                *
+ *                | \_|  ''\---/''  |_/ |                *
+ *                \  .-\__  '-'  ___/-. /                *
+ *              ___'. .'  /--.--\  `. .'___              *
+ *           ."" '<  `.___\_<|>_/___.' >' "".            *
+ *          | | :  `- \`.;`\ _ /`;.`/ - ` : | |          *
+ *          \  \ `_.   \_ __\ /__ _/   .-` /  /          *
+ *      =====`-.____`.___ \_____/___.-`___.-'=====       *
+ *                        `=---='                        *
+ *      ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~      *
+ *********__佛祖保佑__永无BUG__验收通过__钞票多多__*********
+ *********************************************************/
+package com.yxt.anrui.terminal.biz.risk.loanhomevisitinvestigate;
+
+
+import cn.hutool.core.bean.BeanUtil;
+import com.yxt.anrui.riskcenter.api.loanhomevisitinvestigate.*;
+import com.yxt.anrui.terminal.api.risk.loanhomevisitinvestigate.*;
+import com.yxt.common.base.utils.StringUtils;
+import com.yxt.common.core.query.PagerQuery;
+import com.yxt.common.core.result.ResultBean;
+import com.yxt.common.core.vo.PagerVo;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+import java.util.ArrayList;
+import java.util.List;
+
+@Service
+public class LoanHomeVisitInvestigateService {
+
+    @Autowired
+    private LoanHomevisitInvestigateFeign loanHomevisitInvestigateFeign;
+
+    public ResultBean<PagerVo<LoanHomeVisitInvestigatePageVo>> getHomeVisitList(PagerQuery<LoanHomeVisitInvestigatePageQuery> pagerQuery) {
+        ResultBean<PagerVo<LoanHomeVisitInvestigatePageVo>> rb = ResultBean.fireFail();
+        PagerQuery<LoanHomevisitInvestigateQuery> pq = new PagerQuery<>();
+        LoanHomeVisitInvestigatePageQuery params = pagerQuery.getParams();
+        LoanHomevisitInvestigateQuery params1 = new LoanHomevisitInvestigateQuery();
+        params1.setOrgSidPath(params.getOrgPath());
+        params1.setUserSid(params.getUserSid());
+        params1.setNames(params.getNames());
+        params1.setType(params.getType());
+        pq.setParams(params1);
+        ResultBean<PagerVo<LoanHomevisitInvestigateVo>> resultBean = loanHomevisitInvestigateFeign.listPage(pq);
+        List<LoanHomeVisitInvestigatePageVo> loanHomeVisitInvestigatePageVos = new ArrayList<>();
+        PagerVo<LoanHomeVisitInvestigatePageVo> v = new PagerVo<>();
+        List<LoanHomevisitInvestigateVo> records = resultBean.getData().getRecords();
+        for (LoanHomevisitInvestigateVo record : records) {
+            LoanHomeVisitInvestigatePageVo loanHomeVisitInvestigatePageVo = new LoanHomeVisitInvestigatePageVo();
+            loanHomeVisitInvestigatePageVo.setSid(record.getSid());
+            loanHomeVisitInvestigatePageVo.setContractId(record.getContractNo());
+            if (StringUtils.isNotBlank(record.getResHomeVisDate())){
+                loanHomeVisitInvestigatePageVo.setNodeState("已预约");
+                loanHomeVisitInvestigatePageVo.setShowAppointmentBtn(false);
+            }else {
+                loanHomeVisitInvestigatePageVo.setNodeState("未预约");
+                loanHomeVisitInvestigatePageVo.setShowAppointmentBtn(true);
+            }
+            loanHomeVisitInvestigatePageVo.setSalesName(record.getStaffName());
+            loanHomeVisitInvestigatePageVo.setCreateDate(record.getCreateDate());
+            loanHomeVisitInvestigatePageVo.setLenderName(record.getBorrowerName());
+            loanHomeVisitInvestigatePageVo.setMobile(record.getMobile());
+            loanHomeVisitInvestigatePageVo.setTimes(record.getResHomeVisDate());
+            loanHomeVisitInvestigatePageVo.setAddress(record.getHomeVisAddress());
+            if (record.getState().equals("1")) {
+                loanHomeVisitInvestigatePageVo.setShowHandleBtn(true);
+            } else {
+                loanHomeVisitInvestigatePageVo.setShowHandleBtn(false);
+            }
+            loanHomeVisitInvestigatePageVos.add(loanHomeVisitInvestigatePageVo);
+        }
+        v.setRecords(loanHomeVisitInvestigatePageVos);
+        return rb.success().setData(v);
+    }
+
+    public ResultBean saveAppointmentInfo(AppLoanHomeVisitInvestigateReservationDto dto) {
+        ResultBean rb = ResultBean.fireFail();
+        LoanHomeVisitInvestigateReservationDto loanHomeVisitInvestigateReservationDto = new LoanHomeVisitInvestigateReservationDto();
+        BeanUtil.copyProperties(dto,loanHomeVisitInvestigateReservationDto);
+        loanHomevisitInvestigateFeign.saveAppointmentInfo(loanHomeVisitInvestigateReservationDto);
+        return rb.success();
+    }
+
+    public ResultBean<AppLoanHomeVisitInvestigateInitReportStateVo> getHomeVisitReportInfo(String sid) {
+        ResultBean rb = ResultBean.fireFail();
+        LoanHomeVisitInvestigateInitReportStateVo data = loanHomevisitInvestigateFeign.getHomeVisitReportInfo(sid).getData();
+        AppLoanHomeVisitInvestigateInitReportStateVo appLoanHomeVisitInvestigateInitReportStateVo = new AppLoanHomeVisitInvestigateInitReportStateVo();
+        BeanUtil.copyProperties(data,appLoanHomeVisitInvestigateInitReportStateVo);
+        return rb.success().setData(appLoanHomeVisitInvestigateInitReportStateVo);
+    }
+
+    public ResultBean<AppLoanHomeVisitInvestigateInitInformationStateVo> getHomeVisitDataInfo(String sid) {
+        ResultBean rb = ResultBean.fireFail();
+        LoanHomeVisitInvestigateInitInformationStateVo data = loanHomevisitInvestigateFeign.getHomeVisitDataInfo(sid).getData();
+        AppLoanHomeVisitInvestigateInitInformationStateVo appLoanHomeVisitInvestigateInitInformationStateVo = new AppLoanHomeVisitInvestigateInitInformationStateVo();
+        BeanUtil.copyProperties(data,appLoanHomeVisitInvestigateInitInformationStateVo);
+        return rb.success().setData(appLoanHomeVisitInvestigateInitInformationStateVo);
+    }
+}