From 38f8fef7d96dd2c7e767ed858a9f2bdc81f78031 Mon Sep 17 00:00:00 2001 From: fanzongzhe <285169773@qq.com> Date: Thu, 9 May 2024 17:19:29 +0800 Subject: [PATCH] =?UTF-8?q?=E5=AE=8C=E5=96=84=E7=94=9F=E6=88=90=E8=BF=98?= =?UTF-8?q?=E6=AC=BE=E8=AE=A1=E5=88=92=E6=9B=B4=E6=96=B0=E6=B6=88=E8=B4=B7?= =?UTF-8?q?=E5=90=88=E5=90=8C=E8=A1=A8=E7=9A=84=E7=94=9F=E6=88=90=E8=BF=98?= =?UTF-8?q?=E6=AC=BE=E6=97=B6=E9=97=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../BusSalesOrderLoancontractFeign.java | 2 +- ...usSalesOrderLoancontractFeignFallback.java | 2 +- .../BusSalesOrderLoancontractRest.java | 2 +- .../BusSalesOrderLoancontractService.java | 5 +- .../LoanRepaymentScheduleService.java | 12 +++- .../AsBusreserveBillService.java | 62 +++++++++---------- 6 files changed, 45 insertions(+), 40 deletions(-) diff --git a/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesorderloancontract/BusSalesOrderLoancontractFeign.java b/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesorderloancontract/BusSalesOrderLoancontractFeign.java index 59461af22f..c703ff0197 100644 --- a/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesorderloancontract/BusSalesOrderLoancontractFeign.java +++ b/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesorderloancontract/BusSalesOrderLoancontractFeign.java @@ -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") diff --git a/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesorderloancontract/BusSalesOrderLoancontractFeignFallback.java b/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesorderloancontract/BusSalesOrderLoancontractFeignFallback.java index 5c06e616a6..bc25cbe4e2 100644 --- a/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesorderloancontract/BusSalesOrderLoancontractFeignFallback.java +++ b/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesorderloancontract/BusSalesOrderLoancontractFeignFallback.java @@ -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; } diff --git a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesorderloancontract/BusSalesOrderLoancontractRest.java b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesorderloancontract/BusSalesOrderLoancontractRest.java index 0babf51b2e..6f645a8457 100644 --- a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesorderloancontract/BusSalesOrderLoancontractRest.java +++ b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesorderloancontract/BusSalesOrderLoancontractRest.java @@ -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(); diff --git a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesorderloancontract/BusSalesOrderLoancontractService.java b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesorderloancontract/BusSalesOrderLoancontractService.java index 315bd5327d..b836206a31 100644 --- a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesorderloancontract/BusSalesOrderLoancontractService.java +++ b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesorderloancontract/BusSalesOrderLoancontractService.java @@ -1095,8 +1095,7 @@ public class BusSalesOrderLoancontractService extends MybatisBaseService { 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(); diff --git a/yxt-as/src/main/java/com/yxt/anrui/as/biz/asbusreservebill/AsBusreserveBillService.java b/yxt-as/src/main/java/com/yxt/anrui/as/biz/asbusreservebill/AsBusreserveBillService.java index 13790bd8da..c76468eaa5 100644 --- a/yxt-as/src/main/java/com/yxt/anrui/as/biz/asbusreservebill/AsBusreserveBillService.java +++ b/yxt-as/src/main/java/com/yxt/anrui/as/biz/asbusreservebill/AsBusreserveBillService.java @@ -120,37 +120,37 @@ public class AsBusreserveBillService extends MybatisBaseService 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 p = new PagerVo<>(); -// return p; -// } -// } else { -// PagerVo 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 p = new PagerVo<>(); + return p; + } + } else { + PagerVo p = new PagerVo<>(); + return p; + } } if (StringUtils.isNotBlank(query.getState())) {