|
|
@ -38,12 +38,14 @@ import com.yxt.anrui.riskcenter.api.loanrestorereportapply.AlrepaidAndArrVo; |
|
|
import com.yxt.anrui.riskcenter.api.loansubletapply.*; |
|
|
import com.yxt.anrui.riskcenter.api.loansubletapply.*; |
|
|
import com.yxt.anrui.riskcenter.api.loansubletapply.app.AppSubletDetailsVo; |
|
|
import com.yxt.anrui.riskcenter.api.loansubletapply.app.AppSubletDetailsVo; |
|
|
import com.yxt.anrui.riskcenter.api.loansubletapply.flow.*; |
|
|
import com.yxt.anrui.riskcenter.api.loansubletapply.flow.*; |
|
|
|
|
|
import com.yxt.anrui.riskcenter.api.loansubletveh.LoanSubletVeh; |
|
|
import com.yxt.anrui.riskcenter.biz.loanbuckleapplyrecord.LoanBuckleApplyRecordService; |
|
|
import com.yxt.anrui.riskcenter.biz.loanbuckleapplyrecord.LoanBuckleApplyRecordService; |
|
|
import com.yxt.anrui.riskcenter.biz.loanfile.LoanFileService; |
|
|
import com.yxt.anrui.riskcenter.biz.loanfile.LoanFileService; |
|
|
import com.yxt.anrui.riskcenter.biz.loanredemptionveh.LoanRedemptionVehService; |
|
|
import com.yxt.anrui.riskcenter.biz.loanredemptionveh.LoanRedemptionVehService; |
|
|
import com.yxt.anrui.riskcenter.biz.loanrepaymenthistory.LoanRepaymentHistoryService; |
|
|
import com.yxt.anrui.riskcenter.biz.loanrepaymenthistory.LoanRepaymentHistoryService; |
|
|
import com.yxt.anrui.riskcenter.biz.loanrepaymentplandetails.LoanRepaymentPlanDetailsService; |
|
|
import com.yxt.anrui.riskcenter.biz.loanrepaymentplandetails.LoanRepaymentPlanDetailsService; |
|
|
import com.yxt.anrui.riskcenter.biz.loanrestorereportapply.LoanRestoreReportApplyService; |
|
|
import com.yxt.anrui.riskcenter.biz.loanrestorereportapply.LoanRestoreReportApplyService; |
|
|
|
|
|
import com.yxt.anrui.riskcenter.biz.loansubletveh.LoanSubletVehService; |
|
|
import com.yxt.common.base.config.component.FileUploadComponent; |
|
|
import com.yxt.common.base.config.component.FileUploadComponent; |
|
|
import com.yxt.common.base.service.MybatisBaseService; |
|
|
import com.yxt.common.base.service.MybatisBaseService; |
|
|
import com.yxt.common.base.utils.PagerUtil; |
|
|
import com.yxt.common.base.utils.PagerUtil; |
|
|
@ -108,7 +110,7 @@ public class LoanSubletApplyService extends MybatisBaseService<LoanSubletApplyMa |
|
|
@Autowired |
|
|
@Autowired |
|
|
private LoanRestoreReportApplyService loanRestoreReportApplyService; |
|
|
private LoanRestoreReportApplyService loanRestoreReportApplyService; |
|
|
@Autowired |
|
|
@Autowired |
|
|
private LoanRedemptionVehService loanRedemptionVehService; |
|
|
private LoanSubletVehService loanSubletVehService; |
|
|
|
|
|
|
|
|
public PagerVo<LoanSubletApplyVo> listPage(PagerQuery<LoanSubletApplyQuery> pq) { |
|
|
public PagerVo<LoanSubletApplyVo> listPage(PagerQuery<LoanSubletApplyQuery> pq) { |
|
|
IPage<LoanSubletApply> page = PagerUtil.queryToPage(pq); |
|
|
IPage<LoanSubletApply> page = PagerUtil.queryToPage(pq); |
|
|
@ -121,37 +123,37 @@ public class LoanSubletApplyService extends MybatisBaseService<LoanSubletApplyMa |
|
|
privilegeQuery.setMenuUrl(pagerQuery.getMenuUrl()); |
|
|
privilegeQuery.setMenuUrl(pagerQuery.getMenuUrl()); |
|
|
privilegeQuery.setUserSid(pagerQuery.getUserSid()); |
|
|
privilegeQuery.setUserSid(pagerQuery.getUserSid()); |
|
|
ResultBean<String> defaultIdReltBean = sysUserFeign.selectPrivilegeLevel(privilegeQuery); |
|
|
ResultBean<String> defaultIdReltBean = sysUserFeign.selectPrivilegeLevel(privilegeQuery); |
|
|
if (StringUtils.isNotBlank(defaultIdReltBean.getData())) { |
|
|
// if (StringUtils.isNotBlank(defaultIdReltBean.getData())) {
|
|
|
//数据权限ID(1集团、2事业部、3分公司、4部门、5个人)
|
|
|
// //数据权限ID(1集团、2事业部、3分公司、4部门、5个人)
|
|
|
String orgSidPath = pagerQuery.getOrgPath(); |
|
|
// String orgSidPath = pagerQuery.getOrgPath();
|
|
|
orgSidPath = orgSidPath + "/"; |
|
|
// orgSidPath = orgSidPath + "/";
|
|
|
int i1 = orgSidPath.indexOf("/"); |
|
|
// int i1 = orgSidPath.indexOf("/");
|
|
|
int i2 = orgSidPath.indexOf("/", i1 + 1); |
|
|
// int i2 = orgSidPath.indexOf("/", i1 + 1);
|
|
|
int i3 = orgSidPath.indexOf("/", i2 + 1); |
|
|
// int i3 = orgSidPath.indexOf("/", i2 + 1);
|
|
|
int i4 = orgSidPath.indexOf("/", i3 + 1); |
|
|
// int i4 = orgSidPath.indexOf("/", i3 + 1);
|
|
|
String orgLevelKey = defaultIdReltBean.getData(); |
|
|
// String orgLevelKey = defaultIdReltBean.getData();
|
|
|
if ("1".equals(orgLevelKey)) { |
|
|
// if ("1".equals(orgLevelKey)) {
|
|
|
orgSidPath = orgSidPath.substring(0, i1); |
|
|
// orgSidPath = orgSidPath.substring(0, i1);
|
|
|
qw.like("a.orgSidPath", orgSidPath); |
|
|
// qw.like("a.orgSidPath", orgSidPath);
|
|
|
} else if ("2".equals(orgLevelKey)) { |
|
|
// } else if ("2".equals(orgLevelKey)) {
|
|
|
orgSidPath = orgSidPath.substring(0, i2); |
|
|
// orgSidPath = orgSidPath.substring(0, i2);
|
|
|
qw.like("a.orgSidPath", orgSidPath); |
|
|
// qw.like("a.orgSidPath", orgSidPath);
|
|
|
} else if ("3".equals(orgLevelKey)) { |
|
|
// } else if ("3".equals(orgLevelKey)) {
|
|
|
orgSidPath = orgSidPath.substring(0, i3); |
|
|
// orgSidPath = orgSidPath.substring(0, i3);
|
|
|
qw.like("a.orgSidPath", orgSidPath); |
|
|
// qw.like("a.orgSidPath", orgSidPath);
|
|
|
} else if ("4".equals(orgLevelKey)) { |
|
|
// } else if ("4".equals(orgLevelKey)) {
|
|
|
orgSidPath = orgSidPath.substring(0, i4); |
|
|
// orgSidPath = orgSidPath.substring(0, i4);
|
|
|
qw.like("a.orgSidPath", orgSidPath); |
|
|
// qw.like("a.orgSidPath", orgSidPath);
|
|
|
} else if ("5".equals(orgLevelKey)) { |
|
|
// } else if ("5".equals(orgLevelKey)) {
|
|
|
qw.eq("a.createBySid", pagerQuery.getUserSid()); |
|
|
// qw.eq("a.createBySid", pagerQuery.getUserSid());
|
|
|
} else { |
|
|
// } else {
|
|
|
PagerVo<LoanSubletApplyVo> p = new PagerVo<>(); |
|
|
// PagerVo<LoanSubletApplyVo> p = new PagerVo<>();
|
|
|
return p; |
|
|
// return p;
|
|
|
} |
|
|
// }
|
|
|
} else { |
|
|
// } else {
|
|
|
PagerVo<LoanSubletApplyVo> p = new PagerVo<>(); |
|
|
// PagerVo<LoanSubletApplyVo> p = new PagerVo<>();
|
|
|
return p; |
|
|
// return p;
|
|
|
} |
|
|
// }
|
|
|
//=======================
|
|
|
//=======================
|
|
|
//分公司
|
|
|
//分公司
|
|
|
if (StringUtils.isNotBlank(pagerQuery.getCompany())) { |
|
|
if (StringUtils.isNotBlank(pagerQuery.getCompany())) { |
|
|
@ -187,11 +189,11 @@ public class LoanSubletApplyService extends MybatisBaseService<LoanSubletApplyMa |
|
|
} |
|
|
} |
|
|
//车架号
|
|
|
//车架号
|
|
|
if (StringUtils.isNotBlank(pagerQuery.getVinNo())) { |
|
|
if (StringUtils.isNotBlank(pagerQuery.getVinNo())) { |
|
|
qw.like("v.vinNo", pagerQuery.getVinNo()); |
|
|
qw.like("a.vinNo", pagerQuery.getVinNo()); |
|
|
} |
|
|
} |
|
|
//车牌号
|
|
|
//车牌号
|
|
|
if (StringUtils.isNotBlank(pagerQuery.getVehMark())) { |
|
|
if (StringUtils.isNotBlank(pagerQuery.getVehMark())) { |
|
|
qw.like("v.vehMark", pagerQuery.getVehMark()); |
|
|
qw.like("a.vehMark", pagerQuery.getVehMark()); |
|
|
} |
|
|
} |
|
|
String applyStartTime = pagerQuery.getApplyStartDate(); |
|
|
String applyStartTime = pagerQuery.getApplyStartDate(); |
|
|
String applyEndTime = pagerQuery.getApplyEndDate(); |
|
|
String applyEndTime = pagerQuery.getApplyEndDate(); |
|
|
@ -204,8 +206,8 @@ public class LoanSubletApplyService extends MybatisBaseService<LoanSubletApplyMa |
|
|
apply(StringUtils.isNotEmpty(closingEndDate), "date_format (a.closingDate,'%Y-%m-%d') <= date_format('" + closingEndDate + "','%Y-%m-%d')" |
|
|
apply(StringUtils.isNotEmpty(closingEndDate), "date_format (a.closingDate,'%Y-%m-%d') <= date_format('" + closingEndDate + "','%Y-%m-%d')" |
|
|
); |
|
|
); |
|
|
qw.eq("a.isDelete", 0); |
|
|
qw.eq("a.isDelete", 0); |
|
|
qw.orderByDesc("a.createTime"); |
|
|
qw.orderByDesc("a.applyDate"); |
|
|
qw.eq("v.vehType", "0"); |
|
|
qw.apply("(a.count > 1 AND a.vehType = '主车' ) OR (a.count = 1)"); |
|
|
IPage<LoanSubletApplyVo> pagging = baseMapper.listPage(page, qw); |
|
|
IPage<LoanSubletApplyVo> pagging = baseMapper.listPage(page, qw); |
|
|
PagerVo<LoanSubletApplyVo> p = PagerUtil.pageToVo(pagging, null); |
|
|
PagerVo<LoanSubletApplyVo> p = PagerUtil.pageToVo(pagging, null); |
|
|
return p; |
|
|
return p; |
|
|
@ -232,7 +234,7 @@ public class LoanSubletApplyService extends MybatisBaseService<LoanSubletApplyMa |
|
|
qw.eq("v.isDelete", 0); |
|
|
qw.eq("v.isDelete", 0); |
|
|
qw.orderByDesc("v.createTime"); |
|
|
qw.orderByDesc("v.createTime"); |
|
|
qw.eq("v.stockState", "库存"); |
|
|
qw.eq("v.stockState", "库存"); |
|
|
qw.eq("disposal", "未处置"); |
|
|
qw.eq("v.disposal", "未处置"); |
|
|
IPage<SubletVinListVo> pagging = baseMapper.getVinList(page, qw); |
|
|
IPage<SubletVinListVo> pagging = baseMapper.getVinList(page, qw); |
|
|
PagerVo<SubletVinListVo> p = PagerUtil.pageToVo(pagging, null); |
|
|
PagerVo<SubletVinListVo> p = PagerUtil.pageToVo(pagging, null); |
|
|
return p; |
|
|
return p; |
|
|
@ -240,72 +242,63 @@ public class LoanSubletApplyService extends MybatisBaseService<LoanSubletApplyMa |
|
|
|
|
|
|
|
|
public ResultBean<LoanSubletApplyInit> subletInit(String ledgerSid) { |
|
|
public ResultBean<LoanSubletApplyInit> subletInit(String ledgerSid) { |
|
|
ResultBean rb = ResultBean.fireFail(); |
|
|
ResultBean rb = ResultBean.fireFail(); |
|
|
LoanRedemptionApplyInit vo = new LoanRedemptionApplyInit(); |
|
|
LoanSubletApplyInit vo = new LoanSubletApplyInit(); |
|
|
RedemptionInitVo redemptionInitVo = baseMapper.redemptionInit(ledgerSid); |
|
|
SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd"); |
|
|
if (null != redemptionInitVo) { |
|
|
vo.setApplyDate(sdf.format(new Date())); |
|
|
BeanUtil.copyProperties(redemptionInitVo, vo); |
|
|
List<SubletVinList> vinList = new ArrayList<>(); |
|
|
if (StringUtils.isNotBlank(redemptionInitVo.getBusVinSid())) { |
|
|
SubletInitVo subletInitVo = baseMapper.selReturnLegerBySid(ledgerSid); |
|
|
AlrepaidAndArrVo alrepaidAndArr = loanRestoreReportApplyService.getAlrepaidAndArr(redemptionInitVo.getBusVinSid()); |
|
|
String vehType = ""; |
|
|
if (null != alrepaidAndArr) { |
|
|
if (null != subletInitVo) { |
|
|
//已还金额
|
|
|
if (StringUtils.isNotBlank(subletInitVo.getCustomer())) { |
|
|
if (StringUtils.isNotBlank(alrepaidAndArr.getAlRepaidMoney())) { |
|
|
vo.setCustomer(subletInitVo.getCustomer()); |
|
|
vo.setAlRepaidMoney(alrepaidAndArr.getAlRepaidMoney()); |
|
|
} |
|
|
} |
|
|
if (StringUtils.isNotBlank(subletInitVo.getBorrowerName())) { |
|
|
//已还金额换算期数
|
|
|
vo.setBorrowerName(subletInitVo.getBorrowerName()); |
|
|
if (StringUtils.isNotBlank(alrepaidAndArr.getAlRepaidMoneyConPeriod())) { |
|
|
} |
|
|
vo.setAlRepaidMoneyConPeriod(alrepaidAndArr.getAlRepaidMoneyConPeriod()); |
|
|
if (StringUtils.isNotBlank(subletInitVo.getVehType())) { |
|
|
} |
|
|
vehType = subletInitVo.getVehType(); |
|
|
//逾期金额换算期数
|
|
|
if (vehType.equals("主车")) { |
|
|
if (StringUtils.isNotBlank(alrepaidAndArr.getBeOverdueMoneyAndPeriod())) { |
|
|
SubletInitVo mainVeh = baseMapper.selLoanInfoByMainVeh(subletInitVo.getBusVinSid()); |
|
|
vo.setBeOverdueMoneyAndPeriod(alrepaidAndArr.getBeOverdueMoneyAndPeriod()); |
|
|
if (null != mainVeh) { |
|
|
} |
|
|
if (StringUtils.isNotBlank(mainVeh.getBankName())) { |
|
|
//总期数
|
|
|
vo.setBankName(mainVeh.getBankName()); |
|
|
if (StringUtils.isNotBlank(alrepaidAndArr.getNper())) { |
|
|
} |
|
|
vo.setNper(alrepaidAndArr.getNper()); |
|
|
if (StringUtils.isNotBlank(mainVeh.getLoanContractNo())) { |
|
|
|
|
|
vo.setLoanContractNo(mainVeh.getLoanContractNo()); |
|
|
|
|
|
} |
|
|
|
|
|
if (StringUtils.isNotBlank(mainVeh.getBankContractNo())) { |
|
|
|
|
|
vo.setBankContractNo(mainVeh.getBankContractNo()); |
|
|
|
|
|
} |
|
|
} |
|
|
} |
|
|
//当前逾期金额
|
|
|
SubletVinList mVeh = baseMapper.selReturnVinLegerBySid(ledgerSid); |
|
|
if (StringUtils.isNotBlank(alrepaidAndArr.getCurrentBeMoney())) { |
|
|
if (null != mVeh) { |
|
|
vo.setCurrentBeMoney(alrepaidAndArr.getCurrentBeMoney()); |
|
|
vinList.add(mVeh); |
|
|
} |
|
|
} |
|
|
//当前期数
|
|
|
SubletVinList tVeh = baseMapper.selReturnTrVinLegerByPSid(ledgerSid); |
|
|
if (StringUtils.isNotBlank(alrepaidAndArr.getCurrentPeriod())) { |
|
|
if (null != tVeh) { |
|
|
vo.setCurrentPeriod(alrepaidAndArr.getCurrentPeriod()); |
|
|
vinList.add(tVeh); |
|
|
} |
|
|
} |
|
|
//未到期金额
|
|
|
vo.setVinList(vinList); |
|
|
if (StringUtils.isNotBlank(alrepaidAndArr.getUnexpiredMoney())) { |
|
|
} else if (vehType.equals("挂车")) { |
|
|
vo.setUnexpiredMoney(alrepaidAndArr.getUnexpiredMoney()); |
|
|
SubletInitVo trVeh = baseMapper.selLoanInfoByTrVeh(ledgerSid); |
|
|
|
|
|
if (null != trVeh) { |
|
|
|
|
|
if (StringUtils.isNotBlank(trVeh.getBankName())) { |
|
|
|
|
|
vo.setBankName(trVeh.getBankName()); |
|
|
|
|
|
} |
|
|
|
|
|
if (StringUtils.isNotBlank(trVeh.getLoanContractNo())) { |
|
|
|
|
|
vo.setLoanContractNo(trVeh.getLoanContractNo()); |
|
|
|
|
|
} |
|
|
|
|
|
if (StringUtils.isNotBlank(trVeh.getBankContractNo())) { |
|
|
|
|
|
vo.setBankContractNo(trVeh.getBankContractNo()); |
|
|
|
|
|
} |
|
|
} |
|
|
} |
|
|
//其中资金占用费
|
|
|
SubletVinList tVeh = baseMapper.selReturnTrVinLegerBySid(ledgerSid); |
|
|
if (StringUtils.isNotBlank(alrepaidAndArr.getWheFundOccMoney())) { |
|
|
if (null != tVeh) { |
|
|
vo.setWheFundOccMoney(alrepaidAndArr.getWheFundOccMoney()); |
|
|
vinList.add(tVeh); |
|
|
} |
|
|
} |
|
|
|
|
|
vo.setVinList(vinList); |
|
|
} |
|
|
} |
|
|
} |
|
|
} |
|
|
List<RedemptionVinList> vinList = new ArrayList<>(); |
|
|
|
|
|
RedemptionVinList mainVeh = new RedemptionVinList(); |
|
|
|
|
|
if (StringUtils.isNotBlank(redemptionInitVo.getVinSid())) { |
|
|
|
|
|
mainVeh.setVinSid(redemptionInitVo.getVinSid()); |
|
|
|
|
|
} |
|
|
|
|
|
if (StringUtils.isNotBlank(redemptionInitVo.getVinNo())) { |
|
|
|
|
|
mainVeh.setVinNo(redemptionInitVo.getVinNo()); |
|
|
|
|
|
} |
|
|
|
|
|
if (StringUtils.isNotBlank(redemptionInitVo.getVehModel())) { |
|
|
|
|
|
mainVeh.setVehModel(redemptionInitVo.getVehModel()); |
|
|
|
|
|
} |
|
|
|
|
|
if (StringUtils.isNotBlank(redemptionInitVo.getVehMark())) { |
|
|
|
|
|
mainVeh.setVehMark(redemptionInitVo.getVehMark()); |
|
|
|
|
|
} |
|
|
|
|
|
if (StringUtils.isNotBlank(redemptionInitVo.getVehType())) { |
|
|
|
|
|
mainVeh.setVehType(redemptionInitVo.getVehType()); |
|
|
|
|
|
} |
|
|
|
|
|
vinList.add(mainVeh); |
|
|
|
|
|
if (StringUtils.isNotBlank(redemptionInitVo.getLedgerSid())) { |
|
|
|
|
|
RedemptionVinList trailerVeh = baseMapper.selTrailerByLedgerSid(redemptionInitVo.getLedgerSid()); |
|
|
|
|
|
if (null != trailerVeh) { |
|
|
|
|
|
vinList.add(trailerVeh); |
|
|
|
|
|
} |
|
|
|
|
|
} |
|
|
|
|
|
vo.setVinList(vinList); |
|
|
|
|
|
} |
|
|
} |
|
|
return rb.success().setData(vo); |
|
|
return rb.success().setData(vo); |
|
|
} |
|
|
} |
|
|
@ -313,218 +306,163 @@ public class LoanSubletApplyService extends MybatisBaseService<LoanSubletApplyMa |
|
|
|
|
|
|
|
|
@Transactional(rollbackFor = Exception.class) |
|
|
@Transactional(rollbackFor = Exception.class) |
|
|
public ResultBean<String> saveSublet(LoanSubletApplyDto dto) { |
|
|
public ResultBean<String> saveSublet(LoanSubletApplyDto dto) { |
|
|
// ResultBean<String> rb = ResultBean.fireFail();
|
|
|
ResultBean<String> rb = ResultBean.fireFail(); |
|
|
// String sid = "";
|
|
|
String sid = ""; |
|
|
// if (StringUtils.isNotBlank(dto.getSid())) {
|
|
|
if (StringUtils.isNotBlank(dto.getSid())) { |
|
|
// sid = dto.getSid();
|
|
|
sid = dto.getSid(); |
|
|
// LoanRedemptionApply updateEntity = fetchBySid(sid);
|
|
|
LoanSubletApply updateEntity = fetchBySid(sid); |
|
|
// if (null != updateEntity) {
|
|
|
if (null != updateEntity) { |
|
|
// BeanUtil.copyProperties(dto, updateEntity, "id", "sid");
|
|
|
BeanUtil.copyProperties(dto, updateEntity, "id", "sid"); |
|
|
// baseMapper.updateById(updateEntity);
|
|
|
baseMapper.updateById(updateEntity); |
|
|
// loanRedemptionVehService.deleteByMainSid(sid);
|
|
|
//todo 修改车辆交回台账
|
|
|
// //删除附件表中关于该linkSid的文件
|
|
|
List<SubletVinList> subletVinLists = loanSubletVehService.selByMainSid(sid); |
|
|
// loanFileService.deleteByLinkSid(sid);
|
|
|
if (!subletVinLists.isEmpty()) { |
|
|
// List<LoanRedemptionApplyFile> filess = dto.getFiles();
|
|
|
|
|
|
// if (!filess.isEmpty()) {
|
|
|
} |
|
|
// List<String> files = new ArrayList<>();
|
|
|
loanSubletVehService.deleteByMainSid(sid); |
|
|
// for (LoanRedemptionApplyFile file : filess) {
|
|
|
//删除附件表中关于该linkSid的文件
|
|
|
// files.add(file.getUrl());
|
|
|
loanFileService.deleteByLinkSid(sid); |
|
|
// }
|
|
|
List<LoanSubletApplyFile> filess = dto.getFiles(); |
|
|
// loanFileService.saveAll(sid, files, LoanFileEnum.REDEMPTION.getAttachType());
|
|
|
if (!filess.isEmpty()) { |
|
|
// }
|
|
|
List<String> files = new ArrayList<>(); |
|
|
// List<RedemptionVinList> vinList = dto.getVinList();
|
|
|
for (LoanSubletApplyFile file : filess) { |
|
|
// if (!vinList.isEmpty()) {
|
|
|
files.add(file.getUrl()); |
|
|
// for (RedemptionVinList record : vinList) {
|
|
|
} |
|
|
// LoanRedemptionVeh redemptionVeh = new LoanRedemptionVeh();
|
|
|
loanFileService.saveAll(sid, files, LoanFileEnum.SUBLETAPPLY.getAttachType()); |
|
|
// redemptionVeh.setMainSid(sid);
|
|
|
} |
|
|
// if (StringUtils.isNotBlank(record.getVinSid())) {
|
|
|
List<SubletVinList> vinList = dto.getVinList(); |
|
|
// redemptionVeh.setVinSid(record.getVinSid());
|
|
|
if (!vinList.isEmpty()) { |
|
|
// }
|
|
|
for (SubletVinList record : vinList) { |
|
|
// if (StringUtils.isNotBlank(record.getVinNo())) {
|
|
|
LoanSubletVeh subletVeh = new LoanSubletVeh(); |
|
|
// redemptionVeh.setVinNo(record.getVinNo());
|
|
|
BeanUtil.copyProperties(record, subletVeh, "id", "sid"); |
|
|
// }
|
|
|
subletVeh.setMainSid(sid); |
|
|
// if (StringUtils.isNotBlank(record.getVehMark())) {
|
|
|
loanSubletVehService.insert(subletVeh); |
|
|
// redemptionVeh.setVehMark(record.getVehMark());
|
|
|
//todo 交回车辆状态处置状态修改
|
|
|
// }
|
|
|
} |
|
|
// if (StringUtils.isNotBlank(record.getVehModel())) {
|
|
|
} |
|
|
// redemptionVeh.setVehModel(record.getVehModel());
|
|
|
} |
|
|
// }
|
|
|
} else { |
|
|
// if (StringUtils.isNotBlank(record.getVehType())) {
|
|
|
LoanSubletApply apply = new LoanSubletApply(); |
|
|
// redemptionVeh.setVehType(record.getVehType());
|
|
|
sid = apply.getSid(); |
|
|
// if (record.getVehType().equals("主车")) {
|
|
|
BeanUtil.copyProperties(dto, apply, "id", "sid"); |
|
|
// if (StringUtils.isNotBlank(dto.getBusVinSid())) {
|
|
|
apply.setCreateBySid(dto.getUserSid()); |
|
|
// redemptionVeh.setBusVinSid(dto.getBusVinSid());
|
|
|
apply.setOrgSidPath(dto.getOrgPath()); |
|
|
// }
|
|
|
ResultBean<String> orgSidByPath = sysStaffOrgFeign.getOrgSidByPath(dto.getOrgPath()); |
|
|
// }
|
|
|
if (orgSidByPath.getSuccess()) { |
|
|
// }
|
|
|
String userOrgSid = orgSidByPath.getData(); |
|
|
// loanRedemptionVehService.insert(redemptionVeh);
|
|
|
apply.setUseOrgSid(userOrgSid); |
|
|
// }
|
|
|
ResultBean<SysOrganizationVo> organizationVo = sysOrganizationFeign.fetchBySid(userOrgSid); |
|
|
// }
|
|
|
if (organizationVo.getSuccess()) { |
|
|
// }
|
|
|
SysOrganizationVo organizationVoData = organizationVo.getData(); |
|
|
// } else {
|
|
|
if (null != organizationVoData) { |
|
|
// LoanRedemptionApply loanRedemptionApply = new LoanRedemptionApply();
|
|
|
apply.setUseOrgName(organizationVoData.getName()); |
|
|
// sid = loanRedemptionApply.getSid();
|
|
|
} |
|
|
// BeanUtil.copyProperties(dto, loanRedemptionApply, "id", "sid");
|
|
|
} |
|
|
// loanRedemptionApply.setCreateBySid(dto.getUserSid());
|
|
|
} |
|
|
// loanRedemptionApply.setOrgSidPath(dto.getOrgPath());
|
|
|
apply.setNodeState("待提交"); |
|
|
// ResultBean<String> orgSidByPath = sysStaffOrgFeign.getOrgSidByPath(dto.getOrgPath());
|
|
|
baseMapper.insert(apply); |
|
|
// if (orgSidByPath.getSuccess()) {
|
|
|
List<SubletVinList> vinList = dto.getVinList(); |
|
|
// String userOrgSid = orgSidByPath.getData();
|
|
|
if (!vinList.isEmpty()) { |
|
|
// loanRedemptionApply.setUseOrgSid(userOrgSid);
|
|
|
for (SubletVinList record : vinList) { |
|
|
// ResultBean<SysOrganizationVo> organizationVo = sysOrganizationFeign.fetchBySid(userOrgSid);
|
|
|
LoanSubletVeh subletVeh = new LoanSubletVeh(); |
|
|
// if (organizationVo.getSuccess()) {
|
|
|
BeanUtil.copyProperties(record, subletVeh, "id", "sid"); |
|
|
// SysOrganizationVo organizationVoData = organizationVo.getData();
|
|
|
subletVeh.setMainSid(sid); |
|
|
// if (null != organizationVoData) {
|
|
|
|
|
|
// loanRedemptionApply.setUseOrgName(organizationVoData.getName());
|
|
|
|
|
|
// }
|
|
|
|
|
|
// }
|
|
|
|
|
|
// }
|
|
|
|
|
|
// loanRedemptionApply.setNodeState("待提交");
|
|
|
|
|
|
// baseMapper.insert(loanRedemptionApply);
|
|
|
|
|
|
// List<RedemptionVinList> vinList = dto.getVinList();
|
|
|
|
|
|
// if (!vinList.isEmpty()) {
|
|
|
|
|
|
// for (RedemptionVinList record : vinList) {
|
|
|
|
|
|
// LoanRedemptionVeh redemptionVeh = new LoanRedemptionVeh();
|
|
|
|
|
|
// redemptionVeh.setMainSid(sid);
|
|
|
|
|
|
// if (StringUtils.isNotBlank(record.getVinSid())) {
|
|
|
// if (StringUtils.isNotBlank(record.getVinSid())) {
|
|
|
// redemptionVeh.setVinSid(record.getVinSid());
|
|
|
// subletVeh.setVinSid(record.getVinSid());
|
|
|
// }
|
|
|
// }
|
|
|
// if (StringUtils.isNotBlank(record.getVinNo())) {
|
|
|
// if (StringUtils.isNotBlank(record.getVinNo())) {
|
|
|
// redemptionVeh.setVinNo(record.getVinNo());
|
|
|
// subletVeh.setVinNo(record.getVinNo());
|
|
|
// }
|
|
|
// }
|
|
|
// if (StringUtils.isNotBlank(record.getVehMark())) {
|
|
|
// if (StringUtils.isNotBlank(record.getVehMark())) {
|
|
|
// redemptionVeh.setVehMark(record.getVehMark());
|
|
|
// subletVeh.setVehMark(record.getVehMark());
|
|
|
// }
|
|
|
// }
|
|
|
// if (StringUtils.isNotBlank(record.getVehModel())) {
|
|
|
// if (StringUtils.isNotBlank(record.getVehModel())) {
|
|
|
// redemptionVeh.setVehModel(record.getVehModel());
|
|
|
// subletVeh.setVehModel(record.getVehModel());
|
|
|
// }
|
|
|
// }
|
|
|
// if (StringUtils.isNotBlank(record.getVehType())) {
|
|
|
// if (StringUtils.isNotBlank(record.getVehType())) {
|
|
|
// redemptionVeh.setVehType(record.getVehType());
|
|
|
// subletVeh.setVehType(record.getVehType());
|
|
|
// if (record.getVehType().equals("主车")) {
|
|
|
|
|
|
// if (StringUtils.isNotBlank(dto.getBusVinSid())) {
|
|
|
|
|
|
// redemptionVeh.setBusVinSid(dto.getBusVinSid());
|
|
|
|
|
|
// }
|
|
|
|
|
|
// }
|
|
|
|
|
|
// }
|
|
|
// }
|
|
|
// loanRedemptionVehService.insert(redemptionVeh);
|
|
|
// if (StringUtils.isNotBlank(record.getBusVinSid())) {
|
|
|
// //todo 交回车辆状态处置状态修改
|
|
|
// subletVeh.setBusVinSid(record.getBusVinSid());
|
|
|
// }
|
|
|
// }
|
|
|
// }
|
|
|
// if (StringUtils.isNotBlank(record.getLedgerSid())) {
|
|
|
// //删除附件表中关于该linkSid的文件
|
|
|
// subletVeh.setLedgerSid(record.getLedgerSid());
|
|
|
// loanFileService.deleteByLinkSid(sid);
|
|
|
// }
|
|
|
// List<LoanRedemptionApplyFile> filess = dto.getFiles();
|
|
|
loanSubletVehService.insert(subletVeh); |
|
|
// if (!filess.isEmpty()) {
|
|
|
//todo 交回车辆状态处置状态修改
|
|
|
// List<String> files = new ArrayList<>();
|
|
|
} |
|
|
// for (LoanRedemptionApplyFile file : filess) {
|
|
|
} |
|
|
// files.add(file.getUrl());
|
|
|
//删除附件表中关于该linkSid的文件
|
|
|
// }
|
|
|
loanFileService.deleteByLinkSid(sid); |
|
|
// loanFileService.saveAll(sid, files, LoanFileEnum.REDEMPTION.getAttachType());
|
|
|
List<LoanSubletApplyFile> filess = dto.getFiles(); |
|
|
// }
|
|
|
if (!filess.isEmpty()) { |
|
|
// }
|
|
|
List<String> files = new ArrayList<>(); |
|
|
// return rb.success().setData(sid);
|
|
|
for (LoanSubletApplyFile file : filess) { |
|
|
return null; |
|
|
files.add(file.getUrl()); |
|
|
|
|
|
} |
|
|
|
|
|
loanFileService.saveAll(sid, files, LoanFileEnum.SUBLETAPPLY.getAttachType()); |
|
|
|
|
|
} |
|
|
|
|
|
} |
|
|
|
|
|
return rb.success().setData(sid); |
|
|
|
|
|
|
|
|
} |
|
|
} |
|
|
|
|
|
|
|
|
public ResultBean<LoanSubletApplyInit> subletDetails(String sid) { |
|
|
public ResultBean<LoanSubletApplyInit> subletDetails(String sid) { |
|
|
// ResultBean rb = ResultBean.fireFail();
|
|
|
ResultBean rb = ResultBean.fireFail(); |
|
|
// LoanRedemptionApplyInit vo = new LoanRedemptionApplyInit();
|
|
|
LoanSubletApplyInit vo = new LoanSubletApplyInit(); |
|
|
// LoanRedemptionApply entity = fetchBySid(sid);
|
|
|
LoanSubletApply entity = fetchBySid(sid); |
|
|
// SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd");
|
|
|
SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd"); |
|
|
// if (null != entity) {
|
|
|
if (null != entity) { |
|
|
// BeanUtil.copyProperties(entity, vo);
|
|
|
BeanUtil.copyProperties(entity, vo); |
|
|
// if (null != entity.getApplyDate()) {
|
|
|
if (null != entity.getApplyDate()) { |
|
|
// vo.setApplyDate(sdf.format(entity.getApplyDate()));
|
|
|
vo.setApplyDate(sdf.format(entity.getApplyDate())); |
|
|
// }
|
|
|
} |
|
|
// if (StringUtils.isNotBlank(entity.getProcInstId())) {
|
|
|
if (StringUtils.isNotBlank(entity.getProcInstId())) { |
|
|
// vo.setInstanceId(entity.getProcInstId());
|
|
|
vo.setInstanceId(entity.getProcInstId()); |
|
|
// }
|
|
|
} |
|
|
// if (StringUtils.isNotBlank(entity.getCreateBySid())) {
|
|
|
if (StringUtils.isNotBlank(entity.getCreateBySid())) { |
|
|
// vo.setUserSid(entity.getCreateBySid());
|
|
|
vo.setUserSid(entity.getCreateBySid()); |
|
|
// }
|
|
|
} |
|
|
// if (StringUtils.isNotBlank(entity.getOrgSidPath())) {
|
|
|
if (StringUtils.isNotBlank(entity.getOrgSidPath())) { |
|
|
// vo.setOrgPath(entity.getOrgSidPath());
|
|
|
vo.setOrgPath(entity.getOrgSidPath()); |
|
|
// }
|
|
|
} |
|
|
// List<RedemptionVinList> redemptionVinLists = loanRedemptionVehService.selByMainSid(sid);
|
|
|
List<SubletVinList> vinLists = loanSubletVehService.selByMainSid(sid); |
|
|
// if (!redemptionVinLists.isEmpty()) {
|
|
|
if (!vinLists.isEmpty()) { |
|
|
// redemptionVinLists.stream().forEach(v -> {
|
|
|
vo.setVinList(vinLists); |
|
|
// if (v.getVehType().equals("主车")) {
|
|
|
} |
|
|
// vo.setBusVinSid(v.getBusVinSid());
|
|
|
List<LoanFile> fileList = loanFileService.selectByLinkSid(sid, LoanFileEnum.SUBLETAPPLY.getAttachType()); |
|
|
// }
|
|
|
fileList.removeAll(Collections.singleton(null)); |
|
|
// });
|
|
|
if (!fileList.isEmpty()) { |
|
|
// vo.setVinList(redemptionVinLists);
|
|
|
List<String> files = fileList.stream().map(c -> fileUploadComponent.getUrlPrefix() + c.getFilePath()). |
|
|
// }
|
|
|
collect(Collectors.toList()); |
|
|
// if (StringUtils.isNotBlank(vo.getBusVinSid())) {
|
|
|
List<LoanSubletApplyFile> applyFiles = new ArrayList<>(); |
|
|
// AlrepaidAndArrVo alrepaidAndArr = loanRestoreReportApplyService.getAlrepaidAndArr(vo.getBusVinSid());
|
|
|
for (String file : files) { |
|
|
// if (null != alrepaidAndArr) {
|
|
|
LoanSubletApplyFile applyFile = new LoanSubletApplyFile(); |
|
|
// //已还金额
|
|
|
applyFile.setUrl(file); |
|
|
// if (StringUtils.isNotBlank(alrepaidAndArr.getAlRepaidMoney())) {
|
|
|
applyFiles.add(applyFile); |
|
|
// vo.setAlRepaidMoney(alrepaidAndArr.getAlRepaidMoney());
|
|
|
} |
|
|
// }
|
|
|
vo.setFiles(applyFiles); |
|
|
// //已还金额换算期数
|
|
|
} |
|
|
// if (StringUtils.isNotBlank(alrepaidAndArr.getAlRepaidMoneyConPeriod())) {
|
|
|
} |
|
|
// vo.setAlRepaidMoneyConPeriod(alrepaidAndArr.getAlRepaidMoneyConPeriod());
|
|
|
return rb.success().setData(vo); |
|
|
// }
|
|
|
|
|
|
// //逾期金额换算期数
|
|
|
|
|
|
// if (StringUtils.isNotBlank(alrepaidAndArr.getBeOverdueMoneyAndPeriod())) {
|
|
|
|
|
|
// vo.setBeOverdueMoneyAndPeriod(alrepaidAndArr.getBeOverdueMoneyAndPeriod());
|
|
|
|
|
|
// }
|
|
|
|
|
|
// //总期数
|
|
|
|
|
|
// if (StringUtils.isNotBlank(alrepaidAndArr.getNper())) {
|
|
|
|
|
|
// vo.setNper(alrepaidAndArr.getNper());
|
|
|
|
|
|
// }
|
|
|
|
|
|
// //当前逾期金额
|
|
|
|
|
|
// if (StringUtils.isNotBlank(alrepaidAndArr.getCurrentBeMoney())) {
|
|
|
|
|
|
// vo.setCurrentBeMoney(alrepaidAndArr.getCurrentBeMoney());
|
|
|
|
|
|
// }
|
|
|
|
|
|
// //当前期数
|
|
|
|
|
|
// if (StringUtils.isNotBlank(alrepaidAndArr.getCurrentPeriod())) {
|
|
|
|
|
|
// vo.setCurrentPeriod(alrepaidAndArr.getCurrentPeriod());
|
|
|
|
|
|
// }
|
|
|
|
|
|
// //未到期金额
|
|
|
|
|
|
// if (StringUtils.isNotBlank(alrepaidAndArr.getUnexpiredMoney())) {
|
|
|
|
|
|
// vo.setUnexpiredMoney(alrepaidAndArr.getUnexpiredMoney());
|
|
|
|
|
|
// }
|
|
|
|
|
|
// //其中资金占用费
|
|
|
|
|
|
// if (StringUtils.isNotBlank(alrepaidAndArr.getWheFundOccMoney())) {
|
|
|
|
|
|
// vo.setWheFundOccMoney(alrepaidAndArr.getWheFundOccMoney());
|
|
|
|
|
|
// }
|
|
|
|
|
|
// }
|
|
|
|
|
|
// }
|
|
|
|
|
|
//
|
|
|
|
|
|
// List<LoanFile> fileList = loanFileService.selectByLinkSid(sid, LoanFileEnum.REDEMPTION.getAttachType());
|
|
|
|
|
|
// fileList.removeAll(Collections.singleton(null));
|
|
|
|
|
|
// if (!fileList.isEmpty()) {
|
|
|
|
|
|
// List<String> files = fileList.stream().map(c -> fileUploadComponent.getUrlPrefix() + c.getFilePath()).
|
|
|
|
|
|
// collect(Collectors.toList());
|
|
|
|
|
|
// List<LoanRedemptionApplyFile> applyFiles = new ArrayList<>();
|
|
|
|
|
|
// for (String file : files) {
|
|
|
|
|
|
// LoanRedemptionApplyFile applyFile = new LoanRedemptionApplyFile();
|
|
|
|
|
|
// applyFile.setUrl(file);
|
|
|
|
|
|
// applyFiles.add(applyFile);
|
|
|
|
|
|
// }
|
|
|
|
|
|
// vo.setFiles(applyFiles);
|
|
|
|
|
|
// }
|
|
|
|
|
|
// }
|
|
|
|
|
|
// return rb.success().setData(vo);
|
|
|
|
|
|
return null; |
|
|
|
|
|
} |
|
|
} |
|
|
|
|
|
|
|
|
public ResultBean deleteBySids(String[] sids) { |
|
|
public ResultBean deleteBySids(String[] sids) { |
|
|
ResultBean rb = ResultBean.fireFail(); |
|
|
ResultBean rb = ResultBean.fireFail(); |
|
|
// for (String sid : sids) {
|
|
|
for (String sid : sids) { |
|
|
// LoanRedemptionApply entity = fetchBySid(sid);
|
|
|
LoanSubletApply entity = fetchBySid(sid); |
|
|
// if (null != entity) {
|
|
|
if (null != entity) { |
|
|
// if (!entity.getNodeState().equals("待提交")) {
|
|
|
if (!entity.getNodeState().equals("待提交")) { |
|
|
// return rb.setMsg("删除的数据中包含已经提交审批的数据，删除失败");
|
|
|
return rb.setMsg("删除的数据中包含已经提交审批的数据，删除失败"); |
|
|
// }
|
|
|
} |
|
|
// }
|
|
|
} |
|
|
// entity.setIsDelete(1);
|
|
|
entity.setIsDelete(1); |
|
|
// int i = baseMapper.updateById(entity);
|
|
|
int i = baseMapper.updateById(entity); |
|
|
// if (i == 0) {
|
|
|
if (i == 0) { |
|
|
// return rb.setMsg("删除失败");
|
|
|
return rb.setMsg("删除失败"); |
|
|
// }
|
|
|
} |
|
|
// //todo 修改交回车辆台账状态
|
|
|
//todo 修改交回车辆台账状态
|
|
|
// }
|
|
|
} |
|
|
return ResultBean.fireSuccess().setMsg("删除成功"); |
|
|
return ResultBean.fireSuccess().setMsg("删除成功"); |
|
|
} |
|
|
} |
|
|
|
|
|
|
|
|
|
