Merge remote-tracking branch 'origin/master'

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

@@ -7459,6 +7459,8 @@ public class BusSalesOrderService extends MybatisBaseService<BusSalesOrderMapper
             HomeVisitDto homeVisitDto = new HomeVisitDto();
             homeVisitDto.setSaleOrderSid(busSalesOrderBorrower.getSalesOrderSid());
             homeVisitDto.setSaleOrderBorrowerSid(sid);
+            //-------家访准备补充推送createBySid---------
+            homeVisitDto.setCreateBySid(busSalesOrder.getCreateBySid());
             loanHomevisitPrepFeign.saveHomeVisit(homeVisitDto);
         } else {
             return rb.setMsg("该销售订单的剩余台数已不足");

anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanhomevisitprep/HomeVisitDto.java

@@ -16,4 +16,5 @@ public class HomeVisitDto implements Dto {
     private String saleOrderSid;
     @ApiModelProperty("销售订单贷款人表sid")
     private String saleOrderBorrowerSid;
+    private String createBySid;
 }

anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanparameter/LoanParameterFeign.java

@@ -54,4 +54,8 @@ public interface LoanParameterFeign {
     @ResponseBody
     ResultBean<String> fetchByParNo(@RequestParam("parNo") String parNo);
 
+    @ApiOperation("根据参数编码查询记录")
+    @PostMapping("/fetchOneByParNo")
+    @ResponseBody
+    ResultBean<LoanParameter> fetchOneByParNo(@RequestParam("parNo") String parNo);
 }

anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanparameter/LoanParameterFeignFallback.java

@@ -37,4 +37,9 @@ public class LoanParameterFeignFallback implements LoanParameterFeign {
     public ResultBean<String> fetchByParNo(String parNo) {
         return null;
     }
+
+    @Override
+    public ResultBean<LoanParameter> fetchOneByParNo(String parNo) {
+        return null;
+    }
 }

anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanrepaymentschedule/LoanRepaymentScheduleFeign.java

@@ -65,5 +65,9 @@ public interface LoanRepaymentScheduleFeign {
     @ResponseBody
     public ResultBean<AppRepaymentPlanDetailsVo> getRepaymentPlanListBySid(@RequestParam("sid") String sid);
 
+    @ApiOperation("查看单台还款计划表")
+    @GetMapping("/getRepaymentPlanListByVinNo")
+    @ResponseBody
+    public ResultBean<List<AppRepaymentPlanListDetailsVo>> getRepaymentPlanListByVinNo(@RequestParam("vinNo") String vinNo,@RequestParam("sid") String sid);
 
 }

anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanrepaymentschedule/LoanRepaymentScheduleFeignFallback.java

@@ -44,4 +44,9 @@ public class LoanRepaymentScheduleFeignFallback implements LoanRepaymentSchedule
     public ResultBean<AppRepaymentPlanDetailsVo> getRepaymentPlanListBySid(String sid) {
         return null;
     }
+
+    @Override
+    public ResultBean<List<AppRepaymentPlanListDetailsVo>> getRepaymentPlanListByVinNo(String vinNo,String sid) {
+        return null;
+    }
 }

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

@@ -8,6 +8,7 @@ import com.yxt.anrui.riskcenter.api.loanfinotherPolicy.*;
 import com.yxt.anrui.riskcenter.api.loanpreloancreditapply.LoanPreloanCreditApply;
 import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
+import org.apache.ibatis.annotations.Update;
 
 import java.util.List;
 
@@ -35,4 +36,7 @@ public interface LoanFinOtherPolicyMapper extends BaseMapper<LoanFinOtherPolicy>
     IPage<LoanFinOtherPolicyPageVo> selectPageVo(IPage<LoanFinOtherPolicy> page,@Param(Constants.WRAPPER)QueryWrapper<LoanPreloanCreditApply> qw);
 
     List<LoanFinOtherPolicy> fetchByMainSid(String mainSid);
+
+    @Update("update loan_fin_otherpolicy set isDelete = 1 where sid =#{sid}")
+    int deleteOne(String sid);
 }

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

@@ -12,8 +12,8 @@
     </select>
 
     <delete id="deleteMainSid">
-        delete
+        update loan_fin_otherpolicy
-        from loan_fin_otherpolicy
+        set isDelete = 1
         where mainPolicySid = #{mainPolicySid}
     </delete>
 
