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

完善回购申请

master
fanzongzhe 1 year ago
parent
a4ff91896e
commit
c1eeabca3d
7 changed files with 210 additions and 12 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. 4
      anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanrepurchaseapply/LoanRepurchaseApplyDetailsVo.java
  2. 3
      anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanrepurchaseapply/app/AppRepurchaseDetailsVo.java
  3. 6
      anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanrepurchaseapply/LoanRepurchaseApplyMapper.java
  4. 118
      anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanrepurchaseapply/LoanRepurchaseApplyMapper.xml
  5. 81
      anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanrepurchaseapply/LoanRepurchaseApplyService.java
  6. 3
      anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/risk/repurchase/RepurchaseDetailsVo.java
  7. 7
      anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/risk/repurchase/RepurchaseService.java

4
anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanrepurchaseapply/LoanRepurchaseApplyDetailsVo.java
View File

@ -122,8 +122,10 @@ public class LoanRepurchaseApplyDetailsVo implements Vo {
private String bankReceivingAccount;
@ApiModelProperty("资方收款账号")
private String bankAccountNo;
@ApiModelProperty("付款后需备注内容")
private String payRemarks;
private List<LoanRepurchaseApplyFile> buyfiles = new ArrayList<>(); // 回购情况附件
private String salesOrderSid;
}

3
anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanrepurchaseapply/app/AppRepurchaseDetailsVo.java
View File

