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

Merge remote-tracking branch 'origin/master'

master
fanzongzhe 1 year ago
parent
836c4407f6 bbf80bf98a
commit
ccfa797950
6 changed files with 159 additions and 1 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. 13
      anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanvehclearanceapply/LoanVehClearanceApplyDetailsVo.java
  2. 5
      anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanvehclearanceveh/LoanVehClearanceVehDetailsVo.java
  3. 52
      anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanvehclearanceveh/LoanVehClearanceVehFile.java
  4. 82
      anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanvehclearanceapply/LoanVehClearanceApplyService.java
  5. 4
      anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanvehclearanceveh/LoanVehClearanceVehMapper.java
  6. 4
      anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanvehclearanceveh/LoanVehClearanceVehService.java

13
anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanvehclearanceapply/LoanVehClearanceApplyDetailsVo.java
View File

@ -26,12 +26,18 @@
package com.yxt.anrui.riskcenter.api.loanvehclearanceapply;
import com.yxt.anrui.riskcenter.api.loanbecollectionapply.LoanBeCollectionFileVo;
import com.yxt.anrui.riskcenter.api.loanbecollectionveh.LoanBeCollectionVehDetailsVo;
import com.yxt.anrui.riskcenter.api.loanvehclearanceveh.LoanVehClearanceVehDetailsVo;
import com.yxt.common.core.vo.Vo;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import java.util.ArrayList;
import java.util.List;
/**
* Project: anrui-riskcenter(车辆远程解控申请) <br/>
* File: LoanVehClearanceApplyVo.java <br/>
@ -51,6 +57,8 @@ public class LoanVehClearanceApplyDetailsVo implements Vo {
private String sid; // sid
@ApiModelProperty("申请日期")
private String createTime;
@ApiModelProperty("创建人")
private String createByName; // 创建人
@ApiModelProperty("申请编号")
@ -75,5 +83,8 @@ public class LoanVehClearanceApplyDetailsVo implements Vo {
private String nodeState; // 流程状态
@ApiModelProperty("任务id")
private String taskId; // 任务id
@ApiModelProperty("附件")
private List<LoanVehClearanceFileVo> files = new ArrayList<>();
@ApiModelProperty("逾期车辆列表")
private List<LoanVehClearanceVehDetailsVo> loanVehClearanceVehDetailsVoList;
}

5
anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanvehclearanceveh/LoanVehClearanceVehDetailsVo.java
View File

@ -26,12 +26,15 @@
package com.yxt.anrui.riskcenter.api.loanvehclearanceveh;
import com.yxt.anrui.riskcenter.api.loanbecollectionveh.LoanBeCollectionVehFile;
import com.yxt.common.core.vo.Vo;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import java.util.List;
/**
* Project: anrui-riskcenter(车辆远程解控申请) <br/>
* File: LoanVehClearanceVehVo.java <br/>
@ -82,4 +85,6 @@ public class LoanVehClearanceVehDetailsVo implements Vo {
@ApiModelProperty("远程控制申请sid")
private String mainSid; // 远程控制申请sid
@ApiModelProperty
private List<LoanVehClearanceVehFile> sids;
}

52
anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanvehclearanceveh/LoanVehClearanceVehFile.java
View File

@ -0,0 +1,52 @@
/*********************************************************
*********************************************************
******************** *******************
************* ************
******* _oo0oo_ *******
*** o8888888o ***
* 88" . "88 *
* (| -_- |) *
* 0\ = /0 *
* ___/`---'\___ *
* .' \\| |// '. *
* / \\||| : |||// \ *
* / _||||| -:- |||||- \ *
* | | \\\ - /// | | *
* | \_| ''\---/'' |_/ | *
* \ .-\__ '-' ___/-. / *
* ___'. .' /--.--\ `. .'___ *
* ."" '< `.___\_<|>_/___.' >' "". *
* | | : `- \`.;`\ _ /`;.`/ - ` : | | *
* \ \ `_. \_ __\ /__ _/ .-` / / *
* =====`-.____`.___ \_____/___.-`___.-'===== *
* `=---=' *
* ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ *
*********__佛祖保佑__永无BUG__验收通过__钞票多多__*********
*********************************************************/
package com.yxt.anrui.riskcenter.api.loanvehclearanceveh;
import com.yxt.common.core.vo.Vo;
import io.swagger.annotations.ApiModel;
import lombok.Data;
/**
* Project: anrui-riskcenter(催收措施申请) <br/>
* File: LoanBeCollectionVehVo.java <br/>
* Class: com.yxt.anrui.riskcenter.api.loanbecollectionveh.LoanBeCollectionVehVo <br/>
* Description: 逾期催收车辆 视图数据对象. <br/>
* Copyright: Copyright (c) 2011 <br/>
* Company: https://gitee.com/liuzp315 <br/>
* Makedate: 2023-12-12 16:06:20 <br/>
*
* @author liupopo
* @version 1.0
* @since 1.0
*/
@Data
@ApiModel(value = "逾期催收车辆 视图数据详情", description = "逾期催收车辆 视图数据详情")
public class LoanVehClearanceVehFile implements Vo {
private String name;
private String sid;
}