@@ -53,7 +53,8 @@
     </select>
 
     <select id="selectListTwo" resultType="com.yxt.anrui.riskcenter.api.loanfinotherPolicy.OtherPolicyVo">
-       select distinct a.sid, a.name,a.id from ( select lfo.sid, lfo.otherPolicyName as name,lfo.id
+        select distinct a.sid, a.name,a.id,a.period,a.yearRatio from ( select lfo.sid, lfo.otherPolicyName as
+        name,lfo.id,lfo.period,lfo.yearRatio
         from loan_fin_otherpolicy lfo
         where lfo.useOrgSid = #{useOrgSid}
         and lfo.filingState = 2
@@ -70,7 +71,7 @@
             and lfo.vehTypeKey like concat('%',#{type},'%')
         </if>
         union all
-        select lfo.sid, lfo.otherPolicyName as name,lfo.id
+        select lfo.sid, lfo.otherPolicyName as name,lfo.id,lfo.period,lfo.yearRatio
         from loan_fin_otherpolicy lfo
         where lfo.useOrgSid = #{useOrgSid}
         and lfo.filingState = 2

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

@@ -41,8 +41,7 @@ public class LoanFinOtherPolicyRest implements LoanFinOtherPolicyFeign {
 
     @Override
     public ResultBean delBySids(String[] sids) {
-        loanFinOtherPolicyService.delBySids(sids);
+        return loanFinOtherPolicyService.deleteOtherPolicy(sids);
-        return new ResultBean().success();
     }
 
     @Override

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

@@ -187,6 +187,8 @@ public class LoanFinOtherPolicyService extends MybatisBaseService<LoanFinOtherPo
         qw.apply(StringUtils.isNotEmpty(validStartDateTo), "date_format (validDateTo,'%Y-%m-%d') >= date_format('" + validStartDateTo + "','%Y-%m-%d')").
                 apply(StringUtils.isNotEmpty(validEndDateTo), "date_format (validDateTo,'%Y-%m-%d') <= date_format('" + validEndDateTo + "','%Y-%m-%d')"
                 );
+        qw.eq("isDelete", 0);
+        qw.orderByDesc("createTime");
         IPage<LoanFinOtherPolicy> page = PagerUtil.queryToPage(pq);
         IPage<LoanFinOtherPolicyPageVo> pagging = baseMapper.selectPageVo(page, qw);
         PagerVo<LoanFinOtherPolicyPageVo> p = PagerUtil.pageToVo(pagging, null);
@@ -345,4 +347,14 @@ public class LoanFinOtherPolicyService extends MybatisBaseService<LoanFinOtherPo
     public List<LoanFinOtherPolicy> fetchByMainSid(String mainSid) {
         return baseMapper.fetchByMainSid(mainSid);
     }
+
+    public ResultBean deleteOtherPolicy(String[] sids) {
+        ResultBean rb = ResultBean.fireFail();
+        //符合条件直接删除
+        List<String> sidList = Arrays.asList(sids);
+        for (String sid : sidList) {
+            int i = baseMapper.deleteOne(sid);
+        }
+        return rb.success();
+    }
 }

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

@@ -8,6 +8,7 @@ import com.yxt.anrui.riskcenter.api.loanfinpolicy.*;
 import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
 import org.apache.ibatis.annotations.Select;
+import org.apache.ibatis.annotations.Update;
 
 import java.util.List;
 
@@ -30,4 +31,7 @@ public interface LoanFinPolicyMapper extends BaseMapper<LoanFinPolicy> {
     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);
+
+    @Update("update loan_fin_policy set isDelete = 1 where sid =#{sid}")
+    int deleteOne(String sid);
 }

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

@@ -396,7 +396,7 @@ public class LoanFinPolicyService extends MybatisBaseService<LoanFinPolicyMapper
         List<String> sidList = Arrays.asList(sids);
         for (String sid : sidList) {
             loanFinOtherPolicyService.deleteyMainSid(sid);
-            deleteBySid(sid);
+            int i = baseMapper.deleteOne(sid);
         }
         return rb.success();
     }
@@ -539,6 +539,7 @@ public class LoanFinPolicyService extends MybatisBaseService<LoanFinPolicyMapper
         if (StringUtils.isNotBlank(query.getDownPayRatioLeastStart()) && StringUtils.isNotBlank(query.getDownPayRatioLeastEnd())) {
             qw.between("lfp.downPayRatioLeast", query.getDownPayRatioLeastStart(), query.getDownPayRatioLeastEnd());
         }
+        qw.eq("lfp.isDelete", 0);
         IPage<LoanFinPolicy> page = PagerUtil.queryToPage(pagerQuery);
         IPage<LoanFinPolicyVos> pagging = baseMapper.pagerList(page, qw);
         PagerVo<LoanFinPolicyVos> p = PagerUtil.pageToVo(pagging, null);

anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanparameter/LoanParameterMapper.java

@@ -25,4 +25,11 @@ public interface LoanParameterMapper extends BaseMapper<LoanParameter> {
 
     @Select("select parameterValue from loan_parameter where parameterNo = #{parNo}")
     String fetchByParNo(String parNo);
+
+    @Select("select * from loan_parameter where parameterNo = #{parNo} and isDelete = 0")
+    LoanParameter fetchOneByParNo(String parNo);
+
+    int selectParameterByNo(String pNo);
+
+    int selectAllByIdAndpNo(@Param("pNo") String pNo, @Param("sid") String sid);
 }

anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanparameter/LoanParameterMapper.xml

@@ -18,4 +18,17 @@
             ${ew.sqlSegment}
         </where>
     </select>
+    <select id="selectParameterByNo" resultType="java.lang.Integer">
+        select count(*)
+        FROM loan_parameter
+        where parameterNo = #{pNo}
+          and isDelete != 1
+    </select>
+    <select id="selectAllByIdAndpNo" resultType="java.lang.Integer">
+        select count(*)
+        FROM loan_parameter
+        where sid != #{sid}
+          and parameterNo = #{pNo}
+          and isDelete != 1
+    </select>
 </mapper>

anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanparameter/LoanParameterRest.java

@@ -53,4 +53,9 @@ public class LoanParameterRest implements LoanParameterFeign {
     public ResultBean<String> fetchByParNo(String parNo) {
         return parameterService.fetchByParNo(parNo);
     }
+
+    @Override
+    public ResultBean<LoanParameter> fetchOneByParNo(String parNo) {
+        return parameterService.fetchOneByParNo(parNo);
+    }
 }

anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanparameter/LoanParameterService.java

@@ -97,13 +97,44 @@ public class LoanParameterService extends MybatisBaseService<LoanParameterMapper
         return p;
     }
 
