diff --git a/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loansettleapply/LoanSettleApply.java b/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loansettleapply/LoanSettleApply.java index 334c91562f..999d2bd82a 100644 --- a/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loansettleapply/LoanSettleApply.java +++ b/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loansettleapply/LoanSettleApply.java @@ -54,7 +54,7 @@ public class LoanSettleApply extends BaseEntity { private String useOrgSid; @ApiModelProperty("分公司") private String useOrgName; - @ApiModelProperty("机构全路径四大") + @ApiModelProperty("机构全路径") private String orgSidPath; @ApiModelProperty("办结日期") private String closeDate; @@ -68,5 +68,7 @@ public class LoanSettleApply extends BaseEntity { private String taskDefKey; @ApiModelProperty("流程状态") private String nodeState; + @ApiModelProperty("是否勾选减免，1勾选，0不勾选") + private int trueReduction; } diff --git a/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loansettleapply/LoanSettleApplyDetailsQuery.java b/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loansettleapply/LoanSettleApplyDetailsQuery.java index 1d9100857c..83ef91225d 100644 --- a/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loansettleapply/LoanSettleApplyDetailsQuery.java +++ b/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loansettleapply/LoanSettleApplyDetailsQuery.java @@ -1,5 +1,6 @@ package com.yxt.anrui.riskcenter.api.loansettleapply; +import io.swagger.annotations.ApiModelProperty; import lombok.Data; /** @@ -11,4 +12,10 @@ import lombok.Data; public class LoanSettleApplyDetailsQuery { private String sid; + @ApiModelProperty("销售订单车辆表sid") + private String busVinSid; + @ApiModelProperty("用户sid") + private String userSid; + @ApiModelProperty("组织机构全路径sid") + private String orgPath; } diff --git a/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loansettleapply/LoanSettleApplyDetailsVo.java b/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loansettleapply/LoanSettleApplyDetailsVo.java index b98a2f5a76..14b6c10d56 100644 --- a/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loansettleapply/LoanSettleApplyDetailsVo.java +++ b/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loansettleapply/LoanSettleApplyDetailsVo.java @@ -1,7 +1,13 @@ package com.yxt.anrui.riskcenter.api.loansettleapply; +import com.yxt.anrui.riskcenter.api.loansettlebankcost.LoanSettleBankCostVo; +import com.yxt.anrui.riskcenter.api.loansettlecompanycost.LoanSettleCompanyCostVo; +import com.yxt.anrui.riskcenter.api.loansettlecompanyreduction.LoanSettleCompanyReductionVo; +import io.swagger.annotations.ApiModelProperty; import lombok.Data; +import java.math.BigDecimal; + /** * @description: * @author: dimengzhe @@ -9,4 +15,63 @@ import lombok.Data; **/ @Data public class LoanSettleApplyDetailsVo { + + @ApiModelProperty("sid") + private String sid; + @ApiModelProperty("申请部门") + private String createDept; + @ApiModelProperty("申请部门sid") + private String createDeptSid; + @ApiModelProperty("申请人") + private String createByName; + private String userSid; + @ApiModelProperty("申请日期") + private String createTime; + @ApiModelProperty("车架号") + private String vinNo; + @ApiModelProperty("车牌号") + private String vehMark; + @ApiModelProperty("客户名称") + private String customerName; + @ApiModelProperty("客户sid") + private String customerSid; + @ApiModelProperty("贷款人") + private String loanName; + @ApiModelProperty("贷款人sid") + private String loanSid; + @ApiModelProperty("贷款合同编号") + private String loanContractNo; + @ApiModelProperty("资方") + private String bankName; + @ApiModelProperty("资方合同编号") + private String bankContractNo; + @ApiModelProperty("结清日期") + private String settingDate; + @ApiModelProperty("公司当前逾期月还") + private String overdueMonthPrice; + @ApiModelProperty("公司当期未到期月还") + private String currentNotDuePrice; + @ApiModelProperty("公司未到期月还") + private String notDuePrice; + @ApiModelProperty("资方结清费用") + private LoanSettleBankCostVo loanSettleBankCostVo = new LoanSettleBankCostVo(); + @ApiModelProperty("公司结清费用") + private LoanSettleCompanyCostVo loanSettleCompanyCostVo = new LoanSettleCompanyCostVo(); + @ApiModelProperty("公司结清费用减免情况") + private LoanSettleCompanyReductionVo loanSettleCompanyReductionVo = new LoanSettleCompanyReductionVo(); + + @ApiModelProperty("机构全路径") + private String orgPath; + @ApiModelProperty("分公司sid") + private String useOrgSid; + @ApiModelProperty("分公司") + private String useOrgName; + @ApiModelProperty("销售订单车辆表sid") + private String busVinSid; + @ApiModelProperty("销售订单sid") + private String saleOrderSid; + + @ApiModelProperty("是否勾选减免，1勾选，0不勾选") + private int trueReduction; + } diff --git a/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loansettleapply/LoanSettleApplyFeign.java b/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loansettleapply/LoanSettleApplyFeign.java index b13d9c5d86..b08f8d22b8 100644 --- a/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loansettleapply/LoanSettleApplyFeign.java +++ b/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loansettleapply/LoanSettleApplyFeign.java @@ -36,6 +36,10 @@ public interface LoanSettleApplyFeign { @PostMapping("/details") ResultBean details(@RequestBody LoanSettleApplyDetailsQuery query); + @ApiOperation("未结清车辆列表") + @PostMapping("/getListPage") + ResultBean> getListPage(@RequestBody PagerQuery pagerQuery); + @ApiOperation("删除/批量删除") @DeleteMapping("/delBySids") ResultBean delBySids(@RequestBody String[] sids); diff --git a/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loansettleapply/SettleApplyCommonVo.java b/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loansettleapply/SettleApplyCommonVo.java new file mode 100644 index 0000000000..629afc8b89 --- /dev/null +++ b/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loansettleapply/SettleApplyCommonVo.java @@ -0,0 +1,53 @@ +package com.yxt.anrui.riskcenter.api.loansettleapply; + +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +/** + * @description: + * @author: dimengzhe + * @date: 2024/2/7 + **/ +@Data +public class SettleApplyCommonVo { + + @ApiModelProperty("车架号") + private String vinNo; + @ApiModelProperty("车牌号") + private String vehMark; + @ApiModelProperty("客户名称") + private String customerName; + @ApiModelProperty("客户sid") + private String customerSid; + @ApiModelProperty("贷款人") + private String loanName; + @ApiModelProperty("贷款人sid") + private String loanSid; + @ApiModelProperty("贷款合同编号") + private String loanContractNo; + @ApiModelProperty("资方") + private String bankName; + @ApiModelProperty("资方合同编号") + private String bankContractNo; + @ApiModelProperty("公司当前逾期月还") + private String overdueMonthPrice; + @ApiModelProperty("公司当期未到期月还") + private String currentNotDuePrice; + @ApiModelProperty("公司未到期月还") + private String notDuePrice; + @ApiModelProperty("贷款保证金") + private String loanDeposit; + @ApiModelProperty("公司逾期月还") + private String overduePrice; + @ApiModelProperty("垫资方逾期利息") + private String putBankInterest; + @ApiModelProperty("资金占用费") + private String funfCost; + @ApiModelProperty("公司当期未到期月还") + private String companyCurrentNotPrice; + @ApiModelProperty("贷款保证金扣罚金额") + private String deductionAmount; + + @ApiModelProperty("销售订单sid") + private String saleOrderSid; +} diff --git a/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loansettleapply/SettleApplyListQuery.java b/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loansettleapply/SettleApplyListQuery.java new file mode 100644 index 0000000000..ec9ccc5445 --- /dev/null +++ b/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loansettleapply/SettleApplyListQuery.java @@ -0,0 +1,24 @@ +package com.yxt.anrui.riskcenter.api.loansettleapply; + +import com.yxt.common.core.query.Query; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +/** + * @description: + * @author: dimengzhe + * @date: 2024/2/7 + **/ +@Data +public class SettleApplyListQuery implements Query { + private static final long serialVersionUID = 8997178227548223844L; + + @ApiModelProperty("客户名称") + private String customer; + @ApiModelProperty("贷款人") + private String borrowerName; + @ApiModelProperty("车牌号") + private String vehMark; + @ApiModelProperty("机构全路径") + private String orgPath; +} diff --git a/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loansettleapply/SettleApplyListVo.java b/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loansettleapply/SettleApplyListVo.java new file mode 100644 index 0000000000..542831163b --- /dev/null +++ b/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loansettleapply/SettleApplyListVo.java @@ -0,0 +1,30 @@ +package com.yxt.anrui.riskcenter.api.loansettleapply; + +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +/** + * @description: + * @author: dimengzhe + * @date: 2024/2/7 + **/ +@Data +public class SettleApplyListVo { + + @ApiModelProperty("贷款合同编号") + private String loanContractNo; + @ApiModelProperty("车架号") + private String vinNo; + @ApiModelProperty("车牌号") + private String vehMark; + @ApiModelProperty("资方") + private String bankName; + @ApiModelProperty("资方合同编号") + private String bankContractNo; + @ApiModelProperty("客户名称") + private String customer; + @ApiModelProperty("贷款人") + private String borrowName; + @ApiModelProperty("销售订单车辆表sid") + private String busVinSid; +} diff --git a/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loansettlebankcost/LoanSettleBankCostVo.java b/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loansettlebankcost/LoanSettleBankCostVo.java new file mode 100644 index 0000000000..61049ca2fe --- /dev/null +++ b/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loansettlebankcost/LoanSettleBankCostVo.java @@ -0,0 +1,34 @@ +package com.yxt.anrui.riskcenter.api.loansettlebankcost; + +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.math.BigDecimal; + +/** + * @description: + * @author: dimengzhe + * @date: 2024/2/7 + **/ +@Data +public class LoanSettleBankCostVo { + + @ApiModelProperty("资方逾期月还") + private String price; + @ApiModelProperty("资方当期未到期月还") + private String currentNotDuePrice; + @ApiModelProperty("资方未到期金额") + private String notDuePrice; + @ApiModelProperty("资方逾期利息") + private String bankInterest; + @ApiModelProperty("资方名义价") + private String bankNominalPrice; + @ApiModelProperty("资方合同违约金") + private String bankContractLiquidated; + @ApiModelProperty("资方其他应收") + private String bankOtherReceivable; + @ApiModelProperty("其他应收说明") + private String otherReceivableRemarks; + @ApiModelProperty("资方结清金额") + private String bankSettlePrice; +} diff --git a/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loansettlecompanycost/LoanSettleCompanyCostVo.java b/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loansettlecompanycost/LoanSettleCompanyCostVo.java new file mode 100644 index 0000000000..1e1f1ef940 --- /dev/null +++ b/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loansettlecompanycost/LoanSettleCompanyCostVo.java @@ -0,0 +1,42 @@ +package com.yxt.anrui.riskcenter.api.loansettlecompanycost; + +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.math.BigDecimal; + +/** + * @description: + * @author: dimengzhe + * @date: 2024/2/7 + **/ +@Data +public class LoanSettleCompanyCostVo { + + @ApiModelProperty("贷款保证金") + private String loanDeposit; + @ApiModelProperty("公司逾期月还") + private String overduePrice; + @ApiModelProperty("垫资方逾期利息") + private String putBankInterest; + @ApiModelProperty("资金占用费") + private String funfCost; + @ApiModelProperty("资方逾期利息") + private String bankOverInterest; + @ApiModelProperty("公司当期未到期月还") + private String companyCurrentNotPrice; + @ApiModelProperty("资方未到期金额") + private String bankNotPrice; + @ApiModelProperty("贷款保证金扣罚金额") + private String deductionAmount; + @ApiModelProperty("名义价") + private String companyNominalPrice; + @ApiModelProperty("合同违约金") + private String contractLiquidated; + @ApiModelProperty("公司其他费用") + private String companyOtherPrice; + @ApiModelProperty("其他费用说明") + private String otherCostRemarks; + @ApiModelProperty("公司正常结清合计") + private String settleAll; +} diff --git a/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loansettlecompanyreduction/LoanSettleCompanyReductionVo.java b/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loansettlecompanyreduction/LoanSettleCompanyReductionVo.java new file mode 100644 index 0000000000..73a3e07e49 --- /dev/null +++ b/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loansettlecompanyreduction/LoanSettleCompanyReductionVo.java @@ -0,0 +1,26 @@ +package com.yxt.anrui.riskcenter.api.loansettlecompanyreduction; + +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.math.BigDecimal; + +/** + * @description: + * @author: dimengzhe + * @date: 2024/2/7 + **/ +@Data +public class LoanSettleCompanyReductionVo { + + @ApiModelProperty("资金占用费减免") + private String fundPenalty; + @ApiModelProperty("贷款保证金扣罚减免") + private String depositPenalty; + @ApiModelProperty("其他费用减免") + private String otherCost; + @ApiModelProperty("公司减免后结清合计") + private String amountTo; + @ApiModelProperty("结清利润") + private String profit; +} diff --git a/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loansettleapply/LoanSettleApplyMapper.java b/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loansettleapply/LoanSettleApplyMapper.java index 78e67a592c..9139417adc 100644 --- a/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loansettleapply/LoanSettleApplyMapper.java +++ b/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loansettleapply/LoanSettleApplyMapper.java @@ -4,8 +4,10 @@ import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.core.toolkit.Constants; +import com.yxt.anrui.riskcenter.api.loanrepaymentplandetails.LoanRepaymentPlanDetails; import com.yxt.anrui.riskcenter.api.loansettleapply.LoanSettleApply; import com.yxt.anrui.riskcenter.api.loansettleapply.LoanSettleApplyVo; +import com.yxt.anrui.riskcenter.api.loansettleapply.SettleApplyListVo; import org.apache.ibatis.annotations.Mapper; import org.apache.ibatis.annotations.Param; @@ -23,4 +25,12 @@ public interface LoanSettleApplyMapper extends BaseMapper { IPage selectPageVo(IPage page, @Param(Constants.WRAPPER) QueryWrapper qw); int selectBySid(String join); + + IPage getListPage(IPage page, @Param(Constants.WRAPPER) QueryWrapper qw); + + LoanRepaymentPlanDetails selectByBusVinSid(String busVinSid); + + String selectDzfyqlx(String busVinSid); + + String selectZjzyf(@Param("busVinSid") String busVinSid, @Param("settingDate") String settingDate); } diff --git a/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loansettleapply/LoanSettleApplyMapper.xml b/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loansettleapply/LoanSettleApplyMapper.xml index 6de88b62e4..40b3794fa8 100644 --- a/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loansettleapply/LoanSettleApplyMapper.xml +++ b/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loansettleapply/LoanSettleApplyMapper.xml @@ -28,4 +28,48 @@ where length(nodeState) > 0 and find_in_set(sid, #{list}) + + + + + + + + \ No newline at end of file diff --git a/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loansettleapply/LoanSettleApplyRest.java b/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loansettleapply/LoanSettleApplyRest.java index bfe18e6818..1fbceed8a8 100644 --- a/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loansettleapply/LoanSettleApplyRest.java +++ b/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loansettleapply/LoanSettleApplyRest.java @@ -45,6 +45,13 @@ public class LoanSettleApplyRest implements LoanSettleApplyFeign { return loanSettleApplyService.details(query); } + @Override + public ResultBean> getListPage(PagerQuery pagerQuery) { + ResultBean> rb = ResultBean.fireFail(); + PagerVo pv = loanSettleApplyService.getListPage(pagerQuery); + return rb.success().setData(pv); + } + @Override public ResultBean delBySids(String[] sids) { return loanSettleApplyService.delAllBySids(sids); diff --git a/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loansettleapply/LoanSettleApplyService.java b/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loansettleapply/LoanSettleApplyService.java index 05dfc43a19..38deb64114 100644 --- a/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loansettleapply/LoanSettleApplyService.java +++ b/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loansettleapply/LoanSettleApplyService.java @@ -15,9 +15,13 @@ import com.yxt.anrui.flowable.api.flowtask.FlowTaskVo; import com.yxt.anrui.flowable.api.flowtask.LatestTaskVo; import com.yxt.anrui.flowable.api.utils.ProcDefEnum; import com.yxt.anrui.flowable.sqloperationsymbol.BusinessVariables; +import com.yxt.anrui.portal.api.sysorganization.SysOrganizationFeign; import com.yxt.anrui.portal.api.sysorganization.SysOrganizationVo; +import com.yxt.anrui.portal.api.sysstafforg.SysStaffOrgFeign; 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.loanrepaymentplandetails.LoanRepaymentPlanDetails; import com.yxt.anrui.riskcenter.api.loanreturnvehledger.LoanReturnVehLedger; import com.yxt.anrui.riskcenter.api.loansecondarysalesapply.LoanSecondarySalesApply; import com.yxt.anrui.riskcenter.api.loansecondarysalesapply.LoanSecondarySalesApplyQuery; @@ -25,6 +29,15 @@ import com.yxt.anrui.riskcenter.api.loansecondarysalesapply.LoanSecondarySalesAp import com.yxt.anrui.riskcenter.api.loansecondarysalesveh.LoanSecondarySalesVehVo; import com.yxt.anrui.riskcenter.api.loansettleapply.*; import com.yxt.anrui.riskcenter.api.loansettleapply.flowable.*; +import com.yxt.anrui.riskcenter.api.loansettlebankcost.LoanSettleBankCost; +import com.yxt.anrui.riskcenter.api.loansettlebankcost.LoanSettleBankCostVo; +import com.yxt.anrui.riskcenter.api.loansettlecompanycost.LoanSettleCompanyCost; +import com.yxt.anrui.riskcenter.api.loansettlecompanycost.LoanSettleCompanyCostVo; +import com.yxt.anrui.riskcenter.api.loansettlecompanyreduction.LoanSettleCompanyReduction; +import com.yxt.anrui.riskcenter.api.loansettlecompanyreduction.LoanSettleCompanyReductionVo; +import com.yxt.anrui.riskcenter.biz.loansettlebankcost.LoanSettleBankCostService; +import com.yxt.anrui.riskcenter.biz.loansettlecompanycost.LoanSettleCompanyCostService; +import com.yxt.anrui.riskcenter.biz.loansettlecompanyreduction.LoanSettleCompanyReductionService; import com.yxt.common.base.service.MybatisBaseService; import com.yxt.common.base.utils.PagerUtil; import com.yxt.common.core.query.PagerQuery; @@ -60,6 +73,16 @@ public class LoanSettleApplyService extends MybatisBaseService listPageVo(PagerQuery pq) { @@ -136,18 +159,124 @@ public class LoanSettleApplyService extends MybatisBaseService details(LoanSettleApplyDetailsQuery query) { ResultBean rb = ResultBean.fireFail(); + LoanSettleApplyDetailsVo loanSettleApplyDetailsVo = new LoanSettleApplyDetailsVo(); String sid = query.getSid(); + String busVinSid = query.getBusVinSid(); + String orgPath = query.getOrgPath(); + String userSid = query.getUserSid(); if (StringUtils.isBlank(sid)) {//新增初始化 + //根据用户查询发起人、发起部门、发起日期为当前日期 + String deptName = ""; + String deptSid = ""; + String useOrgSid = ""; + if (StringUtils.isNotBlank(orgPath)) { + List split = Arrays.asList(orgPath.split("/")); + if (split.size() > 1) { + //获取本级sid获取本级部门信息 + SysOrganizationVo sysOrganization = sysOrganizationFeign.fetchBySid(split.get(split.size() - 2)).getData(); + SysOrganizationVo sysOrganization1 = sysOrganizationFeign.fetchBySid(split.get(split.size() - 1)).getData(); + deptName = sysOrganization.getName() + "/" + sysOrganization1.getName(); + deptName = sysOrganization1.getName(); + deptSid = sysOrganization1.getSid(); + } else { + SysOrganizationVo sysOrganization = sysOrganizationFeign.fetchBySid(split.get(0)).getData(); + deptName = sysOrganization.getName(); + deptName = sysOrganization.getName(); + deptSid = sysOrganization.getSid(); + } + useOrgSid = sysStaffOrgFeign.getOrgSidByPath(orgPath).getData(); + } + //根据用户sid查询人员姓名 + ResultBean userVoResultBean = sysUserFeign.fetchBySid(userSid); + if (!userVoResultBean.getSuccess()) { + return rb.setMsg(userVoResultBean.getMsg()); + } + loanSettleApplyDetailsVo.setCreateDept(deptName); + loanSettleApplyDetailsVo.setCreateDeptSid(deptSid); + loanSettleApplyDetailsVo.setCreateByName(userVoResultBean.getData().getName()); + loanSettleApplyDetailsVo.setCreateTime(DateUtil.today()); + loanSettleApplyDetailsVo.setOrgPath(query.getOrgPath()); + loanSettleApplyDetailsVo.setUserSid(query.getUserSid()); + loanSettleApplyDetailsVo.setUseOrgSid(useOrgSid); + loanSettleApplyDetailsVo.setSettingDate(DateUtil.today()); + SettleApplyCommonVo settleApplyCommonVo = getInfo(busVinSid, loanSettleApplyDetailsVo.getSettingDate()); + BeanUtil.copyProperties(settleApplyCommonVo, loanSettleApplyDetailsVo); + LoanSettleCompanyCostVo loanSettleCompanyCostVo = new LoanSettleCompanyCostVo(); + BeanUtil.copyProperties(settleApplyCommonVo, loanSettleCompanyCostVo); + loanSettleApplyDetailsVo.setLoanSettleCompanyCostVo(loanSettleCompanyCostVo); + loanSettleApplyDetailsVo.setBusVinSid(busVinSid); } else {//编辑初始化 LoanSettleApply loanSettleApply = fetchBySid(sid); if (loanSettleApply == null) { return rb.setMsg("该申请不存在"); } + BeanUtil.copyProperties(loanSettleApply, loanSettleApplyDetailsVo, "sid"); + loanSettleApplyDetailsVo.setUserSid(loanSettleApply.getCreateBySid()); + loanSettleApplyDetailsVo.setCreateTime(DateUtil.format(loanSettleApply.getCreateTime(), "yyyy-MM-dd")); + LoanSettleBankCostVo loanSettleBankCostVo = new LoanSettleBankCostVo(); + LoanSettleBankCost loanSettleBankCost = loanSettleBankCostService.selectByMainSid(sid); + if (loanSettleBankCost != null) { + BeanUtil.copyProperties(loanSettleBankCost, loanSettleBankCostVo); + loanSettleApplyDetailsVo.setLoanSettleBankCostVo(loanSettleBankCostVo); + } + LoanSettleCompanyCostVo loanSettleCompanyCostVo = new LoanSettleCompanyCostVo(); + LoanSettleCompanyCost loanSettleCompanyCost = loanSettleCompanyCostService.selectByMainSid(sid); + if (loanSettleCompanyCost != null) { + BeanUtil.copyProperties(loanSettleCompanyCost, loanSettleCompanyCostService); + loanSettleApplyDetailsVo.setLoanSettleCompanyCostVo(loanSettleCompanyCostVo); + } + loanSettleApplyDetailsVo.setTrueReduction(loanSettleApply.getTrueReduction()); + LoanSettleCompanyReductionVo loanSettleCompanyReductionVo = new LoanSettleCompanyReductionVo(); + LoanSettleCompanyReduction loanSettleCompanyReduction = loanSettleCompanyReductionService.selectByMainSid(sid); + if (loanSettleCompanyReduction != null) { + if ("0".equals(loanSettleApply.getTrueReduction())) { + loanSettleCompanyReductionVo.setProfit(loanSettleCompanyReduction.getProfit().toString()); + } else { + BeanUtil.copyProperties(loanSettleCompanyReduction, loanSettleCompanyReductionVo); + } + loanSettleApplyDetailsVo.setLoanSettleCompanyReductionVo(loanSettleCompanyReductionVo); + } + } + return rb.success().setData(loanSettleApplyDetailsVo); + } + public SettleApplyCommonVo getInfo(String busVinSid, String settingDate) { + SettleApplyCommonVo settleApplyCommonVo = new SettleApplyCommonVo(); + //根据busVinSid查询还款计划表中数据 + LoanRepaymentPlanDetails loanRepaymentPlanDetails = baseMapper.selectByBusVinSid(busVinSid); + if (loanRepaymentPlanDetails != null) { + settleApplyCommonVo.setVinNo(loanRepaymentPlanDetails.getVinNo()); + settleApplyCommonVo.setVehMark(loanRepaymentPlanDetails.getVehMark()); + settleApplyCommonVo.setCustomerName(loanRepaymentPlanDetails.getCustomer()); + settleApplyCommonVo.setCustomerSid(loanRepaymentPlanDetails.getCustomerSid()); + settleApplyCommonVo.setLoanName(loanRepaymentPlanDetails.getBorrowerName()); + settleApplyCommonVo.setLoanSid(loanRepaymentPlanDetails.getBorrowerSid()); + settleApplyCommonVo.setLoanContractNo(loanRepaymentPlanDetails.getLoanContractNo()); + settleApplyCommonVo.setBankName(loanRepaymentPlanDetails.getBankName()); + settleApplyCommonVo.setBankContractNo(loanRepaymentPlanDetails.getBankContractNo()); + settleApplyCommonVo.setSaleOrderSid(loanRepaymentPlanDetails.getSalesOrderSid()); } + String putBankInterest = baseMapper.selectDzfyqlx(busVinSid); + settleApplyCommonVo.setPutBankInterest(putBankInterest); + //资金占用费 + String funfCost = baseMapper.selectZjzyf(busVinSid, settingDate); + settleApplyCommonVo.setFunfCost(funfCost); + //公司当前逾期月还 - return null; + //公司当期未到期月还 + + //公司未到期月还 + + //贷款保证金 + + //公司逾期月还 + + //公司当期未到期月还 + + //贷款保证金扣罚金额 + + return settleApplyCommonVo; } public ResultBean delAllBySids(String[] sids) { @@ -477,4 +606,33 @@ public class LoanSettleApplyService extends MybatisBaseService getListPage(PagerQuery pagerQuery) { + SettleApplyListQuery query = pagerQuery.getParams(); + QueryWrapper qw = new QueryWrapper<>(); + if (query != null) { + //客户名称 + if (StringUtils.isNotBlank(query.getCustomer())) { + qw.like("ld.customer", query.getCustomer()); + } + //贷款人 + if (StringUtils.isNotBlank(query.getBorrowerName())) { + qw.like("ld.borrowName", query.getBorrowerName()); + } + //车牌号 + if (StringUtils.isNotBlank(query.getVehMark())) { + qw.like("ld.vehMark", query.getVehMark()); + } + //机构全路径 + if (StringUtils.isNotBlank(query.getOrgPath())) { + String useOrgSid = sysStaffOrgFeign.getOrgSidByPath(query.getOrgPath()).getData(); + qw.eq("ld.useOrgSid", useOrgSid); + } + qw.eq("bv.settleState", 0); + + } + IPage page = PagerUtil.queryToPage(pagerQuery); + IPage pagging = baseMapper.getListPage(page, qw); + PagerVo p = PagerUtil.pageToVo(pagging, null); + return p; + } } diff --git a/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loansettlebankcost/LoanSettleBankCostMapper.java b/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loansettlebankcost/LoanSettleBankCostMapper.java index 59639bffab..7f1874a900 100644 --- a/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loansettlebankcost/LoanSettleBankCostMapper.java +++ b/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loansettlebankcost/LoanSettleBankCostMapper.java @@ -11,4 +11,5 @@ import org.apache.ibatis.annotations.Mapper; **/ @Mapper public interface LoanSettleBankCostMapper extends BaseMapper { + LoanSettleBankCost selectByMainSid(String sid); } diff --git a/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loansettlebankcost/LoanSettleBankCostMapper.xml b/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loansettlebankcost/LoanSettleBankCostMapper.xml index 252773d2b9..e76962309d 100644 --- a/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loansettlebankcost/LoanSettleBankCostMapper.xml +++ b/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loansettlebankcost/LoanSettleBankCostMapper.xml @@ -1,4 +1,9 @@ + \ No newline at end of file diff --git a/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loansettlebankcost/LoanSettleBankCostService.java b/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loansettlebankcost/LoanSettleBankCostService.java index 1c190e2182..f4f36314d7 100644 --- a/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loansettlebankcost/LoanSettleBankCostService.java +++ b/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loansettlebankcost/LoanSettleBankCostService.java @@ -11,4 +11,7 @@ import org.springframework.stereotype.Service; **/ @Service public class LoanSettleBankCostService extends MybatisBaseService { + public LoanSettleBankCost selectByMainSid(String sid) { + return baseMapper.selectByMainSid(sid); + } } diff --git a/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loansettlecompanycost/LoanSettleCompanyCostMapper.java b/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loansettlecompanycost/LoanSettleCompanyCostMapper.java index 130573294e..47a3cb07d3 100644 --- a/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loansettlecompanycost/LoanSettleCompanyCostMapper.java +++ b/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loansettlecompanycost/LoanSettleCompanyCostMapper.java @@ -11,4 +11,5 @@ import org.apache.ibatis.annotations.Mapper; **/ @Mapper public interface LoanSettleCompanyCostMapper extends BaseMapper { + LoanSettleCompanyCost selectByMainSid(String sid); } diff --git a/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loansettlecompanycost/LoanSettleCompanyCostMapper.xml b/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loansettlecompanycost/LoanSettleCompanyCostMapper.xml index 4b41599e9e..60ec651004 100644 --- a/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loansettlecompanycost/LoanSettleCompanyCostMapper.xml +++ b/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loansettlecompanycost/LoanSettleCompanyCostMapper.xml @@ -1,4 +1,9 @@ + \ No newline at end of file diff --git a/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loansettlecompanycost/LoanSettleCompanyCostService.java b/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loansettlecompanycost/LoanSettleCompanyCostService.java index dc7ec2620d..20a45639f7 100644 --- a/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loansettlecompanycost/LoanSettleCompanyCostService.java +++ b/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loansettlecompanycost/LoanSettleCompanyCostService.java @@ -11,4 +11,7 @@ import org.springframework.stereotype.Service; **/ @Service public class LoanSettleCompanyCostService extends MybatisBaseService { + public LoanSettleCompanyCost selectByMainSid(String sid) { + return baseMapper.selectByMainSid(sid); + } } diff --git a/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loansettlecompanyreduction/LoanSettleCompanyReductionMapper.java b/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loansettlecompanyreduction/LoanSettleCompanyReductionMapper.java index 417b3b8976..d904ac9fd4 100644 --- a/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loansettlecompanyreduction/LoanSettleCompanyReductionMapper.java +++ b/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loansettlecompanyreduction/LoanSettleCompanyReductionMapper.java @@ -11,4 +11,5 @@ import org.apache.ibatis.annotations.Mapper; **/ @Mapper public interface LoanSettleCompanyReductionMapper extends BaseMapper { + LoanSettleCompanyReduction selectByMainSid(String sid); } diff --git a/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loansettlecompanyreduction/LoanSettleCompanyReductionMapper.xml b/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loansettlecompanyreduction/LoanSettleCompanyReductionMapper.xml index 30b92377e3..f56a978c3c 100644 --- a/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loansettlecompanyreduction/LoanSettleCompanyReductionMapper.xml +++ b/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loansettlecompanyreduction/LoanSettleCompanyReductionMapper.xml @@ -1,4 +1,10 @@ + \ No newline at end of file diff --git a/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loansettlecompanyreduction/LoanSettleCompanyReductionService.java b/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loansettlecompanyreduction/LoanSettleCompanyReductionService.java index 226777fd7b..acc7ca0bfe 100644 --- a/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loansettlecompanyreduction/LoanSettleCompanyReductionService.java +++ b/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loansettlecompanyreduction/LoanSettleCompanyReductionService.java @@ -12,4 +12,7 @@ import org.springframework.stereotype.Service; **/ @Service public class LoanSettleCompanyReductionService extends MybatisBaseService { + public LoanSettleCompanyReduction selectByMainSid(String sid) { + return baseMapper.selectByMainSid(sid); + } } diff --git a/doc/databases/risk_center.sql b/doc/databases/risk_center.sql index 90b7eadf7b..a74cb44b43 100644 --- a/doc/databases/risk_center.sql +++ b/doc/databases/risk_center.sql @@ -1765,6 +1765,7 @@ CREATE TABLE `loan_settle_apply` `taskId` varchar(64) DEFAULT NULL COMMENT '任务id', `taskDefKey` varchar(64) DEFAULT NULL COMMENT '环节id', `nodeState` varchar(64) DEFAULT NULL COMMENT '流程状态', + `trueReduction` int(32) DEFAULT NULL COMMENT '0不勾选，1勾选减免', PRIMARY KEY (`id`), KEY `id` (`id`) ) ENGINE = INNODB