Merge remote-tracking branch 'origin/master'

anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bustransferrecords/BusTransferRecordsFeign.java

@@ -55,4 +55,8 @@ public interface BusTransferRecordsFeign {
     @ApiOperation("移交记录确认")
     @PostMapping("/confirmRecords")
     ResultBean confirmRecords(@RequestBody ConfirmRecordsQuery query);
+
+    @ApiOperation("查看车辆发票记录")
+    @GetMapping("/selectByVinSidAndKey")
+    ResultBean<BusTransferRecords> selectByVinSidAndKey(@RequestParam("vinSid") String vinSid,@RequestParam("goodsTypeKey") String goodsTypeKey);
 }

anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bustransferrecords/BusTransferRecordsMapper.java

@@ -33,4 +33,6 @@ public interface BusTransferRecordsMapper extends BaseMapper<BusTransferRecords>
 
     @Select("select * from bus_transfer_records where sid = #{sid}")
     BusRecordsInvoiceHgzVo getInvoiceInfoHgz(String sid);
+
+    BusTransferRecords selectByVinSidAndKey(@Param("vinSid") String vinSid,@Param("goodsTypeKey") String goodsTypeKey);
 }

anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bustransferrecords/BusTransferRecordsMapper.xml

@@ -48,4 +48,12 @@
             ${ew.sqlSegment}
         </where>
     </select>
+
+    <select id="selectByVinSidAndKey" resultType="com.yxt.anrui.buscenter.api.bustransferrecords.BusTransferRecords">
+        select *
+        from bus_transfer_records
+        where vinSid = #{vinSid}
+        and goodsTypeKey = #{goodsTypeKey}
+        order by id desc limit 1
+    </select>
 </mapper>

anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bustransferrecords/BusTransferRecordsRest.java

@@ -65,4 +65,9 @@ public class BusTransferRecordsRest implements BusTransferRecordsFeign {
     public ResultBean confirmRecords(ConfirmRecordsQuery query) {
         return busTransferRecordsService.confirmRecords(query);
     }
+
+    @Override
+    public ResultBean<BusTransferRecords> selectByVinSidAndKey(String vinSid, String goodsTypeKey) {
+        return busTransferRecordsService.selectByVinSidAndKey(vinSid,goodsTypeKey);
+    }
 }

anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bustransferrecords/BusTransferRecordsService.java

@@ -340,4 +340,10 @@ public class BusTransferRecordsService extends MybatisBaseService<BusTransferRec
         busRecordsInvoiceHgzVo.setReceiveFilesList(receiveFilesList);
         return rb.success().setData(busRecordsInvoiceHgzVo);
     }
+
+    public ResultBean<BusTransferRecords> selectByVinSidAndKey(String vinSid, String goodsTypeKey) {
+        ResultBean<BusTransferRecords> rb = ResultBean.fireFail();
+        BusTransferRecords BusTransferRecords = baseMapper.selectByVinSidAndKey(vinSid, goodsTypeKey);
+        return rb.success().setData(BusTransferRecords);
+    }
 }

anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanfileexamine/LoanFileexamineDetailsVo.java