+    /**
+     * 根据风控参数编码查询是否存在与风控参数编码相同的数据
+     *
+     * @return
+     */
+    public int selectParameterByNo(String pNo) {
+        return baseMapper.selectParameterByNo(pNo);
+    }
+
+    /**
+     * 修改时 根据风控参数编码查询是否存在与风控参数编码相同的数据
+     *
+     * @param pNo 风控参数编码
+     * @param sid         风控参数sid
+     */
+    public int selectAllByIdAndpNo(String pNo, String sid) {
+        return baseMapper.selectAllByIdAndpNo(pNo, sid);
+    }
+
+
     public ResultBean saveOrUpdateParameter(LoanParameterDto dto) {
         ResultBean rb = ResultBean.fireFail();
+        if (StringUtils.isBlank(dto.getParameterNo())) {
+            return rb.setMsg("参数编码不能为空！");
+        }
         if (StringUtils.isNotBlank(dto.getSid())) {
+            int count = selectAllByIdAndpNo(dto.getParameterNo(), dto.getSid());
+            if (count > 0) {
+                return ResultBean.fireFail().setMessage("参数编码已存在");
+            }
             LoanParameter loanParameter = fetchBySid(dto.getSid());
             BeanUtil.copyProperties(dto, loanParameter, "id", "sid");
             baseMapper.updateById(loanParameter);
         } else {
+            int count = selectParameterByNo(dto.getParameterNo());
+            if (count > 0) {
+                return ResultBean.fireFail().setMsg("添加失败，参数编码已存在");
+            }
             LoanParameter loanParameter = new LoanParameter();
             BeanUtil.copyProperties(dto, loanParameter, "id", "sid");
             loanParameter.setOrgSidPath(dto.getOrgPath());
@@ -151,4 +182,10 @@ public class LoanParameterService extends MybatisBaseService<LoanParameterMapper
         String parameterValue = baseMapper.fetchByParNo(parNo);
         return rb.success().setData(parameterValue);
     }
+
+    public ResultBean<LoanParameter> fetchOneByParNo(String parNo) {
+        ResultBean rb = ResultBean.fireFail();
+        LoanParameter parameter = baseMapper.fetchOneByParNo(parNo);
+        return rb.success().setData(parameter);
+    }
 }

anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanrepaymentschedule/LoanRepaymentScheduleRest.java

@@ -57,4 +57,9 @@ public class LoanRepaymentScheduleRest implements LoanRepaymentScheduleFeign {
     public ResultBean<AppRepaymentPlanDetailsVo> getRepaymentPlanListBySid(String sid) {
         return loanRepaymentScheduleService.getRepaymentPlanListBySid(sid);
     }
+
+    @Override
+    public ResultBean<List<AppRepaymentPlanListDetailsVo>> getRepaymentPlanListByVinNo(String vinNo,String sid) {
+        return loanRepaymentScheduleService.getRepaymentPlanListByVinNo(vinNo,sid);
+    }
 }

anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanrepaymentschedule/LoanRepaymentScheduleService.java

@@ -756,4 +756,16 @@ public class LoanRepaymentScheduleService extends MybatisBaseService<LoanRepayme
         }
         return rb.success().setData(vo);
     }
+
+    public ResultBean<List<AppRepaymentPlanListDetailsVo>> getRepaymentPlanListByVinNo(String vinNo , String sid) {
+        ResultBean<List<AppRepaymentPlanListDetailsVo>> rb = ResultBean.fireFail();
+        AppRepaymentPlanDetailsVo data = getRepaymentPlanListBySid(sid).getData();
+        if (null != data) {
+            List<AppRepaymentPlanListDetailsVo> records = data.getRecords();
+            records.removeAll(Collections.singleton(null));
+            if (!records.isEmpty())
+            return rb.success().setData(records);
+        }
+        return rb.success();
+    }
 }

anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/risk/repaymentplan/RepaymentPlanFeign.java

@@ -9,6 +9,8 @@ import io.swagger.annotations.ApiOperation;
 import org.springframework.cloud.openfeign.FeignClient;
 import org.springframework.web.bind.annotation.*;
 
