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

完善生成还款计划更新消贷合同表的生成还款时间

master
fanzongzhe 12 months ago
parent
01c1ae3242
commit
38f8fef7d9
6 changed files with 45 additions and 40 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. 2
      anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesorderloancontract/BusSalesOrderLoancontractFeign.java
  2. 2
      anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesorderloancontract/BusSalesOrderLoancontractFeignFallback.java
  3. 2
      anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesorderloancontract/BusSalesOrderLoancontractRest.java
  4. 5
      anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesorderloancontract/BusSalesOrderLoancontractService.java
  5. 12
      anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanrepaymentschedule/LoanRepaymentScheduleService.java
  6. 62
      yxt-as/src/main/java/com/yxt/anrui/as/biz/asbusreservebill/AsBusreserveBillService.java

2
anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesorderloancontract/BusSalesOrderLoancontractFeign.java
View File

@ -100,7 +100,7 @@ public interface BusSalesOrderLoancontractFeign {
@ApiOperation("设置是否生成还款计划状态")
@PostMapping("/setRepaymentState")
public ResultBean setRepaymentState(@RequestParam("sid") String sid, @RequestParam("createTime")Date createTime);
public ResultBean setRepaymentState(@RequestParam("sid") String sid, @RequestParam("createTime")String createTime);
@ApiOperation("推送融资放款的应收")
@PostMapping("/pushLoanOrder")

2
anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesorderloancontract/BusSalesOrderLoancontractFeignFallback.java
View File

@ -93,7 +93,7 @@ public class BusSalesOrderLoancontractFeignFallback implements BusSalesOrderLoan
}
@Override
public ResultBean setRepaymentState(String sid, Date createTime) {
public ResultBean setRepaymentState(String sid, String createTime) {
return null;
}

2
anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesorderloancontract/BusSalesOrderLoancontractRest.java
View File

@ -122,7 +122,7 @@ public class BusSalesOrderLoancontractRest implements BusSalesOrderLoancontractF
}
@Override
public ResultBean setRepaymentState(String sid, Date createTime) {
public ResultBean setRepaymentState(String sid, String createTime) {
ResultBean rb = ResultBean.fireFail();
int i = busSalesOrderLoancontractService.setRepaymentState(sid, createTime);
return rb.success();

5
anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesorderloancontract/BusSalesOrderLoancontractService.java
View File

@ -1095,8 +1095,7 @@ public class BusSalesOrderLoancontractService extends MybatisBaseService<BusSale
}
public int setRepaymentState(String sid,Date createTime) {
SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
return baseMapper.setRepaymentState(sid,sdf.format(createTime));
public int setRepaymentState(String sid,String createTime) {
return baseMapper.setRepaymentState(sid,createTime);
}
}

12
anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanrepaymentschedule/LoanRepaymentScheduleService.java
View File

@ -386,9 +386,14 @@ public class LoanRepaymentScheduleService extends MybatisBaseService<LoanRepayme
e.printStackTrace();
}
}
BusSalesOrder busSalesOrder = busSalesOrderFeign.fetchBySid(orderSid).getData();
//保存财务凭证部门编码
SysOrganizationVo organizationDeptVo = sysOrganizationFeign.fetchBySid(busSalesOrder.getOrgSid()).getData();
if (null != organizationDeptVo) {
loanRepaymentSchedule.setCwDeptNo(organizationDeptVo.getOrgCode());
}
baseMapper.updateById(loanRepaymentSchedule);
loanRepaymentPlanDetailsService.deletePlanDetails(loanRepaymentSchedule.getSid());
BusSalesOrder busSalesOrder = busSalesOrderFeign.fetchBySid(orderSid).getData();
//新增还款计划明细
LoanRepaymentSchedule scheduleDetails = fetchBySid(loanRepaymentSchedule.getSid());
if (null != scheduleDetails) {
@ -1227,13 +1232,14 @@ public class LoanRepaymentScheduleService extends MybatisBaseService<LoanRepayme
messageFeign.pushNoUriMessage(pushMessageQuery);
}
});
//推送还款计划总凭证
// //推送还款计划总凭证
Future future2 = pool.submit(() -> {
pushScheduleVoucher(schedule);
});
//设置消贷合同是否生成还款计划状态
Future future3 = pool.submit(() -> {
busSalesOrderLoancontractFeign.setRepaymentState(dto.getSalesOrderSid(),new DateTime());
SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
busSalesOrderLoancontractFeign.setRepaymentState(dto.getSalesOrderSid(),sdf.format(new Date()));
});
} catch (Exception e) {
e.printStackTrace();

62
yxt-as/src/main/java/com/yxt/anrui/as/biz/asbusreservebill/AsBusreserveBillService.java
View File

@ -120,37 +120,37 @@ public class AsBusreserveBillService extends MybatisBaseService<AsBusreserveBill
privilegeQuery.setMenuUrl(query.getMenuUrl());
privilegeQuery.setUserSid(query.getUserSid());
ResultBean<String> defaultIdReltBean = sysUserFeign.selectPrivilegeLevel(privilegeQuery);
// if (StringUtils.isNotBlank(defaultIdReltBean.getData())) {
// //数据权限ID(1集团、2事业部、3分公司、4部门、5个人)
// String orgSidPath = query.getOrgPath();
// orgSidPath = orgSidPath + "/";
// int i1 = orgSidPath.indexOf("/");
// int i2 = orgSidPath.indexOf("/", i1 + 1);
// int i3 = orgSidPath.indexOf("/", i2 + 1);
// int i4 = orgSidPath.indexOf("/", i3 + 1);
// String orgLevelKey = defaultIdReltBean.getData();
// if ("1".equals(orgLevelKey)) {
// orgSidPath = orgSidPath.substring(0, i1);
// qw.like("orgSidPath", orgSidPath);
// } else if ("2".equals(orgLevelKey)) {
// orgSidPath = orgSidPath.substring(0, i2);
// qw.like("orgSidPath", orgSidPath);
// } else if ("3".equals(orgLevelKey)) {
// orgSidPath = orgSidPath.substring(0, i3);
// qw.like("orgSidPath", orgSidPath);
// } else if ("4".equals(orgLevelKey)) {
// orgSidPath = orgSidPath.substring(0, i4);
// qw.like("orgSidPath", orgSidPath);
// } else if ("5".equals(orgLevelKey)) {
// qw.eq("createBySid", query.getUserSid());
// } else {
// PagerVo<AsBusreserveBillVo> p = new PagerVo<>();
// return p;
// }
// } else {
// PagerVo<AsBusreserveBillVo> p = new PagerVo<>();
// return p;
// }
if (StringUtils.isNotBlank(defaultIdReltBean.getData())) {
//数据权限ID(1集团、2事业部、3分公司、4部门、5个人)
String orgSidPath = query.getOrgPath();
orgSidPath = orgSidPath + "/";
int i1 = orgSidPath.indexOf("/");
int i2 = orgSidPath.indexOf("/", i1 + 1);
int i3 = orgSidPath.indexOf("/", i2 + 1);
int i4 = orgSidPath.indexOf("/", i3 + 1);
String orgLevelKey = defaultIdReltBean.getData();
if ("1".equals(orgLevelKey)) {
orgSidPath = orgSidPath.substring(0, i1);
qw.like("orgSidPath", orgSidPath);
} else if ("2".equals(orgLevelKey)) {
orgSidPath = orgSidPath.substring(0, i2);
qw.like("orgSidPath", orgSidPath);
} else if ("3".equals(orgLevelKey)) {
orgSidPath = orgSidPath.substring(0, i3);
qw.like("orgSidPath", orgSidPath);
} else if ("4".equals(orgLevelKey)) {
orgSidPath = orgSidPath.substring(0, i4);
qw.like("orgSidPath", orgSidPath);
} else if ("5".equals(orgLevelKey)) {
qw.eq("createBySid", query.getUserSid());
} else {
PagerVo<AsBusreserveBillVo> p = new PagerVo<>();
return p;
}
} else {
PagerVo<AsBusreserveBillVo> p = new PagerVo<>();
return p;
}
}
if (StringUtils.isNotBlank(query.getState())) {

Write Preview
Loading…
Cancel
Save