@ -17,7 +17,6 @@ public class AppRepurchaseDetailsVo {
private String sid;
private String publishInfo; // 发起部门-发起人
private String time; //申请日期
private List<String> files = new ArrayList<>();
private String taskId;
private String procInsId;
@ApiModelProperty("催收记录")
@ -103,6 +102,8 @@ public class AppRepurchaseDetailsVo {
private String bankReceivingAccount;
@ApiModelProperty("资方收款账号")
private String bankAccountNo;
@ApiModelProperty("付款后需备注内容")
private String payRemarks;
private List<String> buyfiles = new ArrayList<>(); // 回购情况附件
@ApiModelProperty("销售订单sid")
private String salesOrderSid;

6
anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanrepurchaseapply/LoanRepurchaseApplyMapper.java
View File

@ -7,7 +7,9 @@ import com.baomidou.mybatisplus.core.toolkit.Constants;
import com.yxt.anrui.riskcenter.api.loanparameter.LoanParameter;
import com.yxt.anrui.riskcenter.api.loanparameter.LoanParameterVo;
import com.yxt.anrui.riskcenter.api.loanrepurchaseapply.LoanRepurchaseApply;
import com.yxt.anrui.riskcenter.api.loanrepurchaseapply.LoanRepurchaseApplyDetailsVo;
import com.yxt.anrui.riskcenter.api.loanrepurchaseapply.LoanRepurchaseApplyVo;
import com.yxt.anrui.riskcenter.api.loanrepurchaseapply.app.AppRepurchaseDetailsVo;
import org.apache.ibatis.annotations.Mapper;
import org.apache.ibatis.annotations.Param;
import org.apache.ibatis.annotations.Select;
@ -23,4 +25,8 @@ public interface LoanRepurchaseApplyMapper extends BaseMapper<LoanRepurchaseAppl
IPage<LoanRepurchaseApplyVo> listPage(IPage<LoanRepurchaseApply> page, @Param(Constants.WRAPPER) QueryWrapper<LoanRepurchaseApply> qw);
AppRepurchaseDetailsVo appDetail(@Param("sid") String sid);
LoanRepurchaseApplyDetailsVo fetchDetailsBySid(@Param("sid") String sid);
}

118
anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanrepurchaseapply/LoanRepurchaseApplyMapper.xml
View File

@ -28,4 +28,122 @@
${ew.sqlSegment}
</where>
</select>
<select id="appDetail"
resultType="com.yxt.anrui.riskcenter.api.loanrepurchaseapply.app.AppRepurchaseDetailsVo">
SELECT
a.sid,
date_format( a.applyDate, '%Y-%m-%d' ) AS `time`,
CONCAT( a.createDept, '-', a.createByName ) AS publishInfo,
a.taskId,
a.procInstId,
a.busVinSid AS csjlSid,
a.customerName AS custName,
a.bankContractNo,
a.loanName AS borrName,
a.vinNo,
a.vehMark,
a.loanContractNo,
a.bankName,
date_format( a.prepareDate, '%Y-%m-%d' ) AS prepareDate,
a.overdueMonthPrice,
a.currentNotDuePrice,
a.notDuePrice,
b.price,
b.currentNotDuePrice as currentNotDuePriceBank,
b.notDuePrice as notDuePriceBank,
b.bankInterest,
b.bankNominalPrice,
b.bankContractLiquidated,
b.bankOtherReceivable,
b.otherReceivableRemarks,
b.bankSettlePrice,
c.loanDeposit,
c.overduePrice,
c.putBankInterest,
c.funfCost,
c.bankOverInterest,
c.companyCurrentNotPrice,
c.bankNotPrice,
c.deductionAmount,
c.companyNominalPrice,
c.contractLiquidated,
c.companyOtherPrice,
c.otherCostRemarks,
c.settleAll,
c.profit,
a.amount,
a.buybacksReason,
a.bankReceivingAccount,
a.bankAccountNo,
a.payRemarks,
a.salesOrderSid
FROM
loan_repurchase_apply AS a
LEFT JOIN loan_repurchase_company_cost AS c ON a.sid = c.mainSid
LEFT JOIN loan_repurchase_cost AS b ON a.sid = b.mainSid
WHERE
a.sid = #{sid}
</select>
<select id="fetchDetailsBySid"
resultType="com.yxt.anrui.riskcenter.api.loanrepurchaseapply.LoanRepurchaseApplyDetailsVo">
SELECT
a.sid,
date_format( a.applyDate, '%Y-%m-%d' ) AS applyDate,
a.createBySid as userSid,
a.orgSidPath as orgPath,
a.createDept,
a.createDeptSid,
a.createByName,
a.taskId,
a.procInstId as instanceId,
a.busVinSid,
a.customerName,
a.bankContractNo,
a.loanName,
a.customerSid,
a.loanSid,
a.vinNo,
a.vehMark,
a.loanContractNo,
a.bankName,
date_format( a.prepareDate, '%Y-%m-%d' ) AS prepareDate,
a.overdueMonthPrice,
a.currentNotDuePrice,
a.notDuePrice,
b.price,
b.currentNotDuePrice as currentNotDuePriceBank,
b.notDuePrice as notDuePriceBank,
b.bankInterest,
b.bankNominalPrice,
b.bankContractLiquidated,
b.bankOtherReceivable,
b.otherReceivableRemarks,
b.bankSettlePrice,
c.loanDeposit,
c.overduePrice,
c.putBankInterest,
c.funfCost,
c.bankOverInterest,
c.companyCurrentNotPrice,
c.bankNotPrice,
c.deductionAmount,
c.companyNominalPrice,
c.contractLiquidated,
c.companyOtherPrice,
c.otherCostRemarks,
c.settleAll,
c.profit,
a.amount,
a.buybacksReason,
a.bankReceivingAccount,
a.bankAccountNo,
a.payRemarks,
a.salesOrderSid
FROM
loan_repurchase_apply AS a
LEFT JOIN loan_repurchase_company_cost AS c ON a.sid = c.mainSid
LEFT JOIN loan_repurchase_cost AS b ON a.sid = b.mainSid
WHERE
a.sid = #{sid}
</select>
</mapper>

81
anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanrepurchaseapply/LoanRepurchaseApplyService.java
View File

@ -8,15 +8,21 @@ 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.riskcenter.api.loanfile.LoanFile;
import com.yxt.anrui.riskcenter.api.loanfile.LoanFileEnum;
import com.yxt.anrui.riskcenter.api.loanparameter.*;
import com.yxt.anrui.riskcenter.api.loanrepurchaseapply.LoanRepurchaseApply;
import com.yxt.anrui.riskcenter.api.loanrepurchaseapply.LoanRepurchaseApplyDetailsVo;
import com.yxt.anrui.riskcenter.api.loanrepurchaseapply.LoanRepurchaseApplyQuery;
import com.yxt.anrui.riskcenter.api.loanrepurchaseapply.LoanRepurchaseApplyVo;
import com.yxt.anrui.riskcenter.api.loanrepaymentschedule.LoanSolutionsDetailsssVo;
import com.yxt.anrui.riskcenter.api.loanrepurchaseapply.*;
import com.yxt.anrui.riskcenter.api.loanrepurchaseapply.app.AppRepurchaseDetailsVo;
import com.yxt.anrui.riskcenter.api.loansolutions.LoanSolutions;
import com.yxt.anrui.riskcenter.api.loansolutions.app.SolutionsDetailsVo;
import com.yxt.anrui.riskcenter.api.loansubletapply.LoanSubletApply;
import com.yxt.anrui.riskcenter.api.loansubletapply.LoanSubletApplyFile;
import com.yxt.anrui.riskcenter.api.loansubletapply.LoanSubletApplyQuery;
import com.yxt.anrui.riskcenter.api.loansubletapply.LoanSubletApplyVo;
import com.yxt.anrui.riskcenter.biz.loanfile.LoanFileService;
import com.yxt.anrui.riskcenter.biz.loansolutions.LoanSolutionsService;
import com.yxt.common.base.config.component.FileUploadComponent;
import com.yxt.common.base.service.MybatisBaseService;
import com.yxt.common.base.utils.PagerUtil;
import com.yxt.common.core.query.PagerQuery;
@ -26,6 +32,11 @@ import org.apache.commons.lang3.StringUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import java.util.ArrayList;
import java.util.Collections;
import java.util.List;
import java.util.stream.Collectors;
/**
* @description:
@ -41,7 +52,12 @@ public class LoanRepurchaseApplyService extends MybatisBaseService<LoanRepurchas
private SysStaffOrgFeign sysStaffOrgFeign;
@Autowired
private SysOrganizationFeign sysOrganizationFeign;
@Autowired
private LoanFileService loanFileService;
@Autowired
private FileUploadComponent fileUploadComponent;
@Autowired
private LoanSolutionsService loanSolutionsService;
public PagerVo<LoanRepurchaseApplyVo> listPage(PagerQuery<LoanRepurchaseApplyQuery> pq) {
IPage<LoanRepurchaseApply> page = PagerUtil.queryToPage(pq);
@ -151,15 +167,62 @@ public class LoanRepurchaseApplyService extends MybatisBaseService<LoanRepurchas
public ResultBean<LoanRepurchaseApplyDetailsVo> fetchDetailsBySid(String sid) {
ResultBean rb = ResultBean.fireFail();
LoanRepurchaseApplyDetailsVo vo = new LoanRepurchaseApplyDetailsVo();
LoanRepurchaseApplyDetailsVo vo = baseMapper.fetchDetailsBySid(sid);
if (vo != null) {
//------金融方案-----------
ResultBean<SolutionsDetailsVo> solutionsDetailsVoResultBean = loanSolutionsService.selectDetailss(vo.getSalesOrderSid());
if (solutionsDetailsVoResultBean.getData() != null) {
LoanRepurchaseSolutionsDetailsssVo solutionsDetailsssVo = new LoanRepurchaseSolutionsDetailsssVo();
BeanUtil.copyProperties(solutionsDetailsVoResultBean.getData(), solutionsDetailsssVo);
vo.setSolutionsDetailsssVo(solutionsDetailsssVo);
}
List<LoanFile> fileList1 = loanFileService.selectByLinkSid(sid, LoanFileEnum.REPURCHASE_BANKFILE.getAttachType());
fileList1.removeAll(Collections.singleton(null));
if (!fileList1.isEmpty()) {
List<String> files = fileList1.stream().map(c -> fileUploadComponent.getUrlPrefix() + c.getFilePath()).
collect(Collectors.toList());
List<LoanRepurchaseApplyFile> applyFiles = new ArrayList<>();
for (String file : files) {
LoanRepurchaseApplyFile applyFile = new LoanRepurchaseApplyFile();
applyFile.setUrl(file);
applyFiles.add(applyFile);
}
vo.setBankfiles(applyFiles);
}
List<LoanFile> fileList2 = loanFileService.selectByLinkSid(sid, LoanFileEnum.REPURCHASE_BACKBUYFILE.getAttachType());
fileList2.removeAll(Collections.singleton(null));
if (!fileList2.isEmpty()) {
List<String> files = fileList2.stream().map(c -> fileUploadComponent.getUrlPrefix() + c.getFilePath()).
collect(Collectors.toList());
List<LoanRepurchaseApplyFile> applyFiles = new ArrayList<>();
for (String file : files) {
LoanRepurchaseApplyFile applyFile = new LoanRepurchaseApplyFile();
applyFile.setUrl(file);
applyFiles.add(applyFile);
}
vo.setBuyfiles(applyFiles);
}
}
return rb.success().setData(vo);
}
public ResultBean<AppRepurchaseDetailsVo> appDetail(String sid) {
ResultBean rb = ResultBean.fireFail();
AppRepurchaseDetailsVo vo = new AppRepurchaseDetailsVo();
AppRepurchaseDetailsVo vo = baseMapper.appDetail(sid);
List<LoanFile> fileList1 = loanFileService.selectByLinkSid(sid, LoanFileEnum.REPURCHASE_BANKFILE.getAttachType());
fileList1.removeAll(Collections.singleton(null));
if (!fileList1.isEmpty()) {
List<String> files = fileList1.stream().map(c -> fileUploadComponent.getUrlPrefix() + c.getFilePath()).
collect(Collectors.toList());
vo.setBankfiles(files);
}
List<LoanFile> fileList2 = loanFileService.selectByLinkSid(sid, LoanFileEnum.REPURCHASE_BACKBUYFILE.getAttachType());
fileList2.removeAll(Collections.singleton(null));
if (!fileList2.isEmpty()) {
List<String> files = fileList2.stream().map(c -> fileUploadComponent.getUrlPrefix() + c.getFilePath()).
collect(Collectors.toList());
vo.setBuyfiles(files);
}
return rb.success().setData(vo);
}
}

3
anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/risk/repurchase/RepurchaseDetailsVo.java
View File

@ -19,7 +19,6 @@ public class RepurchaseDetailsVo implements Vo {
private String sid;
private String publishInfo; // 发起部门-发起人
private String time; //申请日期
private List<String> files = new ArrayList<>();
private String taskId;
private String procInsId;
@ApiModelProperty("催收记录")
@ -105,6 +104,8 @@ public class RepurchaseDetailsVo implements Vo {
private String bankReceivingAccount;
@ApiModelProperty("资方收款账号")
private String bankAccountNo;
@ApiModelProperty("付款后需备注内容")
private String payRemarks;
private List<String> buyfiles = new ArrayList<>(); // 回购情况附件
@ApiModelProperty("销售订单sid")
private String salesOrderSid;

7
anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/risk/repurchase/RepurchaseService.java
View File

@ -12,6 +12,7 @@ import com.yxt.anrui.riskcenter.api.loanredemptionapply.flow.*;
import com.yxt.anrui.riskcenter.api.loanrepurchaseapply.LoanRepurchaseApplyFeign;
import com.yxt.anrui.riskcenter.api.loanrepurchaseapply.app.AppRepurchaseDetailsVo;
import com.yxt.anrui.riskcenter.api.loanrepurchaseapply.flow.*;
import com.yxt.anrui.terminal.api.base.common.CarModelVo;
import com.yxt.anrui.terminal.api.risk.redemption.RedemptionDetailsVo;
import com.yxt.anrui.terminal.api.risk.redemption.flow.AppRedemptionDelegateQuery;
import com.yxt.anrui.terminal.api.risk.redemption.flow.AppRedemptionTaskQuery;
@ -22,6 +23,7 @@ import com.yxt.anrui.terminal.api.risk.repurchase.flow.AppRepurchaseDelegateQuer
import com.yxt.anrui.terminal.api.risk.repurchase.flow.AppRepurchaseTaskQuery;
import com.yxt.anrui.terminal.api.risk.repurchase.flow.CompleteRepurchaseDto;
import com.yxt.anrui.terminal.api.risk.repurchase.flow.RepurchaseFlowableQuery;
import com.yxt.anrui.terminal.biz.base.common.CommonService;
import com.yxt.common.core.result.ResultBean;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
@ -43,6 +45,8 @@ public class RepurchaseService {
private SysStaffOrgFeign sysStaffOrgFeign;
@Autowired
private LoanRepurchaseApplyFeign loanRepurchaseApplyFeign;
@Autowired
private CommonService commonService;
public ResultBean<RepurchaseDetailsVo> detail(String sid) {
ResultBean<RepurchaseDetailsVo> rb = ResultBean.fireFail();
@ -50,6 +54,9 @@ public class RepurchaseService {
AppRepurchaseDetailsVo data = loanRepurchaseApplyFeign.appDetail(sid).getData();
if (null != data) {
BeanUtil.copyProperties(data, vo);
ResultBean<CarModelVo> getLoanSolution = commonService.getLoanSolution(data.getSalesOrderSid());
CarModelVo carModelVo = getLoanSolution.getData();
vo.setJrfa(carModelVo);
}
return rb.success().setData(vo);
}

Write Preview
Loading…
Cancel
Save