+import java.util.List;
+
 /**
  * @Author
  * @Date
@@ -33,5 +35,10 @@ public interface RepaymentPlanFeign {
     @ResponseBody
     public ResultBean<RepaymentPlanDetailsVo> getRepaymentPlanListBySid(@RequestParam("sid") String sid);
 
+    @ApiOperation("查看单台还款计划表")
+    @GetMapping("/getRepaymentPlanListByVinNo")
+    @ResponseBody
+    public ResultBean<List<RepaymentPlanListDetailsVo>> getRepaymentPlanListByVinNo(@RequestParam("vinNo") String vinNo, @RequestParam("sid") String sid);
+
 
 }

anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/risk/repaymentplan/RepaymentPlanFeignFallback.java

@@ -6,6 +6,8 @@ import com.yxt.common.core.result.ResultBean;
 import com.yxt.common.core.vo.PagerVo;
 import org.springframework.stereotype.Component;
 
+import java.util.List;
+
 /**
  * @Author
  * @Date 2023/3/21 15:19
@@ -24,4 +26,9 @@ public class RepaymentPlanFeignFallback implements RepaymentPlanFeign {
     public ResultBean<RepaymentPlanDetailsVo> getRepaymentPlanListBySid(String sid) {
         return null;
     }
+
+    @Override
+    public ResultBean<List<RepaymentPlanListDetailsVo>> getRepaymentPlanListByVinNo(String vinNo, String sid) {
+        return null;
+    }
 }

anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/risk/repaymentplan/RepaymentPlanRest.java

@@ -1,10 +1,7 @@
 package com.yxt.anrui.terminal.biz.risk.repaymentplan;
 
 import com.yxt.anrui.terminal.api.risk.mortgage.*;
-import com.yxt.anrui.terminal.api.risk.repaymentplan.RepaymentPlanDetailsVo;
+import com.yxt.anrui.terminal.api.risk.repaymentplan.*;
-import com.yxt.anrui.terminal.api.risk.repaymentplan.RepaymentPlanFeign;
-import com.yxt.anrui.terminal.api.risk.repaymentplan.RepaymentPlanQuery;
-import com.yxt.anrui.terminal.api.risk.repaymentplan.RepaymentPlanVo;
 import com.yxt.common.core.query.PagerQuery;
 import com.yxt.common.core.result.ResultBean;
 import com.yxt.common.core.vo.PagerVo;
@@ -13,6 +10,8 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Controller;
 import org.springframework.web.bind.annotation.RequestMapping;
 
+import java.util.List;
+
 /**
  * @Author
  * @Date 2023/3/25 9:39
@@ -36,4 +35,9 @@ public class RepaymentPlanRest implements RepaymentPlanFeign {
     public ResultBean<RepaymentPlanDetailsVo> getRepaymentPlanListBySid(String sid) {
         return repaymentPlanService.getRepaymentPlanListBySid(sid);
     }
+
+    @Override
+    public ResultBean<List<RepaymentPlanListDetailsVo>> getRepaymentPlanListByVinNo(String vinNo,String sid) {
+        return repaymentPlanService.getRepaymentPlanListByVinNo(vinNo,sid);
+    }
 }

anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/risk/repaymentplan/RepaymentPlanService.java

@@ -2,15 +2,13 @@ package com.yxt.anrui.terminal.biz.risk.repaymentplan;
 
 import cn.hutool.core.bean.BeanUtil;
 import com.yxt.anrui.riskcenter.api.loanmortgageinformationtransact.*;
-import com.yxt.anrui.riskcenter.api.loanrepaymentschedule.AppRepaymentPlanDetailsVo;
+import com.yxt.anrui.riskcenter.api.loanrepaymentschedule.*;
-import com.yxt.anrui.riskcenter.api.loanrepaymentschedule.AppRepaymentPlanQuery;
-import com.yxt.anrui.riskcenter.api.loanrepaymentschedule.AppRepaymentPlanVo;
-import com.yxt.anrui.riskcenter.api.loanrepaymentschedule.LoanRepaymentScheduleFeign;
 import com.yxt.anrui.terminal.api.risk.mortgage.AppMortgageInformationTransactDetailsVo;
 import com.yxt.anrui.terminal.api.risk.mortgage.AppMortgageInformationTransactDto;
 import com.yxt.anrui.terminal.api.risk.mortgage.AppMortgageInformationTransactQuery;
 import com.yxt.anrui.terminal.api.risk.mortgage.AppMortgageInformationTransactVo;
 import com.yxt.anrui.terminal.api.risk.repaymentplan.RepaymentPlanDetailsVo;
+import com.yxt.anrui.terminal.api.risk.repaymentplan.RepaymentPlanListDetailsVo;
 import com.yxt.anrui.terminal.api.risk.repaymentplan.RepaymentPlanQuery;
 import com.yxt.anrui.terminal.api.risk.repaymentplan.RepaymentPlanVo;
 import com.yxt.common.core.query.PagerQuery;
@@ -19,6 +17,9 @@ import com.yxt.common.core.vo.PagerVo;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
+import java.util.ArrayList;
+import java.util.List;
+
 /**
  * @Author
  * @Date 2023/3/25 9:40
@@ -54,4 +55,19 @@ public class RepaymentPlanService {
         }
         return rb.success().setData(vo);
     }
+
+    public ResultBean<List<RepaymentPlanListDetailsVo>> getRepaymentPlanListByVinNo(String vinNo, String sid) {
+        ResultBean<List<RepaymentPlanListDetailsVo>> rb = ResultBean.fireFail();
+        List<RepaymentPlanListDetailsVo> vo = new ArrayList<>();
+        List<AppRepaymentPlanListDetailsVo> data = loanRepaymentScheduleFeign.getRepaymentPlanListByVinNo(vinNo, sid).getData();
+        if (!data.isEmpty()) {
+            for (AppRepaymentPlanListDetailsVo datum : data) {
+                RepaymentPlanListDetailsVo detailsVo = new RepaymentPlanListDetailsVo();
+                BeanUtil.copyProperties(datum, detailsVo);
+                vo.add(detailsVo);
+            }
+            return rb.success().setData(vo);
+        }
+        return rb.success().setData(vo);
+    }
 }