diff --git a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehicle/BaseVehicleMapper.xml b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehicle/BaseVehicleMapper.xml index 919a96d84f..ec19096587 100644 --- a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehicle/BaseVehicleMapper.xml +++ b/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 - LEFT JOIN anrui_buscenter.bus_sales_order bso + FROM + 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` ${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 != '' \ No newline at end of file diff --git a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehicle/BaseVehicleRest.java b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehicle/BaseVehicleRest.java index 851e0cc50e..9bfd1ec0e8 100644 --- a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehicle/BaseVehicleRest.java +++ b/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(); diff --git a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehicle/BaseVehicleService.java b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehicle/BaseVehicleService.java index 302509515c..682b90da54 100644 --- a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehicle/BaseVehicleService.java +++ b/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 page = vehicleQKKPPageList(pagerQuery); List baseVehicleQKKPTrailerVos = new ArrayList<>(); List records = page.getRecords(); - List recordsNew1 = new ArrayList<>(); - List 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) { + for (BaseVehicleQKKPVo baseVehicleQKKPVo : records) { TraliveredVo data = baseTrailerService.trailerList(baseVehicleQKKPVo.getVehSid(), baseVehicleQKKPVo.getContractNo()).getData(); List trailerVos = data.getList(); if (trailerVos != null && trailerVos.size() > 0) { @@ -4035,7 +4018,6 @@ public class BaseVehicleService extends MybatisBaseService pv = new PagerVo<>(); PagerVo pv1 = PagerUtil.pageToVo(page, pv); return pv1; @@ -4052,12 +4034,6 @@ public class BaseVehicleService extends MybatisBaseService 0) { qw.notIn("bsov.linkSid", params.getVinSids()); } - //查询是否存在应收未收款项 - ResultBean> 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); } diff --git a/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesorderborrower/BusSalesOrderBorrower.java b/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesorderborrower/BusSalesOrderBorrower.java index e77fe3ea3e..5992ce6a7a 100644 --- a/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesorderborrower/BusSalesOrderBorrower.java +++ b/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("金融产品名称") diff --git a/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesorderborrower/BusSalesOrderBorrowerDetailsVo.java b/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesorderborrower/BusSalesOrderBorrowerDetailsVo.java index cf0fd24e46..9514ceaa3f 100644 --- a/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesorderborrower/BusSalesOrderBorrowerDetailsVo.java +++ b/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("金融产品名称") diff --git a/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesorderborrower/BusSalesOrderBorrowerDto.java b/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesorderborrower/BusSalesOrderBorrowerDto.java index 08dc0f2d92..e33dc135d8 100644 --- a/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesorderborrower/BusSalesOrderBorrowerDto.java +++ b/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("金融产品名称") diff --git a/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesorderloancontract/BusSalesOrderLoancontractDto.java b/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesorderloancontract/BusSalesOrderLoancontractDto.java index f3c8680055..1a68c165b5 100644 --- a/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesorderloancontract/BusSalesOrderLoancontractDto.java +++ b/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; } \ No newline at end of file diff --git a/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanhomevisitprep/LoanHomevisitPrepFeign.java b/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanhomevisitprep/LoanHomevisitPrepFeign.java index 7e49251e13..a52f72f4b5 100644 --- a/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanhomevisitprep/LoanHomevisitPrepFeign.java +++ b/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 fetchDetailsBySid(@PathVariable("sid") String sid); + + @ApiOperation("生成合同设置初始化") + @GetMapping("/initConSetUp/{sid}") + @ResponseBody + public ResultBean initConSetUp(@PathVariable("sid") String sid); + + @ApiOperation("生成消贷合同") + @PostMapping("/saveLoanCon") + @ResponseBody + public ResultBean saveLoanCon(@RequestParam("sid") String sid, @RequestParam("conSetUpKey") String conSetUpKey); } \ No newline at end of file diff --git a/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanhomevisitprep/LoanHomevisitPrepFeignFallback.java b/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanhomevisitprep/LoanHomevisitPrepFeignFallback.java index db73ef3272..aeb912cfe7 100644 --- a/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanhomevisitprep/LoanHomevisitPrepFeignFallback.java +++ b/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 initConSetUp(String sid) { + return null; + } + + @Override + public ResultBean saveLoanCon(String sid, String conSetUpKey) { + return null; + } } \ No newline at end of file diff --git a/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanhomevisitprep/LoanHomevisitPrepMapper.java b/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanhomevisitprep/LoanHomevisitPrepMapper.java index c99c2bc522..cb6288c83a 100644 --- a/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanhomevisitprep/LoanHomevisitPrepMapper.java +++ b/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 { @Update("update loan_homevisit_prep set state = '2' where sid = #{sid}") void visit(String sid); + + String initConSetUp(String sid); } \ No newline at end of file diff --git a/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanhomevisitprep/LoanHomevisitPrepMapper.xml b/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanhomevisitprep/LoanHomevisitPrepMapper.xml index e2d463a8b8..d517f287e0 100644 --- a/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanhomevisitprep/LoanHomevisitPrepMapper.xml +++ b/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanhomevisitprep/LoanHomevisitPrepMapper.xml @@ -34,4 +34,14 @@ ${ew.sqlSegment} + + \ No newline at end of file diff --git a/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanhomevisitprep/LoanHomevisitPrepRest.java b/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanhomevisitprep/LoanHomevisitPrepRest.java index d0535649b8..6559a2abbf 100644 --- a/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanhomevisitprep/LoanHomevisitPrepRest.java +++ b/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 - private LoanHomevisitPrepService loanHomevisitPrepService; + @Autowired + private LoanHomevisitPrepService loanHomevisitPrepService; - @Override - @ApiOperation("根据条件分页查询数据的列表") - @PostMapping("/listPage") - public ResultBean> listPage(@RequestBody PagerQuery pq){ - ResultBean rb = ResultBean.fireFail(); - PagerVo pv = loanHomevisitPrepService.listPageVo(pq); - return rb.success().setData(pv); - } + @Override + @ApiOperation("根据条件分页查询数据的列表") + @PostMapping("/listPage") + public ResultBean> listPage(@RequestBody PagerQuery pq) { + ResultBean rb = ResultBean.fireFail(); + PagerVo pv = loanHomevisitPrepService.listPageVo(pq); + return rb.success().setData(pv); + } - @Override - public ResultBean visit(String sid) { - return loanHomevisitPrepService.visit(sid); - } + @Override + public ResultBean visit(String sid) { + return loanHomevisitPrepService.visit(sid); + } - @Override - @ApiOperation("新增或修改") - @PostMapping("/save") - public ResultBean save(@RequestBody LoanHomevisitPrepDto dto){ - ResultBean rb = ResultBean.fireFail(); - loanHomevisitPrepService.saveOrUpdateDto(dto); - return rb.success(); - } + @Override + @ApiOperation("新增或修改") + @PostMapping("/save") + public ResultBean save(@RequestBody LoanHomevisitPrepDto dto) { + ResultBean rb = ResultBean.fireFail(); + loanHomevisitPrepService.saveOrUpdateDto(dto); + return rb.success(); + } - @Override - @ApiOperation("根据sid批量删除") + @Override + @ApiOperation("根据sid批量删除") @PostMapping("/delBySids") - public ResultBean delBySids(@RequestBody String[] sids){ - ResultBean rb = ResultBean.fireFail(); - loanHomevisitPrepService.delBySids(sids); - return rb.success(); - } + public ResultBean delBySids(@RequestBody String[] sids) { + ResultBean rb = ResultBean.fireFail(); + loanHomevisitPrepService.delBySids(sids); + return rb.success(); + } - @Override - @ApiOperation("根据SID获取一条记录") + @Override + @ApiOperation("根据SID获取一条记录") @GetMapping("/fetchDetailsBySid/{sid}") - public ResultBean fetchDetailsBySid(@PathVariable("sid") String sid){ - ResultBean rb = ResultBean.fireFail(); - LoanHomevisitPrepDetailsVo vo = loanHomevisitPrepService.fetchDetailsVoBySid(sid); - return rb.success().setData(vo); - } + public ResultBean fetchDetailsBySid(@PathVariable("sid") String sid) { + ResultBean rb = ResultBean.fireFail(); + LoanHomevisitPrepDetailsVo vo = loanHomevisitPrepService.fetchDetailsVoBySid(sid); + return rb.success().setData(vo); + } + + @Override + public ResultBean initConSetUp(String sid) { + return loanHomevisitPrepService.initConSetUp(sid); + } + + @Override + public ResultBean saveLoanCon(String sid, String conSetUpKey) { + return loanHomevisitPrepService.saveLoanCon(sid, conSetUpKey); + } } diff --git a/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanhomevisitprep/LoanHomevisitPrepService.java b/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanhomevisitprep/LoanHomevisitPrepService.java index 97e32e25b5..f0c3c04f95 100644 --- a/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanhomevisitprep/LoanHomevisitPrepService.java +++ b/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 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(); + } } \ No newline at end of file