Merge remote-tracking branch 'origin/master'

anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesordervehicle/BusSalesOrderVehicle.java

@@ -65,5 +65,7 @@ public class BusSalesOrderVehicle extends BaseEntity {
     private String temporaryNo;
     @ApiModelProperty("临时客户名称")
     private String temporaryName;
+    @ApiModelProperty("贷款人sid")
+    private String borrowerSid;
 
 }

anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesorder/BusSalesOrderMapper.xml

@@ -57,6 +57,7 @@
         when 0 then '否'
         when 1 then '是' end as insuranceInfo,
         if(bo.nodeState = '已办结', true, false) as showStopBtn,
+        if(bo.nodeState = '已办结', true, false) as showBorrowBtn,
         bo.nodeState is null as showUpdateBtn,
         bo.nodeState is null as showDeleteBtn,
         0 as showFinancialBtn,

anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesorder/BusSalesOrderService.java

@@ -2099,6 +2099,17 @@ public class BusSalesOrderService extends MybatisBaseService<BusSalesOrderMapper
             } else {
                 record.setShowContractBtn(false);
             }
+            //ToDo:需考虑家访准备是否存在该贷款人，若存在，则不允许修改贷款人，即确定贷款人按钮不显示。
+            if(record.isShowBorrowBtn()){
+                //为现车类型且不确定车架号的，
+                if("1".equals(record.getType())){
+                    if(StringUtils.isNotBlank(record.getNowCarUnknownVinNum()) && "0".equals(record.getNowCarUnknownVinNum())){
+                        record.setShowBorrowBtn(true);
+                    }else{
+                        record.setShowBorrowBtn(false);
+                    }
+                }
+            }
 
 
         }

anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesorderborrower/BusSalesOrderBorrowerMapper.java

@@ -29,6 +29,9 @@ import com.baomidou.mybatisplus.core.conditions.Wrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.baomidou.mybatisplus.core.toolkit.Constants;
+import com.yxt.anrui.buscenter.api.bussalesordervehicle.BusSalesOrderVehicle;
+import com.yxt.anrui.riskcenter.api.loanfinpolicy.LoanFinPolicy;
+import com.yxt.anrui.riskcenter.api.loansolutions.LoanSolutions;
 import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
 import org.apache.ibatis.annotations.Select;
@@ -68,4 +71,9 @@ public interface BusSalesOrderBorrowerMapper extends BaseMapper<BusSalesOrderBor
     void updateBusNo(@Param("busNo") String busNo,@Param("saleOrderBorrowerSid") String saleOrderBorrowerSid);
 
     int selectBySalesOrderSid(String sid);
+
+    LoanFinPolicy selectBySid(String sid);
+
+	BusSalesOrderBorrower selectByOrderSid(@Param("sid") String sid,@Param("customerSid") String customerSid);
+
 }

anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesorderborrower/BusSalesOrderBorrowerMapper.xml

@@ -14,4 +14,14 @@
 	<select id="selectBySalesOrderSid" resultType="int">
 		select ifnull(sum(vehCount),0) from bus_sales_order_borrower where salesOrderSid = #{sid}
     </select>
+
+	<select id="selectBySid" resultType="com.yxt.anrui.riskcenter.api.loanfinpolicy.LoanFinPolicy">
+		select lp.* from anrui_riskcenter.loan_solutions ls
+		left join anrui_riskcenter.loan_fin_policy lp on lp.sid = ls.policySid
+		where ls.salesOrderSid = #{sid}
+    </select>
+
+	<select id="selectByOrderSid" resultType="com.yxt.anrui.buscenter.api.bussalesorderborrower.BusSalesOrderBorrower">
+		select * from bus_sales_order_borrower where salesOrderSid = #{sid} and customSid = #{customerSid}
+	</select>
 </mapper>

anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesorderborrower/BusSalesOrderBorrowerService.java

@@ -30,7 +30,12 @@ import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.yxt.anrui.buscenter.api.bussalesorderborrower.*;
 import com.yxt.anrui.buscenter.api.bussalesorderprice.BusSalesOrderPrice;
+import com.yxt.anrui.buscenter.api.bussalesorderprice.BusSalesOrderPriceDto;
+import com.yxt.anrui.buscenter.api.bussalesordervehicle.BusSalesOrderVehicle;
 import com.yxt.anrui.buscenter.biz.bussalesorderprice.BusSalesOrderPriceService;
+import com.yxt.anrui.buscenter.biz.bussalesordervehicle.BusSalesOrderVehicleService;
+import com.yxt.anrui.riskcenter.api.loanfinpolicy.LoanFinPolicy;
+import com.yxt.anrui.riskcenter.api.loansolutions.LoanSolutions;
 import org.apache.commons.lang3.StringUtils;
 import com.yxt.common.base.service.MybatisBaseService;
 import com.yxt.common.base.utils.PagerUtil;