82
anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanvehclearanceapply/LoanVehClearanceApplyService.java
View File

@ -30,18 +30,33 @@ import cn.hutool.core.date.DateUtil;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.yxt.anrui.base.common.utils.Rule;
import com.yxt.anrui.buscenter.api.bussalesorder.BusSalesOrder;
import com.yxt.anrui.buscenter.api.bussalesorder.BusSalesOrderFeign;
import com.yxt.anrui.buscenter.api.bussalesordervehicle.BusSalesOrderVehicle;
import com.yxt.anrui.buscenter.api.bussalesordervehicle.BusSalesOrderVehicleFeign;
import com.yxt.anrui.fin.api.finvehicleinvoice.FinVehicleInvoice;
import com.yxt.anrui.fin.api.finvehicleinvoice.FinVehicleInvoiceFeign;
import com.yxt.anrui.portal.api.sysorganization.SysOrganizationFeign;
import com.yxt.anrui.portal.api.sysorganization.SysOrganizationVo;
import com.yxt.anrui.portal.api.sysuser.PrivilegeQuery;
import com.yxt.anrui.portal.api.sysuser.SysUserFeign;
import com.yxt.anrui.riskcenter.api.loanbecollectionapply.LoanBeCollectionApply;
import com.yxt.anrui.riskcenter.api.loanbecollectionapply.LoanBeCollectionApplyDetailsVo;
import com.yxt.anrui.riskcenter.api.loanbecollectionapply.LoanBeCollectionApplyVo;
import com.yxt.anrui.riskcenter.api.loanbecollectionapply.LoanBeCollectionFileVo;
import com.yxt.anrui.riskcenter.api.loanbecollectionveh.LoanBeCollectionVehDetailsVo;
import com.yxt.anrui.riskcenter.api.loanbecollectionveh.LoanBeCollectionVehDto;
import com.yxt.anrui.riskcenter.api.loanbecollectionveh.LoanBeCollectionVehFile;
import com.yxt.anrui.riskcenter.api.loanfile.LoanFile;
import com.yxt.anrui.riskcenter.api.loanfile.LoanFileEnum;
import com.yxt.anrui.riskcenter.api.loansolutions.LoanSolutions;
import com.yxt.anrui.riskcenter.api.loanvehclearanceapply.*;
import com.yxt.anrui.riskcenter.api.loanvehclearanceveh.LoanVehClearanceVehDetailsVo;
import com.yxt.anrui.riskcenter.api.loanvehclearanceveh.LoanVehClearanceVehDto;
import com.yxt.anrui.riskcenter.api.loanvehclearanceveh.LoanVehClearanceVehFile;
import com.yxt.anrui.riskcenter.biz.loanfile.LoanFileService;
import com.yxt.anrui.riskcenter.biz.loanhomevisitinvestigate.LoanHomevisitInvestigateService;
import com.yxt.anrui.riskcenter.biz.loansolutions.LoanSolutionsService;
import com.yxt.anrui.riskcenter.biz.loanvehclearanceveh.LoanVehClearanceVehService;
import com.yxt.common.base.config.component.FileUploadComponent;
import org.apache.commons.lang3.StringUtils;
@ -55,6 +70,8 @@ import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import javax.annotation.Resource;
import java.util.ArrayList;
import java.util.Arrays;
import java.util.List;
/**
@ -83,6 +100,16 @@ public class LoanVehClearanceApplyService extends MybatisBaseService<LoanVehClea
private LoanFileService loanFileService;
@Autowired
private LoanVehClearanceVehService loanVehClearanceVehService;
@Autowired
private BusSalesOrderVehicleFeign busSalesOrderVehicleFeign;
@Autowired
private BusSalesOrderFeign busSalesOrderFeign;
@Autowired
private LoanSolutionsService loanSolutionsService;
@Autowired
private FinVehicleInvoiceFeign finVehicleInvoiceFeign;
@Autowired
private LoanHomevisitInvestigateService loanHomevisitInvestigateService;
public PagerVo<LoanVehClearanceApplyVo> listPageVo(PagerQuery<LoanVehClearanceApplyQuery> pq) {
LoanVehClearanceApplyQuery query = pq.getParams();
@ -232,6 +259,61 @@ public class LoanVehClearanceApplyService extends MybatisBaseService<LoanVehClea
LoanVehClearanceApply entity = fetchBySid(sid);
LoanVehClearanceApplyDetailsVo vo = new LoanVehClearanceApplyDetailsVo();
BeanUtil.copyProperties(entity, vo);
vo.setCreateTime(DateUtil.formatDate(entity.getCreateTime()));
List<LoanFile> loanFiles = loanFileService.selectByLinkSid(sid, LoanFileEnum.VEHCLEARANCE.getAttachType());
List<LoanVehClearanceFileVo> loanVehClearanceFileVos = new ArrayList<>();
if (loanFiles != null && loanFiles.size() > 0){
for (LoanFile loanFile : loanFiles) {
LoanVehClearanceFileVo loanVehClearanceFileVo = new LoanVehClearanceFileVo();
String filePath = loanFile.getFilePath();
String urlPrefix = fileUploadComponent.getUrlPrefix();
filePath = urlPrefix + filePath;
loanVehClearanceFileVo.setUrl(filePath);
loanVehClearanceFileVos.add(loanVehClearanceFileVo);
}
}
vo.setFiles(loanVehClearanceFileVos);
List<LoanVehClearanceVehDetailsVo> loanVehClearanceVehDetailsVoList = loanVehClearanceVehService.selByMainSid(sid);
for (LoanVehClearanceVehDetailsVo loanVehClearanceVehDetailsVo : loanVehClearanceVehDetailsVoList) {
List<LoanVehClearanceVehFile> loanVehClearanceVehFiles = new ArrayList<>();
BusSalesOrderVehicle busSalesOrderVehicle1 = busSalesOrderVehicleFeign.details(loanVehClearanceVehDetailsVo.getSaleVehSid()).getData();
BusSalesOrder busSalesOrder = busSalesOrderFeign.fetchBySid(busSalesOrderVehicle1.getSalesOrderSid()).getData();
//催收记录sid
LoanVehClearanceVehFile loanVehClearanceVehFile1 = new LoanVehClearanceVehFile();
loanVehClearanceVehFile1.setName("催收记录");
loanVehClearanceVehFile1.setSid(loanVehClearanceVehDetailsVo.getSaleVehSid());
loanVehClearanceVehFiles.add(loanVehClearanceVehFile1);
//开票管理sid
FinVehicleInvoice finVehicleInvoice = finVehicleInvoiceFeign.selectByVinAndContractNo(busSalesOrderVehicle1.getLinkSid(), busSalesOrder.getContractNo()).getData();
LoanVehClearanceVehFile loanVehClearanceVehFile2 = new LoanVehClearanceVehFile();
loanVehClearanceVehFile2.setName("开票信息");
loanVehClearanceVehFile2.setSid(finVehicleInvoice.getSid());
loanVehClearanceVehFiles.add(loanVehClearanceVehFile2);
//月还明细sid
LoanVehClearanceVehFile loanVehClearanceVehFile3 = new LoanVehClearanceVehFile();
loanVehClearanceVehFile3.setName("月还明细");
loanVehClearanceVehFile3.setSid(loanVehClearanceVehDetailsVo.getSaleVehSid());
loanVehClearanceVehFiles.add(loanVehClearanceVehFile3);
//金融方案sid
LoanSolutions loanSolutions = loanSolutionsService.selectBySaleOrderSid(busSalesOrder.getSid());
LoanVehClearanceVehFile loanVehClearanceVehFile4 = new LoanVehClearanceVehFile();
loanVehClearanceVehFile4.setName("金融方案");
loanVehClearanceVehFile4.setSid(loanSolutions.getSid());
loanVehClearanceVehFiles.add(loanVehClearanceVehFile4);
//家访考察报告sid
String jfkcSid = loanHomevisitInvestigateService.selectByBorrSid(busSalesOrderVehicle1.getBorrowerSid());
LoanVehClearanceVehFile loanVehClearanceVehFile5 = new LoanVehClearanceVehFile();
loanVehClearanceVehFile5.setName("家访考察报告");
loanVehClearanceVehFile5.setSid(jfkcSid);
loanVehClearanceVehFiles.add(loanVehClearanceVehFile5);
//家访考察资料sid
LoanVehClearanceVehFile loanVehClearanceVehFile6 = new LoanVehClearanceVehFile();
loanVehClearanceVehFile6.setName("家访考察资料");
loanVehClearanceVehFile6.setSid(jfkcSid);
loanVehClearanceVehFiles.add(loanVehClearanceVehFile6);
loanVehClearanceVehDetailsVo.setSids(loanVehClearanceVehFiles);
}
vo.setLoanVehClearanceVehDetailsVoList(loanVehClearanceVehDetailsVoList);
return vo;
}
}

4
anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanvehclearanceveh/LoanVehClearanceVehMapper.java
View File

@ -29,6 +29,7 @@ import com.baomidou.mybatisplus.core.conditions.Wrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.baomidou.mybatisplus.core.toolkit.Constants;
import com.yxt.anrui.riskcenter.api.loanvehclearanceveh.LoanVehClearanceVehDetailsVo;
import org.apache.ibatis.annotations.Delete;
import org.apache.ibatis.annotations.Mapper;
import org.apache.ibatis.annotations.Param;
@ -66,4 +67,7 @@ public interface LoanVehClearanceVehMapper extends BaseMapper<LoanVehClearanceVe
@Delete("delete from loan_veh_clearance_veh where mainSid = #{dtoSid}")
void delByMainSid(String dtoSid);
@Select("select * from loan_veh_clearance_veh where mainSid = #{sid}")
List<LoanVehClearanceVehDetailsVo> selByMainSid(String sid);
}

4
anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanvehclearanceveh/LoanVehClearanceVehService.java
View File

@ -111,4 +111,8 @@ public class LoanVehClearanceVehService extends MybatisBaseService<LoanVehCleara
public void delByMainSid(String dtoSid) {
baseMapper.delByMainSid(dtoSid);
}
public List<LoanVehClearanceVehDetailsVo> selByMainSid(String sid) {
return baseMapper.selByMainSid(sid);
}
}
Write Preview
Loading…
Cancel
Save