@@ -63,6 +63,10 @@ public class LoanFileexamineDetailsVo implements Vo {
     private String staffName;
     @ApiModelProperty("车架号拼接")
     private String vinNo;
+    @ApiModelProperty("合格证图片")
+    private List<String> hgzImages;
+    @ApiModelProperty("发票图片")
+    private List<String> fpImages;
     @ApiModelProperty("银行卡")
     private List<String> yhkImages;
     @ApiModelProperty("购置税发票")

anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanfileexamine/LoanFileexamineQuery.java

@@ -69,10 +69,6 @@ public class LoanFileexamineQuery implements Query {
     private String bankContractNo;
     @ApiModelProperty("资方状态value")
     private String bankStateValue;
-    @ApiModelProperty("电子件状态")
-    private String dzjState;
-    @ApiModelProperty("原件状态")
-    private String yjState;
     @ApiModelProperty("资料状态")
     private String zlState;
     @ApiModelProperty("组织全路径")

anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanfileexamine/LoanFileexamineVo.java

@@ -59,10 +59,6 @@ public class LoanFileexamineVo implements Vo {
     private String staffName;
     @ApiModelProperty("资方状态value")
     private String bankStateValue;
-    @ApiModelProperty("电子件状态")
-    private String dzjState;
-    @ApiModelProperty("原件状态")
-    private String yjState;
     @ApiModelProperty("资料状态")
     private String zlState;
     @ApiModelProperty("消贷合同编号")

anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanfinotherPolicy/LoanFinOtherPolicyFeign.java

@@ -49,7 +49,7 @@ public interface LoanFinOtherPolicyFeign {
 
     @GetMapping("selectList")
     @ApiOperation("获取产品政策下其他融，或分公司下其他融")
-    ResultBean<List<OtherPolicyVo>> selectList(@RequestParam("orgPath") String orgPath, @RequestParam("userSid") String userSid, @RequestParam(value = "sid", required = false) String sid, @RequestParam(value = "name", required = false) String name);
+    ResultBean<List<OtherPolicyVo>> selectList(@RequestParam("orgPath") String orgPath, @RequestParam("userSid") String userSid, @RequestParam(value = "sid", required = false) String sid, @RequestParam(value = "name", required = false) String name,@RequestParam(value = "modelSid", required = false) String modelSid);
 
     @ApiOperation("使用状态停用、开启:useState为1时走停用，为0时走开启")
     @PostMapping("setState")

anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanfileexamine/LoanFileexamineMapper.xml

@@ -10,8 +10,7 @@
         bo.`orgName`,
         bo.`staffName`,
         lf.`bankStateValue`,
-        IF(lf.`dzjState` = '0', '未齐全', '已齐全'),
-        IF(lf.`yjState` = '0', '未齐全', '已齐全'),
+        IF(lf.`zlState` = '0', '未齐全', '已齐全'),
         bl.`loanContractNo`,
         bl.`vehCount` AS num,
         bl.`borrowerName`,

anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanfileexamine/LoanFileexamineService.java

@@ -28,6 +28,9 @@ package com.yxt.anrui.riskcenter.biz.loanfileexamine;
 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.base.api.basevehicleappendix.BaseVehicleAppendixFeign;
+import com.yxt.anrui.base.api.basevehiclecertificate.BaseVehicleCertificateFeign;
+import com.yxt.anrui.base.api.basevehiclecertificate.BaseVehicleCertificateVo;
 import com.yxt.anrui.buscenter.api.bussalesorder.BusSalesOrder;
 import com.yxt.anrui.buscenter.api.bussalesorder.BusSalesOrderFeign;
 import com.yxt.anrui.buscenter.api.bussalesorderloancontract.BusSalesOrderLoancontractDetailsVo;
@@ -35,6 +38,8 @@ import com.yxt.anrui.buscenter.api.bussalesorderloancontract.BusSalesOrderLoanco
 import com.yxt.anrui.buscenter.api.bussalesordervehicle.BusSalesOrderVehicle;
 import com.yxt.anrui.buscenter.api.bussalesordervehicle.BusSalesOrderVehicleFeign;
 import com.yxt.anrui.buscenter.api.bussalesvehicleorder.BusSalesVehicleOrderFeign;
+import com.yxt.anrui.buscenter.api.bustransferrecords.BusTransferRecords;
+import com.yxt.anrui.buscenter.api.bustransferrecords.BusTransferRecordsFeign;
 import com.yxt.anrui.portal.api.sysuser.PrivilegeQuery;
 import com.yxt.anrui.portal.api.sysuser.SysUserFeign;
 import com.yxt.anrui.riskcenter.api.loanfile.LoanFileEnum;
@@ -79,324 +84,349 @@ import java.util.List;
 @Service
 public class LoanFileexamineService extends MybatisBaseService<LoanFileexamineMapper, LoanFileexamine> {
 
-	@Autowired
-	private SysUserFeign sysUserFeign;
-	@Autowired
-	private BusSalesOrderLoancontractFeign busSalesOrderLoancontractFeign;
-	@Autowired
-	private BusSalesOrderFeign busSalesOrderFeign;
-	@Autowired
-	private BusSalesOrderVehicleFeign busSalesOrderVehicleFeign;
-	@Autowired
-	private LoanHomevisitInvestigateFileService loanHomevisitInvestigateFileService;
-	@Autowired
-	private FileUploadComponent fileUploadComponent;
+    @Autowired
+    private SysUserFeign sysUserFeign;
+    @Autowired
+    private BusSalesOrderLoancontractFeign busSalesOrderLoancontractFeign;
+    @Autowired
+    private BusSalesOrderFeign busSalesOrderFeign;
+    @Autowired
+    private BusSalesOrderVehicleFeign busSalesOrderVehicleFeign;
+    @Autowired
+    private LoanHomevisitInvestigateFileService loanHomevisitInvestigateFileService;
+    @Autowired
+    private FileUploadComponent fileUploadComponent;
+    @Autowired
+    private BaseVehicleAppendixFeign baseVehicleAppendixFeign;
+    @Autowired
+    private BaseVehicleCertificateFeign baseVehicleCertificateFeign;
+    @Autowired
+    private BusTransferRecordsFeign busTransferRecordsFeign;
 
-	public PagerVo<LoanFileexamineVo> listPageVo(PagerQuery<LoanFileexamineQuery> pq) {
-		LoanFileexamineQuery query = pq.getParams();
-		QueryWrapper<LoanFileexamine> qw = new QueryWrapper<>();
-		qw.eq("bl.busNo",305);
-		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<LoanFileexamineVo> p = new PagerVo<>();
-					return p;
-				}
-			} else {
-				PagerVo<LoanFileexamineVo> 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.getLoanContractNo())) {
-			qw.like("bl.loanContractNo", query.getLoanContractNo());
-		}
-		if (StringUtils.isNotBlank(query.getLoanPeoName())) {
-			qw.like("bl.borrowerName", query.getLoanPeoName());
-		}
-		if (StringUtils.isNotBlank(query.getBankName())) {
-			qw.like("bl.bankName", query.getBankName());
-		}
-		if (StringUtils.isNotBlank(query.getPolicyName())) {
-			qw.like("bl.policyName", query.getPolicyName());
-		}
-		if (StringUtils.isNotBlank(query.getBankContractNo())) {
-			qw.like("bl.bankContractNo", query.getBankContractNo());
-		}
-		if (StringUtils.isNotBlank(query.getBankStateValue())) {
-			qw.like("lf.bankStateValue", query.getBankStateValue());
-		}
-		if (StringUtils.isNotBlank(query.getDzjState())) {
-			qw.eq("lf.dzjState", query.getDzjState());
-		}
-		if (StringUtils.isNotBlank(query.getYjState())) {
-			qw.eq("lf.yjState", query.getYjState());
-		}
-		IPage<LoanFileexamine> page = PagerUtil.queryToPage(pq);
-		IPage<LoanFileexamineVo> pagging = baseMapper.selectPageVo(page, qw);
-		PagerVo<LoanFileexamineVo> p = PagerUtil.pageToVo(pagging, null);
-		return p;
-	}
-	
-	public void saveOrUpdateDto(LoanFileexamineDto dto){
+    public PagerVo<LoanFileexamineVo> listPageVo(PagerQuery<LoanFileexamineQuery> pq) {
+        LoanFileexamineQuery query = pq.getParams();
+        QueryWrapper<LoanFileexamine> qw = new QueryWrapper<>();
+        qw.eq("bl.busNo", 305);
+        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<LoanFileexamineVo> p = new PagerVo<>();
+                    return p;
+                }
+            } else {
+                PagerVo<LoanFileexamineVo> 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.getLoanContractNo())) {
+            qw.like("bl.loanContractNo", query.getLoanContractNo());
+        }
+        if (StringUtils.isNotBlank(query.getLoanPeoName())) {
+            qw.like("bl.borrowerName", query.getLoanPeoName());
+        }
+        if (StringUtils.isNotBlank(query.getBankName())) {
+            qw.like("bl.bankName", query.getBankName());
+        }
+        if (StringUtils.isNotBlank(query.getPolicyName())) {
+            qw.like("bl.policyName", query.getPolicyName());
+        }
+        if (StringUtils.isNotBlank(query.getBankContractNo())) {
+            qw.like("bl.bankContractNo", query.getBankContractNo());
+        }
+        if (StringUtils.isNotBlank(query.getBankStateValue())) {
+            qw.like("lf.bankStateValue", query.getBankStateValue());
+        }
+        if (StringUtils.isNotBlank(query.getZlState())) {
+            qw.eq("lf.zlState", query.getZlState());
+        }
+        IPage<LoanFileexamine> page = PagerUtil.queryToPage(pq);
+        IPage<LoanFileexamineVo> pagging = baseMapper.selectPageVo(page, qw);
+        PagerVo<LoanFileexamineVo> p = PagerUtil.pageToVo(pagging, null);
+        return p;
+    }
+
+    public void saveOrUpdateDto(LoanFileexamineDto dto) {
         String dtoSid = dto.getSid();
-		List<String> yhkImages = dto.getYhkImages();
-		List<String> gzsfpImages = dto.getGzsfpImages();
-		List<String> bxfpImages = dto.getBxfpImages();
-		List<String> bdImages = dto.getBdImages();
-		List<String> rzhtImages = dto.getRzhtImages();
-		List<String> zmfjImages = dto.getZmfjImages();
-		if (StringUtils.isBlank(dtoSid)) {
-			String sid = this.insertByDto(dto);
-			for (String yhkImage : yhkImages) {
-				LoanHomevisitInvestigateFileDto loanHomevisitInvestigateFileDto = new LoanHomevisitInvestigateFileDto();
-				loanHomevisitInvestigateFileDto.setMainSid(sid);
-				loanHomevisitInvestigateFileDto.setAttachType(LoanAttachTypeEnum.YHK.getAttachType());
-				if (yhkImage.indexOf(fileUploadComponent.getUrlPrefix()) > -1) {
-					yhkImage = yhkImage.replace(fileUploadComponent.getUrlPrefix(), "");
-				}
-				loanHomevisitInvestigateFileDto.setFileUrl(yhkImage);
-				loanHomevisitInvestigateFileService.saveOrUpdateDto(loanHomevisitInvestigateFileDto);
-			}
-			for (String gzsfpImage : gzsfpImages) {
-				LoanHomevisitInvestigateFileDto loanHomevisitInvestigateFileDto = new LoanHomevisitInvestigateFileDto();
-				loanHomevisitInvestigateFileDto.setMainSid(sid);
-				loanHomevisitInvestigateFileDto.setAttachType(LoanAttachTypeEnum.GZSFP.getAttachType());
-				if (gzsfpImage.indexOf(fileUploadComponent.getUrlPrefix()) > -1) {
-					gzsfpImage = gzsfpImage.replace(fileUploadComponent.getUrlPrefix(), "");
-				}
-				loanHomevisitInvestigateFileDto.setFileUrl(gzsfpImage);
-				loanHomevisitInvestigateFileService.saveOrUpdateDto(loanHomevisitInvestigateFileDto);
-			}
-			for (String bxfpImage : bxfpImages) {
-				LoanHomevisitInvestigateFileDto loanHomevisitInvestigateFileDto = new LoanHomevisitInvestigateFileDto();
-				loanHomevisitInvestigateFileDto.setMainSid(sid);
-				loanHomevisitInvestigateFileDto.setAttachType(LoanAttachTypeEnum.BXFP.getAttachType());
-				if (bxfpImage.indexOf(fileUploadComponent.getUrlPrefix()) > -1) {
-					bxfpImage = bxfpImage.replace(fileUploadComponent.getUrlPrefix(), "");
-				}
-				loanHomevisitInvestigateFileDto.setFileUrl(bxfpImage);
-				loanHomevisitInvestigateFileService.saveOrUpdateDto(loanHomevisitInvestigateFileDto);
-			}
-			for (String bdImage : bdImages) {
-				LoanHomevisitInvestigateFileDto loanHomevisitInvestigateFileDto = new LoanHomevisitInvestigateFileDto();
-				loanHomevisitInvestigateFileDto.setMainSid(sid);
-				loanHomevisitInvestigateFileDto.setAttachType(LoanAttachTypeEnum.BD.getAttachType());
-				if (bdImage.indexOf(fileUploadComponent.getUrlPrefix()) > -1) {
-					bdImage = bdImage.replace(fileUploadComponent.getUrlPrefix(), "");
-				}
-				loanHomevisitInvestigateFileDto.setFileUrl(bdImage);
-				loanHomevisitInvestigateFileService.saveOrUpdateDto(loanHomevisitInvestigateFileDto);
-			}
-			for (String rzhtImage : rzhtImages) {
-				LoanHomevisitInvestigateFileDto loanHomevisitInvestigateFileDto = new LoanHomevisitInvestigateFileDto();
-				loanHomevisitInvestigateFileDto.setMainSid(sid);
-				loanHomevisitInvestigateFileDto.setAttachType(LoanAttachTypeEnum.RZHT.getAttachType());
-				if (rzhtImage.indexOf(fileUploadComponent.getUrlPrefix()) > -1) {
-					rzhtImage = rzhtImage.replace(fileUploadComponent.getUrlPrefix(), "");
-				}
-				loanHomevisitInvestigateFileDto.setFileUrl(rzhtImage);
-				loanHomevisitInvestigateFileService.saveOrUpdateDto(loanHomevisitInvestigateFileDto);
-			}
-			for (String zmfjImage : zmfjImages) {
-				LoanHomevisitInvestigateFileDto loanHomevisitInvestigateFileDto = new LoanHomevisitInvestigateFileDto();
-				loanHomevisitInvestigateFileDto.setMainSid(sid);
-				loanHomevisitInvestigateFileDto.setAttachType(LoanAttachTypeEnum.ZMFJ.getAttachType());
-				if (zmfjImage.indexOf(fileUploadComponent.getUrlPrefix()) > -1) {
-					zmfjImage = zmfjImage.replace(fileUploadComponent.getUrlPrefix(), "");
-				}
-				loanHomevisitInvestigateFileDto.setFileUrl(zmfjImage);
-				loanHomevisitInvestigateFileService.saveOrUpdateDto(loanHomevisitInvestigateFileDto);
-			}
-			return;
-        } 
-		this.updateByDto(dto);
-		loanHomevisitInvestigateFileService.delByMainSid(dtoSid);
-		for (String yhkImage : yhkImages) {
-			LoanHomevisitInvestigateFileDto loanHomevisitInvestigateFileDto = new LoanHomevisitInvestigateFileDto();
-			loanHomevisitInvestigateFileDto.setMainSid(dtoSid);
-			loanHomevisitInvestigateFileDto.setAttachType(LoanAttachTypeEnum.YHK.getAttachType());
-			if (yhkImage.indexOf(fileUploadComponent.getUrlPrefix()) > -1) {
-				yhkImage = yhkImage.replace(fileUploadComponent.getUrlPrefix(), "");
-			}
-			loanHomevisitInvestigateFileDto.setFileUrl(yhkImage);
-			loanHomevisitInvestigateFileService.saveOrUpdateDto(loanHomevisitInvestigateFileDto);
-		}
-		for (String gzsfpImage : gzsfpImages) {
-			LoanHomevisitInvestigateFileDto loanHomevisitInvestigateFileDto = new LoanHomevisitInvestigateFileDto();
-			loanHomevisitInvestigateFileDto.setMainSid(dtoSid);
-			loanHomevisitInvestigateFileDto.setAttachType(LoanAttachTypeEnum.GZSFP.getAttachType());
-			if (gzsfpImage.indexOf(fileUploadComponent.getUrlPrefix()) > -1) {
-				gzsfpImage = gzsfpImage.replace(fileUploadComponent.getUrlPrefix(), "");
-			}
-			loanHomevisitInvestigateFileDto.setFileUrl(gzsfpImage);
-			loanHomevisitInvestigateFileService.saveOrUpdateDto(loanHomevisitInvestigateFileDto);
-		}
-		for (String bxfpImage : bxfpImages) {
-			LoanHomevisitInvestigateFileDto loanHomevisitInvestigateFileDto = new LoanHomevisitInvestigateFileDto();
-			loanHomevisitInvestigateFileDto.setMainSid(dtoSid);
-			loanHomevisitInvestigateFileDto.setAttachType(LoanAttachTypeEnum.BXFP.getAttachType());
-			if (bxfpImage.indexOf(fileUploadComponent.getUrlPrefix()) > -1) {
-				bxfpImage = bxfpImage.replace(fileUploadComponent.getUrlPrefix(), "");
-			}
-			loanHomevisitInvestigateFileDto.setFileUrl(bxfpImage);
-			loanHomevisitInvestigateFileService.saveOrUpdateDto(loanHomevisitInvestigateFileDto);
-		}
-		for (String bdImage : bdImages) {
-			LoanHomevisitInvestigateFileDto loanHomevisitInvestigateFileDto = new LoanHomevisitInvestigateFileDto();
-			loanHomevisitInvestigateFileDto.setMainSid(dtoSid);
-			loanHomevisitInvestigateFileDto.setAttachType(LoanAttachTypeEnum.BD.getAttachType());
-			if (bdImage.indexOf(fileUploadComponent.getUrlPrefix()) > -1) {
-				bdImage = bdImage.replace(fileUploadComponent.getUrlPrefix(), "");
-			}
-			loanHomevisitInvestigateFileDto.setFileUrl(bdImage);
-			loanHomevisitInvestigateFileService.saveOrUpdateDto(loanHomevisitInvestigateFileDto);
-		}
-		for (String rzhtImage : rzhtImages) {
-			LoanHomevisitInvestigateFileDto loanHomevisitInvestigateFileDto = new LoanHomevisitInvestigateFileDto();
-			loanHomevisitInvestigateFileDto.setMainSid(dtoSid);
-			loanHomevisitInvestigateFileDto.setAttachType(LoanAttachTypeEnum.RZHT.getAttachType());
-			if (rzhtImage.indexOf(fileUploadComponent.getUrlPrefix()) > -1) {
-				rzhtImage = rzhtImage.replace(fileUploadComponent.getUrlPrefix(), "");
-			}
-			loanHomevisitInvestigateFileDto.setFileUrl(rzhtImage);
-			loanHomevisitInvestigateFileService.saveOrUpdateDto(loanHomevisitInvestigateFileDto);
-		}
-		for (String zmfjImage : zmfjImages) {
-			LoanHomevisitInvestigateFileDto loanHomevisitInvestigateFileDto = new LoanHomevisitInvestigateFileDto();
-			loanHomevisitInvestigateFileDto.setMainSid(dtoSid);
-			loanHomevisitInvestigateFileDto.setAttachType(LoanAttachTypeEnum.ZMFJ.getAttachType());
-			if (zmfjImage.indexOf(fileUploadComponent.getUrlPrefix()) > -1) {
-				zmfjImage = zmfjImage.replace(fileUploadComponent.getUrlPrefix(), "");
-			}
-			loanHomevisitInvestigateFileDto.setFileUrl(zmfjImage);
-			loanHomevisitInvestigateFileService.saveOrUpdateDto(loanHomevisitInvestigateFileDto);
-		}
-	}
-	
-	public String insertByDto(LoanFileexamineDto dto){
-		LoanFileexamine entity = new LoanFileexamine();
-		BeanUtil.copyProperties(dto, entity, "id", "sid");
-		baseMapper.insert(entity);
-		return entity.getSid();
-	}
-	
-	public void updateByDto(LoanFileexamineDto dto){
-          String dtoSid = dto.getSid();
+        List<String> yhkImages = dto.getYhkImages();
+        List<String> gzsfpImages = dto.getGzsfpImages();
+        List<String> bxfpImages = dto.getBxfpImages();
+        List<String> bdImages = dto.getBdImages();
+        List<String> rzhtImages = dto.getRzhtImages();
+        List<String> zmfjImages = dto.getZmfjImages();
         if (StringUtils.isBlank(dtoSid)) {
+            String sid = this.insertByDto(dto);
+            for (String yhkImage : yhkImages) {
+                LoanHomevisitInvestigateFileDto loanHomevisitInvestigateFileDto = new LoanHomevisitInvestigateFileDto();
+                loanHomevisitInvestigateFileDto.setMainSid(sid);
+                loanHomevisitInvestigateFileDto.setAttachType(LoanAttachTypeEnum.YHK.getAttachType());
+                if (yhkImage.indexOf(fileUploadComponent.getUrlPrefix()) > -1) {
+                    yhkImage = yhkImage.replace(fileUploadComponent.getUrlPrefix(), "");
+                }
+                loanHomevisitInvestigateFileDto.setFileUrl(yhkImage);
+                loanHomevisitInvestigateFileService.saveOrUpdateDto(loanHomevisitInvestigateFileDto);
+            }
+            for (String gzsfpImage : gzsfpImages) {
+                LoanHomevisitInvestigateFileDto loanHomevisitInvestigateFileDto = new LoanHomevisitInvestigateFileDto();
+                loanHomevisitInvestigateFileDto.setMainSid(sid);
+                loanHomevisitInvestigateFileDto.setAttachType(LoanAttachTypeEnum.GZSFP.getAttachType());
+                if (gzsfpImage.indexOf(fileUploadComponent.getUrlPrefix()) > -1) {
+                    gzsfpImage = gzsfpImage.replace(fileUploadComponent.getUrlPrefix(), "");
+                }
+                loanHomevisitInvestigateFileDto.setFileUrl(gzsfpImage);
+                loanHomevisitInvestigateFileService.saveOrUpdateDto(loanHomevisitInvestigateFileDto);
+            }
+            for (String bxfpImage : bxfpImages) {
+                LoanHomevisitInvestigateFileDto loanHomevisitInvestigateFileDto = new LoanHomevisitInvestigateFileDto();
+                loanHomevisitInvestigateFileDto.setMainSid(sid);
+                loanHomevisitInvestigateFileDto.setAttachType(LoanAttachTypeEnum.BXFP.getAttachType());
+                if (bxfpImage.indexOf(fileUploadComponent.getUrlPrefix()) > -1) {
+                    bxfpImage = bxfpImage.replace(fileUploadComponent.getUrlPrefix(), "");
+                }
+                loanHomevisitInvestigateFileDto.setFileUrl(bxfpImage);
+                loanHomevisitInvestigateFileService.saveOrUpdateDto(loanHomevisitInvestigateFileDto);
+            }
+            for (String bdImage : bdImages) {
+                LoanHomevisitInvestigateFileDto loanHomevisitInvestigateFileDto = new LoanHomevisitInvestigateFileDto();
+                loanHomevisitInvestigateFileDto.setMainSid(sid);
+                loanHomevisitInvestigateFileDto.setAttachType(LoanAttachTypeEnum.BD.getAttachType());
+                if (bdImage.indexOf(fileUploadComponent.getUrlPrefix()) > -1) {
+                    bdImage = bdImage.replace(fileUploadComponent.getUrlPrefix(), "");
+                }
+                loanHomevisitInvestigateFileDto.setFileUrl(bdImage);
+                loanHomevisitInvestigateFileService.saveOrUpdateDto(loanHomevisitInvestigateFileDto);
+            }
+            for (String rzhtImage : rzhtImages) {
+                LoanHomevisitInvestigateFileDto loanHomevisitInvestigateFileDto = new LoanHomevisitInvestigateFileDto();
+                loanHomevisitInvestigateFileDto.setMainSid(sid);
+                loanHomevisitInvestigateFileDto.setAttachType(LoanAttachTypeEnum.RZHT.getAttachType());
+                if (rzhtImage.indexOf(fileUploadComponent.getUrlPrefix()) > -1) {
+                    rzhtImage = rzhtImage.replace(fileUploadComponent.getUrlPrefix(), "");
+                }
+                loanHomevisitInvestigateFileDto.setFileUrl(rzhtImage);
+                loanHomevisitInvestigateFileService.saveOrUpdateDto(loanHomevisitInvestigateFileDto);
+            }
+            for (String zmfjImage : zmfjImages) {
+                LoanHomevisitInvestigateFileDto loanHomevisitInvestigateFileDto = new LoanHomevisitInvestigateFileDto();
+                loanHomevisitInvestigateFileDto.setMainSid(sid);
+                loanHomevisitInvestigateFileDto.setAttachType(LoanAttachTypeEnum.ZMFJ.getAttachType());
+                if (zmfjImage.indexOf(fileUploadComponent.getUrlPrefix()) > -1) {
+                    zmfjImage = zmfjImage.replace(fileUploadComponent.getUrlPrefix(), "");
+                }
+                loanHomevisitInvestigateFileDto.setFileUrl(zmfjImage);
+                loanHomevisitInvestigateFileService.saveOrUpdateDto(loanHomevisitInvestigateFileDto);
+            }
             return;
-        } 
-		LoanFileexamine entity = fetchBySid(dtoSid);
-		BeanUtil.copyProperties(dto, entity, "id", "sid");
-		baseMapper.updateById(entity);
-	}
-	
-	public LoanFileexamineDetailsVo fetchDetailsVoBySid(String sid){
-		LoanFileexamine entity = fetchBySid(sid);
-		LoanFileexamineDetailsVo vo = new LoanFileexamineDetailsVo();
-		BeanUtil.copyProperties(entity, vo);
-		BusSalesOrderLoancontractDetailsVo busSalesOrderLoancontractDetailsVo = busSalesOrderLoancontractFeign.fetchDetailsBySid(entity.getLoanContractSid()).getData();
-		vo.setLoanContractNo(busSalesOrderLoancontractDetailsVo.getLoanContractNo());
-		vo.setBorrowerName(busSalesOrderLoancontractDetailsVo.getBorrowerName());
-		vo.setNum(busSalesOrderLoancontractDetailsVo.getVehCount());
-		BusSalesOrder busSalesOrder = busSalesOrderFeign.fetchBySid(entity.getSaleOrderSid()).getData();
-		vo.setStaffName(busSalesOrder.getStaffName());
-		List<BusSalesOrderVehicle> busSalesOrderVehicles = busSalesOrderVehicleFeign.selectListByOrderSid(entity.getSaleOrderSid()).getData();
-		String vinNos = "";
-		for (BusSalesOrderVehicle busSalesOrderVehicle : busSalesOrderVehicles) {
-			vinNos = vinNos + busSalesOrderVehicle.getLinkNo() + ",";
-		}
-		vo.setVinNo(vinNos.substring(0,vinNos.lastIndexOf(",")));
-		//银行卡
-		List<LoanHomevisitInvestigateFileDetailsVo> yhkVos = loanHomevisitInvestigateFileService.selByMainSidAndTypeKey(sid, LoanAttachTypeEnum.YHK.getAttachType());
-		List<String> yhkImages = new ArrayList<>();
-		if (yhkVos != null && yhkVos.size() > 0){
-			for (LoanHomevisitInvestigateFileDetailsVo loanHomevisitInvestigateFileDetailsVo : yhkVos) {
-				yhkImages.add(loanHomevisitInvestigateFileDetailsVo.getFileUrl());
-			}
-		}
-		vo.setYhkImages(yhkImages);
-		//购置税发票
-		List<LoanHomevisitInvestigateFileDetailsVo> gzsfpVos = loanHomevisitInvestigateFileService.selByMainSidAndTypeKey(sid, LoanAttachTypeEnum.GZSFP.getAttachType());
-		List<String> gzsfpImages = new ArrayList<>();
-		if (gzsfpVos != null && gzsfpVos.size() > 0){
-			for (LoanHomevisitInvestigateFileDetailsVo loanHomevisitInvestigateFileDetailsVo : gzsfpVos) {
-				gzsfpImages.add(loanHomevisitInvestigateFileDetailsVo.getFileUrl());
-			}
-		}
-		vo.setGzsfpImages(gzsfpImages);
-		//保险发票
-		List<LoanHomevisitInvestigateFileDetailsVo> bxfpVos = loanHomevisitInvestigateFileService.selByMainSidAndTypeKey(sid, LoanAttachTypeEnum.BXFP.getAttachType());
-		List<String> bxfpImages = new ArrayList<>();
-		if (bxfpVos != null && bxfpVos.size() > 0){
-			for (LoanHomevisitInvestigateFileDetailsVo loanHomevisitInvestigateFileDetailsVo : bxfpVos) {
-				bxfpImages.add(loanHomevisitInvestigateFileDetailsVo.getFileUrl());
-			}
-		}
-		vo.setBxfpImages(bxfpImages);
-		//保单
-		List<LoanHomevisitInvestigateFileDetailsVo> bdVos = loanHomevisitInvestigateFileService.selByMainSidAndTypeKey(sid, LoanAttachTypeEnum.BD.getAttachType());
-		List<String> bdImages = new ArrayList<>();
-		if (bdVos != null && bdVos.size() > 0){
-			for (LoanHomevisitInvestigateFileDetailsVo loanHomevisitInvestigateFileDetailsVo : bdVos) {
-				bdImages.add(loanHomevisitInvestigateFileDetailsVo.getFileUrl());
-			}
-		}
-		vo.setBdImages(bdImages);
-		//融资合同
-		List<LoanHomevisitInvestigateFileDetailsVo> rzhtVos = loanHomevisitInvestigateFileService.selByMainSidAndTypeKey(sid, LoanAttachTypeEnum.RZHT.getAttachType());
-		List<String> rzhtImages = new ArrayList<>();
-		if (rzhtVos != null && rzhtVos.size() > 0){
-			for (LoanHomevisitInvestigateFileDetailsVo loanHomevisitInvestigateFileDetailsVo : rzhtVos) {
-				rzhtImages.add(loanHomevisitInvestigateFileDetailsVo.getFileUrl());
-			}
-		}
-		vo.setRzhtImages(rzhtImages);
-		//证明附件
-		List<LoanHomevisitInvestigateFileDetailsVo> zmfjVos = loanHomevisitInvestigateFileService.selByMainSidAndTypeKey(sid, LoanAttachTypeEnum.ZMFJ.getAttachType());
-		List<String> zmfjImages = new ArrayList<>();
-		if (zmfjVos != null && zmfjVos.size() > 0){
-			for (LoanHomevisitInvestigateFileDetailsVo loanHomevisitInvestigateFileDetailsVo : zmfjVos) {
-				zmfjImages.add(loanHomevisitInvestigateFileDetailsVo.getFileUrl());
-			}
-		}
-		vo.setZmfjImages(zmfjImages);
-		return vo;
-	}
+        }
+        this.updateByDto(dto);
+        loanHomevisitInvestigateFileService.delByMainSid(dtoSid);
+        for (String yhkImage : yhkImages) {
+            LoanHomevisitInvestigateFileDto loanHomevisitInvestigateFileDto = new LoanHomevisitInvestigateFileDto();
+            loanHomevisitInvestigateFileDto.setMainSid(dtoSid);
+            loanHomevisitInvestigateFileDto.setAttachType(LoanAttachTypeEnum.YHK.getAttachType());
+            if (yhkImage.indexOf(fileUploadComponent.getUrlPrefix()) > -1) {
+                yhkImage = yhkImage.replace(fileUploadComponent.getUrlPrefix(), "");
+            }
+            loanHomevisitInvestigateFileDto.setFileUrl(yhkImage);
+            loanHomevisitInvestigateFileService.saveOrUpdateDto(loanHomevisitInvestigateFileDto);
+        }
+        for (String gzsfpImage : gzsfpImages) {
+            LoanHomevisitInvestigateFileDto loanHomevisitInvestigateFileDto = new LoanHomevisitInvestigateFileDto();
+            loanHomevisitInvestigateFileDto.setMainSid(dtoSid);
+            loanHomevisitInvestigateFileDto.setAttachType(LoanAttachTypeEnum.GZSFP.getAttachType());
+            if (gzsfpImage.indexOf(fileUploadComponent.getUrlPrefix()) > -1) {
+                gzsfpImage = gzsfpImage.replace(fileUploadComponent.getUrlPrefix(), "");
+            }
+            loanHomevisitInvestigateFileDto.setFileUrl(gzsfpImage);
+            loanHomevisitInvestigateFileService.saveOrUpdateDto(loanHomevisitInvestigateFileDto);
+        }
+        for (String bxfpImage : bxfpImages) {
+            LoanHomevisitInvestigateFileDto loanHomevisitInvestigateFileDto = new LoanHomevisitInvestigateFileDto();
+            loanHomevisitInvestigateFileDto.setMainSid(dtoSid);
+            loanHomevisitInvestigateFileDto.setAttachType(LoanAttachTypeEnum.BXFP.getAttachType());
+            if (bxfpImage.indexOf(fileUploadComponent.getUrlPrefix()) > -1) {
+                bxfpImage = bxfpImage.replace(fileUploadComponent.getUrlPrefix(), "");
+            }
+            loanHomevisitInvestigateFileDto.setFileUrl(bxfpImage);
+            loanHomevisitInvestigateFileService.saveOrUpdateDto(loanHomevisitInvestigateFileDto);
+        }
+        for (String bdImage : bdImages) {
+            LoanHomevisitInvestigateFileDto loanHomevisitInvestigateFileDto = new LoanHomevisitInvestigateFileDto();
+            loanHomevisitInvestigateFileDto.setMainSid(dtoSid);
+            loanHomevisitInvestigateFileDto.setAttachType(LoanAttachTypeEnum.BD.getAttachType());
+            if (bdImage.indexOf(fileUploadComponent.getUrlPrefix()) > -1) {
+                bdImage = bdImage.replace(fileUploadComponent.getUrlPrefix(), "");
+            }
+            loanHomevisitInvestigateFileDto.setFileUrl(bdImage);
+            loanHomevisitInvestigateFileService.saveOrUpdateDto(loanHomevisitInvestigateFileDto);
+        }
+        for (String rzhtImage : rzhtImages) {
+            LoanHomevisitInvestigateFileDto loanHomevisitInvestigateFileDto = new LoanHomevisitInvestigateFileDto();
+            loanHomevisitInvestigateFileDto.setMainSid(dtoSid);
+            loanHomevisitInvestigateFileDto.setAttachType(LoanAttachTypeEnum.RZHT.getAttachType());
+            if (rzhtImage.indexOf(fileUploadComponent.getUrlPrefix()) > -1) {
+                rzhtImage = rzhtImage.replace(fileUploadComponent.getUrlPrefix(), "");
+            }
+            loanHomevisitInvestigateFileDto.setFileUrl(rzhtImage);
+            loanHomevisitInvestigateFileService.saveOrUpdateDto(loanHomevisitInvestigateFileDto);
+        }
+        for (String zmfjImage : zmfjImages) {
+            LoanHomevisitInvestigateFileDto loanHomevisitInvestigateFileDto = new LoanHomevisitInvestigateFileDto();
+            loanHomevisitInvestigateFileDto.setMainSid(dtoSid);
+            loanHomevisitInvestigateFileDto.setAttachType(LoanAttachTypeEnum.ZMFJ.getAttachType());
+            if (zmfjImage.indexOf(fileUploadComponent.getUrlPrefix()) > -1) {
+                zmfjImage = zmfjImage.replace(fileUploadComponent.getUrlPrefix(), "");
+            }
+            loanHomevisitInvestigateFileDto.setFileUrl(zmfjImage);
+            loanHomevisitInvestigateFileService.saveOrUpdateDto(loanHomevisitInvestigateFileDto);
+        }
+    }
+
+    public String insertByDto(LoanFileexamineDto dto) {
+        LoanFileexamine entity = new LoanFileexamine();
+        BeanUtil.copyProperties(dto, entity, "id", "sid");
+        baseMapper.insert(entity);
+        return entity.getSid();
+    }
+
+    public void updateByDto(LoanFileexamineDto dto) {
+        String dtoSid = dto.getSid();
+        if (StringUtils.isBlank(dtoSid)) {
+            return;
+        }
+        LoanFileexamine entity = fetchBySid(dtoSid);
+        BeanUtil.copyProperties(dto, entity, "id", "sid");
+        baseMapper.updateById(entity);
+    }
+
+    public LoanFileexamineDetailsVo fetchDetailsVoBySid(String sid) {
+        LoanFileexamine entity = fetchBySid(sid);
+        LoanFileexamineDetailsVo vo = new LoanFileexamineDetailsVo();
+        BeanUtil.copyProperties(entity, vo);
+        BusSalesOrderLoancontractDetailsVo busSalesOrderLoancontractDetailsVo = busSalesOrderLoancontractFeign.fetchDetailsBySid(entity.getLoanContractSid()).getData();
+        vo.setLoanContractNo(busSalesOrderLoancontractDetailsVo.getLoanContractNo());
+        vo.setBorrowerName(busSalesOrderLoancontractDetailsVo.getBorrowerName());
+        vo.setNum(busSalesOrderLoancontractDetailsVo.getVehCount());
+        BusSalesOrder busSalesOrder = busSalesOrderFeign.fetchBySid(entity.getSaleOrderSid()).getData();
+        vo.setStaffName(busSalesOrder.getStaffName());
+        List<BusSalesOrderVehicle> busSalesOrderVehicles = busSalesOrderVehicleFeign.selectListByOrderSid(entity.getSaleOrderSid()).getData();
+        String vinNos = "";
+        for (BusSalesOrderVehicle busSalesOrderVehicle : busSalesOrderVehicles) {
+            vinNos = vinNos + busSalesOrderVehicle.getLinkNo() + ",";
+        }
+        vo.setVinNo(vinNos.substring(0, vinNos.lastIndexOf(",")));
+        List<String> hgzImages = new ArrayList<>();
+        List<String> fpImages = new ArrayList<>();
+        for (BusSalesOrderVehicle busSalesOrderVehicle : busSalesOrderVehicles) {
+            BaseVehicleCertificateVo baseVehicleCertificateVo = baseVehicleCertificateFeign.selStateByVehicleSid(busSalesOrderVehicle.getLinkSid()).getData();
+            //合格证
+            List<String> stringList = baseVehicleAppendixFeign.selectBySid(baseVehicleCertificateVo.getSid()).getData();
+            for (String s : stringList) {
+                hgzImages.add(s);
+            }
+            BusTransferRecords busTransferRecords = busTransferRecordsFeign.selectByVinSidAndKey(busSalesOrderVehicle.getLinkSid(), "01").getData();
+            String transferFiles = busTransferRecords.getTransferFiles();
+            if (StringUtils.isNotBlank(transferFiles)){
+                String[] split = transferFiles.split(",");
+                for (String s : split) {
+                    String urlPrefix = fileUploadComponent.getUrlPrefix();
+                    s = urlPrefix + s;
+                    fpImages.add(s);
+                }
+            }
+        }
+        vo.setHgzImages(hgzImages);
+        vo.setFpImages(fpImages);
+        //银行卡
+        List<LoanHomevisitInvestigateFileDetailsVo> yhkVos = loanHomevisitInvestigateFileService.selByMainSidAndTypeKey(sid, LoanAttachTypeEnum.YHK.getAttachType());
+        List<String> yhkImages = new ArrayList<>();
+        if (yhkVos != null && yhkVos.size() > 0) {
+            for (LoanHomevisitInvestigateFileDetailsVo loanHomevisitInvestigateFileDetailsVo : yhkVos) {
+                yhkImages.add(loanHomevisitInvestigateFileDetailsVo.getFileUrl());
+            }
+        }
+        vo.setYhkImages(yhkImages);
+        //购置税发票
+        List<LoanHomevisitInvestigateFileDetailsVo> gzsfpVos = loanHomevisitInvestigateFileService.selByMainSidAndTypeKey(sid, LoanAttachTypeEnum.GZSFP.getAttachType());
+        List<String> gzsfpImages = new ArrayList<>();
+        if (gzsfpVos != null && gzsfpVos.size() > 0) {
+            for (LoanHomevisitInvestigateFileDetailsVo loanHomevisitInvestigateFileDetailsVo : gzsfpVos) {
+                gzsfpImages.add(loanHomevisitInvestigateFileDetailsVo.getFileUrl());
+            }
+        }
+        vo.setGzsfpImages(gzsfpImages);
+        //保险发票
+        List<LoanHomevisitInvestigateFileDetailsVo> bxfpVos = loanHomevisitInvestigateFileService.selByMainSidAndTypeKey(sid, LoanAttachTypeEnum.BXFP.getAttachType());
+        List<String> bxfpImages = new ArrayList<>();
+        if (bxfpVos != null && bxfpVos.size() > 0) {
+            for (LoanHomevisitInvestigateFileDetailsVo loanHomevisitInvestigateFileDetailsVo : bxfpVos) {
+                bxfpImages.add(loanHomevisitInvestigateFileDetailsVo.getFileUrl());
+            }
+        }
+        vo.setBxfpImages(bxfpImages);
+        //保单
+        List<LoanHomevisitInvestigateFileDetailsVo> bdVos = loanHomevisitInvestigateFileService.selByMainSidAndTypeKey(sid, LoanAttachTypeEnum.BD.getAttachType());
+        List<String> bdImages = new ArrayList<>();
+        if (bdVos != null && bdVos.size() > 0) {
+            for (LoanHomevisitInvestigateFileDetailsVo loanHomevisitInvestigateFileDetailsVo : bdVos) {
+                bdImages.add(loanHomevisitInvestigateFileDetailsVo.getFileUrl());
+            }
+        }
+        vo.setBdImages(bdImages);
+        //融资合同
+        List<LoanHomevisitInvestigateFileDetailsVo> rzhtVos = loanHomevisitInvestigateFileService.selByMainSidAndTypeKey(sid, LoanAttachTypeEnum.RZHT.getAttachType());
+        List<String> rzhtImages = new ArrayList<>();
+        if (rzhtVos != null && rzhtVos.size() > 0) {
+            for (LoanHomevisitInvestigateFileDetailsVo loanHomevisitInvestigateFileDetailsVo : rzhtVos) {
+                rzhtImages.add(loanHomevisitInvestigateFileDetailsVo.getFileUrl());
+            }
+        }
+        vo.setRzhtImages(rzhtImages);
+        //证明附件
+        List<LoanHomevisitInvestigateFileDetailsVo> zmfjVos = loanHomevisitInvestigateFileService.selByMainSidAndTypeKey(sid, LoanAttachTypeEnum.ZMFJ.getAttachType());
+        List<String> zmfjImages = new ArrayList<>();
+        if (zmfjVos != null && zmfjVos.size() > 0) {
+            for (LoanHomevisitInvestigateFileDetailsVo loanHomevisitInvestigateFileDetailsVo : zmfjVos) {
+                zmfjImages.add(loanHomevisitInvestigateFileDetailsVo.getFileUrl());
+            }
+        }
+        vo.setZmfjImages(zmfjImages);
+        return vo;
+    }
 }

anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanfinotherPolicy/LoanFinOtherPolicyMapper.java

@@ -30,7 +30,7 @@ public interface LoanFinOtherPolicyMapper extends BaseMapper<LoanFinOtherPolicy>
 
     List<OtherPolicyVo> selectListOne(@Param("sid") String sid,@Param("name") String name);
 
-    List<OtherPolicyVo> selectListTwo(@Param("useOrgSid") String useOrgSid,@Param("name") String name);
+    List<OtherPolicyVo> selectListTwo(@Param("useOrgSid") String useOrgSid,@Param("name") String name,@Param("type") String type,@Param("deptSid") String deptSid);
 
     IPage<LoanFinOtherPolicyPageVo> selectPageVo(IPage<LoanFinOtherPolicy> page,@Param(Constants.WRAPPER)QueryWrapper<LoanPreloanCreditApply> qw);
 

anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanfinotherPolicy/LoanFinOtherPolicyMapper.xml

@@ -36,23 +36,56 @@
     </select>
 
     <select id="selectListOne" resultType="com.yxt.anrui.riskcenter.api.loanfinotherPolicy.OtherPolicyVo">
-        select lfo.sid, lfo.otherPolicyName as name, lfo.period, lfo.periodKey, lfo.yearRatio,lfo.maxLoanRatio,lfo.maxLoanAmount
+        select lfo.sid,
+               lfo.otherPolicyName as name,
+               lfo.period,
+               lfo.periodKey,
+               lfo.yearRatio,
+               lfo.maxLoanRatio,
+               lfo.maxLoanAmount
         from loan_fin_otherpolicy lfo