@@ -41,6 +46,7 @@ import com.yxt.common.core.vo.PagerVo;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
+import java.util.Collections;
 import java.util.List;
 
 /**
@@ -61,6 +67,8 @@ public class BusSalesOrderBorrowerService extends MybatisBaseService<BusSalesOrd
 
     @Autowired
     private BusSalesOrderPriceService busSalesOrderPriceService;
+    @Autowired
+    private BusSalesOrderVehicleService busSalesOrderVehicleService;
 
 
     private QueryWrapper<BusSalesOrderBorrower> createQueryWrapper(BusSalesOrderBorrowerQuery query) {
@@ -134,7 +142,37 @@ public class BusSalesOrderBorrowerService extends MybatisBaseService<BusSalesOrd
 
     public ResultBean confirmBorrow(OrderBorrowQuery query) {
         ResultBean rb = ResultBean.fireFail();
-
-        return null;
+        //销售订单sid
+        String sid = query.getSid();
+        String customerSid = query.getCustomSid();
+        BusSalesOrderBorrower busSalesOrderBorrower = baseMapper.selectByOrderSid(sid, customerSid);
+        if (busSalesOrderBorrower != null) {
+            return rb.setMsg("该销售订单中已存在该贷款人");
+        }
+        busSalesOrderBorrower = new BusSalesOrderBorrower();
+        busSalesOrderBorrower.setSalesOrderSid(sid);
+        busSalesOrderBorrower.setBorrowerName(query.getBorrowerName());
+        busSalesOrderBorrower.setCustomSid(query.getCustomSid());
+        busSalesOrderBorrower.setMobile(query.getMobile());
+        busSalesOrderBorrower.setVehCount(query.getVehCount());
+        LoanFinPolicy loanFinPolicy = baseMapper.selectBySid(sid);
+        if (loanFinPolicy != null) {
+            busSalesOrderBorrower.setBankSid(loanFinPolicy.getBankSid());
+            busSalesOrderBorrower.setBankName(loanFinPolicy.getBankShortName());
+            busSalesOrderBorrower.setPolicyName(loanFinPolicy.getPolicyName());
+        }
+        //更新销售订单车辆里的贷款人
+        List<BusSalesOrderVehicle> list = busSalesOrderPriceService.selectByOrdersSid(sid);
+        list.removeAll(Collections.singleton(null));
+        if (list.size() < query.getVehCount()) {
+            return rb.setMsg("销售订单剩余台数不足");
+        }
+        for (int i = 0; i < query.getVehCount(); i++) {
+            BusSalesOrderVehicle busSalesOrderVehicle = list.get(i);
+            busSalesOrderVehicle.setBorrowerSid(query.getCustomSid());
+            busSalesOrderVehicleService.updateById(busSalesOrderVehicle);
+        }
+        baseMapper.insert(busSalesOrderBorrower);
+        return rb.success();
     }
 }

anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesorderprice/BusSalesOrderPriceMapper.java

@@ -30,6 +30,7 @@ import com.yxt.anrui.buscenter.api.bussalesorder.app.order.AppOrderPriceInfoVo;
 import com.yxt.anrui.buscenter.api.bussalesorderprice.BusSalesOrderPrice;
 import com.yxt.anrui.buscenter.api.bussalesorderprice.BusSalesOrderPriceDetailsVo;
 import com.yxt.anrui.buscenter.api.bussalesorderprice.app.AppBusSalesOrderPriceVo;
+import com.yxt.anrui.buscenter.api.bussalesordervehicle.BusSalesOrderVehicle;
 import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
 import org.apache.ibatis.annotations.Select;
@@ -96,4 +97,6 @@ public interface BusSalesOrderPriceMapper extends BaseMapper<BusSalesOrderPrice>
     BusSalesOrderPrice selectByContractNoOne(String contractNo);
 
     List<BusSalesOrderPrice> selectListByOrderSid(@Param("saleOrderSid")String saleOrderSid);
+
+    List<BusSalesOrderVehicle> selectByOrdersSid(String sid);
 }

anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesorderprice/BusSalesOrderPriceMapper.xml

@@ -73,4 +73,8 @@
         from bus_sales_order_price
         where salesOrderSid = #{saleOrderSid}
     </select>
+
+    <select id="selectByOrdersSid" resultType="com.yxt.anrui.buscenter.api.bussalesordervehicle.BusSalesOrderVehicle">
+        select * from bus_sales_order_vehicle where salesOrderSid = #{sid} and (borrowerSid is null or borrowerSid = '')
+    </select>
 </mapper>

anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesorderprice/BusSalesOrderPriceService.java

@@ -35,6 +35,7 @@ import com.yxt.anrui.buscenter.api.bussalesorderprice.BusSalesOrderPriceDetailsV
 import com.yxt.anrui.buscenter.api.bussalesorderprice.BusSalesOrderPriceDto;
 import com.yxt.anrui.buscenter.api.bussalesorderprice.app.AppBusSalesOrderPriceDto;
 import com.yxt.anrui.buscenter.api.bussalesorderprice.app.AppBusSalesOrderPriceVo;
+import com.yxt.anrui.buscenter.api.bussalesordervehicle.BusSalesOrderVehicle;
 import com.yxt.anrui.buscenter.biz.bussalesorder.BusSalesOrderService;
 import com.yxt.anrui.buscenter.biz.bussalesordermakeup.BusSalesOrderMakeupService;
 import com.yxt.anrui.buscenter.biz.bussalesordermodel.BusSalesOrderModelService;
@@ -213,4 +214,8 @@ public class BusSalesOrderPriceService extends MybatisBaseService<BusSalesOrderP
     public List<BusSalesOrderPrice> selectListByOrderSid(String saleOrderSid) {
         return baseMapper.selectListByOrderSid(saleOrderSid);
     }
+
+    public List<BusSalesOrderVehicle> selectByOrdersSid(String sid) {
+        return baseMapper.selectByOrdersSid(sid);
+    }
 }

anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanhomevisitappeal/LoanHomeVisitAppealPageVo.java

@@ -0,0 +1,28 @@
+package com.yxt.anrui.riskcenter.api.loanhomevisitappeal;
+
+import com.yxt.common.core.vo.Vo;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+@Data
+public class LoanHomeVisitAppealPageVo implements Vo {
+
+    @ApiModelProperty("sid")
+    private String sid;
+    @ApiModelProperty("分公司名称")
+    private String useOrgName;
+    @ApiModelProperty("销售部门名称")
+    private String orgName;
+    @ApiModelProperty("销售专员名称")
+    private String staffName;
+    @ApiModelProperty("贷款人姓名")
+    private String lenderName;
+    @ApiModelProperty("家访人员")
+    private String jfMember;
+    @ApiModelProperty("预约家访日期")
+    private String times;
+    @ApiModelProperty("家访考察意见")
+    private String remarks;
+    @ApiModelProperty("申诉原因")
+    private String appealReason;
+}

anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanhomevisitappeal/LoanHomevisitAppealDto.java

@@ -52,7 +52,7 @@ import java.util.List;
 @ApiModel(value = "家访考察申诉 数据传输对象", description = "家访考察申诉 数据传输对象")
 public class LoanHomevisitAppealDto implements Dto {
 
-    private String sid;
+    private String ssSid;
 
 	@ApiModelProperty("申诉原因")
     private String appealReason;

anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanhomevisitappeal/LoanHomevisitAppealFeign.java

@@ -64,6 +64,11 @@ public interface LoanHomevisitAppealFeign {
     @ResponseBody
     public ResultBean<PagerVo<LoanHomevisitAppealVo>> listPage(@RequestBody PagerQuery<LoanHomevisitAppealQuery> pq);
 
+    @ApiOperation("获取家访申诉列表")
+    @PostMapping("/getHomeAppealList2")
+    @ResponseBody
+    ResultBean<PagerVo<LoanHomeVisitAppealPageVo>> getHomeAppealList2(@RequestBody PagerQuery<LoanHomevisitAppealQuery> pq);
+
     @ApiOperation("新增或修改")
     @PostMapping("/save")
     @ResponseBody

anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanhomevisitappeal/LoanHomevisitAppealFeignFallback.java

@@ -55,6 +55,11 @@ public class LoanHomevisitAppealFeignFallback implements LoanHomevisitAppealFeig
         return rb.setMsg("接口anrui-riskcenter/loanhomevisitappeal/listPage无法访问");
     }
 
+    @Override
+    public ResultBean<PagerVo<LoanHomeVisitAppealPageVo>> getHomeAppealList2(PagerQuery<LoanHomevisitAppealQuery> pq) {
+        return null;
+    }
+
     @Override
     public ResultBean save(LoanHomevisitAppealDto dto) {
         return ResultBean.fireFail().setMsg("接口anrui-riskcenter/loanhomevisitappeal/save无法访问");

anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanpreloancreditapply/LoanOrderPreloanVo.java

@@ -18,8 +18,7 @@ public class LoanOrderPreloanVo implements Vo {
     private String quantity;
     @ApiModelProperty("按钮：信用审核、当为等待中时为我知道了、信用申诉")
     private String confirmBtn;
-    @ApiModelProperty("页面地址")
-    private String pluginPage;
+
 
 
 }

anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanpreloancreditapply/LoanPreloanCreditApplyFeign.java

@@ -96,4 +96,6 @@ public interface LoanPreloanCreditApplyFeign {
     @ResponseBody
     ResultBean<LoanOrderPreloanVo> judgeIsLoan(@RequestParam("sid") String sid);
 
+
+
 }

anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanpreloancreditapply/LoanPreloanQuery.java

@@ -24,4 +24,6 @@ public class LoanPreloanQuery implements Query {
 
     @ApiModelProperty("移动端：姓名、身份证、手机号")
     private String name;
+    @ApiModelProperty("销售订单sid")
+    private String orderSid;
 }

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

@@ -38,7 +38,7 @@
     <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
         from loan_fin_otherpolicy lfo
-        where lfo.mainPolicySid = #{sid}
+        where lfo.mainPolicySid = #{sid} and useSate = 0 and riskState = 0
         <if test="name != null and name != ''">
             and lfo.otherPolicyName like concat('%', #{name}, '%')
         </if>

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

@@ -107,7 +107,7 @@
         where lfp.filingState = 1
           and isPack = #{isPack}
           and lfp.useOrgSid = #{useOrgSid}
-          and lfp.validDateTo > now()
+          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>

anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanhomevisitappeal/LoanHomevisitAppealMapper.java

@@ -26,9 +26,11 @@
 package com.yxt.anrui.riskcenter.biz.loanhomevisitappeal;
 
 import com.baomidou.mybatisplus.core.conditions.Wrapper;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 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.loanhomevisitappeal.LoanHomeVisitAppealPageVo;
 import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
 import org.apache.ibatis.annotations.Select;
@@ -54,21 +56,23 @@ import java.util.Map;
 @Mapper
 public interface LoanHomevisitAppealMapper extends BaseMapper<LoanHomevisitAppeal> {
 
-	//@Update("update loan_homevisit_appeal set name=#{msg} where id=#{id}")
-	//IPage<LoanHomevisitAppealVo> voPage(IPage<LoanHomevisitAppeal> page, @Param(Constants.WRAPPER) QueryWrapper<LoanHomevisitAppeal> qw);
-	
-	IPage<LoanHomevisitAppealVo> selectPageVo(IPage<LoanHomevisitAppeal> page, @Param(Constants.WRAPPER) Wrapper<LoanHomevisitAppeal> qw);
-	
-	List<LoanHomevisitAppealVo> selectListAllVo(@Param(Constants.WRAPPER) Wrapper<LoanHomevisitAppeal> qw);
-	
-	@Select("select * from loan_homevisit_appeal")
-	List<LoanHomevisitAppealVo> selectListVo();
+    //@Update("update loan_homevisit_appeal set name=#{msg} where id=#{id}")
+    //IPage<LoanHomevisitAppealVo> voPage(IPage<LoanHomevisitAppeal> page, @Param(Constants.WRAPPER) QueryWrapper<LoanHomevisitAppeal> qw);
 
-	int selectBySid(String join);
+    IPage<LoanHomevisitAppealVo> selectPageVo(IPage<LoanHomevisitAppeal> page, @Param(Constants.WRAPPER) Wrapper<LoanHomevisitAppeal> qw);
 
-	String selectNum(String billNo);
+    List<LoanHomevisitAppealVo> selectListAllVo(@Param(Constants.WRAPPER) Wrapper<LoanHomevisitAppeal> qw);
 
-	int updateFlowFiled(Map<String, Object> map);
+    @Select("select * from loan_homevisit_appeal")
+    List<LoanHomevisitAppealVo> selectListVo();
 
-	int selectKcSid(String kcSid);
+    int selectBySid(String join);
+
+    String selectNum(String billNo);
+
+    int updateFlowFiled(Map<String, Object> map);
+
+    int selectKcSid(String kcSid);
+
+    IPage<LoanHomeVisitAppealPageVo> getHomeAppealList2(IPage<LoanHomevisitAppeal> page, @Param(Constants.WRAPPER) QueryWrapper<LoanHomevisitAppeal> qw);
 }

anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanhomevisitappeal/LoanHomevisitAppealMapper.xml

@@ -72,7 +72,28 @@
         SELECT COUNT(*)
         FROM loan_homevisit_appeal
         WHERE homeVisitSid = #{kcSid}
-        AND nodeState != '待提交'
+          AND nodeState != '待提交'
         AND nodeState != '终止'
+        AND nodeState != '发起申请'
+    </select>
+
+    <select id="getHomeAppealList2"
+            resultType="com.yxt.anrui.riskcenter.api.loanhomevisitappeal.LoanHomeVisitAppealPageVo">
+        SELECT la.sid,
+               bo.`useOrgName`,
+               bo.`orgName`,
+               bo.`staffName`,
+               bb.`borrowerName`   AS lenderName,
+               li.homeVisStaffName AS jfMember,
+               li.resHomeVisDate   AS times,
+               li.`remarks`,
+               la.`appealReason`
+        FROM loan_homevisit_appeal la
+                     LEFT JOIN loan_homevisit_investigate li
+                ON la.`homeVisitSid` = li.`sid`
+                     LEFT JOIN anrui_buscenter.`bus_sales_order` bo
+                ON li.`saleOrderSid` = bo.`sid`
+                     LEFT JOIN anrui_buscenter.`bus_sales_order_borrower` bb
+                ON li.`saleOrderBorrowerSid` = bb.`sid`
     </select>
 </mapper>

anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanhomevisitappeal/LoanHomevisitAppealRest.java

@@ -70,6 +70,13 @@ public class LoanHomevisitAppealRest implements LoanHomevisitAppealFeign {
         return rb.success().setData(pv);
     }
 
+    @Override
+    public ResultBean<PagerVo<LoanHomeVisitAppealPageVo>> getHomeAppealList2(PagerQuery<LoanHomevisitAppealQuery> pq) {
+        ResultBean rb = ResultBean.fireFail();
+        PagerVo<LoanHomeVisitAppealPageVo> pv = loanHomevisitAppealService.getHomeAppealList2(pq);
+        return rb.success().setData(pv);
+    }
+
     @Override
     @ApiOperation("新增或修改")
     @PostMapping("/save")

anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanhomevisitappeal/LoanHomevisitAppealService.java

@@ -204,9 +204,60 @@ public class LoanHomevisitAppealService extends MybatisBaseService<LoanHomevisit
 		PagerVo<LoanHomevisitAppealVo> p = PagerUtil.pageToVo(pagging, null);
 		return p;
 	}
+
+	public PagerVo<LoanHomeVisitAppealPageVo> getHomeAppealList2(PagerQuery<LoanHomevisitAppealQuery> pq) {
+		LoanHomevisitAppealQuery query = pq.getParams();
+		QueryWrapper<LoanHomevisitAppeal> qw = new QueryWrapper<>();
+		if (StringUtils.isNotBlank(query.getMenuSid())) {
+			//=======================
+			PrivilegeQuery privilegeQuery = new PrivilegeQuery();
+			privilegeQuery.setOrgPath(query.getOrgSidPath());
+			privilegeQuery.setMenuSid(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<LoanHomeVisitAppealPageVo> p = new PagerVo<>();
+					return p;
+				}
+			} else {
+				PagerVo<LoanHomeVisitAppealPageVo> p = new PagerVo<>();
+				return p;
+			}
+		}
+		if (StringUtils.isNotBlank(query.getNames())){
+			qw.and(wrapper -> wrapper.like("bb.borrowerName", query.getNames()).or().like("li.homeVisStaffName", query.getNames()));
+		}
+		IPage<LoanHomevisitAppeal> page = PagerUtil.queryToPage(pq);
+		IPage<LoanHomeVisitAppealPageVo> pagging = baseMapper.getHomeAppealList2(page, qw);
+		PagerVo<LoanHomeVisitAppealPageVo> p = PagerUtil.pageToVo(pagging, null);
+		return p;
+	}
 	
 	public String saveOrUpdateDto(LoanHomevisitAppealDto dto){
-        String dtoSid = dto.getSid();
+        String dtoSid = dto.getSsSid();
 		List<String> ssImages = dto.getSsImages();
 		if (StringUtils.isBlank(dtoSid)) {
 			//生成单据编号
@@ -263,7 +314,7 @@ public class LoanHomevisitAppealService extends MybatisBaseService<LoanHomevisit
 	}
 	
 	public void updateByDto(LoanHomevisitAppealDto dto){
-          String dtoSid = dto.getSid();
+          String dtoSid = dto.getSsSid();
         if (StringUtils.isBlank(dtoSid)) {
             return;
         } 
@@ -317,7 +368,7 @@ public class LoanHomevisitAppealService extends MybatisBaseService<LoanHomevisit
 			return rb.setMsg("该家访考察申诉已存在");
 		}
 		dto.getKcSid();
-		LoanHomevisitAppeal loanHomevisitAppeal = fetchBySid(dto.getSid());
+		LoanHomevisitAppeal loanHomevisitAppeal = fetchBySid(dto.getSsSid());
 		int r = submitBusinessData(dto, loanHomevisitAppeal);
 		if (r == 3) {
 			return rb.setMsg("该申请不存在");
@@ -401,7 +452,8 @@ public class LoanHomevisitAppealService extends MybatisBaseService<LoanHomevisit
 		LoanHomevisitAppeal loanHomevisitAppeal = fetchBySid(businessSid);
 		Map<String, Object> variables = new HashMap<>();
 		Map<String, Object> appMap = new HashMap<>();
-		appMap.put("sid", businessSid);
+		appMap.put("kcSid", loanHomevisitAppeal.getHomeVisitSid());
+		appMap.put("ssSid", loanHomevisitAppeal.getSid());
 		variables.put("app", appMap);
 		FlowProcessMapQuery flowProcessMapQuery = new FlowProcessMapQuery();
 		if (StringUtils.isBlank(loanHomevisitAppeal.getProcDefId())) {
@@ -500,7 +552,8 @@ public class LoanHomevisitAppealService extends MybatisBaseService<LoanHomevisit
 				BeanUtil.copyProperties(query, flowTaskVo);
 				Map<String, Object> variables = new HashMap<>();
 				Map<String, Object> appMap = new HashMap<>();
-				appMap.put("sid", businessSid);
+				appMap.put("kcSid", loanHomevisitAppeal.getHomeVisitSid());
+				appMap.put("ssSid", loanHomevisitAppeal.getSid());
 				variables.put("app", appMap);
 				flowTaskVo.setValues(variables);
 				ResultBean<UpdateFlowFieldVo> resultBean = flowableFeign.taskReject(flowTaskVo);
@@ -629,7 +682,7 @@ public class LoanHomevisitAppealService extends MybatisBaseService<LoanHomevisit
 
 	private synchronized int submitBusinessData(SubmitHomeAppealDto dto, LoanHomevisitAppeal loanHomevisitAppeal) {
 		int r = 0;
-		if (StringUtils.isBlank(dto.getSid())) {
+		if (StringUtils.isBlank(dto.getSsSid())) {
 			r = 1;
 		} else {
 			if (loanHomevisitAppeal != null) {

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

@@ -86,8 +86,11 @@ public class LoanHomevisitFileexamineService extends MybatisBaseService<LoanHome
     public PagerVo<LoanHomevisitFileexamineVo> homeInforListPage(PagerQuery<LoanHomevisitFileexamineQuery> pq) {
         LoanHomevisitFileexamineQuery query = pq.getParams();
         QueryWrapper<LoanHomevisitFileexamine> qw = new QueryWrapper<>();
-        qw.eq("li.state", query.getType());
-        qw.eq("bb.busNo", 303);
+        qw.eq("li.state", 2);
+        qw.eq("lf.state", query.getType());
+        if ("1".equals(query.getType())){
+            qw.eq("bb.busNo", 303);
+        }
         if (StringUtils.isNotBlank(query.getMenuUrl())) {
             //=======================
             PrivilegeQuery privilegeQuery = new PrivilegeQuery();
@@ -426,7 +429,7 @@ public class LoanHomevisitFileexamineService extends MybatisBaseService<LoanHome
             loanXdConDetailsVo.setLoanCotractNoShow("消贷合同号" + "(" + busSalesOrderLoancontractDetailsVo.getLoanCotractNo() + ")");
             //消贷合同附件
             List<LoanHomevisitInvestigateFileDetailsVo> loanHomevisitInvestigateFileDetailsVos = loanHomevisitInvestigateFileService.selByMainSidAndTypeKey(loanHomevisitFileexamine.getHomeVisitSid(), busSalesOrderLoancontractDetailsVo.getLoanCotractNo());
-            if (loanHomevisitInvestigateFileDetailsVos != null && loanHomevisitInvestigateFileDetailsVos.size() > 0){
+            if (loanHomevisitInvestigateFileDetailsVos != null && loanHomevisitInvestigateFileDetailsVos.size() > 0) {
                 for (LoanHomevisitInvestigateFileDetailsVo loanHomevisitInvestigateFileDetailsVo : loanHomevisitInvestigateFileDetailsVos) {
                     loanCotractImages.add(loanHomevisitInvestigateFileDetailsVo.getFileUrl());
                 }
@@ -440,7 +443,7 @@ public class LoanHomevisitFileexamineService extends MybatisBaseService<LoanHome
                 loanZfConDetailsVo.setBankContractNoShow("资方合同号" + "(" + busSalesOrderLoancontractDetailsVo.getLoanCotractNo() + ")");
                 //资方合同附件
                 List<LoanHomevisitInvestigateFileDetailsVo> loanHomevisitInvestigateFileDetailsVos2 = loanHomevisitInvestigateFileService.selByMainSidAndTypeKey(loanHomevisitFileexamine.getHomeVisitSid(), busSalesOrderLoancontractDetailsVo.getLoanCotractNo());
-                if (loanHomevisitInvestigateFileDetailsVos2 != null && loanHomevisitInvestigateFileDetailsVos2.size() > 0){
+                if (loanHomevisitInvestigateFileDetailsVos2 != null && loanHomevisitInvestigateFileDetailsVos2.size() > 0) {
                     for (LoanHomevisitInvestigateFileDetailsVo loanHomevisitInvestigateFileDetailsVo : loanHomevisitInvestigateFileDetailsVos2) {
                         bankContractImages.add(loanHomevisitInvestigateFileDetailsVo.getFileUrl());
                     }

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

@@ -36,6 +36,7 @@ import com.yxt.anrui.crm.api.crmcustomertemp.CrmCustomerTempVo;
 import com.yxt.anrui.portal.api.sysuser.PrivilegeQuery;
 import com.yxt.anrui.portal.api.sysuser.SysUserFeign;
 import com.yxt.anrui.portal.api.sysuser.SysUserVo;
+import com.yxt.anrui.riskcenter.api.loanhomevisitfileexamine.LoanHomevisitFileexamineDto;
 import com.yxt.anrui.riskcenter.api.loanhomevisitinvestigate.*;
 import com.yxt.anrui.riskcenter.api.loanhomevisitinvestigatecustomer.LoanHomeVisitInvestigateInitCustomerVo;
 import com.yxt.anrui.riskcenter.api.loanhomevisitinvestigatecustomer.LoanHomeVisitInvestigateSaveCustomerDto;
@@ -61,6 +62,7 @@ import com.yxt.anrui.riskcenter.api.loanhomevisitinvestigatetransport.LoanHomeVi
 import com.yxt.anrui.riskcenter.api.loanhomevisitinvestigatetransport.LoanHomeVisitInvestigateInitTranVo;
 import com.yxt.anrui.riskcenter.api.loanhomevisitinvestigatetransport.LoanHomevisitInvestigateTransportDetailsVo;
 import com.yxt.anrui.riskcenter.api.loanhomevisitinvestigatetransport.LoanHomevisitInvestigateTransportDto;
+import com.yxt.anrui.riskcenter.biz.loanhomevisitfileexamine.LoanHomevisitFileexamineService;
 import com.yxt.anrui.riskcenter.biz.loanhomevisitinvestigatecustomer.LoanHomevisitInvestigateCustomerService;
 import com.yxt.anrui.riskcenter.biz.loanhomevisitinvestigatefile.LoanHomevisitInvestigateFileService;
 import com.yxt.anrui.riskcenter.biz.loanhomevisitinvestigateoperations.LoanHomevisitInvestigateOperationsService;
@@ -119,6 +121,8 @@ public class LoanHomevisitInvestigateService extends MybatisBaseService<LoanHome
     @Autowired
     private LoanHomevisitInvestigateOtherpeoService loanHomevisitInvestigateOtherpeoService;
     @Autowired
+    private LoanHomevisitFileexamineService loanHomevisitFileexamineService;
+    @Autowired
     private FileUploadComponent fileUploadComponent;
 
     public PagerVo<LoanHomevisitInvestigateVo> listPageVo(PagerQuery<LoanHomevisitInvestigateQuery> pq) {
@@ -1139,6 +1143,7 @@ public class LoanHomevisitInvestigateService extends MybatisBaseService<LoanHome
 
     public ResultBean saveReportInfo(String comment, Boolean agree, String sid, String userSid) {
         ResultBean rb = ResultBean.fireFail();
+        LoanHomevisitInvestigate loanHomevisitInvestigate = fetchBySid(sid);
         LoanHomeVisitInvestigateInitReportStateVo loanHomeVisitInvestigateInitReportStateVo = getHomeVisitReportInfo(sid).getData();
         LoanHomeVisitInvestigateInitInformationStateVo loanHomeVisitInvestigateInitInformationStateVo = getHomeVisitDataInfo(sid).getData();
         if (loanHomeVisitInvestigateInitReportStateVo.getOperationState() == 0) {
@@ -1154,6 +1159,11 @@ public class LoanHomevisitInvestigateService extends MybatisBaseService<LoanHome
         }
         SysUserVo sysUserVo = sysUserFeign.fetchBySid(userSid).getData();
         baseMapper.saveReportInfo(comment, jg, sid, userSid, sysUserVo.getName());
+        LoanHomevisitFileexamineDto loanHomevisitFileexamineDto = new LoanHomevisitFileexamineDto();
+        loanHomevisitFileexamineDto.setHomeVisitSid(sid);
+        loanHomevisitFileexamineDto.setSaleOrderSid(loanHomevisitInvestigate.getSaleOrderSid());
+        loanHomevisitFileexamineService.saveOrUpdateDto(loanHomevisitFileexamineDto);
+        busSalesOrderBorrowerFeign.updateBusNo("303",loanHomevisitInvestigate.getSaleOrderBorrowerSid());
         return rb.success();
     }
 

anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanpreloancreditapply/LoanPreloanCreditApplyMapper.java

@@ -65,4 +65,6 @@ public interface LoanPreloanCreditApplyMapper extends BaseMapper<LoanPreloanCred
     LoanPreloanCreditApply judgeIsLoan(String sid);
 
     LoanOrderPreloanVo judgeIsLoan2(String sid);
+
+    List<String> selectBySid(String orderSid);
 }

anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanpreloancreditapply/LoanPreloanCreditApplyMapper.xml

@@ -48,7 +48,7 @@
         select la.* from
         loan_preloan_credit_apply la
         left join anrui_buscenter.bus_sales_order bo on bo.customerSid = la.custSid
-        where bo.sid = #{sid} and la.state = 0
+        where bo.sid = #{sid}
         order by la.createTime desc limit 1
     </select>
 
@@ -58,4 +58,8 @@
         left join anrui_buscenter.bus_sales_order_price bp on bp.salesOrderSid = bo.sid
         where bo.sid = #{sid}
     </select>
+
+    <select id="selectBySid" resultType="java.lang.String">
+        select borrowerSid from anrui_buscenter.bus_sales_order_vehicle where salesOrderSid = #{orderSid}
+    </select>
 </mapper>

anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanpreloancreditapply/LoanPreloanCreditApplyService.java

@@ -54,6 +54,7 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
 import java.util.ArrayList;
+import java.util.Collections;
 import java.util.List;
 
 @Service
@@ -562,6 +563,12 @@ public class LoanPreloanCreditApplyService extends MybatisBaseService<LoanPreloa
                 qw.like("la.idCard", query.getIdCard());
             }
             qw.eq("la.isDelete", 0);
+            //排除销售订单已选择的贷款人
+            List<String> borrowSidList = baseMapper.selectBySid(query.getOrderSid());
+            borrowSidList.removeAll(Collections.singleton(null));
+            if(borrowSidList.size()>0){
+                qw.notIn("la.custSid",borrowSidList);
+            }
         }
         IPage<LoanPreloanCreditApply> page = PagerUtil.queryToPage(pagerQuery);
         IPage<LoanPreloanVo> pagging = baseMapper.getOrderLoanPagerList(page, qw, query.getName());
@@ -578,32 +585,30 @@ public class LoanPreloanCreditApplyService extends MybatisBaseService<LoanPreloa
             loanOrderPreloanVo.setConfirmBtn("信用审核");
             return rb.setData(loanOrderPreloanVo).setMsg("实际购车人未进行贷前信用审核");
         } else {
-            if (StringUtils.isNotBlank(loanPreloanCreditApply.getGsfkjgKey())) {
-                if (loanPreloanCreditApply.getState() != 2 && "001".equals(loanPreloanCreditApply.getGsfkjgKey())) {
-                    loanOrderPreloanVo.setConfirmBtn("我知道了");
-                    return rb.setData(loanOrderPreloanVo).setMsg("实际购车人的贷前信用审核进行中，请等待！");
-                } else {
-                    if ("002".equals(loanPreloanCreditApply.getGsfkjgKey())) {
-                        //查询申诉是否通过，若无申诉，则直接提示未通过，若存在申诉，通过的，也算信用审核通过
-                        LoanCreditAppealApply loanCreditAppealApply = loanCreditAppealApplyService.selectByApplySid(loanPreloanCreditApply.getSid());
-                        if (loanCreditAppealApply != null) {
-                            if ("已办结".equals(loanCreditAppealApply.getNodeState())) {
-                                return rb.success();
-                            } else {
-                                loanOrderPreloanVo.setConfirmBtn("信用申诉");
-                                return rb.setData(loanOrderPreloanVo).setMsg("实际购车人贷前信用审核未通过！");
-                            }
+            if ("1".equals(loanPreloanCreditApply.getState())) {
+                loanOrderPreloanVo.setConfirmBtn("信用审核");
+                return rb.setData(loanOrderPreloanVo).setMsg("实际购车人未进行贷前信用审核");
+            } else if ("0".equals(loanPreloanCreditApply.getState())) {
+                loanOrderPreloanVo.setConfirmBtn("我知道了");
+                return rb.setData(loanOrderPreloanVo).setMsg("实际购车人的贷前信用审核进行中，请等待！");
+            } else {
+                if ("002".equals(loanPreloanCreditApply.getGsfkjgKey())) {
+                    //查询申诉是否通过，若无申诉，则直接提示未通过，若存在申诉，通过的，也算信用审核通过
+                    LoanCreditAppealApply loanCreditAppealApply = loanCreditAppealApplyService.selectByApplySid(loanPreloanCreditApply.getSid());
+                    if (loanCreditAppealApply != null) {
+                        if ("已办结".equals(loanCreditAppealApply.getNodeState())) {
+                            return rb.success();
                         } else {
                             loanOrderPreloanVo.setConfirmBtn("信用申诉");
                             return rb.setData(loanOrderPreloanVo).setMsg("实际购车人贷前信用审核未通过！");
                         }
                     } else {
-                        return rb.success();
+                        loanOrderPreloanVo.setConfirmBtn("信用申诉");
+                        return rb.setData(loanOrderPreloanVo).setMsg("实际购车人贷前信用审核未通过！");
                     }
+                } else {
+                    return rb.success();
                 }
-            } else {
-                loanOrderPreloanVo.setConfirmBtn("我知道了");
-                return rb.setData(loanOrderPreloanVo).setMsg("实际购车人的贷前信用审核进行中，请等待！");
             }
         }
     }

anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/saleOrders/AppBusSalesOrderFeign.java

@@ -318,5 +318,10 @@ public interface AppBusSalesOrderFeign {
     @ResponseBody
     ResultBean agreeSaleOrderInfoBy(@RequestBody SaleOrderQueryBy dto);
 
+    @ApiOperation("销售订单点击贷款人确定")
+    @GetMapping("/judgeIsLoan")
+    @ResponseBody
+    ResultBean<OrderLoanVo> judgeIsLoan(@RequestParam("sid") String sid);
+
 
 }

anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/saleOrders/AppBusSalesOrderFeignFallback.java

@@ -283,4 +283,9 @@ public class AppBusSalesOrderFeignFallback implements AppBusSalesOrderFeign {
     public ResultBean agreeSaleOrderInfoBy(SaleOrderQueryBy dto) {
         return null;
     }
+
+    @Override
+    public ResultBean<OrderLoanVo> judgeIsLoan(String sid) {
+        return null;
+    }
 }

anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/saleOrders/OrderLoanVo.java

@@ -1,5 +1,6 @@
 package com.yxt.anrui.terminal.api.autoservice.saleOrders;
 
+import com.yxt.anrui.terminal.api.base.common.CarModelVo;
 import com.yxt.common.core.vo.Vo;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
@@ -17,4 +18,9 @@ public class OrderLoanVo implements Vo {
     private String customerName;
     @ApiModelProperty("台数")
     private String quantity;
+
+    @ApiModelProperty("按钮：信用审核、当为等待中时为我知道了、信用申诉")
+    private String confirmBtn;
+    @ApiModelProperty("页面地址")
+    private CarModelVo pluginPage;
 }

anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/base/common/CommonFeign.java

@@ -58,4 +58,9 @@ public interface CommonFeign {
     @GetMapping("/getLoanSolution")
     ResultBean<CarModelVo> getLoanSolution(@RequestParam("orderSid") String orderSid);
 
+    @ApiOperation(value = "贷前信用审核页面")
+    @ResponseBody
+    @GetMapping("/getLoanPreloan")
+    ResultBean<CarModelVo> getLoanPreloan(@RequestParam("orderSid") String orderSid);
+
 }

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

@@ -0,0 +1,24 @@
+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 AppLoanHomeVisitAppealPageVo implements Vo {
+
+    @ApiModelProperty("sid")
+    private String sid;
+    @ApiModelProperty("分公司-销售部门-销售专员")
+    private String salesName;
+    @ApiModelProperty("贷款人姓名")
+    private String lenderName;
+    @ApiModelProperty("家访人员")
+    private String jfMember;
+    @ApiModelProperty("预约家访日期")
+    private String times;
+    @ApiModelProperty("家访考察意见")
+    private String remarks;
+    @ApiModelProperty("申诉原因")
+    private String appealReason;
+}

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

@@ -51,7 +51,7 @@ import java.util.List;
 @ApiModel(value = "家访考察申诉 数据传输对象", description = "家访考察申诉 数据传输对象")
 public class AppLoanHomevisitAppealDto implements Dto {
 
-    private String sid;
+    private String ssSid;
 
 	@ApiModelProperty("申诉原因")
     private String appealReason;

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

@@ -149,6 +149,11 @@ public interface LoanHomeVisitInvestigateFeign {
     @ResponseBody
     ResultBean<PagerVo<LoanHomeVisitInvestigatePageVo>> getHomeAppealList(@RequestBody PagerQuery<LoanHomeVisitInvestigatePageQuery> pagerQuery);
 
+    @ApiOperation("获取家访申诉列表")
+    @PostMapping("/getHomeAppealList2")
+    @ResponseBody
+    ResultBean<PagerVo<AppLoanHomeVisitAppealPageVo>> getHomeAppealList2(@RequestBody PagerQuery<LoanHomeVisitInvestigatePageQuery> pagerQuery);
+
     @ApiOperation("初始化家访申诉")
     @GetMapping("/getHomeVisitAppealInfo")
     @ResponseBody

anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/autoservice/saleOrders/AppBusSalesOrderRest.java

@@ -376,4 +376,9 @@ public class AppBusSalesOrderRest implements AppBusSalesOrderFeign {
         return appBusSalesOrderService.agreeSaleOrderInfoBy(dto);
     }
 
+    @Override
+    public ResultBean<OrderLoanVo> judgeIsLoan(String sid) {
+        return appBusSalesOrderService.judgeIsLoan(sid);
+    }
+
 }

anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/autoservice/saleOrders/AppBusSalesOrderService.java

@@ -99,7 +99,10 @@ import com.yxt.anrui.terminal.api.autoservice.saleOrders.vininput.InputVinDto;
 import com.yxt.anrui.terminal.api.autoservice.saleOrders.vininput.InputVinQuery;
 import com.yxt.anrui.terminal.api.autoservice.saleOrders.vininput.InputVinVo;
 import com.yxt.anrui.terminal.api.autoservice.saleOrders.vininput.VinNoVo;
+import com.yxt.anrui.terminal.api.base.common.CarModelVo;
 import com.yxt.anrui.terminal.api.base.common.SystemVo;
+import com.yxt.anrui.terminal.api.risk.loanhomevisitinvestigate.AppLoanHomeVisitVo;
+import com.yxt.anrui.terminal.biz.base.common.CommonService;
 import com.yxt.anrui.terminal.config.CoverUtils;
 import com.yxt.common.base.utils.StringUtils;
 import com.yxt.common.core.query.PagerQuery;
@@ -163,6 +166,8 @@ public class AppBusSalesOrderService {
     private BasePurchaseSystemFeign basePurchaseSystemFeign;
     @Autowired
     private LoanPreloanCreditApplyFeign loanPreloanCreditApplyFeign;
+    @Autowired
+    private CommonService commonService;
 
     /************************************* 销售订单接口 *********************************************/
 
