|
|
|
@ -57,6 +57,7 @@ import org.springframework.beans.factory.annotation.Autowired; |
|
|
|
import org.springframework.stereotype.Service; |
|
|
|
|
|
|
|
import java.math.BigDecimal; |
|
|
|
import java.math.RoundingMode; |
|
|
|
import java.text.ParseException; |
|
|
|
import java.text.SimpleDateFormat; |
|
|
|
import java.util.*; |
|
|
|
@ -395,8 +396,8 @@ public class LoanSettleApplyService extends MybatisBaseService<LoanSettleApplyMa |
|
|
|
Date d2 = format.parse(DateUtil.today());//毫秒ms
|
|
|
|
long diff = d2.getTime() - d1.getTime(); |
|
|
|
long diffDays = diff / (24 * 60 * 60 * 1000); |
|
|
|
int i = new Long(diffDays).intValue(); |
|
|
|
String dks = new BigDecimal(dk).multiply(new BigDecimal(0.0007)).multiply(new BigDecimal(i)).toString(); |
|
|
|
int i = new Long(diffDays).intValue() + 1; |
|
|
|
String dks = new BigDecimal(dk).multiply(new BigDecimal("0.0007")).multiply(new BigDecimal(i)).setScale(2, RoundingMode.HALF_UP).toString(); |
|
|
|
funfCost = new BigDecimal(funfCost).add(new BigDecimal(dks)).toString(); |
|
|
|
} catch (ParseException e) { |
|
|
|
e.printStackTrace(); |
|
|
|
@ -500,7 +501,21 @@ public class LoanSettleApplyService extends MybatisBaseService<LoanSettleApplyMa |
|
|
|
bv.setOrgSidPath(loanSettleApply.getOrgSidPath()); |
|
|
|
bv.setBusinessSid(businessSid); |
|
|
|
bv.setUserSid(dto.getUserSid()); |
|
|
|
if (StringUtils.isNotBlank(loanSettleApply.getBusSid())) { |
|
|
|
variables.put("orderNames", "提前结清申请"); |
|
|
|
} |
|
|
|
bv.setFormVariables(variables); |
|
|
|
List<String> orgPathList = Arrays.asList(dto.getOrgPath().split("/")); |
|
|
|
SysOrganizationVo sysOrganization = sysOrganizationFeign.fetchBySid(orgPathList.get(orgPathList.size() - 1)).getData(); |
|
|
|
if (sysOrganization == null) { |
|
|
|
return rb.setMsg("当前所在的组织机构不存在"); |
|
|
|
} |
|
|
|
if (StringUtils.isBlank(sysOrganization.getManagerSid())) { |
|
|
|
// return rb.setMsg("当前所在的组织机构未设置主管人员");
|
|
|
|
sysOrganization.setManagerSid(ProcDefEnum.DEFAUL_TADMIN_SID.getProDefId()); |
|
|
|
} |
|
|
|
String nextNodeUserSids_ = sysOrganization.getManagerSid(); |
|
|
|
bv.setNextNodeUserSids(nextNodeUserSids_); |
|
|
|
if (r == 1) { |
|
|
|
//ToDo:流程定义id
|
|
|
|
bv.setModelId(ProcDefEnum.LOANSETTLEAPPLY.getProDefId()); |
|
|
|
@ -581,6 +596,9 @@ public class LoanSettleApplyService extends MybatisBaseService<LoanSettleApplyMa |
|
|
|
Map<String, Object> appMap = new HashMap<>(); |
|
|
|
appMap.put("sid", businessSid); |
|
|
|
variables.put("app", appMap); |
|
|
|
if (StringUtils.isNotBlank(loanSettleApply.getBusSid())) { |
|
|
|
variables.put("orderNames", "提前结清申请"); |
|
|
|
} |
|
|
|
bv.setFormVariables(variables); |
|
|
|
bv.setOrgSidPath(loanSettleApply.getOrgSidPath()); |
|
|
|
bv.setModelId(loanSettleApply.getProcDefId()); |
|
|
|
@ -669,6 +687,9 @@ public class LoanSettleApplyService extends MybatisBaseService<LoanSettleApplyMa |
|
|
|
Map<String, Object> variables = new HashMap<>(); |
|
|
|
Map<String, Object> appMap = new HashMap<>(); |
|
|
|
appMap.put("sid", businessSid); |
|
|
|
if (StringUtils.isNotBlank(loanSettleApply.getBusSid())) { |
|
|
|
variables.put("orderNames", "提前结清申请"); |
|
|
|
} |
|
|
|
variables.put("app", appMap); |
|
|
|
ResultBean<UpdateFlowFieldVo> resultBean = flowableFeign.taskReject(flowTaskVo); |
|
|
|
if (!resultBean.getSuccess()) { |
|
|
|
@ -780,11 +801,72 @@ public class LoanSettleApplyService extends MybatisBaseService<LoanSettleApplyMa |
|
|
|
|
|
|
|
public ResultBean<SettleApplyAppVo> getAppDetails(String sid) { |
|
|
|
ResultBean<SettleApplyAppVo> rb = ResultBean.fireFail(); |
|
|
|
SettleApplyAppVo settleApplyAppVo = new SettleApplyAppVo(); |
|
|
|
LoanSettleApply loanSettleApply = fetchBySid(sid); |
|
|
|
if (loanSettleApply == null) { |
|
|
|
return rb.setMsg("该申请不存在"); |
|
|
|
} |
|
|
|
return null; |
|
|
|
BeanUtil.copyProperties(loanSettleApply, settleApplyAppVo); |
|
|
|
settleApplyAppVo.setCreateTime(DateUtil.format(loanSettleApply.getCreateTime(), "yyyy-MM-dd")); |
|
|
|
LoanSettleBankCost loanSettleBankCost = loanSettleBankCostService.selectByMainSid(sid); |
|
|
|
if (loanSettleBankCost != null) { |
|
|
|
settleApplyAppVo.setPrice(loanSettleBankCost.getPrice().toString()); |
|
|
|
settleApplyAppVo.setCurrentNotDuePriceBank(loanSettleBankCost.getCurrentNotDuePrice().toString()); |
|
|
|
settleApplyAppVo.setNotDuePriceBank(loanSettleBankCost.getNotDuePrice().toString()); |
|
|
|
settleApplyAppVo.setBankInterest(loanSettleBankCost.getBankInterest().toString()); |
|
|
|
settleApplyAppVo.setBankNominalPrice(loanSettleBankCost.getBankNominalPrice().toString()); |
|
|
|
settleApplyAppVo.setBankContractLiquidated(loanSettleBankCost.getBankContractLiquidated().toString()); |
|
|
|
settleApplyAppVo.setBankOtherReceivable(loanSettleBankCost.getBankOtherReceivable().toString()); |
|
|
|
settleApplyAppVo.setOtherReceivableRemarks(loanSettleBankCost.getOtherReceivableRemarks()); |
|
|
|
settleApplyAppVo.setBankSettlePrice(loanSettleBankCost.getBankSettlePrice().toString()); |
|
|
|
if (StringUtils.isNotBlank(loanSettleBankCost.getFiles())) { |
|
|
|
List<String> fileList = Arrays.asList(loanSettleBankCost.getFiles().split(",")).stream().map(c -> fileUploadComponent.getUrlPrefix() + c).collect(Collectors.toList()); |
|
|
|
fileList.removeAll(Collections.singleton(null)); |
|
|
|
if (!fileList.isEmpty()) { |
|
|
|
settleApplyAppVo.setBankFiles(fileList); |
|
|
|
} |
|
|
|
} |
|
|
|
} |
|
|
|
LoanSettleCompanyCost loanSettleCompanyCost = loanSettleCompanyCostService.selectByMainSid(sid); |
|
|
|
if (loanSettleCompanyCost != null) { |
|
|
|
settleApplyAppVo.setLoanDeposit(loanSettleCompanyCost.getLoanDeposit().toString()); |
|
|
|
settleApplyAppVo.setOverduePrice(loanSettleCompanyCost.getOverduePrice().toString()); |
|
|
|
settleApplyAppVo.setPutBankInterest(loanSettleCompanyCost.getPutBankInterest().toString()); |
|
|
|
settleApplyAppVo.setFunfCost(loanSettleCompanyCost.getFunfCost().toString()); |
|
|
|
settleApplyAppVo.setBankOverInterest(loanSettleCompanyCost.getBankOverInterest().toString()); |
|
|
|
settleApplyAppVo.setCompanyCurrentNotPrice(loanSettleCompanyCost.getCompanyCurrentNotPrice().toString()); |
|
|
|
settleApplyAppVo.setBankNotPrice(loanSettleCompanyCost.getBankNotPrice().toString()); |
|
|
|
settleApplyAppVo.setDeductionAmount(loanSettleCompanyCost.getDeductionAmount().toString()); |
|
|
|
settleApplyAppVo.setCompanyNominalPrice(loanSettleCompanyCost.getCompanyNominalPrice().toString()); |
|
|
|
settleApplyAppVo.setContractLiquidated(loanSettleCompanyCost.getContractLiquidated().toString()); |
|
|
|
settleApplyAppVo.setCompanyOtherPrice(loanSettleCompanyCost.getCompanyOtherPrice().toString()); |
|
|
|
settleApplyAppVo.setOtherCostRemarks(loanSettleCompanyCost.getOtherCostRemarks()); |
|
|
|
settleApplyAppVo.setSettleAll(loanSettleCompanyCost.getSettleAll().toString()); |
|
|
|
settleApplyAppVo.setFundAll(loanSettleCompanyCost.getFundAll().toString()); |
|
|
|
} |
|
|
|
LoanSettleCompanyReduction loanSettleCompanyReduction = loanSettleCompanyReductionService.selectByMainSid(sid); |
|
|
|
if (loanSettleCompanyReduction != null) { |
|
|
|
if (loanSettleApply.getTrueReduction() == 0) {//未勾选
|
|
|
|
settleApplyAppVo.setProfit(loanSettleCompanyReduction.getProfit().toString()); |
|
|
|
settleApplyAppVo.setTrueReduction(false); |
|
|
|
} else { |
|
|
|
settleApplyAppVo.setFundPenalty(loanSettleCompanyReduction.getFundPenalty().toString()); |
|
|
|
settleApplyAppVo.setDepositPenalty(loanSettleCompanyReduction.getDepositPenalty().toString()); |
|
|
|
settleApplyAppVo.setOtherCost(loanSettleCompanyReduction.getOtherCost().toString()); |
|
|
|
settleApplyAppVo.setAmountTo(loanSettleCompanyReduction.getAmountTo().toString()); |
|
|
|
settleApplyAppVo.setProfit(loanSettleCompanyReduction.getProfit().toString()); |
|
|
|
settleApplyAppVo.setTrueReduction(true); |
|
|
|
} |
|
|
|
} |
|
|
|
settleApplyAppVo.setSaleOrderSid(loanSettleApply.getSaleOrderSid()); |
|
|
|
settleApplyAppVo.setCsjlSid(loanSettleApply.getBusVinSid()); |
|
|
|
if (StringUtils.isNotBlank(loanSettleApply.getBusSid())) { |
|
|
|
settleApplyAppVo.setTrueHg(true); |
|
|
|
} else { |
|
|
|
settleApplyAppVo.setTrueHg(false); |
|
|
|
} |
|
|
|
|
|
|
|
return rb.success().setData(settleApplyAppVo); |
|
|
|
} |
|
|
|
|
|
|
|
|
|
|
|
|
dimengzhe
1 year ago