|
|
@ -251,6 +251,7 @@ public class LoanSettleApplyService extends MybatisBaseService<LoanSettleApplyMa |
|
|
|
loanSettleApply.setTypeState("01"); |
|
|
|
loanSettleApply.setTypeStateValue("正常结清"); |
|
|
|
} |
|
|
|
baseMapper.insert(loanSettleApply); |
|
|
|
} else {//修改
|
|
|
|
LoanSettleApply loanSettleApply = fetchBySid(sid); |
|
|
|
if (loanSettleApply == null) { |
|
|
@ -269,6 +270,8 @@ public class LoanSettleApplyService extends MybatisBaseService<LoanSettleApplyMa |
|
|
|
if (loanSettleCompanyReductionVo != null) { |
|
|
|
loanSettleCompanyReductionService.saveReduction(sid, loanSettleCompanyReductionVo); |
|
|
|
} |
|
|
|
loanSettleApply.setTrueReduction(dto.isTrueReduction() ? 1 : 0); |
|
|
|
baseMapper.updateById(loanSettleApply); |
|
|
|
} |
|
|
|
return rb.success().setData(sid); |
|
|
|
} |
|
|
@ -302,6 +305,11 @@ public class LoanSettleApplyService extends MybatisBaseService<LoanSettleApplyMa |
|
|
|
} |
|
|
|
useOrgSid = sysStaffOrgFeign.getOrgSidByPath(orgPath).getData(); |
|
|
|
} |
|
|
|
//创建组织使用组织
|
|
|
|
ResultBean<SysOrganizationVo> organizationResultBean = sysOrganizationFeign.fetchBySid(useOrgSid); |
|
|
|
if (organizationResultBean.getData() != null) { |
|
|
|
loanSettleApplyDetailsVo.setUseOrgName(organizationResultBean.getData().getName()); |
|
|
|
} |
|
|
|
//根据用户sid查询人员姓名
|
|
|
|
ResultBean<SysUserVo> userVoResultBean = sysUserFeign.fetchBySid(userSid); |
|
|
|
if (!userVoResultBean.getSuccess()) { |
|
|
@ -354,7 +362,7 @@ public class LoanSettleApplyService extends MybatisBaseService<LoanSettleApplyMa |
|
|
|
BeanUtil.copyProperties(loanSettleCompanyCost, loanSettleCompanyCostService); |
|
|
|
loanSettleApplyDetailsVo.setLoanSettleCompanyCostVo(loanSettleCompanyCostVo); |
|
|
|
} |
|
|
|
loanSettleApplyDetailsVo.setTrueReduction(loanSettleApply.getTrueReduction()); |
|
|
|
loanSettleApplyDetailsVo.setTrueReduction(loanSettleApply.getTrueReduction() == 1); |
|
|
|
LoanSettleCompanyReductionVo loanSettleCompanyReductionVo = new LoanSettleCompanyReductionVo(); |
|
|
|
LoanSettleCompanyReduction loanSettleCompanyReduction = loanSettleCompanyReductionService.selectByMainSid(sid); |
|
|
|
if (loanSettleCompanyReduction != null) { |
|
|
@ -899,4 +907,5 @@ public class LoanSettleApplyService extends MybatisBaseService<LoanSettleApplyMa |
|
|
|
PagerVo<SettleApplyListVo> p = PagerUtil.pageToVo(pagging, null); |
|
|
|
return p; |
|
|
|
} |
|
|
|
|
|
|
|
} |
|
|
|