优化

anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehicle/BaseVehicleMapper.xml

@@ -1743,13 +1743,22 @@
         bso.`contractNo`,
         bvc.certificateState,
         bvc.`certificateStateValue`
-        FROM anrui_buscenter.bus_sales_order_vehicle bsov
+        FROM
-        LEFT JOIN anrui_buscenter.bus_sales_order bso
+        anrui_buscenter.bus_sales_order_vehicle bsov
+        JOIN anrui_buscenter.bus_sales_order bso
         ON bsov.`salesOrderSid` = bso.`sid`
-        LEFT JOIN base_vehicle_certificate bvc
+        JOIN base_vehicle_state bs
+        ON bsov.sid = bs.busSid
+        JOIN base_vehicle_certificate bvc
         ON bsov.`linkSid` = bvc.`vehicleSid`
         <where>
             ${ew.sqlSegment}
+            AND bs.finSourceKey = '2'
+            AND bs.finState = '0'
+            AND bs.carryVehicleState = '0'
+            AND bs.carryInvoiceState = '0'
+            AND bs.busState = '401'
+            AND bs.vinNo != ''
         </where>
     </select>
 </mapper>

anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehicle/BaseVehicleRest.java

@@ -644,6 +644,9 @@ public class BaseVehicleRest implements BaseVehicleFeign {
             return rb.setMsg("已存在该车架号的车辆信息");
         }*/
         BeanUtil.copyProperties(dto, baseVehicle);
+        if (StringUtils.isBlank(dto.getSalesDate())){
+            baseVehicle.setSalesDate(null);
+        }
         //修改存放地点编码
         String location = dto.getLocation();
         ScmWarehouseVo scmWarehouseVo = scmWarehouseFeign.fetchBySid(location).getData();

anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehicle/BaseVehicleService.java

@@ -4003,24 +4003,7 @@ public class BaseVehicleService extends MybatisBaseService<BaseVehicleMapper, Ba
         IPage<BaseVehicleQKKPVo> page = vehicleQKKPPageList(pagerQuery);
         List<BaseVehicleQKKPTrailerVo> baseVehicleQKKPTrailerVos = new ArrayList<>();
         List<BaseVehicleQKKPVo> records = page.getRecords();
-        List<BaseVehicleQKKPVo> recordsNew1 = new ArrayList<>();
+        for (BaseVehicleQKKPVo baseVehicleQKKPVo : records) {
-        List<BaseVehicleQKKPVo> recordsNew = new ArrayList<>();
-        for (BaseVehicleQKKPVo record : records) {
-            if (StringUtils.isNotBlank(record.getVehSid())) {
-                FinBillVehicleDetailsVo finBillVehicleDetailsVo = finBillVehicleFeign.fetchByVehSid(record.getVehSid()).getData();
-                if (finBillVehicleDetailsVo == null) {
-                    recordsNew1.add(record);
-                }
-            }
-        }
-        for (BaseVehicleQKKPVo baseVehicleQKKPVo : recordsNew1) {
-            String vehSid = baseVehicleQKKPVo.getVehSid();
-            BusArrearsCarryVehicleApply busArrearsCarryVehicleApply = busArrearsCarryVehicleApplyFeign.selSubmitLc(vehSid).getData();
-            if (busArrearsCarryVehicleApply == null) {
-                recordsNew.add(baseVehicleQKKPVo);
-            }
-        }
-        for (BaseVehicleQKKPVo baseVehicleQKKPVo : recordsNew) {
             TraliveredVo data = baseTrailerService.trailerList(baseVehicleQKKPVo.getVehSid(), baseVehicleQKKPVo.getContractNo()).getData();
             List<TrailerVo> trailerVos = data.getList();
             if (trailerVos != null && trailerVos.size() > 0) {
@@ -4035,7 +4018,6 @@ public class BaseVehicleService extends MybatisBaseService<BaseVehicleMapper, Ba
             }
             baseVehicleQKKPVo.setTrailers(baseVehicleQKKPTrailerVos);
         }
-        page.setRecords(recordsNew);
         PagerVo<BaseVehicleQKKPVo> pv = new PagerVo<>();
         PagerVo<BaseVehicleQKKPVo> pv1 = PagerUtil.pageToVo(page, pv);
         return pv1;
@@ -4052,12 +4034,6 @@ public class BaseVehicleService extends MybatisBaseService<BaseVehicleMapper, Ba
         if (params.getVinSids().size() > 0) {
             qw.notIn("bsov.linkSid", params.getVinSids());
         }
-        //查询是否存在应收未收款项
-        ResultBean<List<String>> listResultBean = finUncollectedReceivablesDetailedFeign.selectByContractNoOne(params.getContractNo());
-        if (!listResultBean.getData().isEmpty()) {
-            listResultBean.getData().removeAll(Collections.singleton(null));
-            qw.notIn("bsov.sid", listResultBean.getData());
-        }
         return baseMapper.vehicleQKKPPageList(page, qw);
     }
 

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

