yxt_develop
/
anrui
9
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
Browse Source

Merge remote-tracking branch 'origin/master'

master
yunuo970428 1 year ago
parent
a8296a80ad 4779a37d7c
commit
7e8bf4606f
28 changed files with 853 additions and 130 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 15
      anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/baseinternalpurchase/BaseInternalPurchaseService.java
  2. 28
      anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/fincollectionconfirmation/FinCollectionConfirmation.java
  3. 17
      anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/fincollectionconfirmation/FinCollectionConfirmationFeign.java
  4. 12
      anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/fincollectionconfirmation/FinCollectionConfirmationFeignFallback.java
  5. 95
      anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/fincollectionconfirmation/rsk/FinCollectionConfirmationRskDto.java
  6. 83
      anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/fincollectionconfirmation/rsk/FinCollectionConfirmationRskVo.java
  7. 37
      anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/fincollectionconfirmation/rsk/FinSelectedReceivablesDetailedRsk.java
  8. 12
      anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/fincollectionconfirmation/FinCollectionConfirmationRest.java
  9. 380
      anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/fincollectionconfirmation/FinCollectionConfirmationService.java
  10. 1
      anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finuncollectedreceivablesdetailedjr/FinUncollectedReceivablesDetailedJRMapper.java
  11. 4
      anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finuncollectedreceivablesdetailedjr/FinUncollectedReceivablesDetailedJRMapper.xml
  12. 3
      anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finuncollectedreceivablesdetailedjr/FinUncollectedReceivablesDetailedJRService.java
  13. 10
      anrui-fin/anrui-fin-biz/src/main/resources/application-dev.yml
  14. 16
      anrui-flowable/anrui-flowable-biz/src/main/java/com/yxt/anrui/flowable/biz/flow2/FlowService.java
  15. 2
      anrui-reportcenter/anrui-reportcenter-api/src/main/java/com/yxt/anrui/reportcenter/api/dailyreport/DailyReportAppVo.java
  16. 6
      anrui-reportcenter/anrui-reportcenter-api/src/main/java/com/yxt/anrui/reportcenter/api/dailyreport/DailyReportVo.java
  17. 18
      anrui-reportcenter/anrui-reportcenter-api/src/main/java/com/yxt/anrui/reportcenter/api/dailyreport/ParameterVo.java
  18. 47
      anrui-reportcenter/anrui-reportcenter-biz/src/main/java/com/yxt/anrui/reportcenter/biz/dailyreport/DailyReportMapper.xml
  19. 31
      anrui-reportcenter/anrui-reportcenter-biz/src/main/java/com/yxt/anrui/reportcenter/biz/dailyreport/DailyReportService.java
  20. 6
      anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanhomevisitinvestigate/LoanHomevisitInvestigateDetailsPCVo.java
  21. 2
      anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanrepaymentplandetails/LoanRepaymentPlanDetails.java
  22. 2
      anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanrepaymentplandetails/LoanRepaymentPlanDetailsDto.java
  23. 6
      anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanrepaymentplandetails/LoanRepaymentPlanDetailsFeign.java
  24. 5
      anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanrepaymentplandetails/LoanRepaymentPlanDetailsFeignFallback.java
  25. 93
      anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanhomevisitinvestigate/LoanHomevisitInvestigateService.java
  26. 6
      anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanrepaymentplandetails/LoanRepaymentPlanDetailsRest.java
  27. 12
      anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanrepaymentplandetails/LoanRepaymentPlanDetailsService.java
  28. 34
      anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanrepaymentschedule/LoanRepaymentScheduleService.java

15
anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/baseinternalpurchase/BaseInternalPurchaseService.java
View File

@ -495,6 +495,14 @@ public class BaseInternalPurchaseService extends MybatisBaseService<BaseInternal
Map<String, Object> appMap = new HashMap<>();
appMap.put("sid", bv.getBusinessSid());
variables.put("app", appMap);
variables.put("service", "公司间调车");
//调入采购部门sid
String callInBuyerOrgSid = baseInternalPurchase.getCallInBuyerOrgSid();
//调入部门信息
SysOrganizationVo sysOrganizationVoDRBM = sysOrganizationFeign.fetchBySid(callInBuyerOrgSid).getData();
//调入部门全路径
String orgSidPathDRBM = sysOrganizationVoDRBM.getOrgSidPath();
variables.put("ydfOrgPath", orgSidPathDRBM);
bv.setFormVariables(variables);
bv.setOrgSidPath(baseInternalPurchase.getOrgSidPath());
ResultBean<UpdateFlowFieldVo> resultBean = flowFeign.handleProsess(bv);
@ -627,7 +635,7 @@ public class BaseInternalPurchaseService extends MybatisBaseService<BaseInternal
}
if (StringUtils.isBlank(nextNodeUserSids)) {
bv.setNextNodeUserSids(ProcDefEnum.DEFAUL_TADMIN_SID.getProDefId());
}else {
} else {
String substring = nextNodeUserSids.substring(0, nextNodeUserSids.lastIndexOf(","));
bv.setNextNodeUserSids(substring);
}
@ -654,6 +662,7 @@ public class BaseInternalPurchaseService extends MybatisBaseService<BaseInternal
SysOrganizationVo sysOrganizationVoDRBM = sysOrganizationFeign.fetchBySid(callInBuyerOrgSid).getData();
//调入部门全路径
String orgSidPathDRBM = sysOrganizationVoDRBM.getOrgSidPath();
bv.setOrgSidPath(orgSidPathDRBM);
userQuery.setRoleSid(candidateGroups.get(0));
if (("Activity_08r04ow").equals(id)) {//判断下一环节是否为事业部副总经理审批(管辖调出方)
userQuery.setOrgSidPath(baseInternalPurchase.getOrgSidPath());
@ -674,7 +683,7 @@ public class BaseInternalPurchaseService extends MybatisBaseService<BaseInternal
}
if (StringUtils.isBlank(nextNodeUserSids)) {
bv.setNextNodeUserSids(ProcDefEnum.DEFAUL_TADMIN_SID.getProDefId());
}else {
} else {
String substring = nextNodeUserSids.substring(0, nextNodeUserSids.lastIndexOf(","));
bv.setNextNodeUserSids(substring);
}
@ -743,7 +752,7 @@ public class BaseInternalPurchaseService extends MybatisBaseService<BaseInternal
}
if (StringUtils.isBlank(nextNodeUserSids)) {
bv.setNextNodeUserSids(ProcDefEnum.DEFAUL_TADMIN_SID.getProDefId());
}else {
} else {
String substring = nextNodeUserSids.substring(0, nextNodeUserSids.lastIndexOf(","));
bv.setNextNodeUserSids(substring);
}

28
anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/fincollectionconfirmation/FinCollectionConfirmation.java
View File