@@ -719,4 +724,20 @@ public class AppBusSalesOrderService {
         }
         return rb.success().setData(resultBean.getData()).setMsg(resultBean.getMsg());
     }
+
+    public ResultBean<OrderLoanVo> judgeIsLoan(String sid) {
+        ResultBean<OrderLoanVo> rb = ResultBean.fireFail();
+        ResultBean<LoanOrderPreloanVo> resultBean = loanPreloanCreditApplyFeign.judgeIsLoan(sid);
+        if (!resultBean.getSuccess()) {
+            OrderLoanVo orderLoanVo = new OrderLoanVo();
+            LoanOrderPreloanVo loanOrderPreloanVo = resultBean.getData();
+            BeanUtil.copyProperties(loanOrderPreloanVo, orderLoanVo);
+            if ("信用审核".equals(loanOrderPreloanVo.getConfirmBtn())) {
+                CarModelVo finPage1 = commonService.getLoanSolution(sid).getData();
+                orderLoanVo.setPluginPage(finPage1);
+            }
+            return rb.setMsg(resultBean.getMsg()).setData(orderLoanVo);
+        }
+        return rb.success();
+    }
 }

anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/base/common/CommonRest.java

@@ -58,4 +58,9 @@ public class CommonRest implements CommonFeign {
     public ResultBean<CarModelVo> getLoanSolution(String orderSid) {
         return commonService.getLoanSolution(orderSid);
     }
+
+    @Override
+    public ResultBean<CarModelVo> getLoanPreloan(String orderSid) {
+        return commonService.getLoanPreloan(orderSid);
+    }
 }

anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/base/common/CommonService.java

@@ -141,4 +141,34 @@ public class CommonService {
         carModelVo.setARouterParamValue(aRouterParamValue);
         return rb.success().setData(carModelVo);
     }
+
+    public ResultBean<CarModelVo> getLoanPreloan(String orderSid) {
+        ResultBean<CarModelVo> rb = ResultBean.fireFail();
+        String appSid = "fec4e243-491a-11ec-94cd-fa163e0cb33c";
+        String moduleAction = "com.anrui.android.plugin.riskcontrol.activity.EditCreditReviewActivity";
+        ResultBean<AppSubVersionVo> voResultBean = appSubsetVersionFeign.getLastRiskByAppSid(appSid, moduleAction);
+        AppSubVersionVo appSubVersionVo = voResultBean.getData();
+        CarModelVo carModelVo = new CarModelVo();
+        Map<String, Object> map = new HashMap<>();
+        map.put("creditType",0);
+        map.put("createSource", 2);
+        map.put("sourceSid", orderSid);
+        appSubVersionVo.setJson(JSONObject.toJSONString(map));
+        BeanUtil.copyProperties(appSubVersionVo, carModelVo);
+        carModelVo.setRequestCode("1004");
+        carModelVo.setPluginName("riskcontrol");
+        carModelVo.setARouterClass("com.anrui.android.plugin.riskcontrol.manager.ARouterManager");
+        carModelVo.setARouterMethod("EDIT_CREDIT_REVIEW_ACTIVITY");
+        List<String> aRouterParamType = new ArrayList<>();
+        aRouterParamType.add("INT");
+        aRouterParamType.add("INT");
+        aRouterParamType.add("STRING");
+        List<String> aRouterParamValue = new ArrayList<>();
+        aRouterParamValue.add("0");
+        aRouterParamValue.add("2");
+        aRouterParamValue.add(orderSid);
+        carModelVo.setARouterParamType(aRouterParamType);
+        carModelVo.setARouterParamValue(aRouterParamValue);
+        return rb.success().setData(carModelVo);
+    }
 }

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