@@ -60,6 +60,8 @@ public class BusSalesOrderBorrower extends BaseEntity {
     private String mobile; // 手机号码
 	@ApiModelProperty("台数")
     private Integer vehCount; // 台数
+    @ApiModelProperty("资方sid")
+    private String bankSid;
     @ApiModelProperty("资方名称")
     private String bankName;
 	@ApiModelProperty("金融产品名称")

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

@@ -61,6 +61,8 @@ public class BusSalesOrderBorrowerDetailsVo implements Vo {
     private String mobile; // 手机号码
 	@ApiModelProperty("台数")
     private Integer vehCount; // 台数
+    @ApiModelProperty("资方sid")
+    private String bankSid;
     @ApiModelProperty("资方名称")
     private String bankName;
 	@ApiModelProperty("金融产品名称")

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

@@ -61,6 +61,8 @@ public class BusSalesOrderBorrowerDto implements Dto {
     private String mobile; // 手机号码
 	@ApiModelProperty("台数")
     private Integer vehCount; // 台数
+    @ApiModelProperty("资方sid")
+    private String bankSid;
     @ApiModelProperty("资方名称")
     private String bankName;
 	@ApiModelProperty("金融产品名称")

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

@@ -49,29 +49,29 @@ import lombok.Data;
 @ApiModel(value = "销售订单-消贷合同 数据传输对象", description = "销售订单-消贷合同 数据传输对象")
 public class BusSalesOrderLoancontractDto implements Dto {
 
-    private String sid; // sid
+    private String sid;
 
 	@ApiModelProperty("销售订单sid")
-    private String salesOrderSid; // 销售订单sid
+    private String salesOrderSid;
 	@ApiModelProperty("借款人sid（客户sid）")
-    private String borrowerSid; // 借款人sid（客户sid）
+    private String borrowerSid;
 	@ApiModelProperty("借款人名称")
-    private String borrowerName; // 借款人名称
+    private String borrowerName;
 	@ApiModelProperty("台数")
-    private Integer vehCount; // 台数
+    private Integer vehCount;
 	@ApiModelProperty("消贷合同编号")
-    private String loanCotractNo; // 消贷合同编号
+    private String loanCotractNo;
 	@ApiModelProperty("资方合同号")
-    private String bankContractNo; // 资方合同号
+    private String bankContractNo;
     @ApiModelProperty("资方名称")
     private String bankName;
 	@ApiModelProperty("金融产品名称")
-    private String policyName; // 金融产品名称
+    private String policyName;
 	@ApiModelProperty("业务阶段编码")
-    private String busNo; // 业务阶段编码
+    private String busNo;
 	@ApiModelProperty("业务阶段名称")
-    private String busName; // 业务阶段名称
+    private String busName;
 	@ApiModelProperty("业务状态码")
-    private String busState; // 业务状态码
+    private String busState;
 
 }

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

@@ -70,14 +70,24 @@ public interface LoanHomevisitPrepFeign {
     @PostMapping("/save")
     @ResponseBody
     public ResultBean save(@RequestBody LoanHomevisitPrepDto dto);
-        
+
     @ApiOperation("根据sid删除记录")
     @DeleteMapping("/delBySids")
     @ResponseBody
     public ResultBean delBySids(@RequestBody String[] sids);
-      
+
     @ApiOperation("根据SID获取一条记录")
     @GetMapping("/fetchDetailsBySid/{sid}")
     @ResponseBody
     public ResultBean<LoanHomevisitPrepDetailsVo> fetchDetailsBySid(@PathVariable("sid") String sid);
+
+    @ApiOperation("生成合同设置初始化")
+    @GetMapping("/initConSetUp/{sid}")
+    @ResponseBody
+    public ResultBean<String> initConSetUp(@PathVariable("sid") String sid);
+
+    @ApiOperation("生成消贷合同")
+    @PostMapping("/saveLoanCon")
+    @ResponseBody
+    public ResultBean saveLoanCon(@RequestParam("sid") String sid, @RequestParam("conSetUpKey") String conSetUpKey);
 }

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

@@ -74,4 +74,14 @@ public class LoanHomevisitPrepFeignFallback implements LoanHomevisitPrepFeign {
 		ResultBean rb = ResultBean.fireFail();
 		return rb.setMsg("接口anrui-riskcenter/loanhomevisitprep/fetchDetailsBySid无法访问");
 	}
+
+	@Override
+	public ResultBean<String> initConSetUp(String sid) {
+		return null;
+	}
+
+	@Override
+	public ResultBean saveLoanCon(String sid, String conSetUpKey) {
+		return null;
+	}
 }

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

@@ -66,4 +66,6 @@ public interface LoanHomevisitPrepMapper extends BaseMapper<LoanHomevisitPrep> {
 
     @Update("update loan_homevisit_prep set state = '2' where sid = #{sid}")
     void visit(String sid);
+
+    String initConSetUp(String sid);
 }

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

@@ -34,4 +34,14 @@
             ${ew.sqlSegment}
         </where>
     </select>
+
+    <select id="initConSetUp" resultType="java.lang.String">
+        SELECT lb.contractSetKey
+        FROM loan_fin_bank lb
+                     LEFT JOIN anrui_buscenter.`bus_sales_order_borrower` bb
+                ON lb.sid = bb.`bankSid`
+                     LEFT JOIN loan_homevisit_prep lp
+                ON lp.`saleOrderBorrowerSid` = bb.`sid`
+        WHERE lp.sid = #{sid}
+    </select>
 </mapper>

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

@@ -34,6 +34,7 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 
 import java.util.List;
+
 import com.yxt.anrui.riskcenter.api.loanhomevisitprep.LoanHomevisitPrep;
 import com.yxt.anrui.riskcenter.api.loanhomevisitprep.LoanHomevisitPrepQuery;
 import com.yxt.anrui.riskcenter.api.loanhomevisitprep.LoanHomevisitPrepVo;
@@ -59,47 +60,57 @@ import com.yxt.anrui.riskcenter.api.loanhomevisitprep.LoanHomevisitPrepFeign;
 @RequestMapping("v1/loanhomevisitprep")
 public class LoanHomevisitPrepRest implements LoanHomevisitPrepFeign {
 
-	@Autowired
+    @Autowired
-	private LoanHomevisitPrepService loanHomevisitPrepService;
+    private LoanHomevisitPrepService loanHomevisitPrepService;
 
-	@Override
+    @Override
-	@ApiOperation("根据条件分页查询数据的列表")
+    @ApiOperation("根据条件分页查询数据的列表")
-	@PostMapping("/listPage")
+    @PostMapping("/listPage")
-	public ResultBean<PagerVo<LoanHomevisitPrepVo>> listPage(@RequestBody PagerQuery<LoanHomevisitPrepQuery> pq){
+    public ResultBean<PagerVo<LoanHomevisitPrepVo>> listPage(@RequestBody PagerQuery<LoanHomevisitPrepQuery> pq) {
-		ResultBean rb = ResultBean.fireFail();
+        ResultBean rb = ResultBean.fireFail();
-		PagerVo<LoanHomevisitPrepVo> pv = loanHomevisitPrepService.listPageVo(pq);
+        PagerVo<LoanHomevisitPrepVo> pv = loanHomevisitPrepService.listPageVo(pq);
-		return rb.success().setData(pv);
+        return rb.success().setData(pv);
-	}
+    }
 
-	@Override
+    @Override
-	public ResultBean visit(String sid) {
+    public ResultBean visit(String sid) {
-		return loanHomevisitPrepService.visit(sid);
+        return loanHomevisitPrepService.visit(sid);
-	}
+    }
 
-	@Override
+    @Override
-	@ApiOperation("新增或修改")
+    @ApiOperation("新增或修改")
-	@PostMapping("/save")
+    @PostMapping("/save")
-	public ResultBean save(@RequestBody LoanHomevisitPrepDto dto){
+    public ResultBean save(@RequestBody LoanHomevisitPrepDto dto) {
-		ResultBean rb = ResultBean.fireFail();
+        ResultBean rb = ResultBean.fireFail();
-		loanHomevisitPrepService.saveOrUpdateDto(dto);
+        loanHomevisitPrepService.saveOrUpdateDto(dto);
-		return rb.success();
+        return rb.success();
-	}
+    }
 
-	@Override
+    @Override
-	@ApiOperation("根据sid批量删除")
+    @ApiOperation("根据sid批量删除")
     @PostMapping("/delBySids")
-    public ResultBean delBySids(@RequestBody String[] sids){
+    public ResultBean delBySids(@RequestBody String[] sids) {
-		ResultBean rb = ResultBean.fireFail();
+        ResultBean rb = ResultBean.fireFail();
-		loanHomevisitPrepService.delBySids(sids);
+        loanHomevisitPrepService.delBySids(sids);
-		return rb.success();
+        return rb.success();
-	}
+    }
 
-	@Override
+    @Override
-	@ApiOperation("根据SID获取一条记录")
+    @ApiOperation("根据SID获取一条记录")
     @GetMapping("/fetchDetailsBySid/{sid}")
-    public ResultBean<LoanHomevisitPrepDetailsVo> fetchDetailsBySid(@PathVariable("sid") String sid){
+    public ResultBean<LoanHomevisitPrepDetailsVo> fetchDetailsBySid(@PathVariable("sid") String sid) {
-		ResultBean rb = ResultBean.fireFail();
+        ResultBean rb = ResultBean.fireFail();
-		LoanHomevisitPrepDetailsVo vo = loanHomevisitPrepService.fetchDetailsVoBySid(sid);
+        LoanHomevisitPrepDetailsVo vo = loanHomevisitPrepService.fetchDetailsVoBySid(sid);
-		return rb.success().setData(vo);
+        return rb.success().setData(vo);
-	}
+    }
+
+    @Override
+    public ResultBean<String> initConSetUp(String sid) {
+        return loanHomevisitPrepService.initConSetUp(sid);
+    }
+
+    @Override
+    public ResultBean saveLoanCon(String sid, String conSetUpKey) {
+        return loanHomevisitPrepService.saveLoanCon(sid, conSetUpKey);
+    }
 }

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

@@ -181,4 +181,18 @@ public class LoanHomevisitPrepService extends MybatisBaseService<LoanHomevisitPr
         baseMapper.visit(sid);
         return rb.success();
     }
+
+    public ResultBean<String> initConSetUp(String sid) {
+        ResultBean rb = ResultBean.fireFail();
+        String contractSetKey = baseMapper.initConSetUp(sid);
+        return rb.success().setData(contractSetKey);
+    }
+
+    public ResultBean saveLoanCon(String sid, String conSetUpKey) {
+        ResultBean rb = ResultBean.fireFail();
+        if (conSetUpKey.equals("")){
+
+        }
+        return rb.success();
+    }
 }