diff --git a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehicle/BaseVehicleQuery.java b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehicle/BaseVehicleQuery.java index a16df80f88..f6c74a1296 100644 --- a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehicle/BaseVehicleQuery.java +++ b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehicle/BaseVehicleQuery.java @@ -52,21 +52,21 @@ public class BaseVehicleQuery implements Query { @ApiModelProperty(value = "采购类型") private String manPurOrderTypeKey; - @ApiModelProperty(value = "买断结束日期") - private String solidEndDate; - - @ApiModelProperty(value = "厂家入库日期") - private String priceDate; - @ApiModelProperty(value = "买断状态") - private String settlementStatus; - + @ApiModelProperty(value = "厂家入库开始日期") + private String applicationDateStart; + @ApiModelProperty(value = "厂家入库结束日期") + private String applicationDateEnd; @ApiModelProperty(value = "销售开始日期") private String salesStartDate; @ApiModelProperty(value = "销售结束日期") private String salesEndDate; - @ApiModelProperty(value = "买断开始日期") private String solidStartDate; + @ApiModelProperty(value = "买断结束日期") + private String solidEndDate; + + @ApiModelProperty(value = "买断状态") + private String settlementStatus; @ApiModelProperty(value = "排产订单编号") private String orderingNo; @ApiModelProperty(value = "厂家库龄") 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 e7a25b1f4a..33050fec35 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 @@ -49,7 +49,6 @@ import com.yxt.anrui.buscenter.api.busarrearscarryvehicleapply.BusArrearsCarryVe import com.yxt.anrui.buscenter.api.busarrearscarryvehicleapply.BusArrearsCarryVehicleApplyFeign; import com.yxt.anrui.buscenter.api.busmaindeposit.pc.PcBusMainDepositFeign; import com.yxt.anrui.buscenter.api.busmaindeposit.pc.PcBusMainDepositVehicleQuery; -import com.yxt.anrui.buscenter.api.bussalesorder.BusSalesOrder; import com.yxt.anrui.buscenter.api.bussalesorder.BusSalesOrderDetailsVo; import com.yxt.anrui.buscenter.api.bussalesorder.BusSalesOrderFeign; import com.yxt.anrui.buscenter.api.bussalesorder.app.order.AppOrderDetailsVo; @@ -57,12 +56,8 @@ import com.yxt.anrui.buscenter.api.bussalesordervehicle.BusSalesOrderVehicle; import com.yxt.anrui.buscenter.api.bussalesordervehicle.BusSalesOrderVehicleFeign; import com.yxt.anrui.crm.api.crmcustomertemp.CrmCustomerTempDto; import com.yxt.anrui.crm.api.crmcustomertemp.CrmCustomerTempFeign; -import com.yxt.anrui.fin.api.finbillapplication.FinBillApplication; -import com.yxt.anrui.fin.api.finbillapplication.FinBillApplicationQuery; -import com.yxt.anrui.fin.api.finbillapplication.FinBillApplicationVo; import com.yxt.anrui.fin.api.finbillvehicle.FinBillVehicleDetailsVo; import com.yxt.anrui.fin.api.finbillvehicle.FinBillVehicleFeign; -import com.yxt.anrui.fin.api.finbillvehicle.FinBillVehicleVo; import com.yxt.anrui.fin.api.finuncollectedreceivablesdetailed.FinUncollectedReceivablesDetailedFeign; import com.yxt.anrui.portal.api.appsubsetversion.AppSubVersionVo; import com.yxt.anrui.portal.api.appsubsetversion.AppSubsetVersionFeign; @@ -198,9 +193,24 @@ public class BaseVehicleService extends MybatisBaseService= date_format('" + pricestartDate + "','%Y-%m-%d')"). + apply(StringUtils.isNotEmpty(priceEndDate), "date_format (bv.priceDate,'%Y-%m-%d') <= date_format('" + priceEndDate + "','%Y-%m-%d')" + ); + //销售日期 + String salesStartDate = pagerQuery.getSalesStartDate(); + String salesEndDate = pagerQuery.getSalesEndDate(); + qw.apply(StringUtils.isNotEmpty(salesStartDate), "date_format (bv.salesDate,'%Y-%m-%d') >= date_format('" + salesStartDate + "','%Y-%m-%d')"). + apply(StringUtils.isNotEmpty(salesEndDate), "date_format (bv.salesDate,'%Y-%m-%d') <= date_format('" + salesEndDate + "','%Y-%m-%d')" + ); + //买断日期 + String solidStartDate = pagerQuery.getSolidStartDate(); + String solidEndDate = pagerQuery.getSolidEndDate(); + qw.apply(StringUtils.isNotEmpty(solidStartDate), "date_format (bv.solidDate,'%Y-%m-%d') >= date_format('" + solidStartDate + "','%Y-%m-%d')"). + apply(StringUtils.isNotEmpty(solidEndDate), "date_format (bv.solidDate,'%Y-%m-%d') <= date_format('" + solidEndDate + "','%Y-%m-%d')" + ); if (StringUtils.isNotBlank(pagerQuery.getSettlementStatus())) {//买断状态 qw.eq("bv.settlementStatus", pagerQuery.getSettlementStatus()); } @@ -348,22 +358,27 @@ public class BaseVehicleService extends MybatisBaseService= date_format('" + pricestartDate + "','%Y-%m-%d')"). + apply(StringUtils.isNotEmpty(priceEndDate), "date_format (bv.priceDate,'%Y-%m-%d') <= date_format('" + priceEndDate + "','%Y-%m-%d')" + ); + //销售日期 String salesStartDate = pagerQuery.getSalesStartDate(); String salesEndDate = pagerQuery.getSalesEndDate(); - qw.apply(org.apache.commons.lang3.StringUtils.isNotEmpty(salesStartDate), "date_format (bv.salesDate,'%Y-%m-%d') >= date_format('" + salesStartDate + "','%Y-%m-%d')"). - apply(org.apache.commons.lang3.StringUtils.isNotEmpty(salesEndDate), "date_format (bv.salesDate,'%Y-%m-%d') <= date_format('" + salesEndDate + "','%Y-%m-%d')" + qw.apply(StringUtils.isNotEmpty(salesStartDate), "date_format (bv.salesDate,'%Y-%m-%d') >= date_format('" + salesStartDate + "','%Y-%m-%d')"). + apply(StringUtils.isNotEmpty(salesEndDate), "date_format (bv.salesDate,'%Y-%m-%d') <= date_format('" + salesEndDate + "','%Y-%m-%d')" ); + //买断日期 String solidStartDate = pagerQuery.getSolidStartDate(); String solidEndDate = pagerQuery.getSolidEndDate(); - qw.apply(org.apache.commons.lang3.StringUtils.isNotEmpty(solidStartDate), "date_format (bv.solidDate,'%Y-%m-%d') >= date_format('" + solidStartDate + "','%Y-%m-%d')"). - apply(org.apache.commons.lang3.StringUtils.isNotEmpty(solidEndDate), "date_format (bv.solidDate,'%Y-%m-%d') <= date_format('" + solidEndDate + "','%Y-%m-%d')" + qw.apply(StringUtils.isNotEmpty(solidStartDate), "date_format (bv.solidDate,'%Y-%m-%d') >= date_format('" + solidStartDate + "','%Y-%m-%d')"). + apply(StringUtils.isNotEmpty(solidEndDate), "date_format (bv.solidDate,'%Y-%m-%d') <= date_format('" + solidEndDate + "','%Y-%m-%d')" ); + if (StringUtils.isNotBlank(pagerQuery.getSettlementStatus())) {//买断状态 + qw.eq("bv.settlementStatus", pagerQuery.getSettlementStatus()); + } //车型字段 if (StringUtils.isNotBlank(pagerQuery.getCarBrand())) {//品牌 qw.eq("bvm.carBrand", pagerQuery.getCarBrand()); @@ -4060,9 +4075,24 @@ public class BaseVehicleService extends MybatisBaseService= date_format('" + pricestartDate + "','%Y-%m-%d')"). + apply(StringUtils.isNotEmpty(priceEndDate), "date_format (bv.priceDate,'%Y-%m-%d') <= date_format('" + priceEndDate + "','%Y-%m-%d')" + ); + //销售日期 + String salesStartDate = pagerQuery.getSalesStartDate(); + String salesEndDate = pagerQuery.getSalesEndDate(); + qw.apply(StringUtils.isNotEmpty(salesStartDate), "date_format (bv.salesDate,'%Y-%m-%d') >= date_format('" + salesStartDate + "','%Y-%m-%d')"). + apply(StringUtils.isNotEmpty(salesEndDate), "date_format (bv.salesDate,'%Y-%m-%d') <= date_format('" + salesEndDate + "','%Y-%m-%d')" + ); + //买断日期 + String solidStartDate = pagerQuery.getSolidStartDate(); + String solidEndDate = pagerQuery.getSolidEndDate(); + qw.apply(StringUtils.isNotEmpty(solidStartDate), "date_format (bv.solidDate,'%Y-%m-%d') >= date_format('" + solidStartDate + "','%Y-%m-%d')"). + apply(StringUtils.isNotEmpty(solidEndDate), "date_format (bv.solidDate,'%Y-%m-%d') <= date_format('" + solidEndDate + "','%Y-%m-%d')" + ); if (StringUtils.isNotBlank(pagerQuery.getSettlementStatus())) {//买断状态 qw.eq("bv.settlementStatus", pagerQuery.getSettlementStatus()); } diff --git a/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loancreditappealapply/LoanCreditAppealApplyVo.java b/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loancreditappealapply/LoanCreditAppealApplyVo.java index 84201fd656..a5a6815b99 100644 --- a/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loancreditappealapply/LoanCreditAppealApplyVo.java +++ b/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loancreditappealapply/LoanCreditAppealApplyVo.java @@ -105,4 +105,8 @@ public class LoanCreditAppealApplyVo implements Vo { private Boolean showHandleBtn; @ApiModelProperty("流程状态") private String nodeState; + @ApiModelProperty("流程定义的id") + private String procDefId; + @ApiModelProperty("流程实例的sid") + private String procInstSid; } diff --git a/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanfinotherPolicy/LoanFinOtherPolicyFeign.java b/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanfinotherPolicy/LoanFinOtherPolicyFeign.java index 83ee5c6c21..0db09ce6a8 100644 --- a/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanfinotherPolicy/LoanFinOtherPolicyFeign.java +++ b/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanfinotherPolicy/LoanFinOtherPolicyFeign.java @@ -1,11 +1,14 @@ package com.yxt.anrui.riskcenter.api.loanfinotherPolicy; +import com.yxt.anrui.riskcenter.api.loancreditappealapply.LoanCreditAppealApplyQuery; +import com.yxt.anrui.riskcenter.api.loancreditappealapply.LoanCreditAppealApplyVo; +import com.yxt.common.core.query.PagerQuery; import com.yxt.common.core.result.ResultBean; +import com.yxt.common.core.vo.PagerVo; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import org.springframework.cloud.openfeign.FeignClient; -import org.springframework.web.bind.annotation.GetMapping; -import org.springframework.web.bind.annotation.RequestParam; +import org.springframework.web.bind.annotation.*; import java.util.List; @@ -22,6 +25,11 @@ import java.util.List; fallback = LoanFinOtherPolicyFeignFallback.class) public interface LoanFinOtherPolicyFeign { + @ApiOperation("根据条件分页查询数据的列表") + @PostMapping("/listPage") + @ResponseBody + public ResultBean> listPage(@RequestBody PagerQuery pq); + @GetMapping("details") @ApiOperation("详情") ResultBean details(@RequestParam("sid") String sid); diff --git a/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanfinotherPolicy/LoanFinOtherPolicyPageVo.java b/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanfinotherPolicy/LoanFinOtherPolicyPageVo.java new file mode 100644 index 0000000000..ab5008fdb3 --- /dev/null +++ b/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanfinotherPolicy/LoanFinOtherPolicyPageVo.java @@ -0,0 +1,46 @@ +package com.yxt.anrui.riskcenter.api.loanfinotherPolicy; + +import com.baomidou.mybatisplus.annotation.TableName; +import com.yxt.common.core.domain.BaseEntity; +import com.yxt.common.core.vo.Vo; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.math.BigDecimal; + +/** + * @description: 其他融产品 + * @author: dimengzhe + * @date: 2023/7/6 + **/ +@Data +public class LoanFinOtherPolicyPageVo implements Vo { + + private String sid; + @ApiModelProperty("报备状态：1已报备，0未报备") + private int filingState; + @ApiModelProperty("风控状态：1禁用 0正常 风控中心设置的状态") + private int riskState; + @ApiModelProperty("使用状态：1停用 0正常 各分公司设置的状态") + private int useSate; + @ApiModelProperty("有效期至") + private String validDateTo; + @ApiModelProperty("创建组织名称") + private String createOrgName; + @ApiModelProperty("适用销售部门名称(逗号分隔)") + private String useDeptNames; + @ApiModelProperty("产品名称：组合（资方+产品类别+最高融资比例+期数）") + private String otherPolicyName; + @ApiModelProperty("业务类型value") + private String busTypeValue; + @ApiModelProperty("车辆大类value") + private String vehCategoryValue; + @ApiModelProperty("车辆功能value") + private String vehTypeValue; + @ApiModelProperty("最高融资额") + private BigDecimal maxLoanAmount; + @ApiModelProperty("期数") + private int period; + @ApiModelProperty("年利率（%）") + private BigDecimal yearRatio; +} diff --git a/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanfinotherPolicy/LoanFinOtherPolicyQuery.java b/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanfinotherPolicy/LoanFinOtherPolicyQuery.java index a21cb6e0ab..62a6e46fd5 100644 --- a/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanfinotherPolicy/LoanFinOtherPolicyQuery.java +++ b/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanfinotherPolicy/LoanFinOtherPolicyQuery.java @@ -1,12 +1,41 @@ package com.yxt.anrui.riskcenter.api.loanfinotherPolicy; +import com.yxt.common.core.query.Query; +import io.swagger.annotations.ApiModelProperty; import lombok.Data; +import java.math.BigDecimal; + /** * @description: * @author: dimengzhe * @date: 2023/7/6 **/ @Data -public class LoanFinOtherPolicyQuery { +public class LoanFinOtherPolicyQuery implements Query { + + @ApiModelProperty("报备状态：1已报备，0未报备") + private int filingState; + @ApiModelProperty("风控状态：1禁用 0正常 风控中心设置的状态") + private int riskState; + @ApiModelProperty("使用状态：1停用 0正常 各分公司设置的状态") + private int useSate; + @ApiModelProperty("创建组织名称") + private String createOrgName; + @ApiModelProperty("业务类型value") + private String busTypeValue; + @ApiModelProperty("车辆大类value") + private String vehCategoryValue; + @ApiModelProperty("车辆功能value") + private String vehTypeValue; + @ApiModelProperty("产品名称：组合（资方+产品类别+最高融资比例+期数）") + private String otherPolicyName; + @ApiModelProperty("开始有效期至") + private String validStartDateTo; + @ApiModelProperty("结束有效期至") + private String validEndDateTo; + @ApiModelProperty("期数") + private int period; + @ApiModelProperty("年利率（%）") + private BigDecimal yearRatio; } diff --git a/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loancreditappealapply/LoanCreditAppealApplyMapper.java b/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loancreditappealapply/LoanCreditAppealApplyMapper.java index e379443a32..1075e3d1c2 100644 --- a/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loancreditappealapply/LoanCreditAppealApplyMapper.java +++ b/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loancreditappealapply/LoanCreditAppealApplyMapper.java @@ -34,6 +34,7 @@ import org.apache.ibatis.annotations.Param; import org.apache.ibatis.annotations.Select; import com.yxt.anrui.riskcenter.api.loancreditappealapply.LoanCreditAppealApply; import com.yxt.anrui.riskcenter.api.loancreditappealapply.LoanCreditAppealApplyVo; +import org.apache.ibatis.annotations.Update; import java.util.List; import java.util.Map; @@ -67,4 +68,7 @@ public interface LoanCreditAppealApplyMapper extends BaseMapper map); + + @Update("update loan_credit_appeal_apply set ssjg=#{ssjg} where sid=#{creditApplySid}") + void updateSsjgBySid(String ssjg, String creditApplySid); } \ No newline at end of file diff --git a/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loancreditappealapply/LoanCreditAppealApplyService.java b/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loancreditappealapply/LoanCreditAppealApplyService.java index 5bc43fb308..7d7fad44d4 100644 --- a/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loancreditappealapply/LoanCreditAppealApplyService.java +++ b/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loancreditappealapply/LoanCreditAppealApplyService.java @@ -423,6 +423,7 @@ public class LoanCreditAppealApplyService extends MybatisBaseService map = BeanUtil.beanToMap(resultBean.getData()); updateFlowFiled(map); + baseMapper.updateSsjgBySid("不通过",loanCreditAppealApply.getCreditApplySid()); return rb.success().setData(resultBean.getData()); }else{ if (businessTaskId.equals(query.getTaskId())) { @@ -582,6 +584,7 @@ public class LoanCreditAppealApplyService extends MybatisBaseService map = BeanUtil.beanToMap(resultBean.getData()); updateFlowFiled(map); + baseMapper.updateSsjgBySid("不通过",loanCreditAppealApply.getCreditApplySid()); return rb.success().setData(resultBean.getData()); } } diff --git a/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanfinotherPolicy/LoanFinOtherPolicyRest.java b/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanfinotherPolicy/LoanFinOtherPolicyRest.java index 091cf4390c..2e5ef8f72d 100644 --- a/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanfinotherPolicy/LoanFinOtherPolicyRest.java +++ b/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanfinotherPolicy/LoanFinOtherPolicyRest.java @@ -1,9 +1,9 @@ package com.yxt.anrui.riskcenter.biz.loanfinotherPolicy; -import com.yxt.anrui.riskcenter.api.loanfinotherPolicy.LoanFinOtherPolicyFeign; -import com.yxt.anrui.riskcenter.api.loanfinotherPolicy.LoanFinOtherPolicyVos; -import com.yxt.anrui.riskcenter.api.loanfinotherPolicy.OtherPolicyVo; +import com.yxt.anrui.riskcenter.api.loanfinotherPolicy.*; +import com.yxt.common.core.query.PagerQuery; import com.yxt.common.core.result.ResultBean; +import com.yxt.common.core.vo.PagerVo; import io.swagger.annotations.Api; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.RequestMapping; @@ -24,6 +24,11 @@ public class LoanFinOtherPolicyRest implements LoanFinOtherPolicyFeign { @Autowired private LoanFinOtherPolicyService loanFinOtherPolicyService; + @Override + public ResultBean> listPage(PagerQuery pq) { + return null; + } + @Override public ResultBean details(String sid) { return loanFinOtherPolicyService.details(sid); diff --git a/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanpreloancreditapply/LoanPreloanCreditApplyService.java b/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanpreloancreditapply/LoanPreloanCreditApplyService.java index 14cc2a901e..ad61bba53e 100644 --- a/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanpreloancreditapply/LoanPreloanCreditApplyService.java +++ b/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanpreloancreditapply/LoanPreloanCreditApplyService.java @@ -161,7 +161,7 @@ public class LoanPreloanCreditApplyService extends MybatisBaseService