@@ -164,6 +164,11 @@ public class LoanHomeVisitInvestigateRest implements LoanHomeVisitInvestigateFei
         return loanHomeVisitInvestigateService.getHomeAppealList(pagerQuery);
     }
 
+    @Override
+    public ResultBean<PagerVo<AppLoanHomeVisitAppealPageVo>> getHomeAppealList2(PagerQuery<LoanHomeVisitInvestigatePageQuery> pagerQuery) {
+        return loanHomeVisitInvestigateService.getHomeAppealList2(pagerQuery);
+    }
+
     @Override
     public ResultBean<AppLoanHomeVisitInitAppealVo> getHomeVisitAppealInfo(String kcSid, String ssSid) {
         return loanHomeVisitInvestigateService.getHomeVisitAppealInfo(kcSid, ssSid);

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

@@ -27,18 +27,7 @@ package com.yxt.anrui.terminal.biz.risk.loanhomevisitinvestigate;
 
 
 import cn.hutool.core.bean.BeanUtil;
-import com.yxt.anrui.portal.api.sysorganization.SysOrganizationVo;
-import com.yxt.anrui.portal.api.sysuser.SysUserFeign;
-import com.yxt.anrui.portal.api.sysuser.SysUserVo;
-import com.yxt.anrui.riskcenter.api.loancreditappealapply.flowable.LoanCreditApplyCompleteDto;
-import com.yxt.anrui.riskcenter.api.loancreditappealapply.flowable.LoanCreditApplyNodeQuery;
-import com.yxt.anrui.riskcenter.api.loancreditappealapply.flowable.LoanCreditApplyNodeVo;
-import com.yxt.anrui.riskcenter.api.loancreditappealapply.flowable.LoanCreditApplyTaskQuery;
-import com.yxt.anrui.riskcenter.api.loancreditappealpeo.LoanCreditAppealPeoDto;
-import com.yxt.anrui.riskcenter.api.loanhomevisitappeal.LoanHomeVisitInitAppealVo;
-import com.yxt.anrui.riskcenter.api.loanhomevisitappeal.LoanHomevisitAppealFeign;
-import com.yxt.anrui.riskcenter.api.loanhomevisitappeal.LoanHomevisitAppealQuery;
-import com.yxt.anrui.riskcenter.api.loanhomevisitappeal.LoanHomevisitAppealVo;
+import com.yxt.anrui.riskcenter.api.loanhomevisitappeal.*;
 import com.yxt.anrui.riskcenter.api.loanhomevisitappeal.flowable.*;
 import com.yxt.anrui.riskcenter.api.loanhomevisitinvestigate.*;
 import com.yxt.anrui.riskcenter.api.loanhomevisitinvestigatecustomer.LoanHomeVisitInvestigateInitCustomerVo;
@@ -365,6 +354,35 @@ public class LoanHomeVisitInvestigateService {
         return rb.success().setData(v);
     }
 
+    public ResultBean<PagerVo<AppLoanHomeVisitAppealPageVo>> getHomeAppealList2(PagerQuery<LoanHomeVisitInvestigatePageQuery> pagerQuery) {
+        ResultBean<PagerVo<AppLoanHomeVisitAppealPageVo>> rb = ResultBean.fireFail();
+        PagerQuery<LoanHomevisitAppealQuery> pq = new PagerQuery<>();
+        LoanHomeVisitInvestigatePageQuery params = pagerQuery.getParams();
+        LoanHomevisitAppealQuery loanHomevisitAppealQuery = new LoanHomevisitAppealQuery();
+        loanHomevisitAppealQuery.setOrgSidPath(params.getOrgPath());
+        loanHomevisitAppealQuery.setUserSid(params.getUserSid());
+        loanHomevisitAppealQuery.setNames(params.getNames());
+        loanHomevisitAppealQuery.setMenuSid(params.getMenuSid());
+        pq.setParams(loanHomevisitAppealQuery);
+        ResultBean<PagerVo<LoanHomeVisitAppealPageVo>> resultBean = loanHomevisitAppealFeign.getHomeAppealList2(pq);
+        List<AppLoanHomeVisitAppealPageVo> appLoanHomeVisitAppealPageVos = new ArrayList<>();
+        PagerVo<AppLoanHomeVisitAppealPageVo> v = new PagerVo<>();
+        List<LoanHomeVisitAppealPageVo> records = resultBean.getData().getRecords();
+        for (LoanHomeVisitAppealPageVo record : records) {
+            AppLoanHomeVisitAppealPageVo appealPageVo = new AppLoanHomeVisitAppealPageVo();
+            appealPageVo.setSid(record.getSid());
+            appealPageVo.setSalesName(record.getUseOrgName() + "-" + record.getOrgName() + "-" + record.getStaffName());
+            appealPageVo.setLenderName(record.getLenderName());
+            appealPageVo.setJfMember(record.getJfMember());
+            appealPageVo.setTimes(record.getTimes());
+            appealPageVo.setRemarks(record.getRemarks());
+            appealPageVo.setAppealReason(record.getAppealReason());
+            appLoanHomeVisitAppealPageVos.add(appealPageVo);
+        }
+        v.setRecords(appLoanHomeVisitAppealPageVos);
+        return rb.success().setData(v);
+    }
+
     public ResultBean submitCreditInfo(SubmitHomeAppealApplyDto dto) {
         ResultBean rb = ResultBean.fireFail();
         SubmitHomeAppealDto submitHomeAppealDto = new SubmitHomeAppealDto();