From 2b83eec4f32182590007047cdcea54cdefc98ef2 Mon Sep 17 00:00:00 2001 From: fanzongzhe <285169773@qq.com> Date: Wed, 20 Sep 2023 17:21:48 +0800 Subject: [PATCH 1/2] =?UTF-8?q?=E4=BC=98=E5=8C=96=E9=A3=8E=E6=8E=A7?= =?UTF-8?q?=E6=B5=8B=E8=AF=95=E9=97=AE=E9=A2=98=E3=80=81=E9=87=91=E8=9E=8D?= =?UTF-8?q?=E6=B5=8B=E7=AE=97=E5=85=B6=E4=BB=96=E8=9E=8D=E6=9C=9F=E6=95=B0?= =?UTF-8?q?=E8=B5=8B=E5=80=BC=E3=80=81=E8=BF=98=E6=AC=BE=E8=AE=A1=E5=88=92?= =?UTF-8?q?=E8=A1=A8=E7=AD=89=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../api/loanparameter/LoanParameterFeign.java | 4 + .../LoanParameterFeignFallback.java | 5 ++ .../LoanRepaymentScheduleFeign.java | 4 + .../LoanRepaymentScheduleFeignFallback.java | 5 ++ .../LoanFinOtherPolicyMapper.java | 4 + .../LoanFinOtherPolicyMapper.xml | 73 ++++++++++--------- .../LoanFinOtherPolicyRest.java | 3 +- .../LoanFinOtherPolicyService.java | 66 ++++++++++------- .../loanfinpolicy/LoanFinPolicyMapper.java | 8 +- .../loanfinpolicy/LoanFinPolicyService.java | 13 ++-- .../loanparameter/LoanParameterMapper.java | 7 ++ .../biz/loanparameter/LoanParameterMapper.xml | 13 ++++ .../biz/loanparameter/LoanParameterRest.java | 5 ++ .../loanparameter/LoanParameterService.java | 37 ++++++++++ .../LoanRepaymentScheduleRest.java | 5 ++ .../LoanRepaymentScheduleService.java | 12 +++ .../repaymentplan/RepaymentPlanFeign.java | 7 ++ .../RepaymentPlanFeignFallback.java | 7 ++ .../risk/repaymentplan/RepaymentPlanRest.java | 12 ++- .../repaymentplan/RepaymentPlanService.java | 24 +++++- 20 files changed, 233 insertions(+), 81 deletions(-) diff --git a/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanparameter/LoanParameterFeign.java b/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanparameter/LoanParameterFeign.java index 9cc5fa28d7..7e7ea85163 100644 --- a/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanparameter/LoanParameterFeign.java +++ b/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanparameter/LoanParameterFeign.java @@ -54,4 +54,8 @@ public interface LoanParameterFeign { @ResponseBody ResultBean fetchByParNo(@RequestParam("parNo") String parNo); + @ApiOperation("根据参数编码查询记录") + @PostMapping("/fetchOneByParNo") + @ResponseBody + ResultBean fetchOneByParNo(@RequestParam("parNo") String parNo); } diff --git a/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanparameter/LoanParameterFeignFallback.java b/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanparameter/LoanParameterFeignFallback.java index 111e11bbcb..9baba62d80 100644 --- a/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanparameter/LoanParameterFeignFallback.java +++ b/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanparameter/LoanParameterFeignFallback.java @@ -37,4 +37,9 @@ public class LoanParameterFeignFallback implements LoanParameterFeign { public ResultBean fetchByParNo(String parNo) { return null; } + + @Override + public ResultBean fetchOneByParNo(String parNo) { + return null; + } } diff --git a/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanrepaymentschedule/LoanRepaymentScheduleFeign.java b/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanrepaymentschedule/LoanRepaymentScheduleFeign.java index 8c0d87c3fe..00f5d89e49 100644 --- a/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanrepaymentschedule/LoanRepaymentScheduleFeign.java +++ b/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanrepaymentschedule/LoanRepaymentScheduleFeign.java @@ -65,5 +65,9 @@ public interface LoanRepaymentScheduleFeign { @ResponseBody public ResultBean getRepaymentPlanListBySid(@RequestParam("sid") String sid); + @ApiOperation("查看单台还款计划表") + @GetMapping("/getRepaymentPlanListByVinNo") + @ResponseBody + public ResultBean> getRepaymentPlanListByVinNo(@RequestParam("vinNo") String vinNo,@RequestParam("sid") String sid); } diff --git a/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanrepaymentschedule/LoanRepaymentScheduleFeignFallback.java b/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanrepaymentschedule/LoanRepaymentScheduleFeignFallback.java index 0285ff78ec..aa87270e63 100644 --- a/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanrepaymentschedule/LoanRepaymentScheduleFeignFallback.java +++ b/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanrepaymentschedule/LoanRepaymentScheduleFeignFallback.java @@ -44,4 +44,9 @@ public class LoanRepaymentScheduleFeignFallback implements LoanRepaymentSchedule public ResultBean getRepaymentPlanListBySid(String sid) { return null; } + + @Override + public ResultBean> getRepaymentPlanListByVinNo(String vinNo,String sid) { + return null; + } } diff --git a/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanfinotherPolicy/LoanFinOtherPolicyMapper.java b/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanfinotherPolicy/LoanFinOtherPolicyMapper.java index e4f0e84a3a..434747193d 100644 --- a/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanfinotherPolicy/LoanFinOtherPolicyMapper.java +++ b/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanfinotherPolicy/LoanFinOtherPolicyMapper.java @@ -8,6 +8,7 @@ import com.yxt.anrui.riskcenter.api.loanfinotherPolicy.*; import com.yxt.anrui.riskcenter.api.loanpreloancreditapply.LoanPreloanCreditApply; import org.apache.ibatis.annotations.Mapper; import org.apache.ibatis.annotations.Param; +import org.apache.ibatis.annotations.Update; import java.util.List; @@ -35,4 +36,7 @@ public interface LoanFinOtherPolicyMapper extends BaseMapper IPage selectPageVo(IPage page,@Param(Constants.WRAPPER)QueryWrapper qw); List fetchByMainSid(String mainSid); + + @Update("update loan_fin_otherpolicy set isDelete = 1 where sid =#{sid}") + int deleteOne(String sid); } diff --git a/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanfinotherPolicy/LoanFinOtherPolicyMapper.xml b/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanfinotherPolicy/LoanFinOtherPolicyMapper.xml index e971a0485d..41736a0e38 100644 --- a/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanfinotherPolicy/LoanFinOtherPolicyMapper.xml +++ b/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanfinotherPolicy/LoanFinOtherPolicyMapper.xml @@ -12,8 +12,8 @@ - delete - from loan_fin_otherpolicy + update loan_fin_otherpolicy + set isDelete = 1 where mainPolicySid = #{mainPolicySid} @@ -37,27 +37,28 @@ SELECT sid, - CASE filingState - WHEN 1 THEN '已报备' - WHEN 2 THEN '报备中' - WHEN 0 THEN '未报备' END AS filingState, - CASE riskState - WHEN 1 THEN '禁用' - WHEN 0 THEN '正常' - END AS riskState, - CASE useSate - WHEN 1 THEN '停用' - WHEN 0 THEN '正常' - END AS useSate, - validDateTo, - createOrgName, - useDeptNames, - otherPolicyName, - busTypeValue, - vehCategoryValue, - vehTypeValue, - maxLoanAmount, - period, - yearRatio + CASE filingState + WHEN 1 THEN '已报备' + WHEN 2 THEN '报备中' + WHEN 0 THEN '未报备' END AS filingState, + CASE riskState + WHEN 1 THEN '禁用' + WHEN 0 THEN '正常' + END AS riskState, + CASE useSate + WHEN 1 THEN '停用' + WHEN 0 THEN '正常' + END AS useSate, + validDateTo, + createOrgName, + useDeptNames, + otherPolicyName, + busTypeValue, + vehCategoryValue, + vehTypeValue, + maxLoanAmount, + period, + yearRatio FROM loan_fin_otherpolicy ${ew.sqlSegment} diff --git a/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanfinotherPolicy/LoanFinOtherPolicyRest.java b/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanfinotherPolicy/LoanFinOtherPolicyRest.java index 72183a9687..c763dbdf30 100644 --- a/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanfinotherPolicy/LoanFinOtherPolicyRest.java +++ b/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanfinotherPolicy/LoanFinOtherPolicyRest.java @@ -41,8 +41,7 @@ public class LoanFinOtherPolicyRest implements LoanFinOtherPolicyFeign { @Override public ResultBean delBySids(String[] sids) { - loanFinOtherPolicyService.delBySids(sids); - return new ResultBean().success(); + return loanFinOtherPolicyService.deleteOtherPolicy(sids); } @Override diff --git a/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanfinotherPolicy/LoanFinOtherPolicyService.java b/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanfinotherPolicy/LoanFinOtherPolicyService.java index 196e7ca9ee..5c0e4f291f 100644 --- a/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanfinotherPolicy/LoanFinOtherPolicyService.java +++ b/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanfinotherPolicy/LoanFinOtherPolicyService.java @@ -69,7 +69,7 @@ public class LoanFinOtherPolicyService extends MybatisBaseService vehTypeKeyList = new ArrayList<>(); - if (StringUtils.isNotBlank(vehTypeKey)){ + if (StringUtils.isNotBlank(vehTypeKey)) { String[] s1s = vehTypeKey.split(","); for (String s1 : s1s) { vehTypeKeyList.add(s1); @@ -78,7 +78,7 @@ public class LoanFinOtherPolicyService extends MybatisBaseService vehTypeValueList = new ArrayList<>(); - if (StringUtils.isNotBlank(vehTypeValue)){ + if (StringUtils.isNotBlank(vehTypeValue)) { String[] s2s = vehTypeValue.split(","); for (String s2 : s2s) { vehTypeValueList.add(s2); @@ -92,15 +92,15 @@ public class LoanFinOtherPolicyService extends MybatisBaseService> selectList(String orgPath, String userSid, String sid,String name,String modelSid) { + public ResultBean> selectList(String orgPath, String userSid, String sid, String name, String modelSid) { ResultBean> rb = ResultBean.fireFail(); String useOrgSid = sysStaffOrgFeign.getOrgSidByPath(orgPath).getData(); String vehTypeKey = loanFinPolicyService.selectVehType(modelSid); String deptSid = Arrays.asList(orgPath.split("/")).get(Arrays.asList(orgPath.split("/")).size() - 1); - List list = baseMapper.selectListOne(sid,name); + List list = baseMapper.selectListOne(sid, name); list.removeAll(Collections.singleton(null)); if (list.isEmpty()) { - list = baseMapper.selectListTwo(useOrgSid,name,vehTypeKey,deptSid); + list = baseMapper.selectListTwo(useOrgSid, name, vehTypeKey, deptSid); list.removeAll(Collections.singleton(null)); } @@ -131,7 +131,7 @@ public class LoanFinOtherPolicyService extends MybatisBaseService= date_format('" + validStartDateTo + "','%Y-%m-%d')"). apply(StringUtils.isNotEmpty(validEndDateTo), "date_format (validDateTo,'%Y-%m-%d') <= date_format('" + validEndDateTo + "','%Y-%m-%d')" ); + qw.eq("isDelete", 0); + qw.orderByDesc("createTime"); IPage page = PagerUtil.queryToPage(pq); IPage pagging = baseMapper.selectPageVo(page, qw); PagerVo p = PagerUtil.pageToVo(pagging, null); @@ -215,22 +217,22 @@ public class LoanFinOtherPolicyService extends MybatisBaseService vehTypeKeyList = dto.getVehTypeKeyList(); List vehTypeValueList = dto.getVehTypeValueList(); @@ -238,15 +240,15 @@ public class LoanFinOtherPolicyService extends MybatisBaseService vehTypeKeyList = dto.getVehTypeKeyList(); List vehTypeValueList = dto.getVehTypeValueList(); String vehTypeKey = ""; for (String s1 : vehTypeKeyList) { vehTypeKey = vehTypeKey + s1 + ","; } - if (StringUtils.isNotBlank(vehTypeKey)){ - entity.setVehTypeKey(vehTypeKey.substring(0,vehTypeKey.lastIndexOf(","))); + if (StringUtils.isNotBlank(vehTypeKey)) { + entity.setVehTypeKey(vehTypeKey.substring(0, vehTypeKey.lastIndexOf(","))); } String vehTypeValue = ""; for (String s2 : vehTypeValueList) { vehTypeValue = vehTypeValue + s2 + ","; } - if (StringUtils.isNotBlank(vehTypeValue)){ - entity.setVehTypeValue(vehTypeValue.substring(0,vehTypeValue.lastIndexOf(","))); + if (StringUtils.isNotBlank(vehTypeValue)) { + entity.setVehTypeValue(vehTypeValue.substring(0, vehTypeValue.lastIndexOf(","))); } baseMapper.updateById(entity); } @@ -345,4 +347,14 @@ public class LoanFinOtherPolicyService extends MybatisBaseService fetchByMainSid(String mainSid) { return baseMapper.fetchByMainSid(mainSid); } + + public ResultBean deleteOtherPolicy(String[] sids) { + ResultBean rb = ResultBean.fireFail(); + //符合条件直接删除 + List sidList = Arrays.asList(sids); + for (String sid : sidList) { + int i = baseMapper.deleteOne(sid); + } + return rb.success(); + } } diff --git a/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanfinpolicy/LoanFinPolicyMapper.java b/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanfinpolicy/LoanFinPolicyMapper.java index dc85744206..1d532d999a 100644 --- a/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanfinpolicy/LoanFinPolicyMapper.java +++ b/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanfinpolicy/LoanFinPolicyMapper.java @@ -8,6 +8,7 @@ import com.yxt.anrui.riskcenter.api.loanfinpolicy.*; import org.apache.ibatis.annotations.Mapper; import org.apache.ibatis.annotations.Param; import org.apache.ibatis.annotations.Select; +import org.apache.ibatis.annotations.Update; import java.util.List; @@ -23,11 +24,14 @@ public interface LoanFinPolicyMapper extends BaseMapper { @Select("select * from loan_fin_policy where bankSid = #{sid}") List selectByBankSid(String sid); - IPage getProductList(IPage page, @Param(Constants.WRAPPER) QueryWrapper qw, @Param("name") String name,@Param("useOrgSid") String useOrgSid,@Param("deptSid") String deptSid); + IPage getProductList(IPage page, @Param(Constants.WRAPPER) QueryWrapper qw, @Param("name") String name, @Param("useOrgSid") String useOrgSid, @Param("deptSid") String deptSid); AppPolicyDetailsVo getProductInfo(String sid); - List selectListOne(@Param("deptSid") String deptSid,@Param("isPack") String isPack,@Param("name") String name,@Param("vehTypeKey") String vehTypeKey,@Param("useOrgSid") String useOrgSid); + List selectListOne(@Param("deptSid") String deptSid, @Param("isPack") String isPack, @Param("name") String name, @Param("vehTypeKey") String vehTypeKey, @Param("useOrgSid") String useOrgSid); String selectVehType(String modelSid); + + @Update("update loan_fin_policy set isDelete = 1 where sid =#{sid}") + int deleteOne(String sid); } diff --git a/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanfinpolicy/LoanFinPolicyService.java b/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanfinpolicy/LoanFinPolicyService.java index c955e5c57c..1775c6de50 100644 --- a/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanfinpolicy/LoanFinPolicyService.java +++ b/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanfinpolicy/LoanFinPolicyService.java @@ -396,7 +396,7 @@ public class LoanFinPolicyService extends MybatisBaseService sidList = Arrays.asList(sids); for (String sid : sidList) { loanFinOtherPolicyService.deleteyMainSid(sid); - deleteBySid(sid); + int i = baseMapper.deleteOne(sid); } return rb.success(); } @@ -462,7 +462,7 @@ public class LoanFinPolicyService extends MybatisBaseService page = PagerUtil.queryToPage(pagerQuery); IPage pagging = baseMapper.pagerList(page, qw); PagerVo p = PagerUtil.pageToVo(pagging, null); @@ -637,9 +638,9 @@ public class LoanFinPolicyService extends MybatisBaseService page = PagerUtil.queryToPage(pagerQuery); - IPage pagging = baseMapper.getProductList(page, qw, query.getName(),useOrgSid,deptSid); + IPage pagging = baseMapper.getProductList(page, qw, query.getName(), useOrgSid, deptSid); PagerVo p = PagerUtil.pageToVo(pagging, null); return p; @@ -680,7 +681,7 @@ public class LoanFinPolicyService extends MybatisBaseService list = baseMapper.selectListOne(deptSid, isPack, name, vehTypeKey,useOrgSid); + List list = baseMapper.selectListOne(deptSid, isPack, name, vehTypeKey, useOrgSid); list.removeAll(Collections.singleton(null)); return rb.success().setData(list); } diff --git a/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanparameter/LoanParameterMapper.java b/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanparameter/LoanParameterMapper.java index 6d3a1c81ab..40b5c82bfb 100644 --- a/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanparameter/LoanParameterMapper.java +++ b/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanparameter/LoanParameterMapper.java @@ -25,4 +25,11 @@ public interface LoanParameterMapper extends BaseMapper { @Select("select parameterValue from loan_parameter where parameterNo = #{parNo}") String fetchByParNo(String parNo); + + @Select("select * from loan_parameter where parameterNo = #{parNo} and isDelete = 0") + LoanParameter fetchOneByParNo(String parNo); + + int selectParameterByNo(String pNo); + + int selectAllByIdAndpNo(@Param("pNo") String pNo, @Param("sid") String sid); } diff --git a/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanparameter/LoanParameterMapper.xml b/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanparameter/LoanParameterMapper.xml index 48b1e7753b..e3aab23fa3 100644 --- a/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanparameter/LoanParameterMapper.xml +++ b/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanparameter/LoanParameterMapper.xml @@ -18,4 +18,17 @@ ${ew.sqlSegment} + + \ No newline at end of file diff --git a/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanparameter/LoanParameterRest.java b/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanparameter/LoanParameterRest.java index 3c7fc2b479..4368f7f5b1 100644 --- a/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanparameter/LoanParameterRest.java +++ b/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanparameter/LoanParameterRest.java @@ -53,4 +53,9 @@ public class LoanParameterRest implements LoanParameterFeign { public ResultBean fetchByParNo(String parNo) { return parameterService.fetchByParNo(parNo); } + + @Override + public ResultBean fetchOneByParNo(String parNo) { + return parameterService.fetchOneByParNo(parNo); + } } diff --git a/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanparameter/LoanParameterService.java b/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanparameter/LoanParameterService.java index 64f1879f7b..5df72ebe5c 100644 --- a/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanparameter/LoanParameterService.java +++ b/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanparameter/LoanParameterService.java @@ -97,13 +97,44 @@ public class LoanParameterService extends MybatisBaseService 0) { + return ResultBean.fireFail().setMessage("参数编码已存在"); + } LoanParameter loanParameter = fetchBySid(dto.getSid()); BeanUtil.copyProperties(dto, loanParameter, "id", "sid"); baseMapper.updateById(loanParameter); } else { + int count = selectParameterByNo(dto.getParameterNo()); + if (count > 0) { + return ResultBean.fireFail().setMsg("添加失败，参数编码已存在"); + } LoanParameter loanParameter = new LoanParameter(); BeanUtil.copyProperties(dto, loanParameter, "id", "sid"); loanParameter.setOrgSidPath(dto.getOrgPath()); @@ -151,4 +182,10 @@ public class LoanParameterService extends MybatisBaseService fetchOneByParNo(String parNo) { + ResultBean rb = ResultBean.fireFail(); + LoanParameter parameter = baseMapper.fetchOneByParNo(parNo); + return rb.success().setData(parameter); + } } diff --git a/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanrepaymentschedule/LoanRepaymentScheduleRest.java b/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanrepaymentschedule/LoanRepaymentScheduleRest.java index 7ae29d682c..d1c7a4f23c 100644 --- a/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanrepaymentschedule/LoanRepaymentScheduleRest.java +++ b/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanrepaymentschedule/LoanRepaymentScheduleRest.java @@ -57,4 +57,9 @@ public class LoanRepaymentScheduleRest implements LoanRepaymentScheduleFeign { public ResultBean getRepaymentPlanListBySid(String sid) { return loanRepaymentScheduleService.getRepaymentPlanListBySid(sid); } + + @Override + public ResultBean> getRepaymentPlanListByVinNo(String vinNo,String sid) { + return loanRepaymentScheduleService.getRepaymentPlanListByVinNo(vinNo,sid); + } } diff --git a/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanrepaymentschedule/LoanRepaymentScheduleService.java b/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanrepaymentschedule/LoanRepaymentScheduleService.java index ee1abf63ff..bfd664890b 100644 --- a/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanrepaymentschedule/LoanRepaymentScheduleService.java +++ b/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanrepaymentschedule/LoanRepaymentScheduleService.java @@ -756,4 +756,16 @@ public class LoanRepaymentScheduleService extends MybatisBaseService> getRepaymentPlanListByVinNo(String vinNo , String sid) { + ResultBean> rb = ResultBean.fireFail(); + AppRepaymentPlanDetailsVo data = getRepaymentPlanListBySid(sid).getData(); + if (null != data) { + List records = data.getRecords(); + records.removeAll(Collections.singleton(null)); + if (!records.isEmpty()) + return rb.success().setData(records); + } + return rb.success(); + } } diff --git a/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/risk/repaymentplan/RepaymentPlanFeign.java b/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/risk/repaymentplan/RepaymentPlanFeign.java index 6a44375f8e..015969a206 100644 --- a/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/risk/repaymentplan/RepaymentPlanFeign.java +++ b/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/risk/repaymentplan/RepaymentPlanFeign.java @@ -9,6 +9,8 @@ import io.swagger.annotations.ApiOperation; import org.springframework.cloud.openfeign.FeignClient; import org.springframework.web.bind.annotation.*; +import java.util.List; + /** * @Author * @Date @@ -33,5 +35,10 @@ public interface RepaymentPlanFeign { @ResponseBody public ResultBean getRepaymentPlanListBySid(@RequestParam("sid") String sid); + @ApiOperation("查看单台还款计划表") + @GetMapping("/getRepaymentPlanListByVinNo") + @ResponseBody + public ResultBean> getRepaymentPlanListByVinNo(@RequestParam("vinNo") String vinNo, @RequestParam("sid") String sid); + } diff --git a/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/risk/repaymentplan/RepaymentPlanFeignFallback.java b/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/risk/repaymentplan/RepaymentPlanFeignFallback.java index 5d54632b77..e8c1a3fae8 100644 --- a/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/risk/repaymentplan/RepaymentPlanFeignFallback.java +++ b/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/risk/repaymentplan/RepaymentPlanFeignFallback.java @@ -6,6 +6,8 @@ import com.yxt.common.core.result.ResultBean; import com.yxt.common.core.vo.PagerVo; import org.springframework.stereotype.Component; +import java.util.List; + /** * @Author * @Date 2023/3/21 15:19 @@ -24,4 +26,9 @@ public class RepaymentPlanFeignFallback implements RepaymentPlanFeign { public ResultBean getRepaymentPlanListBySid(String sid) { return null; } + + @Override + public ResultBean> getRepaymentPlanListByVinNo(String vinNo, String sid) { + return null; + } } diff --git a/anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/risk/repaymentplan/RepaymentPlanRest.java b/anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/risk/repaymentplan/RepaymentPlanRest.java index fd46a23cda..04e328afa0 100644 --- a/anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/risk/repaymentplan/RepaymentPlanRest.java +++ b/anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/risk/repaymentplan/RepaymentPlanRest.java @@ -1,10 +1,7 @@ package com.yxt.anrui.terminal.biz.risk.repaymentplan; import com.yxt.anrui.terminal.api.risk.mortgage.*; -import com.yxt.anrui.terminal.api.risk.repaymentplan.RepaymentPlanDetailsVo; -import com.yxt.anrui.terminal.api.risk.repaymentplan.RepaymentPlanFeign; -import com.yxt.anrui.terminal.api.risk.repaymentplan.RepaymentPlanQuery; -import com.yxt.anrui.terminal.api.risk.repaymentplan.RepaymentPlanVo; +import com.yxt.anrui.terminal.api.risk.repaymentplan.*; import com.yxt.common.core.query.PagerQuery; import com.yxt.common.core.result.ResultBean; import com.yxt.common.core.vo.PagerVo; @@ -13,6 +10,8 @@ import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Controller; import org.springframework.web.bind.annotation.RequestMapping; +import java.util.List; + /** * @Author * @Date 2023/3/25 9:39 @@ -36,4 +35,9 @@ public class RepaymentPlanRest implements RepaymentPlanFeign { public ResultBean getRepaymentPlanListBySid(String sid) { return repaymentPlanService.getRepaymentPlanListBySid(sid); } + + @Override + public ResultBean> getRepaymentPlanListByVinNo(String vinNo,String sid) { + return repaymentPlanService.getRepaymentPlanListByVinNo(vinNo,sid); + } } diff --git a/anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/risk/repaymentplan/RepaymentPlanService.java b/anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/risk/repaymentplan/RepaymentPlanService.java index 72ae4bef49..f7da5eaa59 100644 --- a/anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/risk/repaymentplan/RepaymentPlanService.java +++ b/anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/risk/repaymentplan/RepaymentPlanService.java @@ -2,15 +2,13 @@ package com.yxt.anrui.terminal.biz.risk.repaymentplan; import cn.hutool.core.bean.BeanUtil; import com.yxt.anrui.riskcenter.api.loanmortgageinformationtransact.*; -import com.yxt.anrui.riskcenter.api.loanrepaymentschedule.AppRepaymentPlanDetailsVo; -import com.yxt.anrui.riskcenter.api.loanrepaymentschedule.AppRepaymentPlanQuery; -import com.yxt.anrui.riskcenter.api.loanrepaymentschedule.AppRepaymentPlanVo; -import com.yxt.anrui.riskcenter.api.loanrepaymentschedule.LoanRepaymentScheduleFeign; +import com.yxt.anrui.riskcenter.api.loanrepaymentschedule.*; import com.yxt.anrui.terminal.api.risk.mortgage.AppMortgageInformationTransactDetailsVo; import com.yxt.anrui.terminal.api.risk.mortgage.AppMortgageInformationTransactDto; import com.yxt.anrui.terminal.api.risk.mortgage.AppMortgageInformationTransactQuery; import com.yxt.anrui.terminal.api.risk.mortgage.AppMortgageInformationTransactVo; import com.yxt.anrui.terminal.api.risk.repaymentplan.RepaymentPlanDetailsVo; +import com.yxt.anrui.terminal.api.risk.repaymentplan.RepaymentPlanListDetailsVo; import com.yxt.anrui.terminal.api.risk.repaymentplan.RepaymentPlanQuery; import com.yxt.anrui.terminal.api.risk.repaymentplan.RepaymentPlanVo; import com.yxt.common.core.query.PagerQuery; @@ -19,6 +17,9 @@ import com.yxt.common.core.vo.PagerVo; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; +import java.util.ArrayList; +import java.util.List; + /** * @Author * @Date 2023/3/25 9:40 @@ -54,4 +55,19 @@ public class RepaymentPlanService { } return rb.success().setData(vo); } + + public ResultBean> getRepaymentPlanListByVinNo(String vinNo, String sid) { + ResultBean> rb = ResultBean.fireFail(); + List vo = new ArrayList<>(); + List data = loanRepaymentScheduleFeign.getRepaymentPlanListByVinNo(vinNo, sid).getData(); + if (!data.isEmpty()) { + for (AppRepaymentPlanListDetailsVo datum : data) { + RepaymentPlanListDetailsVo detailsVo = new RepaymentPlanListDetailsVo(); + BeanUtil.copyProperties(datum, detailsVo); + vo.add(detailsVo); + } + return rb.success().setData(vo); + } + return rb.success().setData(vo); + } } From fc7672cc19b14afe8674c4c9399d4b08924b17b1 Mon Sep 17 00:00:00 2001 From: fanzongzhe <285169773@qq.com> Date: Thu, 21 Sep 2023 08:54:36 +0800 Subject: [PATCH 2/2] =?UTF-8?q?=E9=94=80=E5=94=AE=E8=AE=A2=E5=8D=95?= =?UTF-8?q?=E7=A1=AE=E5=AE=9A=E8=B4=B7=E6=AC=BE=E4=BA=BA=E6=8E=A8=E9=80=81?= =?UTF-8?q?=E5=AE=B6=E8=AE=BF=E5=87=86=E5=A4=87=E8=A1=A5=E5=85=85createByS?= =?UTF-8?q?id?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../buscenter/biz/bussalesorder/BusSalesOrderService.java | 6 ++++-- .../riskcenter/api/loanhomevisitprep/HomeVisitDto.java | 1 + 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesorder/BusSalesOrderService.java b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesorder/BusSalesOrderService.java index 5492bcbb86..00cc59624b 100644 --- a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesorder/BusSalesOrderService.java +++ b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesorder/BusSalesOrderService.java @@ -7449,7 +7449,7 @@ public class BusSalesOrderService extends MybatisBaseService list = busSalesOrderPriceService.selectByOrdersSid(busSalesOrderBorrower.getSalesOrderSid()); list.removeAll(Collections.singleton(null)); - if(list.size()>0){ + if (list.size() > 0) { for (int i = 0; i < Integer.parseInt(num); i++) { BusSalesOrderVehicle busSalesOrderVehicle = list.get(i); busSalesOrderVehicle.setBorrowerSid(busSalesOrderBorrower.getSid()); @@ -7459,8 +7459,10 @@ public class BusSalesOrderService extends MybatisBaseService