-        where lfo.mainPolicySid = #{sid} and useSate = 0 and riskState = 0
+        where lfo.mainPolicySid = #{sid}
+          and useSate = 0
+          and riskState = 0
         <if test="name != null and name != ''">
             and lfo.otherPolicyName like concat('%', #{name}, '%')
         </if>
     </select>
 
     <select id="selectListTwo" resultType="com.yxt.anrui.riskcenter.api.loanfinotherPolicy.OtherPolicyVo">
-        select lfo.sid, lfo.otherPolicyName as name
+       select distinct a.sid, a.name,a.id from ( select lfo.sid, lfo.otherPolicyName as name,lfo.id
         from loan_fin_otherpolicy lfo
         where lfo.useOrgSid = #{useOrgSid}
           and lfo.filingState = 2
           and lfo.validDateTo > now()
+        and lfo.useSate = 0
+        and lfo.riskState = 0
         <if test="name != null and name != ''">
             and lfo.otherPolicyName like concat('%', #{name}, '%')
         </if>
+        <if test="deptSid != null and deptSid != ''">
+            and lfo.useDeptSids like concat('%',#{deptSid},'%')
+        </if>
+        <if test="type != null and type != ''">
+            and lfo.vehTypeKey like concat('%',#{type},'%')
+        </if>
+        union all
+        select lfo.sid, lfo.otherPolicyName as name,lfo.id
+        from loan_fin_otherpolicy lfo
+        where lfo.useOrgSid = #{useOrgSid}
+        and lfo.filingState = 2
+        and lfo.useSate = 0
+        and lfo.riskState = 0
+        and lfo.validDateTo > now()
+        <if test="name != null and name != ''">
+            and lfo.otherPolicyName like concat('%', #{name}, '%')
+        </if>
+        <if test="useOrgSid != null and useOrgSid != ''">
+            and lfo.useOrgSid like concat('%',#{useOrgSid},'%') and (lfo.useDeptSids is null or lfo.useDeptSids = '')
+        </if>
+        <if test="type != null and type != ''">
+            and lfo.vehTypeKey like concat('%',#{type},'%')
+        </if>) a order by a.id desc
     </select>
 
     <select id="selectPageVo" resultType="com.yxt.anrui.riskcenter.api.loanfinotherPolicy.LoanFinOtherPolicyPageVo">

anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanfinotherPolicy/LoanFinOtherPolicyRest.java

@@ -51,8 +51,8 @@ public class LoanFinOtherPolicyRest implements LoanFinOtherPolicyFeign {
     }
 
     @Override
-    public ResultBean<List<OtherPolicyVo>> selectList(String orgPath, String userSid, String sid,String name) {
-        return loanFinOtherPolicyService.selectList(orgPath,userSid,sid,name);
+    public ResultBean<List<OtherPolicyVo>> selectList(String orgPath, String userSid, String sid,String name,String modelSid) {
+        return loanFinOtherPolicyService.selectList(orgPath,userSid,sid,name,modelSid);
     }
 
     @Override

anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanfinotherPolicy/LoanFinOtherPolicyService.java

@@ -14,6 +14,7 @@ import com.yxt.anrui.riskcenter.api.loanfinpolicy.LoanRiskStateQuery;
 import com.yxt.anrui.riskcenter.api.loanfinpolicy.UseDept;
 import com.yxt.anrui.riskcenter.api.loanpreloancreditapply.*;
 import com.yxt.anrui.riskcenter.api.loanpreloancreditpeo.LoanPreloanCreditPeoDto;
+import com.yxt.anrui.riskcenter.biz.loanfinpolicy.LoanFinPolicyService;
 import com.yxt.common.base.service.MybatisBaseService;
 import com.yxt.common.base.utils.PagerUtil;
 import com.yxt.common.core.query.PagerQuery;
@@ -25,6 +26,7 @@ import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
 import java.util.ArrayList;
+import java.util.Arrays;
 import java.util.Collections;
 import java.util.List;
 
@@ -40,6 +42,8 @@ public class LoanFinOtherPolicyService extends MybatisBaseService<LoanFinOtherPo
     private SysStaffOrgFeign sysStaffOrgFeign;
     @Autowired
     private SysUserFeign sysUserFeign;
+    @Autowired
+    private LoanFinPolicyService loanFinPolicyService;
 
     /**
      * 根据主产品sid查询
@@ -88,13 +92,15 @@ public class LoanFinOtherPolicyService extends MybatisBaseService<LoanFinOtherPo
         return baseMapper.selectByMainSids(sid);
     }
 
-    public ResultBean<List<OtherPolicyVo>> selectList(String orgPath, String userSid, String sid,String name) {
+    public ResultBean<List<OtherPolicyVo>> selectList(String orgPath, String userSid, String sid,String name,String modelSid) {
         ResultBean<List<OtherPolicyVo>> rb = ResultBean.fireFail();
         String useOrgSid = sysStaffOrgFeign.getOrgSidByPath(orgPath).getData();
+        String vehTypeKey = loanFinPolicyService.selectVehType(modelSid);
+        String deptSid = Arrays.asList(orgPath.split("/")).get(Arrays.asList(orgPath.split("/")).size() - 1);
         List<OtherPolicyVo> list = baseMapper.selectListOne(sid,name);
         list.removeAll(Collections.singleton(null));
         if (list.isEmpty()) {
-            list = baseMapper.selectListTwo(useOrgSid,name);
+            list = baseMapper.selectListTwo(useOrgSid,name,vehTypeKey,deptSid);
             list.removeAll(Collections.singleton(null));
         }
 

anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanfinpolicy/LoanFinPolicyMapper.java

@@ -23,11 +23,11 @@ public interface LoanFinPolicyMapper extends BaseMapper<LoanFinPolicy> {
     @Select("select * from loan_fin_policy where bankSid = #{sid}")
     List<LoanFinPolicy> selectByBankSid(String sid);
 
-    IPage<AppLoanFinPolicyVo> getProductList(IPage<LoanFinPolicy> page, @Param(Constants.WRAPPER) QueryWrapper<LoanFinPolicy> qw, @Param("name") String name);
+    IPage<AppLoanFinPolicyVo> getProductList(IPage<LoanFinPolicy> page, @Param(Constants.WRAPPER) QueryWrapper<LoanFinPolicy> qw, @Param("name") String name,@Param("useOrgSid") String useOrgSid,@Param("deptSid") String deptSid);
 
     AppPolicyDetailsVo getProductInfo(String sid);
 
-    List<PolicyVo> selectListOne(@Param("deptSid") String deptSid,@Param("isPack") String isPack,@Param("name") String name,@Param("vehTypeKey") String vehTypeKey);
+    List<PolicyVo> selectListOne(@Param("deptSid") String deptSid,@Param("isPack") String isPack,@Param("name") String name,@Param("vehTypeKey") String vehTypeKey,@Param("useOrgSid") String useOrgSid);
 
     String selectVehType(String modelSid);
 }

anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanfinpolicy/LoanFinPolicyMapper.xml

@@ -45,8 +45,29 @@
     </select>
 
     <select id="getProductList" resultType="com.yxt.anrui.riskcenter.api.loanfinpolicy.AppLoanFinPolicyVo">
+        select distinct a.sid, a.policyName, a.id from ( select lfp.sid,
+                                                                lfp.policyName,
+                                                                lfp.id
+                                                         from loan_fin_policy lfp
+        <where>
+            ${ew.sqlSegment}
+            <if test="name != null and name != ''">
+                and lfp.policyName LIKE concat('%'
+                  , #{name}
+                  , '%')
+            </if>
+            and lfp.validDateTo
+              > now()
+            <if test="deptSid != null and deptSid != ''">
+                and lfp.useDeptSids like concat('%'
+                  , #{deptSid}
+                  , '%')
+            </if>
+        </where>
+        union all
         select lfp.sid,
-               lfp.policyName
+            lfp.policyName,
+            lfp.id
         from loan_fin_policy lfp
         <where>
             ${ew.sqlSegment}
@@ -57,8 +78,14 @@
             </if>
             and lfp.validDateTo
               > now()
+            <if test="useOrgSid != null and useOrgSid != ''">
+                and lfp.useOrgSid like concat('%'
+                  , #{useOrgSid}
+                  , '%') and (lfp.useDeptSids is null or lfp.useDeptSids = '')
+            </if>
         </where>
-        order by lfp.id desc
+        ) a
+        order by a.id desc
     </select>
 
     <select id="getProductInfo" resultType="com.yxt.anrui.riskcenter.api.loanfinpolicy.AppPolicyDetailsVo">
@@ -93,7 +120,23 @@
     </select>
 
     <select id="selectListOne" resultType="com.yxt.anrui.riskcenter.api.loanfinpolicy.PolicyVo">
-        select lfp.policyName              name,
+       select distinct
+        a.sid,
+        a.name,
+        a.downPayRatio,
+        a.downPayRatioKey,
+        a.period,
+        a.periodKey,
+        a.bondRatio,
+        a.bondRatioKey,
+        a.yearRatio,
+        a.serviceChargeTypeKey,
+        a.serviceChargeTypeValue,
+        a.depositPremium,
+        a.depositSettle,
+        a.nominalPrice,
+        a.vehAccidentAmount,
+        a.id from ( select lfp.policyName              name,
                lfp.sid,
                lfp.downPayRatio,
                lfp.downPayRatioKey,
@@ -107,7 +150,8 @@
                lfp.depositPremium,
                lfp.depositSettle,
                lfp.nominalPrice,
-               lfp.vehAccidentAmount
+               lfp.vehAccidentAmount,
+        lfp.id
         from loan_fin_policy lfp
         where lfp.filingState = 1
           and isPack = #{isPack}
@@ -123,6 +167,38 @@
         <if test="name != null and name != ''">
             and lfp.policyName like concat('%', #{name}, '%')
         </if>
+        union all
+        select lfp.policyName              name,
+        lfp.sid,
+        lfp.downPayRatio,
+        lfp.downPayRatioKey,
+        lfp.period,
+        lfp.periodKey,
+        lfp.bondRatio,
+        lfp.bondRatioKey,
+        lfp.yearRatio,
+        lfp.serviceAmountTypeKey as serviceChargeTypeKey,
+        lfp.serviceAmount        as serviceChargeTypeValue,
+        lfp.depositPremium,
+        lfp.depositSettle,
+        lfp.nominalPrice,
+        lfp.vehAccidentAmount,
+        lfp.id
+        from loan_fin_policy lfp
+        where lfp.filingState = 1
+        and isPack = #{isPack}
+        <if test="useOrgSid != null and useOrgSid != ''">
+            and lfp.useOrgSid like concat('%', #{useOrgSid}, '%') and (lfp.useDeptSids is null or lfp.useDeptSids = '')
+        </if>
+        <if test="vehTypeKey != null and vehTypeKey != ''">
+            and lfp.vehTypeKey like concat('%', #{vehTypeKey}, '%')
+        </if>
+        and lfp.validDateTo > now()
+        and lfp.useSate = 0
+        and lfp.riskState = 0
+        <if test="name != null and name != ''">
+            and lfp.policyName like concat('%', #{name}, '%')
+        </if>) a order by a.id desc
     </select>
 
     <select id="selectVehType" resultType="java.lang.String">

anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanfinpolicy/LoanFinPolicyService.java

@@ -1,6 +1,7 @@
 package com.yxt.anrui.riskcenter.biz.loanfinpolicy;
 
 import cn.hutool.core.bean.BeanUtil;
+import cn.hutool.core.util.ObjectUtil;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.yxt.anrui.portal.api.sysorganization.SysOrganizationFeign;
@@ -589,6 +590,8 @@ public class LoanFinPolicyService extends MybatisBaseService<LoanFinPolicyMapper
     public PagerVo<AppLoanFinPolicyVo> getProductList(PagerQuery<AppLoanFinPolicyQuery> pagerQuery) {
         AppLoanFinPolicyQuery query = pagerQuery.getParams();
         QueryWrapper<LoanFinPolicy> qw = new QueryWrapper<>();
+        String useOrgSid = "";
+        String deptSid = "";
         if (query != null) {
             //========================================数据授权开始
            /* PrivilegeQuery privilegeQuery = new PrivilegeQuery();
@@ -628,17 +631,17 @@ public class LoanFinPolicyService extends MybatisBaseService<LoanFinPolicyMapper
                 return p;
             }*/
             if (StringUtils.isNotBlank(query.getOrgPath())) {
-                String useOrgSid = sysStaffOrgFeign.getOrgSidByPath(query.getOrgPath()).getData();
-                qw.eq("lfp.useOrgSid", useOrgSid);
-                String deptSid = Arrays.asList(query.getOrgPath().split("/")).get(Arrays.asList(query.getOrgPath().split("/")).size()-1);
-                qw.like("lfp.useDeptSids", deptSid);
+                 useOrgSid = sysStaffOrgFeign.getOrgSidByPath(query.getOrgPath()).getData();
+//                qw.eq("lfp.useOrgSid", useOrgSid);
+                 deptSid = Arrays.asList(query.getOrgPath().split("/")).get(Arrays.asList(query.getOrgPath().split("/")).size()-1);
+//                qw.like("lfp.useDeptSids", deptSid);
             }
             qw.eq("lfp.filingState", 1);
             qw.eq("lfp.useSate", 0);
             qw.eq("lfp.riskState", 0);
         }
         IPage<LoanFinPolicy> page = PagerUtil.queryToPage(pagerQuery);
-        IPage<AppLoanFinPolicyVo> pagging = baseMapper.getProductList(page, qw, query.getName());
+        IPage<AppLoanFinPolicyVo> pagging = baseMapper.getProductList(page, qw, query.getName(),useOrgSid,deptSid);
         PagerVo<AppLoanFinPolicyVo> p = PagerUtil.pageToVo(pagging, null);
         return p;
 
@@ -671,8 +674,12 @@ public class LoanFinPolicyService extends MybatisBaseService<LoanFinPolicyMapper
         String useOrgSid = sysStaffOrgFeign.getOrgSidByPath(orgPath).getData();
         String vehTypeKey = baseMapper.selectVehType(modelSid);
         String deptSid = Arrays.asList(orgPath.split("/")).get(Arrays.asList(orgPath.split("/")).size() - 1);
-        List<PolicyVo> list = baseMapper.selectListOne(deptSid, isPack, name, vehTypeKey);
+        List<PolicyVo> list = baseMapper.selectListOne(deptSid, isPack, name, vehTypeKey,useOrgSid);
         list.removeAll(Collections.singleton(null));
         return rb.success().setData(list);
     }
+
+    public String selectVehType(String modelSid) {
+        return baseMapper.selectVehType(modelSid);
+    }
 }

anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/risk/solutions/SolutionsFeign.java

@@ -48,7 +48,7 @@ public interface SolutionsFeign {
     @ApiOperation("获取产品政策下其他融，或分公司下其他融")
     @GetMapping("/selectOtherList")
     @ResponseBody
-    ResultBean<List<OtherPolicysVo>> selectOtherList(@RequestParam("orgPath") String orgPath, @RequestParam("userSid") String userSid, @RequestParam(value = "sid", required = false) String sid, @RequestParam(value = "name", required = false) String name);
+    ResultBean<List<OtherPolicysVo>> selectOtherList(@RequestParam("orgPath") String orgPath, @RequestParam("userSid") String userSid, @RequestParam(value = "sid", required = false) String sid, @RequestParam(value = "name", required = false) String name,@RequestParam(value = "modelSid", required = false) String modelSid);
 
     @ApiOperation("初始化金融方案2")
     @GetMapping("/selectDetailsVo2")

anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/risk/solutions/SolutionsRest.java

@@ -44,8 +44,8 @@ public class SolutionsRest implements SolutionsFeign {
     }
 
     @Override
-    public ResultBean<List<OtherPolicysVo>> selectOtherList(String orgPath, String userSid, String sid, String name) {
-        return solutionsService.selectOtherList(orgPath, userSid, sid, name);
+    public ResultBean<List<OtherPolicysVo>> selectOtherList(String orgPath, String userSid, String sid, String name,String modelSid) {
+        return solutionsService.selectOtherList(orgPath, userSid, sid, name,modelSid);
     }
 
     @Override

anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/risk/solutions/SolutionsService.java

@@ -75,10 +75,10 @@ public class SolutionsService {
         return rb.success().setData(listNew);
     }
 
-    public ResultBean<List<OtherPolicysVo>> selectOtherList(String orgPath, String userSid, String sid, String name) {
+    public ResultBean<List<OtherPolicysVo>> selectOtherList(String orgPath, String userSid, String sid, String name,String modelSid) {
         ResultBean<List<OtherPolicysVo>> rb = ResultBean.fireFail();
         List<OtherPolicysVo> listNew = new ArrayList<>();
-        ResultBean<List<OtherPolicyVo>> resultBean = loanFinOtherPolicyFeign.selectList(orgPath, userSid, sid, name);
+        ResultBean<List<OtherPolicyVo>> resultBean = loanFinOtherPolicyFeign.selectList(orgPath, userSid, sid, name,modelSid);
         if (resultBean.getData() != null && !resultBean.getData().isEmpty()) {
             List<OtherPolicyVo> list = resultBean.getData();
             list.removeAll(Collections.singleton(null));