@ -52,33 +52,33 @@ import java.math.BigDecimal;
public class FinCollectionConfirmation extends BaseEntity {
private static final long serialVersionUID = 1L;
@ApiModelProperty("创建人")
@ApiModelProperty("创建人")
private String createByName; // 创建人接口
@ApiModelProperty("收款日期")
@ApiModelProperty("收款日期")
private String collectionDate; // 收款日期
@ApiModelProperty("收款银行key")
private String collectionBankKey; // 收款银行key
@ApiModelProperty("收款银行")
@ApiModelProperty("收款银行")
private String collectionBank; // 收款银行
@ApiModelProperty("收款银行账号key")
private String collectionBankNumKey; // 收款银行账号key
@ApiModelProperty("收款银行账号")
@ApiModelProperty("收款银行账号")
private String collectionBankNum; // 收款银行账号
@ApiModelProperty("收款方式key")
@ApiModelProperty("收款方式key")
private String collectionTypeKey; // 收款方式key
@ApiModelProperty("收款方式value")
@ApiModelProperty("收款方式value")
private String collectionTypeValue; // 收款方式value
@ApiModelProperty("付款方名称")
@ApiModelProperty("付款方名称")
private String payerName; // 付款方名称
@ApiModelProperty("收款金额")
@ApiModelProperty("收款金额")
private BigDecimal collectionMoney; // 收款金额
@ApiModelProperty("打款凭证Url")
@ApiModelProperty("打款凭证Url")
private String paymentVoucherUrl; // 打款凭证Url
@ApiModelProperty("汇款确认书Url")
@ApiModelProperty("汇款确认书Url")
private String remittanceConfirmationUrl; // 汇款确认书Url
@ApiModelProperty("余额")
@ApiModelProperty("余额")
private BigDecimal balance; // 余额
@ApiModelProperty("分公司sid")
@ApiModelProperty("分公司sid")
private String useOrgSid; // 分公司sid
@ApiModelProperty("审核状态（1待审核/2已驳回/3已审核）")
private Integer auditState; // 审核状态
@ -93,7 +93,7 @@ public class FinCollectionConfirmation extends BaseEntity {
private String busNo;
@ApiModelProperty("是否是首次：0是，1不是")
private int first;
@ApiModelProperty("申请部门")
private String createDept;
@ApiModelProperty("申请日期")
@ -141,4 +141,6 @@ public class FinCollectionConfirmation extends BaseEntity {
@ApiModelProperty("分公司名称")
private String useOrgName;
@ApiModelProperty("款项来源（01销售认款、02金融认款）")
private String source;
}

17
anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/fincollectionconfirmation/FinCollectionConfirmationFeign.java
View File

@ -27,6 +27,8 @@ package com.yxt.anrui.fin.api.fincollectionconfirmation;
import com.yxt.anrui.fin.api.fincollectionconfirmation.app.AppBusArrearsCarryMoneyVo;
import com.yxt.anrui.fin.api.fincollectionconfirmation.app.FinConfirmDto;
import com.yxt.anrui.fin.api.fincollectionconfirmation.rsk.FinCollectionConfirmationRskDto;
import com.yxt.anrui.fin.api.fincollectionconfirmation.rsk.FinCollectionConfirmationRskVo;
import com.yxt.anrui.fin.api.finuncollectedreceivablesdetailed.AppFinUncollectedReceivablesDetailedVo;
import com.yxt.common.core.query.PagerQuery;
import com.yxt.common.core.result.ResultBean;
@ -103,6 +105,21 @@ public interface FinCollectionConfirmationFeign {
@PostMapping("/ctskd")
@ResponseBody
ResultBean ctskd(@RequestParam("skdSid") String skdSid);
/*----------------------金融认款申请---------------------------*/
@ApiOperation("金融认款申请提交新增保存")
@PostMapping("/saveRsk")
public ResultBean saveRsk(@RequestBody FinCollectionConfirmationRskDto dto);
@ApiOperation("金融认款申请详情")
@GetMapping("/rskDetails/{sid}")
public ResultBean<FinCollectionConfirmationRskVo> rskDetails(@PathVariable("sid") String sid);
/*---------------------App接口 ---------------------*/
@ApiOperation("手机端—获取款项确认列表")

12
anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/fincollectionconfirmation/FinCollectionConfirmationFeignFallback.java
View File

@ -27,6 +27,8 @@ package com.yxt.anrui.fin.api.fincollectionconfirmation;
import com.yxt.anrui.fin.api.fincollectionconfirmation.app.AppBusArrearsCarryMoneyVo;
import com.yxt.anrui.fin.api.fincollectionconfirmation.app.FinConfirmDto;
import com.yxt.anrui.fin.api.fincollectionconfirmation.rsk.FinCollectionConfirmationRskDto;
import com.yxt.anrui.fin.api.fincollectionconfirmation.rsk.FinCollectionConfirmationRskVo;
import com.yxt.anrui.fin.api.finuncollectedreceivablesdetailed.AppFinUncollectedReceivablesDetailedVo;
import com.yxt.common.core.query.PagerQuery;
import com.yxt.common.core.result.ResultBean;
@ -103,6 +105,16 @@ public class FinCollectionConfirmationFeignFallback implements FinCollectionConf
return null;
}
@Override
public ResultBean saveRsk(FinCollectionConfirmationRskDto dto) {
return null;
}
@Override
public ResultBean<FinCollectionConfirmationRskVo> rskDetails(String sid) {
return null;
}
@Override
public ResultBean<PagerVo<AppFinCollectionConfirmationPageVo>> getCollectionConfirmList(PagerQuery<AppFinCollectionConfirmationQuery> pagerQuery) {
return null;

95
anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/fincollectionconfirmation/rsk/FinCollectionConfirmationRskDto.java
View File

@ -0,0 +1,95 @@
package com.yxt.anrui.fin.api.fincollectionconfirmation.rsk;
import com.yxt.anrui.fin.api.fincollectionconfirmation.FinCollectionConfirmationAppendixDto;
import com.yxt.anrui.fin.api.finselectedreceivablesdetailed.FinSelectedReceivablesDetailedDto;
import com.yxt.common.core.dto.Dto;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import javax.validation.Valid;
import java.util.ArrayList;
import java.util.List;
/**
* @author Fan
* @description
* @date 2023/12/14 9:05
*/
@Data
public class FinCollectionConfirmationRskDto implements Dto {
@ApiModelProperty("用户sid")
private String userSid;
@ApiModelProperty("sid")
private String sid; // 收款确认单sid
@ApiModelProperty("业务员sid")
private String staffSid; // 业务员sid
@ApiModelProperty("创建人接口")
private String createByName; // 创建人接口
@ApiModelProperty("收款日期")
private String collectionDate; // 收款日期
@ApiModelProperty("收款银行key")
private String collectionBankKey; // 收款银行key
@ApiModelProperty("收款银行")
private String collectionBank; // 收款银行
@ApiModelProperty("收款银行账号key")
private String collectionBankNumKey; // 收款银行账号key
@ApiModelProperty("收款银行账号")
private String collectionBankNum; // 收款银行账号
@ApiModelProperty("收款方式key")
private String collectionTypeKey; // 收款方式key
@ApiModelProperty("收款方式value")
private String collectionTypeValue; // 收款方式value
@ApiModelProperty("付款方名称")
private String payerName; // 付款方名称
@ApiModelProperty("收款金额")
private String collectionMoney; // 收款金额
@ApiModelProperty("当前组织机构全路径sid")
private String orgPath;
@ApiModelProperty("备注")
private String remarks; // 备注
@ApiModelProperty("申请部门")
private String createDept;
@ApiModelProperty("申请部门sid")
private String createDeptSid;
@ApiModelProperty("申请日期")
private String createDate;
@ApiModelProperty("收款账户名称")
private String receivingName;
@ApiModelProperty("付款账号后4位")
private String payAccount;
@ApiModelProperty("付款银行")
private String payBank;
@ApiModelProperty("收款银行账号sid")
private String accountSid;
@ApiModelProperty("采购系统sid")
private String purchaseSystemSid;
@ApiModelProperty("采购系统名称")
private String purchaseSystemName;
@ApiModelProperty("款项状态（1未认款/2部分认款/3已认款）")
private Integer paymentState; // 审核状态
@ApiModelProperty("已选应收款项明细")
@Valid
private List<FinSelectedReceivablesDetailedRsk> finSelectedReceivablesDetaileds; // 已选应收款项明细
@ApiModelProperty("打款凭证附件")
private List<FinCollectionConfirmationAppendixDto> paymentVoucherAppendixs = new ArrayList<>(); // 打款凭证附件
@ApiModelProperty("汇款确认书附件")
private List<FinCollectionConfirmationAppendixDto> remittanceConfirmationAppendixs = new ArrayList<>(); // 汇款确认书附件
@ApiModelProperty("打款凭证Url")
private String paymentVoucherUrl; // 打款凭证Url
@ApiModelProperty("汇款确认书Url")
private String remittanceConfirmationUrl; // 汇款确认书Url
/* @ApiModelProperty("余额")
private String balance;*/
// @ApiModelProperty("分公司sid")
// private String useOrgSid; // 分公司sid
// @ApiModelProperty("销售专员名称")
// private String staffName;
// @ApiModelProperty("销售专员用户sid")
// private String staffUserSid;
// @ApiModelProperty("销售专员部门名称")
// private String staffDeptName;
// @ApiModelProperty("销售专员部门sid")
// private String staffDeptSid;
// @ApiModelProperty("组织全路径")
// private String orgSidPath;
}

83
anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/fincollectionconfirmation/rsk/FinCollectionConfirmationRskVo.java
View File

@ -0,0 +1,83 @@
package com.yxt.anrui.fin.api.fincollectionconfirmation.rsk;
import com.yxt.anrui.fin.api.fincollectionconfirmation.FinCollectionConfirmationAppendixDto;
import com.yxt.anrui.fin.api.fincollectionconfirmation.FinCollectionConfirmationAppendixVo;
import com.yxt.common.core.vo.Vo;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import javax.validation.Valid;
import java.util.ArrayList;
import java.util.List;
/**
* @author Fan
* @description
* @date 2023/12/14 13:40
*/
@Data
public class FinCollectionConfirmationRskVo implements Vo {
@ApiModelProperty("用户sid")
private String userSid;
@ApiModelProperty("sid")
private String sid; // 收款确认单sid
@ApiModelProperty("业务员sid")
private String staffSid; // 业务员sid
@ApiModelProperty("创建人接口")
private String createByName; // 创建人接口
@ApiModelProperty("收款日期")
private String collectionDate; // 收款日期
@ApiModelProperty("收款银行key")
private String collectionBankKey; // 收款银行key
@ApiModelProperty("收款银行")
private String collectionBank; // 收款银行
@ApiModelProperty("收款银行账号key")
private String collectionBankNumKey; // 收款银行账号key
@ApiModelProperty("收款银行账号")
private String collectionBankNum; // 收款银行账号
@ApiModelProperty("收款方式key")
private String collectionTypeKey; // 收款方式key
@ApiModelProperty("收款方式value")
private String collectionTypeValue; // 收款方式value
@ApiModelProperty("付款方名称")
private String payerName; // 付款方名称
@ApiModelProperty("收款金额")
private String collectionMoney; // 收款金额
@ApiModelProperty("当前组织机构全路径sid")
private String orgPath;
@ApiModelProperty("备注")
private String remarks; // 备注
@ApiModelProperty
private String reason;
@ApiModelProperty("申请部门")
private String createDept;
@ApiModelProperty("申请部门sid")
private String createDeptSid;
@ApiModelProperty("申请日期")
private String createDate;
@ApiModelProperty("收款账户名称")
private String receivingName;
@ApiModelProperty("付款账号后4位")
private String payAccount;
@ApiModelProperty("付款银行")
private String payBank;
@ApiModelProperty("收款银行账号sid")
private String accountSid;
@ApiModelProperty("采购系统sid")
private String purchaseSystemSid;
@ApiModelProperty("采购系统名称")
private String purchaseSystemName;
@ApiModelProperty("款项状态（1未认款/2部分认款/3已认款）")
private Integer paymentState; // 审核状态
@ApiModelProperty("已选应收款项明细")
@Valid
private List<FinSelectedReceivablesDetailedRsk> finSelectedReceivablesDetaileds; // 已选应收款项明细
@ApiModelProperty("打款凭证附件")
private List<FinCollectionConfirmationAppendixVo> paymentVoucherAppendixs = new ArrayList<>(); // 打款凭证附件
@ApiModelProperty("汇款确认书附件")
private List<FinCollectionConfirmationAppendixVo> remittanceConfirmationAppendixs = new ArrayList<>(); // 汇款确认书附件
@ApiModelProperty("打款凭证Url")
private String paymentVoucherUrl; // 打款凭证Url
@ApiModelProperty("汇款确认书Url")
private String remittanceConfirmationUrl; // 汇款确认书Url
}

37
anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/fincollectionconfirmation/rsk/FinSelectedReceivablesDetailedRsk.java
View File

@ -0,0 +1,37 @@
package com.yxt.anrui.fin.api.fincollectionconfirmation.rsk;
import com.fasterxml.jackson.annotation.JsonProperty;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import javax.validation.constraints.NotBlank;
/**
* @author Fan
* @description
* @date 2023/12/14 9:14
*/
@Data
public class FinSelectedReceivablesDetailedRsk {
//实收sid
private String sid;
@ApiModelProperty("应收未收款项sid")
private String receivablesSid;
@ApiModelProperty("消贷合同号")
private String loanContractNo; // 合同编号
@ApiModelProperty("贷款人")
private String borrowerName; // 贷款人
@ApiModelProperty("车架号/车牌号")
private String vinNo; // 车架号
@ApiModelProperty("期数")
private String period;
@ApiModelProperty("应收项目名称")
private String receivablesName; // 应收项目名称
@ApiModelProperty("当前未收金额")
private String currentReceivableMoney; // 当前未收金额
@ApiModelProperty("资方")
private String bankName;
@ApiModelProperty("认款金额")
@NotBlank(message = "认款金额不能为空")
private String subscriptionMoney; // 认款金额
}

12
anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/fincollectionconfirmation/FinCollectionConfirmationRest.java
View File

@ -29,6 +29,8 @@ import com.baomidou.mybatisplus.core.metadata.IPage;
import com.yxt.anrui.fin.api.fincollectionconfirmation.*;
import com.yxt.anrui.fin.api.fincollectionconfirmation.app.AppBusArrearsCarryMoneyVo;
import com.yxt.anrui.fin.api.fincollectionconfirmation.app.FinConfirmDto;
import com.yxt.anrui.fin.api.fincollectionconfirmation.rsk.FinCollectionConfirmationRskDto;
import com.yxt.anrui.fin.api.fincollectionconfirmation.rsk.FinCollectionConfirmationRskVo;
import com.yxt.anrui.fin.api.finuncollectedreceivablesdetailed.AppFinUncollectedReceivablesDetailedVo;
import com.yxt.common.base.utils.PagerUtil;
import com.yxt.common.core.query.PagerQuery;
@ -125,6 +127,16 @@ public class FinCollectionConfirmationRest implements FinCollectionConfirmationF
public ResultBean ctskd(String skdSid) {
return finCollectionConfirmationService.ctskd(skdSid);
}
//------------------------金融认款申请-----------------------------------
@Override
public ResultBean saveRsk(FinCollectionConfirmationRskDto dto) {
return finCollectionConfirmationService.saveRsk(dto);
}
@Override
public ResultBean<FinCollectionConfirmationRskVo> rskDetails(String sid) {
return finCollectionConfirmationService.rskDetails(sid);
}
/**
* 手机端—获取款项确认列表

380
anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/fincollectionconfirmation/FinCollectionConfirmationService.java
View File

@ -29,14 +29,10 @@ import cn.hutool.core.bean.BeanUtil;
import cn.hutool.core.date.DateUtil;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.google.common.util.concurrent.ThreadFactoryBuilder;
import com.yxt.anrui.base.api.basepurchasesystem.BasePurchaseSystemDetailsVo;
import com.yxt.anrui.base.api.basepurchasesystem.BasePurchaseSystemFeign;
import com.yxt.anrui.base.api.basetrailer.BaseTrailerDetailsVo;
import com.yxt.anrui.base.api.basetrailer.BaseTrailerFeign;
import com.yxt.anrui.base.api.basevehicle.BaseVehicle;
import com.yxt.anrui.base.api.basevehicle.BaseVehicleFeign;
import com.yxt.anrui.base.api.basevehiclestate.BaseVehicleStateDto;
import com.yxt.anrui.base.api.basevehiclestate.BaseVehicleStateEnum;
import com.yxt.anrui.base.api.basevehiclestate.BaseVehicleStateFeign;
@ -45,67 +41,36 @@ import com.yxt.anrui.base.api.commonappendix.*;
import com.yxt.anrui.base.api.commoncontract.CommonContract;
import com.yxt.anrui.base.api.commoncontract.CommonContractFeign;
import com.yxt.anrui.base.common.enums.BillTypeEnum;
import com.yxt.anrui.base.common.enums.VehicleStateTempOrLast;
import com.yxt.anrui.base.common.utils.Rule;
import com.yxt.anrui.base.common.utils.domain.BillNo;
import com.yxt.anrui.buscenter.api.busarrearscarryvehicleapply.BusArrearsCarryVehicleApplyFeign;
import com.yxt.anrui.buscenter.api.busarrearscarryvehicleapply.BusArrearsCarryVehicleApplyVo;
import com.yxt.anrui.buscenter.api.busbillapplication.BusBillApplication;
import com.yxt.anrui.buscenter.api.busbillapplication.BusBillApplicationFeign;
import com.yxt.anrui.buscenter.api.busbilltrailer.BusBillTrailerFeign;
import com.yxt.anrui.buscenter.api.busbilltrailer.BusBillTrailerVo;
import com.yxt.anrui.buscenter.api.busbillvehicle.BusBillVehicleFeign;
import com.yxt.anrui.buscenter.api.busbillvehicle.BusBillVehicleVo;
import com.yxt.anrui.buscenter.api.busdelivered.BusDelivered;
import com.yxt.anrui.buscenter.api.busdelivered.BusDeliveredDto;
import com.yxt.anrui.buscenter.api.busdelivered.BusDeliveredFeign;
import com.yxt.anrui.buscenter.api.busdeposit.AppBusDepositBuscenterDetailVo;
import com.yxt.anrui.buscenter.api.busdeposit.BusDepositFeign;
import com.yxt.anrui.buscenter.api.bussalesorder.BusSalesOrder;
import com.yxt.anrui.buscenter.api.bussalesorder.BusSalesOrderFeign;
import com.yxt.anrui.buscenter.api.bussalesorder.app.order.AppOrderDepositInfoVo;
import com.yxt.anrui.buscenter.api.bussalesorder.app.order.AppOrderDetailsVo;
import com.yxt.anrui.buscenter.api.bussalesorder.app.order.AppOrderModelInfoVo;
import com.yxt.anrui.buscenter.api.bussalesorder.app.order.AppOrderPriceInfoVo;
import com.yxt.anrui.buscenter.api.bussalesordersubmit.SubmitVo;
import com.yxt.anrui.buscenter.api.bussalesordervehicle.BusSalesOrderVehicle;
import com.yxt.anrui.buscenter.api.bussalesordervehicle.BusSalesOrderVehicleFeign;
import com.yxt.anrui.buscenter.api.busvalcustfiling.BusValcustFiling;
import com.yxt.anrui.buscenter.api.busvalcustfiling.BusValcustFilingFeign;
import com.yxt.anrui.crm.api.crmcustomertemp.*;
import com.yxt.anrui.fin.api.finbillapplication.FinBillApplication;
import com.yxt.anrui.fin.api.finbilltrailer.FinBillTrailerVo;
import com.yxt.anrui.fin.api.finbillvehicle.FinBillVehicleVo;
import com.yxt.anrui.fin.api.fincollectionconfirmation.*;
import com.yxt.anrui.fin.api.fincollectionconfirmation.app.AppBusArrearsCarryMoneyVo;
import com.yxt.anrui.fin.api.fincollectionconfirmation.app.FinConfirmDto;
import com.yxt.anrui.fin.api.fincollectionconfirmation.app.FinSelectDto;
import com.yxt.anrui.fin.api.fincompanyinvoicing.FinCompanyInvoicingDetailsVo;
import com.yxt.anrui.fin.api.fincollectionconfirmation.rsk.FinCollectionConfirmationRskDto;
import com.yxt.anrui.fin.api.fincollectionconfirmation.rsk.FinCollectionConfirmationRskVo;
import com.yxt.anrui.fin.api.fincollectionconfirmation.rsk.FinSelectedReceivablesDetailedRsk;
import com.yxt.anrui.fin.api.finselectedreceivablesdetailed.*;
import com.yxt.anrui.fin.api.finuncollectedreceivablesdetailed.AppFinUncollectedReceivablesDetailedVo;
import com.yxt.anrui.fin.api.finuncollectedreceivablesdetailed.FinUncollectedReceivablesDetailed;
import com.yxt.anrui.fin.api.finvehicleinvoice.FinVehicleInvoiceDto;
import com.yxt.anrui.fin.api.kingdee.FinKingDeeFeign;
import com.yxt.anrui.fin.api.kingdee.arreceivable.ARReceivable;
import com.yxt.anrui.fin.api.finuncollectedreceivablesdetailedjr.FinUncollectedReceivablesDetailedJR;
import com.yxt.anrui.fin.api.kingdee.arreceivebill.ARReceivebill;
import com.yxt.anrui.fin.api.kingdee.bdcustomer.BdCustomer;
import com.yxt.anrui.fin.api.kingdee.capitalcreditresult.CapitalCreditResult;
import com.yxt.anrui.fin.api.kingdee.capitalcreditresult.CwSystemYT;
import com.yxt.anrui.fin.biz.finbillapplication.FinBillApplicationService;
import com.yxt.anrui.fin.biz.finbilltrailer.FinBillTrailerService;
import com.yxt.anrui.fin.biz.finbillvehicle.FinBillVehicleService;
import com.yxt.anrui.fin.biz.fincompanyinvoicing.FinCompanyInvoicingService;
import com.yxt.anrui.fin.biz.finfundscarriedforwardveh.FinFundsCarriedForwardVehService;
import com.yxt.anrui.fin.biz.finselectedreceivablesdetailed.FinSelectedReceivablesDetailedService;
import com.yxt.anrui.fin.biz.finuncollectedreceivablesdetailed.FinUncollectedReceivablesDetailedService;
import com.yxt.anrui.fin.biz.finvehicleinvoice.FinVehicleInvoiceService;
import com.yxt.anrui.fin.biz.finuncollectedreceivablesdetailedjr.FinUncollectedReceivablesDetailedJRService;
import com.yxt.anrui.fin.biz.kingdee.FinKingDeeService;
import com.yxt.anrui.fin.biz.kingdee.arreceivebill.ArReceivebillService;
import com.yxt.anrui.fin.biz.kingdee.bdcustomer.BdCustomerService;
import com.yxt.anrui.fin.biz.kingdee.capitalcreditresult.OtherReceivableBillCreditResultService;
import com.yxt.anrui.fin.biz.kingdee.receivablebill.ReceivableBillService;
import com.yxt.anrui.portal.api.dictcommon.DictCommonFeign;
import com.yxt.anrui.portal.api.dictcommon.DictCommonVo;
import com.yxt.anrui.portal.api.sysorganization.SysOrganizationFeign;
import com.yxt.anrui.portal.api.sysorganization.SysOrganizationVo;
import com.yxt.anrui.portal.api.sysstafforg.SysStaffOrg;
@ -119,9 +84,9 @@ import com.yxt.anrui.riskcenter.api.loandiffdetails.LoanDiffDetailssDto;
import com.yxt.anrui.riskcenter.api.loanfinbank.LoanFinBank;
import com.yxt.anrui.riskcenter.api.loanfinotherPolicy.LoanFinOtherPolicy;
import com.yxt.anrui.riskcenter.api.loanfinpolicy.LoanFinPolicy;
import com.yxt.anrui.riskcenter.api.loanrepaymentplandetails.LoanRepaymentPlanDetails;
import com.yxt.anrui.riskcenter.api.loanrepaymentplandetails.LoanRepaymentPlanDetailsFeign;
import com.yxt.anrui.riskcenter.api.loansolutions.LoanSolutions;
import com.yxt.anrui.riskcenter.api.loansolutions.LoanSolutionsFeign;
import com.yxt.anrui.riskcenter.api.loansolutions.app.SolutionsDetailsVo;
import com.yxt.anrui.riskcenter.api.loansolutionsdetail.LoanSolutionsDetail;
import com.yxt.anrui.riskcenter.api.loansolutionsotherpolicy.LoanSolutionsOtherpolicy;
import com.yxt.common.base.config.component.FileUploadComponent;
@ -142,7 +107,6 @@ import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
import java.math.BigDecimal;
import java.text.SimpleDateFormat;
import java.util.*;
import java.util.concurrent.*;
import java.util.stream.Collectors;
@ -203,6 +167,10 @@ public class FinCollectionConfirmationService extends MybatisBaseService<FinColl
private OtherReceivableBillCreditResultService creditResultService;
@Autowired
private DictCommonFeign dictCommonFeign;
@Autowired
private LoanRepaymentPlanDetailsFeign loanRepaymentPlanDetailsFeign;
@Autowired
private FinUncollectedReceivablesDetailedJRService finUncollectedReceivablesDetailedJRService;
private QueryWrapper<FinCollectionConfirmation> createQueryWrapper(FinCollectionConfirmationQuery query) {
// todo: 这里根据具体业务调整查询条件
@ -1007,7 +975,7 @@ public class FinCollectionConfirmationService extends MybatisBaseService<FinColl
return rb.setMsg("该申请不存在");
}
List<AppFinSelectedReceivablesDetailedDto> finSelectedReceivablesDetailedDtos = dto.getContractList();
if(finSelectedReceivablesDetailedDtos.isEmpty()){
if (finSelectedReceivablesDetailedDtos.isEmpty()) {
return rb.setMsg("请添加认款信息");
}
List<AppFinSelectedReceivablesDetailedDto> dingList = finSelectedReceivablesDetailedDtos.stream()
@ -1608,7 +1576,7 @@ public class FinCollectionConfirmationService extends MybatisBaseService<FinColl
finSelectedReceivablesDetailedService.tskpgl(v);
//ToDo:查询是否符合待出库的条件
//该合同编号下的该车架号的所有认款金额
if("2".equals(finUncollectedReceivablesDetailed.getPayTypeKey())){
if ("2".equals(finUncollectedReceivablesDetailed.getPayTypeKey())) {
List<FinSelectedReceivablesDetailedVo> voList = finSelectedReceivablesDetailedService.selectListByVin1(v.getContractNo(), finUncollectedReceivablesDetailed.getBusVinSid(), 3);
BigDecimal bigDecimalVinAll = voList.stream().map(FinSelectedReceivablesDetailedVo::getSubscriptionMoney).map(BigDecimal::new).reduce(BigDecimal.ZERO, BigDecimal::add);
List<FinUncollectedReceivablesDetailed> unList = finUncollectedReceivablesDetailedService.selectListByBusVinSid1(finUncollectedReceivablesDetailed.getBusVinSid());
@ -1622,7 +1590,7 @@ public class FinCollectionConfirmationService extends MybatisBaseService<FinColl
baseVehicleStateDto.setBusSid(finUncollectedReceivablesDetailed.getBusVinSid());
dtoList.add(baseVehicleStateDto);
}
}else{
} else {
List<FinSelectedReceivablesDetailedVo> voList = finSelectedReceivablesDetailedService.selectListByVin(v.getContractNo(), finUncollectedReceivablesDetailed.getBusVinSid(), 3);
BigDecimal bigDecimalVinAll = voList.stream().map(FinSelectedReceivablesDetailedVo::getSubscriptionMoney).map(BigDecimal::new).reduce(BigDecimal.ZERO, BigDecimal::add);
List<FinUncollectedReceivablesDetailed> unList = finUncollectedReceivablesDetailedService.selectListByBusVinSid(finUncollectedReceivablesDetailed.getBusVinSid());
@ -1692,7 +1660,7 @@ public class FinCollectionConfirmationService extends MybatisBaseService<FinColl
return rb.success().setMsg("款项确认成功");
}
public void pushLoanDiff(FinCollectionConfirmation confirmation){
public void pushLoanDiff(FinCollectionConfirmation confirmation) {
String sid = confirmation.getSid();
/**
* 查询该申请是否有融资放款款项的明细，若有
@ -1705,7 +1673,7 @@ public class FinCollectionConfirmationService extends MybatisBaseService<FinColl
*/
List<FinSelectedReceivablesDetailed> finLi = finSelectedReceivablesDetailedService.selectLiBy(sid);
finLi.removeAll(Collections.singleton(null));
if(!finLi.isEmpty()){
if (!finLi.isEmpty()) {
LoanDiffsDto loanDiffsDto = new LoanDiffsDto();
loanDiffsDto.setCreateByName(confirmation.getCreateByName());
loanDiffsDto.setCreateBySid(confirmation.getCreateBySid());
@ -1728,24 +1696,24 @@ public class FinCollectionConfirmationService extends MybatisBaseService<FinColl
LoanFinPolicy loanFinPolicy = null;
LoanFinOtherPolicy loanFinOtherPolicy = null;
boolean isTue = false;
if(loanSolutions != null){
if (loanSolutions != null) {
loanSolutionsDetail = baseMapper.selectByLoanSid(loanSolutions.getSid());
loanSolutionsOtherpolicy = baseMapper.selectBySoluSid(loanSolutions.getSid());
if (loanSolutionsDetail.getBondAmounts() != null) {
bigAdd = bigAdd.add(loanSolutionsDetail.getBondAmounts());
}
if(loanSolutions.getFactoryDiscount() != null){
if (loanSolutions.getFactoryDiscount() != null) {
bigAdd = bigAdd.add(loanSolutions.getActualDiscount());
}
if(loanSolutionsOtherpolicy != null){
if(loanSolutionsOtherpolicy.getOtherDiscount() != null){
if (loanSolutionsOtherpolicy != null) {
if (loanSolutionsOtherpolicy.getOtherDiscount() != null) {
bigAdd = bigAdd.add(loanSolutionsOtherpolicy.getOtherActualDiscount());
}
}
if(loanSolutionsDetail != null){
if(loanSolutionsDetail.getProxyAccidentPremium() != null){
if (loanSolutionsDetail != null) {
if (loanSolutionsDetail.getProxyAccidentPremium() != null) {
bigAdd = bigAdd.add(loanSolutionsDetail.getProxyAccidentPremium());
}
}
@ -1753,25 +1721,25 @@ public class FinCollectionConfirmationService extends MybatisBaseService<FinColl
loanFinPolicy = baseMapper.selectBySoll(loanSolutions.getPolicySid());
loanFinOtherPolicy = baseMapper.selectByOtherSid(loanSolutionsOtherpolicy.getOtherPolicySid());
if(loanFinOtherPolicy != null){
if(!loanFinPolicy.getBankSid().equals(loanFinOtherPolicy.getBankSid())){
isTue =true;
if (loanFinOtherPolicy != null) {
if (!loanFinPolicy.getBankSid().equals(loanFinOtherPolicy.getBankSid())) {
isTue = true;
}
}
}
BigDecimal decimalAll = new BigDecimal(finUncollectedReceivablesDetailed.getReveivableMoney()).subtract(finSelectedReceivablesDetailed.getSubscriptionMoney());
if(finSelectedReceivablesDetailed.getSubscriptionMoney().compareTo(new BigDecimal(finUncollectedReceivablesDetailed.getReveivableMoney())) != 0){
if (finSelectedReceivablesDetailed.getSubscriptionMoney().compareTo(new BigDecimal(finUncollectedReceivablesDetailed.getReveivableMoney())) != 0) {
//有差额
if(isTue){//不一致
if (isTue) {//不一致
//根据busVinSid查询融资放款的是否已认完款，若已认完，则推送，若未认完则不推送
List<FinSelectedReceivablesDetailedVo> voList = finSelectedReceivablesDetailedService.selectListByVin2(finUncollectedReceivablesDetailed.getContractNo(), finUncollectedReceivablesDetailed.getBusVinSid(), 3);
BigDecimal bigDecimalVinAll = voList.stream().map(FinSelectedReceivablesDetailedVo::getSubscriptionMoney).map(BigDecimal::new).reduce(BigDecimal.ZERO, BigDecimal::add);
List<FinUncollectedReceivablesDetailed> unList = finUncollectedReceivablesDetailedService.selectListByBusVinSid2(finUncollectedReceivablesDetailed.getBusVinSid());
BigDecimal unDecimalVinAll = unList.stream().map(FinUncollectedReceivablesDetailed::getReveivableMoney).map(BigDecimal::new).reduce(BigDecimal.ZERO, BigDecimal::add);
if(bigDecimalVinAll.compareTo(unDecimalVinAll) == 0){//认完
if(bigAdd.compareTo(decimalAll) != 0){//不相等，推送放款差额确认待办
if (bigDecimalVinAll.compareTo(unDecimalVinAll) == 0) {//认完
if (bigAdd.compareTo(decimalAll) != 0) {//不相等，推送放款差额确认待办
LoanDiffDetailssDto loanDiffDetailssDto = new LoanDiffDetailssDto();
loanDiffDetailssDto.setBankSid(loanFinPolicy.getBankSid());
loanDiffDetailssDto.setBankName(loanFinPolicy.getBankShortName());
@ -1789,9 +1757,9 @@ public class FinCollectionConfirmationService extends MybatisBaseService<FinColl
loanDiffDetailssDto.setBusVinSid(busSalesOrderVehicle.getSid());
loanDiffDetailssDtos.add(loanDiffDetailssDto);
loanDiffsDto.setLoanDiffDetailssDtos(loanDiffDetailssDtos);
}else{
} else {
CapitalCreditResult creditResult = new CapitalCreditResult();
if(loanFinPolicy != null){
if (loanFinPolicy != null) {
LoanFinBank loanFinBank = baseMapper.selectByBankSid(loanFinPolicy.getBankSid());
creditResult.setBankName(loanFinBank.getBankNo());
}
@ -1832,14 +1800,14 @@ public class FinCollectionConfirmationService extends MybatisBaseService<FinColl
List<CapitalCreditResult.CapitalCreditResultDetailDto> collectionDetailDtoListOne = new ArrayList<>();
SysOrganizationVo sysOrganizationVo2 = sysOrganizationFeign.fetchBySid(busSalesOrder.getOrgSid()).getData();
if (loanSolutions.getBondAmount() != null) {//贷款保证金
if(loanSolutions.getBondAmount().compareTo(BigDecimal.ZERO) != 0){
if (loanSolutions.getBondAmount().compareTo(BigDecimal.ZERO) != 0) {
CapitalCreditResult.CapitalCreditResultDetailDto creditResultDetailDto = new CapitalCreditResult.CapitalCreditResultDetailDto();
creditResultDetailDto.setDearDept(sysOrganizationVo2.getOrgCode());
creditResultDetailDto.setExTaxMoney("-" + loanSolutions.getBondAmount().toString());
creditResultDetailDto.setUseTo(CwSystemYT.BOND_AMOUNTS.getType());
creditResultDetailDto.setRemarks(CwSystemYT.BOND_AMOUNTS.getMark());
if(baseVehicle != null){
String vinNo = baseVehicle.getVinNo().substring(baseVehicle.getVinNo().length() - 8);
if (baseVehicle != null) {
String vinNo = baseVehicle.getVinNo().substring(baseVehicle.getVinNo().length() - 8);
creditResultDetailDto.setMaterialNo(vinNo);
}
collectionDetailDtoListOne.add(creditResultDetailDto);
@ -1847,13 +1815,13 @@ public class FinCollectionConfirmationService extends MybatisBaseService<FinColl
}
if (loanSolutions.getActualDiscount() != null) {//主产品厂家贴息
if(loanSolutions.getActualDiscount().compareTo(BigDecimal.ZERO) != 0){
if (loanSolutions.getActualDiscount().compareTo(BigDecimal.ZERO) != 0) {
CapitalCreditResult.CapitalCreditResultDetailDto creditResultDetailDto = new CapitalCreditResult.CapitalCreditResultDetailDto();
creditResultDetailDto.setDearDept(sysOrganizationVo2.getOrgCode());
creditResultDetailDto.setExTaxMoney("-" + loanSolutions.getActualDiscount().toString());
creditResultDetailDto.setUseTo(CwSystemYT.SANFANG_TIEXI_DIECHEKUAN.getType());
creditResultDetailDto.setRemarks(CwSystemYT.SANFANG_TIEXI_DIECHEKUAN.getMark());
if(baseVehicle != null){
if (baseVehicle != null) {
String vinNo = baseVehicle.getVinNo().substring(baseVehicle.getVinNo().length() - 8);
creditResultDetailDto.setMaterialNo(vinNo);
}
@ -1862,13 +1830,13 @@ public class FinCollectionConfirmationService extends MybatisBaseService<FinColl
}
if (loanSolutionsOtherpolicy.getOtherActualDiscount() != null) {//其他融厂家贴息
if(loanSolutionsOtherpolicy.getOtherActualDiscount().compareTo(BigDecimal.ZERO) != 0){
if (loanSolutionsOtherpolicy.getOtherActualDiscount().compareTo(BigDecimal.ZERO) != 0) {
CapitalCreditResult.CapitalCreditResultDetailDto creditResultDetailDto = new CapitalCreditResult.CapitalCreditResultDetailDto();
creditResultDetailDto.setDearDept(sysOrganizationVo2.getOrgCode());
creditResultDetailDto.setExTaxMoney("-" + loanSolutionsOtherpolicy.getOtherActualDiscount().toString());
creditResultDetailDto.setUseTo(CwSystemYT.SANFANG_TIEXI_DIECHEKUAN.getType());
creditResultDetailDto.setRemarks(CwSystemYT.SANFANG_TIEXI_DIECHEKUAN.getMark());
if(baseVehicle != null){
if (baseVehicle != null) {
String vinNo = baseVehicle.getVinNo().substring(baseVehicle.getVinNo().length() - 8);
creditResultDetailDto.setMaterialNo(vinNo);
}
@ -1877,13 +1845,13 @@ public class FinCollectionConfirmationService extends MybatisBaseService<FinColl
}
if (loanSolutionsDetail.getProxyAccidentPremium() != null) {//意外险
if(loanSolutionsDetail.getProxyAccidentPremium().compareTo(BigDecimal.ZERO) != 0){
if (loanSolutionsDetail.getProxyAccidentPremium().compareTo(BigDecimal.ZERO) != 0) {
CapitalCreditResult.CapitalCreditResultDetailDto creditResultDetailDto = new CapitalCreditResult.CapitalCreditResultDetailDto();
creditResultDetailDto.setDearDept(sysOrganizationVo2.getOrgCode());
creditResultDetailDto.setExTaxMoney("-" + loanSolutionsDetail.getProxyAccidentPremium().toString());
creditResultDetailDto.setUseTo(CwSystemYT.PROXY_ACCIDENT_PREMIUM.getType());
creditResultDetailDto.setRemarks(CwSystemYT.PROXY_ACCIDENT_PREMIUM.getMark());
if(baseVehicle != null){
if (baseVehicle != null) {
String vinNo = baseVehicle.getVinNo().substring(baseVehicle.getVinNo().length() - 8);
creditResultDetailDto.setMaterialNo(vinNo);
}
@ -1897,8 +1865,8 @@ public class FinCollectionConfirmationService extends MybatisBaseService<FinColl
finUncollectedReceivablesDetailedService.updateById(finUncollectedReceivablesDetailed);
}
}
}else{
if(bigAdd.compareTo(decimalAll) != 0){//不相等，推送放款差额确认待办
} else {
if (bigAdd.compareTo(decimalAll) != 0) {//不相等，推送放款差额确认待办
LoanDiffDetailssDto loanDiffDetailssDto = new LoanDiffDetailssDto();
loanDiffDetailssDto.setBankSid(loanFinPolicy.getBankSid());
loanDiffDetailssDto.setBankName(loanFinPolicy.getBankShortName());
@ -1916,9 +1884,9 @@ public class FinCollectionConfirmationService extends MybatisBaseService<FinColl
loanDiffDetailssDto.setBusVinSid(busSalesOrderVehicle.getSid());
loanDiffDetailssDtos.add(loanDiffDetailssDto);
loanDiffsDto.setLoanDiffDetailssDtos(loanDiffDetailssDtos);
}else{
} else {
CapitalCreditResult creditResult = new CapitalCreditResult();
if(loanFinPolicy != null){
if (loanFinPolicy != null) {
LoanFinBank loanFinBank = baseMapper.selectByBankSid(loanFinPolicy.getBankSid());
creditResult.setBankName(loanFinBank.getBankNo());
}
@ -1959,13 +1927,13 @@ public class FinCollectionConfirmationService extends MybatisBaseService<FinColl
List<CapitalCreditResult.CapitalCreditResultDetailDto> collectionDetailDtoListOne = new ArrayList<>();
SysOrganizationVo sysOrganizationVo2 = sysOrganizationFeign.fetchBySid(busSalesOrder.getOrgSid()).getData();
if (loanSolutions.getBondAmount() != null) {//贷款保证金
if(loanSolutions.getBondAmount().compareTo(BigDecimal.ZERO) != 0){
if (loanSolutions.getBondAmount().compareTo(BigDecimal.ZERO) != 0) {
CapitalCreditResult.CapitalCreditResultDetailDto creditResultDetailDto = new CapitalCreditResult.CapitalCreditResultDetailDto();
creditResultDetailDto.setDearDept(sysOrganizationVo2.getOrgCode());
creditResultDetailDto.setExTaxMoney("-" + loanSolutions.getBondAmount().toString());
creditResultDetailDto.setUseTo(CwSystemYT.BOND_AMOUNTS.getType());
creditResultDetailDto.setRemarks(CwSystemYT.BOND_AMOUNTS.getMark());
if(baseVehicle != null){
if (baseVehicle != null) {
String vinNo = baseVehicle.getVinNo().substring(baseVehicle.getVinNo().length() - 8);
creditResultDetailDto.setMaterialNo(vinNo);
}
@ -1974,13 +1942,13 @@ public class FinCollectionConfirmationService extends MybatisBaseService<FinColl
}
if (loanSolutions.getActualDiscount() != null) {//主产品厂家贴息
if(loanSolutions.getActualDiscount().compareTo(BigDecimal.ZERO) != 0){
if (loanSolutions.getActualDiscount().compareTo(BigDecimal.ZERO) != 0) {
CapitalCreditResult.CapitalCreditResultDetailDto creditResultDetailDto = new CapitalCreditResult.CapitalCreditResultDetailDto();
creditResultDetailDto.setDearDept(sysOrganizationVo2.getOrgCode());
creditResultDetailDto.setExTaxMoney("-" + loanSolutions.getActualDiscount().toString());
creditResultDetailDto.setUseTo(CwSystemYT.SANFANG_TIEXI_DIECHEKUAN.getType());
creditResultDetailDto.setRemarks(CwSystemYT.SANFANG_TIEXI_DIECHEKUAN.getMark());
if(baseVehicle != null){
if (baseVehicle != null) {
String vinNo = baseVehicle.getVinNo().substring(baseVehicle.getVinNo().length() - 8);
creditResultDetailDto.setMaterialNo(vinNo);
}
@ -1989,13 +1957,13 @@ public class FinCollectionConfirmationService extends MybatisBaseService<FinColl
}
if (loanSolutionsOtherpolicy.getOtherActualDiscount() != null) {//其他融厂家贴息
if(loanSolutionsOtherpolicy.getOtherActualDiscount().compareTo(BigDecimal.ZERO) != 0){
if (loanSolutionsOtherpolicy.getOtherActualDiscount().compareTo(BigDecimal.ZERO) != 0) {
CapitalCreditResult.CapitalCreditResultDetailDto creditResultDetailDto = new CapitalCreditResult.CapitalCreditResultDetailDto();
creditResultDetailDto.setDearDept(sysOrganizationVo2.getOrgCode());
creditResultDetailDto.setExTaxMoney("-" + loanSolutionsOtherpolicy.getOtherActualDiscount().toString());
creditResultDetailDto.setUseTo(CwSystemYT.SANFANG_TIEXI_DIECHEKUAN.getType());
creditResultDetailDto.setRemarks(CwSystemYT.SANFANG_TIEXI_DIECHEKUAN.getMark());
if(baseVehicle != null){
if (baseVehicle != null) {
String vinNo = baseVehicle.getVinNo().substring(baseVehicle.getVinNo().length() - 8);
creditResultDetailDto.setMaterialNo(vinNo);
}
@ -2004,13 +1972,13 @@ public class FinCollectionConfirmationService extends MybatisBaseService<FinColl
}
if (loanSolutionsDetail.getProxyAccidentPremium() != null) {//意外险
if(loanSolutionsDetail.getProxyAccidentPremium().compareTo(BigDecimal.ZERO) != 0){
if (loanSolutionsDetail.getProxyAccidentPremium().compareTo(BigDecimal.ZERO) != 0) {
CapitalCreditResult.CapitalCreditResultDetailDto creditResultDetailDto = new CapitalCreditResult.CapitalCreditResultDetailDto();
creditResultDetailDto.setDearDept(sysOrganizationVo2.getOrgCode());
creditResultDetailDto.setExTaxMoney("-" + loanSolutionsDetail.getProxyAccidentPremium().toString());
creditResultDetailDto.setUseTo(CwSystemYT.PROXY_ACCIDENT_PREMIUM.getType());
creditResultDetailDto.setRemarks(CwSystemYT.PROXY_ACCIDENT_PREMIUM.getMark());
if(baseVehicle != null){
if (baseVehicle != null) {
String vinNo = baseVehicle.getVinNo().substring(baseVehicle.getVinNo().length() - 8);
creditResultDetailDto.setMaterialNo(vinNo);
}
@ -2027,12 +1995,12 @@ public class FinCollectionConfirmationService extends MybatisBaseService<FinColl
}
}else{
} else {
//无差额
}
}
if(!loanDiffDetailssDtos.isEmpty()){
if (!loanDiffDetailssDtos.isEmpty()) {
//推送待办
ResultBean resultBean = loanDiffFeign.save(loanDiffsDto);
}
@ -2329,7 +2297,7 @@ public class FinCollectionConfirmationService extends MybatisBaseService<FinColl
freceivebillentry.setFPURPOSEIDType("cw_skyt");
freceivebillentry.setFACCOUNTID(confirmation.getCollectionBankNum());
LoanFinBank loanFinBank = baseMapper.selectFinBnk(vvvv.getContractNo());
if(loanFinBank != null){
if (loanFinBank != null) {
freceivebillentry.setF_PAEZ_Base(loanFinBank.getBankNo());//资方编码
}
fEntityList.add(freceivebillentry);
@ -3350,4 +3318,242 @@ public class FinCollectionConfirmationService extends MybatisBaseService<FinColl
public String getBalance(String busSid) {
return baseMapper.getBalance(busSid);
}
public ResultBean saveRsk(FinCollectionConfirmationRskDto dto) {
ResultBean rb = ResultBean.fireFail();
String sid = dto.getSid();
if (StringUtils.isBlank(sid)) {
//首次认款
List<FinSelectedReceivablesDetailedRsk> finSelectedReceivablesDetailedDtos = dto.getFinSelectedReceivablesDetaileds();
if (finSelectedReceivablesDetailedDtos.size() > 0) {
for (FinSelectedReceivablesDetailedRsk v : finSelectedReceivablesDetailedDtos) {
if (StringUtils.isBlank(v.getSubscriptionMoney())) {
return rb.setMsg("认款金额不允许为空");
}
}
}
BigDecimal subscriptionMoneyAll = finSelectedReceivablesDetailedDtos.stream().map(FinSelectedReceivablesDetailedRsk::getSubscriptionMoney).map(BigDecimal::new).reduce(BigDecimal.ZERO, BigDecimal::add);
if (subscriptionMoneyAll.compareTo(StringUtils.isNotBlank(dto.getCollectionMoney()) ? new BigDecimal(dto.getCollectionMoney()) : BigDecimal.ZERO) != 0) {
return rb.setMsg("认款总额与收款金额不符");
}
//打款凭证附件
List<FinCollectionConfirmationAppendixDto> paymentVoucherAppendixs = dto.getPaymentVoucherAppendixs();
//汇款确认书附件
List<FinCollectionConfirmationAppendixDto> remittanceConfirmationAppendixs = dto.getRemittanceConfirmationAppendixs();
List<String> stringList = finSelectedReceivablesDetailedDtos.stream().map(v -> v.getReceivablesSid()).collect(Collectors.toList());
stringList.removeAll(Collections.singleton(null));
if (!stringList.isEmpty()) {
List<String> stringList1 = stringList.stream().distinct().collect(Collectors.toList());
if (stringList.size() != stringList1.size()) {
return rb.setMsg("认款选择的数据存在问题，请检查是否重复");
}
}
//根据用户sid查询分公司sid
String useOrgSid = "";
if (StringUtils.isNotBlank(dto.getOrgPath())) {
useOrgSid = sysStaffOrgFeign.getOrgSidByPath(dto.getOrgPath()).getData();
} else {
useOrgSid = sysStaffOrgFeign.getPathSidByUserSid(dto.getUserSid()).getData();
}
//对收款申请进行赋值操作
FinCollectionConfirmation finCollectionConfirmation = new FinCollectionConfirmation();
BeanUtil.copyProperties(dto, finCollectionConfirmation, "sid");
finCollectionConfirmation.setSource("02");
// if (StringUtils.isBlank(finCollectionConfirmation.getStaffUserSid())) {
// //收款
// finCollectionConfirmation.setStaffName(finCollectionConfirmation.getCreateByName());
// finCollectionConfirmation.setStaffUserSid(dto.getUserSid());
// finCollectionConfirmation.setStaffDeptName(finCollectionConfirmation.getCreateDept());
// finCollectionConfirmation.setStaffDeptSid(finCollectionConfirmation.getCreateDeptSid());
// String orgPath = dto.getOrgPath();
// finCollectionConfirmation.setOrgSidPath(orgPath);
// ResultBean<SysOrganizationVo> sysOrganizationVoResultBean = sysOrganizationFeign.fetchBySid(useOrgSid);
// if (sysOrganizationVoResultBean.getData() != null) {
// finCollectionConfirmation.setUseOrgName(sysOrganizationVoResultBean.getData().getName());
// }
// } else
// {
//代收款
String orgPath = dto.getOrgPath();
finCollectionConfirmation.setOrgSidPath(orgPath);
ResultBean<SysOrganizationVo> sysOrganizationVoResultBean = sysOrganizationFeign.fetchBySid(useOrgSid);
if (sysOrganizationVoResultBean.getData() != null) {
finCollectionConfirmation.setUseOrgName(sysOrganizationVoResultBean.getData().getName());
}
// List<String> orgList = Arrays.asList(orgPath.split("/"));
// orgList.set(orgList.size() - 1, dto.getStaffDeptSid());
// finCollectionConfirmation.setOrgSidPath(String.join("/", orgList));
// }
sid = finCollectionConfirmation.getSid();
finCollectionConfirmation.setCreateBySid(dto.getUserSid());
finCollectionConfirmation.setUseOrgSid(useOrgSid);
//附件保存:打款凭证附件
paymentVoucherAppendixs.stream().forEach(v -> {
CommonAppendixDto commonAppendixDto = new CommonAppendixDto();
BeanUtil.copyProperties(v, commonAppendixDto);
String s = commonAppendixDto.getFilePath();
if (s.contains(fileUploadComponent.getUrlPrefix())) {
s = s.replace(fileUploadComponent.getUrlPrefix(), "");
}
commonAppendixDto.setLinkSid(finCollectionConfirmation.getSid());
commonAppendixDto.setFilePath(s);
commonAppendixDto.setCreateBySid(dto.getUserSid());
commonAppendixDto.setAttachType(CommonAttachTypeEnum.PAYMENT_VOUCHER.getAttachType());
commonAppendixFeign.save(commonAppendixDto);
});
String payFilePath = paymentVoucherAppendixs.stream().map(v -> v.getFilePath().replace(fileUploadComponent.getUrlPrefix(), "")).collect(Collectors.joining(","));
finCollectionConfirmation.setPaymentVoucherUrl(payFilePath);
//汇款确认书附件保存
remittanceConfirmationAppendixs.stream().forEach(v -> {
CommonAppendixDto commonAppendixDto = new CommonAppendixDto();
BeanUtil.copyProperties(v, commonAppendixDto);
String s = commonAppendixDto.getFilePath();
if (s.contains(fileUploadComponent.getUrlPrefix())) {
s = s.replace(fileUploadComponent.getUrlPrefix(), "");
}
commonAppendixDto.setLinkSid(finCollectionConfirmation.getSid());
commonAppendixDto.setFilePath(s);
commonAppendixDto.setCreateBySid(dto.getUserSid());
commonAppendixDto.setAttachType(CommonAttachTypeEnum.REMITTAN_CECONFIRMATION.getAttachType());
commonAppendixFeign.save(commonAppendixDto);
});
String remFilePath = remittanceConfirmationAppendixs.stream().map(v -> v.getFilePath().replace(fileUploadComponent.getUrlPrefix(), "")).collect(Collectors.joining(","));
finCollectionConfirmation.setRemittanceConfirmationUrl(remFilePath);
if (finSelectedReceivablesDetailedDtos.size() > 0) {
//认款明细保存
String finalSid = sid;
String finalUseOrgSid = useOrgSid;
finSelectedReceivablesDetailedDtos.stream().forEach(v -> {//已选
FinSelectedReceivablesDetailed finSelectedReceivablesDetailed = new FinSelectedReceivablesDetailed();
// BeanUtil.copyProperties(v, finSelectedReceivablesDetailed, "sid");
if (StringUtils.isNotBlank(v.getVinNo())) {
String[] splitVin = v.getVinNo().split("/");
finSelectedReceivablesDetailed.setVIN(splitVin[0]);
}
if (StringUtils.isNotBlank(v.getReceivablesName())) {
finSelectedReceivablesDetailed.setReceivablesName(v.getReceivablesName());
}
if (StringUtils.isNotBlank(v.getSubscriptionMoney())) {
finSelectedReceivablesDetailed.setSubscriptionMoney(new BigDecimal(v.getSubscriptionMoney()));
}
finSelectedReceivablesDetailed.setReceivablesSid(v.getReceivablesSid());
finSelectedReceivablesDetailed.setCollSid(finalSid);
finSelectedReceivablesDetailed.setUseOrgSid(finalUseOrgSid);
finSelectedReceivablesDetailed.setPurchaseSystemSid(finCollectionConfirmation.getPurchaseSystemSid());
finSelectedReceivablesDetailed.setPurchaseSystemName(finCollectionConfirmation.getPurchaseSystemName());
//设置审核状态为待审核(1待审核/2已驳回/3已审核)
finSelectedReceivablesDetailed.setAuditState(1);
finSelectedReceivablesDetailed.setCreateBySid(dto.getUserSid());
//认款日期默认为当天的日期
finSelectedReceivablesDetailed.setSubscriptionDate(DateUtil.today());
// finSelectedReceivablesDetailed.setBalance(v.getSubscriptionMoney());
// FinUncollectedReceivablesDetailed finUncollectedReceivablesDetailed = finUncollectedReceivablesDetailedService.fetchBySid(finSelectedReceivablesDetailed.getReceivablesSid());
// finSelectedReceivablesDetailed.setStaffName(finUncollectedReceivablesDetailed.getStaffName());
// finSelectedReceivablesDetailed.setStaffUserSid(finUncollectedReceivablesDetailed.getStaffUserSid());
// finSelectedReceivablesDetailed.setStaffDeptSid(finUncollectedReceivablesDetailed.getStaffDeptSid());
// finSelectedReceivablesDetailed.setStaffDeptName(finUncollectedReceivablesDetailed.getStaffDeptName());
finSelectedReceivablesDetailed.setOrgSidPath(finCollectionConfirmation.getOrgSidPath());
finSelectedReceivablesDetailed.setUseOrgName(finCollectionConfirmation.getUseOrgName());
finSelectedReceivablesDetailedService.insert(finSelectedReceivablesDetailed);
// if (v.getSubscribedOf() == 0) {
// //应收未收减去相应的认款
// finUncollectedReceivablesDetailed = finUncollectedReceivablesDetailedService.fetchBySid(finSelectedReceivablesDetailed.getReceivablesSid());
// BigDecimal currentReceivableMoney = finUncollectedReceivablesDetailed.getCurrentReceivableMoney().subtract(finSelectedReceivablesDetailed.getSubscriptionMoney());
// finUncollectedReceivablesDetailed.setCurrentReceivableMoney(currentReceivableMoney);
// finUncollectedReceivablesDetailedService.updateById(finUncollectedReceivablesDetailed);
// }
});
}
finCollectionConfirmation.setBalance(finCollectionConfirmation.getCollectionMoney());
finCollectionConfirmation.setAuditState(1);
//1未认款/2部分认款/3已认款
finCollectionConfirmation.setPaymentState(1);
//添加单据编号
String billNo = getApplyCode(finCollectionConfirmation.getUseOrgSid());
finCollectionConfirmation.setBillNo(billNo);
baseMapper.insert(finCollectionConfirmation);
}
return rb.success().setMsg("添加成功");
}
public ResultBean<FinCollectionConfirmationRskVo> rskDetails(String sid) {
ResultBean rb = ResultBean.fireFail();
FinCollectionConfirmationRskVo finCollectionConfirmationDetailsVo = new FinCollectionConfirmationRskVo();
FinCollectionConfirmation finCollectionConfirmation = fetchBySid(sid);
BeanUtil.copyProperties(finCollectionConfirmation, finCollectionConfirmationDetailsVo);
List<FinCollectionConfirmationAppendixVo> paymentVoucherAppendixs = new ArrayList<>();
List<FinCollectionConfirmationAppendixVo> remittanceConfirmationAppendixs = new ArrayList<>();
CommonAppendixSelectQuery commonAppendixSelectQuery = new CommonAppendixSelectQuery();
commonAppendixSelectQuery.setLinkSid(sid);
//打款凭证附件
commonAppendixSelectQuery.setAttachType(CommonAttachTypeEnum.PAYMENT_VOUCHER.getAttachType());
ResultBean<List<CommonAppendixVo>> listResultBean = commonAppendixFeign.getPcAppendix(commonAppendixSelectQuery);
if (listResultBean.getSuccess()) {
for (CommonAppendixVo commonApp : listResultBean.getData()) {
FinCollectionConfirmationAppendixVo paymentVoucherAppendixVo = new FinCollectionConfirmationAppendixVo();
//commonApp.setFilePath(fileUploadComponent.getUrlPrefix()+commonApp.getFilePath());
BeanUtil.copyProperties(commonApp, paymentVoucherAppendixVo);
paymentVoucherAppendixs.add(paymentVoucherAppendixVo);
}
}
finCollectionConfirmationDetailsVo.setPaymentVoucherAppendixs(paymentVoucherAppendixs);
commonAppendixSelectQuery = new CommonAppendixSelectQuery();
commonAppendixSelectQuery.setLinkSid(sid);
//汇款确认书附件
commonAppendixSelectQuery.setAttachType(CommonAttachTypeEnum.REMITTAN_CECONFIRMATION.getAttachType());
listResultBean = commonAppendixFeign.getPcAppendix(commonAppendixSelectQuery);
if (listResultBean.getSuccess()) {
for (CommonAppendixVo commonApp : listResultBean.getData()) {
FinCollectionConfirmationAppendixVo remittanceConfirmationAppendixVo = new FinCollectionConfirmationAppendixVo();
//commonApp.setFilePath(fileUploadComponent.getUrlPrefix()+commonApp.getFilePath());
BeanUtil.copyProperties(commonApp, remittanceConfirmationAppendixVo);
remittanceConfirmationAppendixs.add(remittanceConfirmationAppendixVo);
}
}
finCollectionConfirmationDetailsVo.setRemittanceConfirmationAppendixs(remittanceConfirmationAppendixs);
List<FinSelectedReceivablesDetailedVo> finSelectedReceivablesDetailedVos = finSelectedReceivablesDetailedService.fetchByCillSid(sid);
List<FinSelectedReceivablesDetailedRsk> rskList = new ArrayList<>();
if (!finSelectedReceivablesDetailedVos.isEmpty()) {
finSelectedReceivablesDetailedVos.stream().forEach(v -> {
FinSelectedReceivablesDetailedRsk rsk = new FinSelectedReceivablesDetailedRsk();
String receivablesSid = v.getReceivablesSid();
if (v.getReceivablesName().equals("月还")) {
LoanRepaymentPlanDetails data = loanRepaymentPlanDetailsFeign.fetchDetails(receivablesSid).getData();
if (null != data) {
BeanUtil.copyProperties(data, rsk, "sid");
if (StringUtils.isNotBlank(data.getVinNo()) && StringUtils.isNotBlank(data.getVehMark())) {
rsk.setVinNo(data.getVinNo() + "/" + data.getVehMark());
}
}
} else {
FinUncollectedReceivablesDetailedJR jr = finUncollectedReceivablesDetailedJRService.fetchBySid(receivablesSid);
if (jr != null) {
String busSid = jr.getBusSid();
LoanRepaymentPlanDetails data = loanRepaymentPlanDetailsFeign.fetchDetails(busSid).getData();
if (null != data) {
BeanUtil.copyProperties(data, rsk, "sid");
if (StringUtils.isNotBlank(data.getVinNo()) && StringUtils.isNotBlank(data.getVehMark())) {
rsk.setVinNo(data.getVinNo() + "/" + data.getVehMark());
}
}
}
}
rsk.setReceivablesName(v.getReceivablesName());
rsk.setSid(v.getSid());
rsk.setSubscriptionMoney(v.getSubscriptionMoney());
rsk.setReceivablesSid(v.getReceivablesSid());
rskList.add(rsk);
});
}
finCollectionConfirmationDetailsVo.setFinSelectedReceivablesDetaileds(rskList);
if (finCollectionConfirmation.getAuditState() == 2) {
String confirmationDetails = finCollectionConfirmation.getConfirmName() + "于" + finCollectionConfirmation.getConfirmDate() + "已驳回，原因是：" + finCollectionConfirmation.getReason();
finCollectionConfirmationDetailsVo.setReason(confirmationDetails);
} else if (finCollectionConfirmation.getAuditState() == 3) {
String confirmationDetails = finCollectionConfirmation.getConfirmName() + "于" + finCollectionConfirmation.getConfirmDate() + "已确认";
finCollectionConfirmationDetailsVo.setReason(confirmationDetails);
}
return rb.success().setData(finCollectionConfirmationDetailsVo);
}
}

1
anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finuncollectedreceivablesdetailedjr/FinUncollectedReceivablesDetailedJRMapper.java
View File

@ -65,7 +65,6 @@ public interface FinUncollectedReceivablesDetailedJRMapper extends BaseMapper<Fi
@Param("loanContractNo") String loanContractNo,
@Param("bankName") String bankName,
@Param("receivablesName") String receivablesName,
@Param("createBySid") String createBySid,
@Param("userOrgSid") String userOrgSid,
@Param("purchaseSystemSid") String purchaseSystemSid
);

4
anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finuncollectedreceivablesdetailedjr/FinUncollectedReceivablesDetailedJRMapper.xml
View File

@ -58,7 +58,6 @@
) &lt; p.dueMoney
AND p.dueDate &lt; last_day(curdate())
AND s.purchaseSystemSid = #{purchaseSystemSid}
AND s.createBySid = #{createBySid}
AND s.useOrgSid = #{userOrgSid}
<if test="vinNo != null and vinNo != ''">
and CONCAT( p.vinNo, '/', p.vehMark ) like concat('%', #{vinNo}, '%')
@ -96,7 +95,7 @@
fin_selected_receivables_detailed AS se
WHERE
se.receivablesSid = jr.sid
AND se.auditState != '2'
AND se.auditState != '2' and se.auditState != '4'
)),
0
) AS currentReceivableMoney,
@ -107,7 +106,6 @@
LEFT JOIN anrui_buscenter.bus_sales_order AS s ON p.salesOrderSid = s.sid
where
s.purchaseSystemSid = #{purchaseSystemSid}
AND s.createBySid = #{createBySid}
AND s.useOrgSid = #{userOrgSid}
<if test="vinNo != null and vinNo != ''">
and CONCAT( p.vinNo, '/', p.vehMark ) like concat('%', #{vinNo}, '%')

3
anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finuncollectedreceivablesdetailedjr/FinUncollectedReceivablesDetailedJRService.java
View File

@ -66,7 +66,7 @@ public class FinUncollectedReceivablesDetailedJRService extends MybatisBaseServi
String loanContractNo = query.getLoanContractNo();
String bankName = query.getBankName();
String receivablesName = query.getReceivablesName();
String createBySid = query.getCreateBySid();
// String createBySid = query.getCreateBySid();
String orgPath = query.getOrgPath();
String purchaseSystemSid = query.getPurchaseSystemSid();
ResultBean<String> orgSidByPath = sysStaffOrgFeign.getOrgSidByPath(orgPath);
@ -81,7 +81,6 @@ public class FinUncollectedReceivablesDetailedJRService extends MybatisBaseServi
loanContractNo,
bankName,
receivablesName,
createBySid,
userOrgSid,
purchaseSystemSid
);

10
anrui-fin/anrui-fin-biz/src/main/resources/application-dev.yml
View File

@ -25,11 +25,11 @@ image:
url:
prefix: http://192.168.1.109:8111/upload/
kingdee: #金蝶的系统的链接账号 url等信息
acctID: 64ae52afbc9aa4 #登录金蝶的账户信息 202307测试
userName: 信息部 #登录金蝶的账户信息 202307测试的
password: 123321 #登录金蝶的账户信息
userName_administrator: Administrator #登录金蝶的账户信息 202307测试
password_administrator: ANrui123456. #登录金蝶的账户信息 202307测试
acctID: 65641dbcf39079 #登录金蝶的账户信息 202311测试
userName: 信息部 #登录金蝶的账户信息 202311测试的
password: 123456 #登录金蝶的账户信息
userName_administrator: Administrator #登录金蝶的账户信息 202311测试
password_administrator: ANrui123456. #登录金蝶的账户信息 202311测试
lcid: 2052 #登录金蝶的账户信息
url: http://121.36.43.55 #金蝶财务系统ip地址
templateUrl:

16
anrui-flowable/anrui-flowable-biz/src/main/java/com/yxt/anrui/flowable/biz/flow2/FlowService.java
View File

@ -445,7 +445,21 @@ public class FlowService extends MybatisBaseService<FlowMapper, Flowable> {
boolean contains = false;
//设置是否是管理员自动审批，默认否
boolean adminContains = false;
if (StringUtils.isBlank(nextUserSid)) {
String service = (String) formVariables.get("service");
String ydfOrgPath = (String) formVariables.get("ydfOrgPath");
if ("公司间调车".equals(service) && "Activity_0695qh4".equals(bv.getTaskDefKey())){
if (StringUtils.isBlank(nextUserSid)) {
bv.setOrgSidPath(ydfOrgPath);
ResultBean<String> stringResultBean = getNextNodeUserSidsOfSubmit(bv);
if (!stringResultBean.getSuccess()) {
//下一环节用户为空的情况
nextUserSid = ProcDefEnum.DEFAUL_TADMIN_SID.getProDefId();
adminContains = true;
} else {
nextUserSid = stringResultBean.getData();
}
}
} else if (StringUtils.isBlank(nextUserSid)) {
ResultBean<String> stringResultBean = getNextNodeUserSidsOfSubmit(bv);
if (!stringResultBean.getSuccess()) {
//下一环节用户为空的情况

2
anrui-reportcenter/anrui-reportcenter-api/src/main/java/com/yxt/anrui/reportcenter/api/dailyreport/DailyReportAppVo.java
View File

@ -114,6 +114,8 @@ public class DailyReportAppVo {
@ApiModelProperty("金融未放款金额")
private List<String> row49 = new ArrayList<>();
private List<ParameterVo> dynamicRows = new ArrayList<>();
private List<DailyReportVo> dailyReportVoList = new ArrayList<>();

6
anrui-reportcenter/anrui-reportcenter-api/src/main/java/com/yxt/anrui/reportcenter/api/dailyreport/DailyReportVo.java
View File

@ -158,8 +158,8 @@ public class DailyReportVo implements Vo {
private String saddle;
@ApiModelProperty("空调")
private String airConditioner;
@ApiModelProperty("更多配置")
private String otherConfig;
/* @ApiModelProperty("更多配置")
private String otherConfig;*/
@ApiModelProperty("速比")
private String rearAxleRatio;
@ApiModelProperty("后桥")
@ -238,4 +238,6 @@ public class DailyReportVo implements Vo {
@ApiModelProperty("规格型号")
private String specifications;
}

18
anrui-reportcenter/anrui-reportcenter-api/src/main/java/com/yxt/anrui/reportcenter/api/dailyreport/ParameterVo.java
View File

@ -0,0 +1,18 @@
package com.yxt.anrui.reportcenter.api.dailyreport;
import lombok.Data;
import java.util.ArrayList;
import java.util.List;
/**
* @description:
* @author: dimengzhe
* @date: 2023/12/14
**/
@Data
public class ParameterVo {
private String name;
private List<String> row = new ArrayList<>();
}

47
anrui-reportcenter/anrui-reportcenter-biz/src/main/java/com/yxt/anrui/reportcenter/biz/dailyreport/DailyReportMapper.xml
View File

@ -533,7 +533,52 @@
ifnull(sum(dr.deliver_subtotal_year), 0) as deliver_subtotal_year
,
bm.fuelTypeValue,
bm.emissionStandardValue
bm.emissionStandardValue,
bmc.carColor,
bmc.specification,
bmc.fuelTank,
bmc.baffleModel,
bmc.independentSources,
bmc.tireCover,
bmc.saddle,
bmc.airConditioner,
bmc.rearAxleRatio,
bmc.rearAxleValue,
bmc.tireSize,
bmc.slowMachine,
bmc.rearViewMirror,
bmc.wheelbase,
bmc.suspension,
bmc.packingCase,
bmc.seat,
bmc.hubMaterial,
bmc.configuringBao,
bmc.multimedia,
bmc.bumper,
bmc.clutchValue,
bmc.dirMachineValue,
bmc.proponsValue,
bmc.doorAndWindowValue,
bmc.doorLockValue,
bmc.headlightValue,
bmc.boardPedalValue,
bmc.steerWheelValue,
bmc.storagBatteryValue,
bmc.comfortPackValue,
bmc.cheBasePackValue,
bmc.savingPackValue,
bmc.conPackValue,
bm.vehicleTypeValue,
bm.emissionStandardValue,
bm.productLineValue,
bm.driveFormValue,
bm.powerValue,
bm.tranCaseTypeValue,
bm.gearboxTypeValue,
bm.fuelTypeValue,
bm.vehicleVersionValue,
bm.engineTypeValue,
bm.specifications
from daily_report dr
left join anrui_base.base_vehicle_model bm on bm.sid = dr.vehModelSid
left join anrui_base.base_model_config bmc on bmc.sid = dr.vehMConfigSid

31
anrui-reportcenter/anrui-reportcenter-biz/src/main/java/com/yxt/anrui/reportcenter/biz/dailyreport/DailyReportService.java
View File

@ -1303,6 +1303,37 @@ public class DailyReportService extends MybatisBaseService<DailyReportMapper, Da
BigDecimal row49All = row49.stream().map(BigDecimal::new).reduce(BigDecimal.ZERO, BigDecimal::add);
row49.add(row49All.toString());
dailyReportAppVo.setRow49(row49);
List<ParameterVo> dynamicRows = new ArrayList<>();
List<DailyParameterVo> parameterVoList = baseMapper.selectByParameters(useOrgSid);
parameterVoList.removeAll(Collections.singleton(null));
for (int i = 0; i < parameterVoList.size(); i++) {
DailyParameterVo dailyParameterVo = parameterVoList.get(i);
String tableName = Arrays.asList(dailyParameterVo.getTableNameKey().split("\\.")).get(1);
ParameterVo parameterVo = new ParameterVo();
parameterVo.setName(dailyParameterVo.getColText());
List<String> columnNames = dailyReportVoList.stream().map(v-> {
String columnName = "";
try {
Field field = v.getClass().getDeclaredField(dailyParameterVo.getColName());
field.setAccessible(true);
columnName = (String) field.get(v);
} catch (NoSuchFieldException | IllegalAccessException e) {
e.printStackTrace();
}
if(StringUtils.isBlank(columnName)){
return "-";
}else{
return columnName;
}
}).collect(Collectors.toList());
columnNames.add("");
parameterVo.setRow(columnNames);
dynamicRows.add(parameterVo);
}
dailyReportAppVo.setDynamicRows(dynamicRows);
return rb.success().setData(dailyReportAppVo);
}
}

6
anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanhomevisitinvestigate/LoanHomevisitInvestigateDetailsPCVo.java
View File

@ -109,20 +109,14 @@ public class LoanHomevisitInvestigateDetailsPCVo implements Vo {
/*
* 订单信息
* */
@ApiModelProperty("车辆信息确认key")
private String carConfirmKey;
@ApiModelProperty("车辆信息确认")
private String carConfirm;
@ApiModelProperty("车辆信息确认备注")
private String carRemarks;
@ApiModelProperty("金融方案信息确认key")
private String finConfirmKey;
@ApiModelProperty("金融方案信息确认")
private String finConfirm;
@ApiModelProperty("金融方案信息确认备注")
private String finRemarks;
@ApiModelProperty("金融首付比例key")
private String finDownPayKey;
@ApiModelProperty("金融首付比例")
private String finDownPay;
@ApiModelProperty("金融首付比例备注")

2
anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanrepaymentplandetails/LoanRepaymentPlanDetails.java
View File

@ -36,6 +36,8 @@ public class LoanRepaymentPlanDetails extends BaseEntity {
private String busVinSid;
@ApiModelProperty("车架号")
private String vinNo;
@ApiModelProperty("车牌号")
private String vehMark;
@ApiModelProperty("消贷合同编号")
private String loanContractNo;
@ApiModelProperty("消贷合同sid")

2
anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanrepaymentplandetails/LoanRepaymentPlanDetailsDto.java
View File

@ -34,6 +34,8 @@ public class LoanRepaymentPlanDetailsDto implements Dto {
private String busVinSid;
@ApiModelProperty("车架号")
private String vinNo;
@ApiModelProperty("车牌号")
private String vehMark;
@ApiModelProperty("消贷合同编号")
private String loanContractNo;
@ApiModelProperty("消贷合同sid")

6
anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanrepaymentplandetails/LoanRepaymentPlanDetailsFeign.java
View File

@ -37,4 +37,10 @@ public interface LoanRepaymentPlanDetailsFeign {
@ApiOperation("月还明细")
@DeleteMapping("/details")
public ResultBean<MonRepayDetails> details(@RequestParam("saleVehSid") String saleVehSid);
@ApiOperation("查询还款计划表明细")
@GetMapping("/fetchDetails")
@ResponseBody
public ResultBean<LoanRepaymentPlanDetails> fetchDetails(@RequestParam("sid") String sid);
}

5
anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanrepaymentplandetails/LoanRepaymentPlanDetailsFeignFallback.java
View File

@ -31,4 +31,9 @@ public class LoanRepaymentPlanDetailsFeignFallback implements LoanRepaymentPlanD
public ResultBean<MonRepayDetails> details(String saleVehSid) {
return null;
}
@Override
public ResultBean<LoanRepaymentPlanDetails> fetchDetails(String sid) {
return null;
}
}

93
anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanhomevisitinvestigate/LoanHomevisitInvestigateService.java
View File

@ -40,6 +40,7 @@ import com.yxt.anrui.portal.api.sysuser.SysUserFeign;
import com.yxt.anrui.portal.api.sysuser.SysUserVo;
import com.yxt.anrui.riskcenter.api.loanhomevisitfileexamine.LoanHomevisitFileexamineDto;
import com.yxt.anrui.riskcenter.api.loanhomevisitinvestigate.*;
import com.yxt.anrui.riskcenter.api.loanhomevisitinvestigate.LoanHomevisitInvestigateFile;
import com.yxt.anrui.riskcenter.api.loanhomevisitinvestigatecustomer.LoanHomeVisitInvestigateInitCustomerVo;
import com.yxt.anrui.riskcenter.api.loanhomevisitinvestigatecustomer.LoanHomeVisitInvestigateSaveCustomerDto;
import com.yxt.anrui.riskcenter.api.loanhomevisitinvestigatecustomer.LoanHomevisitInvestigateCustomerDetailsVo;
@ -55,6 +56,7 @@ import com.yxt.anrui.riskcenter.api.loanhomevisitinvestigateorder.LoanHomevisitI
import com.yxt.anrui.riskcenter.api.loanhomevisitinvestigateorder.LoanHomevisitInvestigateOrderDto;
import com.yxt.anrui.riskcenter.api.loanhomevisitinvestigateotherpeo.LoanHomeVisitInvestigateInitOtherPeoVo;
import com.yxt.anrui.riskcenter.api.loanhomevisitinvestigateotherpeo.LoanHomeVisitInvestigateSaveOtherPeoDto;
import com.yxt.anrui.riskcenter.api.loanhomevisitinvestigateotherpeo.LoanHomevisitInvestigateOtherpeoDetailsPCVo;
import com.yxt.anrui.riskcenter.api.loanhomevisitinvestigateotherpeo.LoanHomevisitInvestigateOtherpeoDto;
import com.yxt.anrui.riskcenter.api.loanhomevisitinvestigateproperty.LoanHomeVisitInvestigateSavePropDto;
import com.yxt.anrui.riskcenter.api.loanhomevisitinvestigateproperty.LoanHomeVisitInvestigateInitPropVo;
@ -1709,7 +1711,7 @@ public class LoanHomevisitInvestigateService extends MybatisBaseService<LoanHome
financeForm46.setValue("备注：" + loanHomevisitInvestigatePropertyDetailsVo.getRealRemarks());
financeForm46.setSpanSize(2);
zCInfo.add(financeForm46);
}else {
} else {
FinanceForm financeForm72 = new FinanceForm();
financeForm72.setValue("是否有房产：无");
financeForm72.setSpanSize(2);
@ -2006,7 +2008,92 @@ public class LoanHomevisitInvestigateService extends MybatisBaseService<LoanHome
loanHomevisitInvestigateDetailsPCVo.setBorrowerMobile(loanHomevisitInvestigateCustomerDetailsVo.getBorrowerMobile());
loanHomevisitInvestigateDetailsPCVo.setBorrowerCareerValue(loanHomevisitInvestigateCustomerDetailsVo.getBorrowerCareerValue());
loanHomevisitInvestigateDetailsPCVo.setMaritalStatusValue(loanHomevisitInvestigateCustomerDetailsVo.getMaritalStatusValue());
return null;
loanHomevisitInvestigateDetailsPCVo.setIsChildrenValue(loanHomevisitInvestigateCustomerDetailsVo.getIsChildrenValue());
loanHomevisitInvestigateDetailsPCVo.setBorrowerDomAddress(loanHomevisitInvestigateCustomerDetailsVo.getBorrowerDomAddress());
loanHomevisitInvestigateDetailsPCVo.setBorrowerPreAddress(loanHomevisitInvestigateCustomerDetailsVo.getBorrowerPreAddress());
loanHomevisitInvestigateDetailsPCVo.setBankCardNo(loanHomevisitInvestigateCustomerDetailsVo.getBankCardNo());
loanHomevisitInvestigateDetailsPCVo.setDepositBank(loanHomevisitInvestigateCustomerDetailsVo.getDepositBank());
//银行卡照片
//银行卡附件
List<LoanHomevisitInvestigateFileDetailsVo> loanHomevisitInvestigateFileDetailsVos = loanHomevisitInvestigateFileService.selByMainSidAndTypeKey(sid, LoanAttachTypeEnum.YHK.getAttachType());
List<LoanHomevisitInvestigateFile> loanHomevisitInvestigateFiles = new ArrayList<>();
if (loanHomevisitInvestigateFileDetailsVos != null && loanHomevisitInvestigateFileDetailsVos.size() > 0) {
for (LoanHomevisitInvestigateFileDetailsVo loanHomevisitInvestigateFileDetailsVo : loanHomevisitInvestigateFileDetailsVos) {
LoanHomevisitInvestigateFile loanHomevisitInvestigateFile = new LoanHomevisitInvestigateFile();
loanHomevisitInvestigateFile.setUrl(loanHomevisitInvestigateFileDetailsVo.getFileUrl());
loanHomevisitInvestigateFiles.add(loanHomevisitInvestigateFile);
}
}
loanHomevisitInvestigateDetailsPCVo.setYhkImages(loanHomevisitInvestigateFiles);
//配偶
loanHomevisitInvestigateDetailsPCVo.setSpouseName(loanHomevisitInvestigateCustomerDetailsVo.getSpouseName());
loanHomevisitInvestigateDetailsPCVo.setSpouseIdNumber(loanHomevisitInvestigateCustomerDetailsVo.getSpouseIdNumber());
loanHomevisitInvestigateDetailsPCVo.setSpouseMobile(loanHomevisitInvestigateCustomerDetailsVo.getSpouseMobile());
loanHomevisitInvestigateDetailsPCVo.setSpouseCareerValue(loanHomevisitInvestigateCustomerDetailsVo.getSpouseCareerValue());
loanHomevisitInvestigateDetailsPCVo.setSpouseDomAddress(loanHomevisitInvestigateCustomerDetailsVo.getSpouseDomAddress());
loanHomevisitInvestigateDetailsPCVo.setSpousePreAddress(loanHomevisitInvestigateCustomerDetailsVo.getSpousePreAddress());
loanHomevisitInvestigateDetailsPCVo.setEmergencyContact(loanHomevisitInvestigateCustomerDetailsVo.getEmergencyContact());
loanHomevisitInvestigateDetailsPCVo.setEmergencyMobile(loanHomevisitInvestigateCustomerDetailsVo.getEmergencyMobile());
loanHomevisitInvestigateDetailsPCVo.setRelationshipValue(loanHomevisitInvestigateCustomerDetailsVo.getRelationshipValue());
//其他人员
List<LoanHomeVisitInvestigateInitOtherPeoVo> loanHomeVisitInvestigateInitOtherPeoVos = loanHomevisitInvestigateOtherpeoService.selByMainSid(sid);
List<LoanHomevisitInvestigateOtherpeoDetailsPCVo> loanHomevisitInvestigateOtherpeoDetailsPCVos = new ArrayList<>();
if (loanHomeVisitInvestigateInitOtherPeoVos != null && loanHomeVisitInvestigateInitOtherPeoVos.size() > 0) {
for (LoanHomeVisitInvestigateInitOtherPeoVo loanHomeVisitInvestigateInitOtherPeoVo : loanHomeVisitInvestigateInitOtherPeoVos) {
LoanHomevisitInvestigateOtherpeoDetailsPCVo loanHomevisitInvestigateOtherpeoDetailsPCVo = new LoanHomevisitInvestigateOtherpeoDetailsPCVo();
loanHomevisitInvestigateOtherpeoDetailsPCVo.setPeoType(loanHomevisitInvestigateOtherpeoDetailsPCVo.getPeoType());
loanHomevisitInvestigateOtherpeoDetailsPCVo.setPeoName(loanHomevisitInvestigateOtherpeoDetailsPCVo.getPeoName());
loanHomevisitInvestigateOtherpeoDetailsPCVo.setIdNumber(loanHomevisitInvestigateOtherpeoDetailsPCVo.getIdNumber());
loanHomevisitInvestigateOtherpeoDetailsPCVo.setMobile(loanHomevisitInvestigateOtherpeoDetailsPCVo.getMobile());
loanHomevisitInvestigateOtherpeoDetailsPCVo.setPeoDomAddress(loanHomevisitInvestigateOtherpeoDetailsPCVo.getPeoDomAddress());
loanHomevisitInvestigateOtherpeoDetailsPCVo.setPeoPreAddress(loanHomevisitInvestigateOtherpeoDetailsPCVo.getPeoPreAddress());
loanHomevisitInvestigateOtherpeoDetailsPCVo.setWorkUnit(loanHomevisitInvestigateOtherpeoDetailsPCVo.getWorkUnit());
loanHomevisitInvestigateOtherpeoDetailsPCVo.setPeoCareerValue(loanHomevisitInvestigateOtherpeoDetailsPCVo.getPeoCareerValue());
loanHomevisitInvestigateOtherpeoDetailsPCVos.add(loanHomevisitInvestigateOtherpeoDetailsPCVo);
}
}
loanHomevisitInvestigateDetailsPCVo.setLoanHomevisitInvestigateOtherpeoDetailsPCVoList(loanHomevisitInvestigateOtherpeoDetailsPCVos);
//订单信息
LoanHomevisitInvestigateOrderDetailsVo loanHomevisitInvestigateOrderDetailsVo = loanHomevisitInvestigateOrderService.selByMainSid(sid);
loanHomevisitInvestigateDetailsPCVo.setCarConfirm(loanHomevisitInvestigateOrderDetailsVo.getCarConfirm());
loanHomevisitInvestigateDetailsPCVo.setCarRemarks(loanHomevisitInvestigateOrderDetailsVo.getCarRemarks());
loanHomevisitInvestigateDetailsPCVo.setFinConfirm(loanHomevisitInvestigateOrderDetailsVo.getFinConfirm());
loanHomevisitInvestigateDetailsPCVo.setFinRemarks(loanHomevisitInvestigateOrderDetailsVo.getFinRemarks());
loanHomevisitInvestigateDetailsPCVo.setFinDownPay(loanHomevisitInvestigateOrderDetailsVo.getFinDownPay());
loanHomevisitInvestigateDetailsPCVo.setFinDownPayRemarks(loanHomevisitInvestigateOrderDetailsVo.getFinDownPayRemarks());
//营运经历
LoanHomevisitInvestigateOperationsDetailsVo loanHomevisitInvestigateOperationsDetailsVo = loanHomevisitInvestigateOperationsService.selByMainSid(sid);
loanHomevisitInvestigateDetailsPCVo.setIndustryYears(loanHomevisitInvestigateOperationsDetailsVo.getIndustryYears());
loanHomevisitInvestigateDetailsPCVo.setDriveProTypeValue(loanHomevisitInvestigateOperationsDetailsVo.getDriveProTypeValue());
loanHomevisitInvestigateDetailsPCVo.setBeforeOpeTypeValue(loanHomevisitInvestigateOperationsDetailsVo.getBeforeOpeTypeValue());
//运输信息
LoanHomevisitInvestigateTransportDetailsVo loanHomevisitInvestigateTransportDetailsVo = loanHomevisitInvestigateTransportService.selByMainSid(sid);
loanHomevisitInvestigateDetailsPCVo.setTransportRoute(loanHomevisitInvestigateTransportDetailsVo.getTransportRoute());
loanHomevisitInvestigateDetailsPCVo.setTransportTypeValue(loanHomevisitInvestigateTransportDetailsVo.getTransportTypeValue());
loanHomevisitInvestigateDetailsPCVo.setTransportGoodsTrip(loanHomevisitInvestigateTransportDetailsVo.getTransportGoodsTrip());
loanHomevisitInvestigateDetailsPCVo.setTransportGoodsRetTrip(loanHomevisitInvestigateTransportDetailsVo.getTransportGoodsRetTrip());
loanHomevisitInvestigateDetailsPCVo.setRoundTripMileage(loanHomevisitInvestigateTransportDetailsVo.getRoundTripMileage());
loanHomevisitInvestigateDetailsPCVo.setDeadWeight(loanHomevisitInvestigateTransportDetailsVo.getDeadWeight());
loanHomevisitInvestigateDetailsPCVo.setMonthlyTrip(loanHomevisitInvestigateTransportDetailsVo.getMonthlyTrip());
loanHomevisitInvestigateDetailsPCVo.setPerTripYuan(loanHomevisitInvestigateTransportDetailsVo.getPerTripYuan());
loanHomevisitInvestigateDetailsPCVo.setFuelConsumptionPerTrip(loanHomevisitInvestigateTransportDetailsVo.getFuelConsumptionPerTrip());
loanHomevisitInvestigateDetailsPCVo.setDriverSalary(loanHomevisitInvestigateTransportDetailsVo.getDriverSalary());
loanHomevisitInvestigateDetailsPCVo.setToll(loanHomevisitInvestigateTransportDetailsVo.getToll());
loanHomevisitInvestigateDetailsPCVo.setMaintenance(loanHomevisitInvestigateTransportDetailsVo.getMaintenance());
loanHomevisitInvestigateDetailsPCVo.setExpectedRevenue(loanHomevisitInvestigateTransportDetailsVo.getExpectedRevenue());
loanHomevisitInvestigateDetailsPCVo.setNetIncome(loanHomevisitInvestigateTransportDetailsVo.getNetIncome());
//资产情况
LoanHomevisitInvestigatePropertyDetailsVo loanHomevisitInvestigatePropertyDetailsVo = loanHomevisitInvestigatePropertyService.selByMainSid(sid);
loanHomevisitInvestigateDetailsPCVo.setIsRealEstate(loanHomevisitInvestigatePropertyDetailsVo.getIsRealEstate());
loanHomevisitInvestigateDetailsPCVo.setPropertyType(loanHomevisitInvestigatePropertyDetailsVo.getPropertyType());
loanHomevisitInvestigateDetailsPCVo.setRealLoanSituation(loanHomevisitInvestigatePropertyDetailsVo.getRealLoanSituation());
loanHomevisitInvestigateDetailsPCVo.setRealRemarks(loanHomevisitInvestigatePropertyDetailsVo.getRealRemarks());
loanHomevisitInvestigateDetailsPCVo.setIsCar(loanHomevisitInvestigatePropertyDetailsVo.getIsCar());
loanHomevisitInvestigateDetailsPCVo.setCarType(loanHomevisitInvestigatePropertyDetailsVo.getCarType());
loanHomevisitInvestigateDetailsPCVo.setCarLoanSituation(loanHomevisitInvestigatePropertyDetailsVo.getCarLoanSituation());
loanHomevisitInvestigateDetailsPCVo.setZcCarRemarks(loanHomevisitInvestigatePropertyDetailsVo.getCarRemarks());
loanHomevisitInvestigateDetailsPCVo.setDownPaySourceValue(loanHomevisitInvestigatePropertyDetailsVo.getDownPaySourceValue());
loanHomevisitInvestigateDetailsPCVo.setOtherSourceValue(loanHomevisitInvestigatePropertyDetailsVo.getOtherSourceValue());
return loanHomevisitInvestigateDetailsPCVo;
}
}

6
anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanrepaymentplandetails/LoanRepaymentPlanDetailsRest.java
View File

@ -1,6 +1,7 @@
package com.yxt.anrui.riskcenter.biz.loanrepaymentplandetails;
import com.yxt.anrui.riskcenter.api.loanrepaymentplandetails.LoanRepaymentPlanDetails;
import com.yxt.anrui.riskcenter.api.loanrepaymentplandetails.LoanRepaymentPlanDetailsDto;
import com.yxt.anrui.riskcenter.api.loanrepaymentplandetails.LoanRepaymentPlanDetailsFeign;
import com.yxt.anrui.riskcenter.api.loanrepaymentplandetails.MonRepayDetails;
@ -41,4 +42,9 @@ public class LoanRepaymentPlanDetailsRest implements LoanRepaymentPlanDetailsFei
MonRepayDetails monRepayDetails = loanRepaymentPlanDetailsService.details(saleVehSid);
return rb.success().setData(monRepayDetails);
}
@Override
public ResultBean<LoanRepaymentPlanDetails> fetchDetails(String sid) {
return loanRepaymentPlanDetailsService.fetchDetails(sid);
}
}

12
anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanrepaymentplandetails/LoanRepaymentPlanDetailsService.java
View File

@ -87,12 +87,12 @@ public class LoanRepaymentPlanDetailsService extends MybatisBaseService<LoanRepa
return rb.success();
}
public List<LoanRepaymentPlanDetails> selPlanByNoAndPeriod(String bankContractNo,String period) {
return baseMapper.selPlanByNoAndPeriod(bankContractNo,period);
public List<LoanRepaymentPlanDetails> selPlanByNoAndPeriod(String bankContractNo, String period) {
return baseMapper.selPlanByNoAndPeriod(bankContractNo, period);
}
public String selBeMoney(String no, String period, String bankContractNo) {
return baseMapper.selBeMoney(no,period,bankContractNo);
return baseMapper.selBeMoney(no, period, bankContractNo);
}
public MonRepayDetails details(String saleVehSid) {
@ -101,4 +101,10 @@ public class LoanRepaymentPlanDetailsService extends MybatisBaseService<LoanRepa
monRepayDetails.setMonRepayPeriodDetailsList(monRepayPeriodDetailsList);
return monRepayDetails;
}
public ResultBean<LoanRepaymentPlanDetails> fetchDetails(String sid) {
ResultBean rb = ResultBean.fireFail();
LoanRepaymentPlanDetails planDetails = fetchBySid(sid);
return rb.success().setData(planDetails);
}
}

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

@ -410,6 +410,13 @@ public class LoanRepaymentScheduleService extends MybatisBaseService<LoanRepayme
vinNo = linkNo;
}
String busVinSid = vehicle.getSid();
String vehMark = "";
LoanWarrantInformation loanWarrantInformation = loanWarrantInformationService.fetchByBusVinSid(busVinSid);
if (null != loanWarrantInformation) {
if (StringUtils.isNotBlank(loanWarrantInformation.getVehicleMark())) {
vehMark = loanWarrantInformation.getVehicleMark();
}
}
//主方案
for (int i = 0; i < mainPeriod; i++) {
LoanRepaymentPlanDetailsDto mainDto = new LoanRepaymentPlanDetailsDto();
@ -433,6 +440,7 @@ public class LoanRepaymentScheduleService extends MybatisBaseService<LoanRepayme
mainDto.setOrgSidPath(orgSidPath);
mainDto.setBusVinSid(busVinSid);
mainDto.setVinNo(vinNo);
mainDto.setVehMark(vehMark);
mainDto.setSalesUserSid(staffSid);
mainDto.setStaffName(staffName);
mainDto.setPolicyOrOther("0");
@ -472,6 +480,7 @@ public class LoanRepaymentScheduleService extends MybatisBaseService<LoanRepayme
otherDto.setOrgSidPath(orgSidPath);
otherDto.setBusVinSid(busVinSid);
otherDto.setVinNo(vinNo);
otherDto.setVehMark(vehMark);
otherDto.setSalesUserSid(staffSid);
otherDto.setStaffName(staffName);
otherDto.setPolicyOrOther("1");
@ -570,6 +579,13 @@ public class LoanRepaymentScheduleService extends MybatisBaseService<LoanRepayme
vinNo = linkNo;
}
String busVinSid = vehicle.getSid();
String vehMark = "";
LoanWarrantInformation loanWarrantInformation = loanWarrantInformationService.fetchByBusVinSid(busVinSid);
if (null != loanWarrantInformation) {
if (StringUtils.isNotBlank(loanWarrantInformation.getVehicleMark())) {
vehMark = loanWarrantInformation.getVehicleMark();
}
}
//主方案
for (int i = 0; i < mainPeriod; i++) {
LoanRepaymentPlanDetailsDto mainDto = new LoanRepaymentPlanDetailsDto();
@ -593,6 +609,7 @@ public class LoanRepaymentScheduleService extends MybatisBaseService<LoanRepayme
mainDto.setOrgSidPath(orgSidPath);
mainDto.setBusVinSid(busVinSid);
mainDto.setVinNo(vinNo);
mainDto.setVehMark(vehMark);
mainDto.setSalesUserSid(staffSid);
mainDto.setStaffName(staffName);
mainDto.setPolicyOrOther("1");
@ -779,6 +796,13 @@ public class LoanRepaymentScheduleService extends MybatisBaseService<LoanRepayme
vinNo = linkNo;
}
String busVinSid = vehicle.getSid();
String vehMark = "";
LoanWarrantInformation loanWarrantInformation = loanWarrantInformationService.fetchByBusVinSid(busVinSid);
if (null != loanWarrantInformation) {
if (StringUtils.isNotBlank(loanWarrantInformation.getVehicleMark())) {
vehMark = loanWarrantInformation.getVehicleMark();
}
}
//主方案
for (int i = 0; i < mainPeriod; i++) {
LoanRepaymentPlanDetailsDto mainDto = new LoanRepaymentPlanDetailsDto();
@ -802,6 +826,7 @@ public class LoanRepaymentScheduleService extends MybatisBaseService<LoanRepayme
mainDto.setOrgSidPath(orgSidPath);
mainDto.setBusVinSid(busVinSid);
mainDto.setVinNo(vinNo);
mainDto.setVehMark(vehMark);
mainDto.setSalesUserSid(staffSid);
mainDto.setStaffName(staffName);
mainDto.setPolicyOrOther("0");
@ -841,6 +866,7 @@ public class LoanRepaymentScheduleService extends MybatisBaseService<LoanRepayme
otherDto.setOrgSidPath(orgSidPath);
otherDto.setBusVinSid(busVinSid);
otherDto.setVinNo(vinNo);
otherDto.setVehMark(vehMark);
otherDto.setSalesUserSid(staffSid);
otherDto.setStaffName(staffName);
otherDto.setPolicyOrOther("1");
@ -938,6 +964,13 @@ public class LoanRepaymentScheduleService extends MybatisBaseService<LoanRepayme
vinNo = linkNo;
}
String busVinSid = vehicle.getSid();
String vehMark = "";
LoanWarrantInformation loanWarrantInformation = loanWarrantInformationService.fetchByBusVinSid(busVinSid);
if (null != loanWarrantInformation) {
if (StringUtils.isNotBlank(loanWarrantInformation.getVehicleMark())) {
vehMark = loanWarrantInformation.getVehicleMark();
}
}
//主方案
for (int i = 0; i < mainPeriod; i++) {
LoanRepaymentPlanDetailsDto mainDto = new LoanRepaymentPlanDetailsDto();
@ -961,6 +994,7 @@ public class LoanRepaymentScheduleService extends MybatisBaseService<LoanRepayme
mainDto.setOrgSidPath(orgSidPath);
mainDto.setBusVinSid(busVinSid);
mainDto.setVinNo(vinNo);
mainDto.setVehMark(vehMark);
mainDto.setSalesUserSid(staffSid);
mainDto.setStaffName(staffName);
mainDto.setPolicyOrOther("1");

Write Preview
Loading…
Cancel
Save