diff --git a/anrui-reportcenter/anrui-reportcenter-api/src/main/java/com/yxt/anrui/reportcenter/api/dailyreport/DailyReportFeign.java b/anrui-reportcenter/anrui-reportcenter-api/src/main/java/com/yxt/anrui/reportcenter/api/dailyreport/DailyReportFeign.java index c589ecec94..69bebd65b7 100644 --- a/anrui-reportcenter/anrui-reportcenter-api/src/main/java/com/yxt/anrui/reportcenter/api/dailyreport/DailyReportFeign.java +++ b/anrui-reportcenter/anrui-reportcenter-api/src/main/java/com/yxt/anrui/reportcenter/api/dailyreport/DailyReportFeign.java @@ -89,7 +89,7 @@ public interface DailyReportFeign { @ApiOperation("集团日期初始化") @GetMapping("getReport") @ResponseBody - ResultBean getReport(@RequestParam("date") String date,@RequestParam("userSid") String userSid); + ResultBean getReport(@RequestParam("date") String date,@RequestParam("userSid") String userSid,@RequestParam("orgPath")String orgPath,@RequestParam("type")String type); @ApiOperation("集团事业部合集日报表") @GetMapping("list2") @@ -111,20 +111,20 @@ public interface DailyReportFeign { @ResponseBody ResultBean pageList2(@RequestBody PagerQuery pagerQuery); - @ApiOperation("事业部日期初始化") + /* @ApiOperation("事业部日期初始化") @GetMapping("getReport2") @ResponseBody ResultBean getReport2(@RequestParam("date") String date, @RequestParam("orgPath") String orgPath,@RequestParam("userSid")String userSid); - +*/ @ApiOperation("分公司日报表分页列表") @PostMapping("pageList3") @ResponseBody ResultBean pageList3(@RequestBody PagerQuery pagerQuery); - @ApiOperation("分公司日期初始化") + /* @ApiOperation("分公司日期初始化") @GetMapping("getReport3") @ResponseBody ResultBean getReport3(@RequestParam("date") String date, @RequestParam("orgPath") String orgPath,@RequestParam("userSid")String userSid); - +*/ } diff --git a/anrui-reportcenter/anrui-reportcenter-api/src/main/java/com/yxt/anrui/reportcenter/api/dailyreport/ReportVo.java b/anrui-reportcenter/anrui-reportcenter-api/src/main/java/com/yxt/anrui/reportcenter/api/dailyreport/ReportVo.java index 10bd3f4356..dab2045c14 100644 --- a/anrui-reportcenter/anrui-reportcenter-api/src/main/java/com/yxt/anrui/reportcenter/api/dailyreport/ReportVo.java +++ b/anrui-reportcenter/anrui-reportcenter-api/src/main/java/com/yxt/anrui/reportcenter/api/dailyreport/ReportVo.java @@ -112,10 +112,14 @@ public class ReportVo implements Vo { private String loan_not_amount; @ApiModelProperty("前三个月销售台数之和") private String saleAllToThree; - + @ApiModelProperty("事业部sid") private String busOrgSid; - + @ApiModelProperty("事业部名称") + private String busOrgName; + @ApiModelProperty("分公司sid") private String useOrgSid; + @ApiModelProperty("分公司名称") + private String useOrgName; private List list; } diff --git a/anrui-reportcenter/anrui-reportcenter-api/src/main/java/com/yxt/anrui/reportcenter/api/reportset/ReportSetFeign.java b/anrui-reportcenter/anrui-reportcenter-api/src/main/java/com/yxt/anrui/reportcenter/api/reportset/ReportSetFeign.java index 33f335e2eb..6e8d39747b 100644 --- a/anrui-reportcenter/anrui-reportcenter-api/src/main/java/com/yxt/anrui/reportcenter/api/reportset/ReportSetFeign.java +++ b/anrui-reportcenter/anrui-reportcenter-api/src/main/java/com/yxt/anrui/reportcenter/api/reportset/ReportSetFeign.java @@ -1,6 +1,5 @@ package com.yxt.anrui.reportcenter.api.reportset; -import com.yxt.anrui.reportcenter.api.dailyreport.DailyReportFeignFallback; import com.yxt.common.core.result.ResultBean; import org.springframework.cloud.openfeign.FeignClient; import org.springframework.web.bind.annotation.PostMapping; diff --git a/anrui-reportcenter/anrui-reportcenter-biz/src/main/java/com/yxt/anrui/reportcenter/biz/dailyreport/DailyReportMapper.xml b/anrui-reportcenter/anrui-reportcenter-biz/src/main/java/com/yxt/anrui/reportcenter/biz/dailyreport/DailyReportMapper.xml index 32c92dcab5..1412fa986b 100644 --- a/anrui-reportcenter/anrui-reportcenter-biz/src/main/java/com/yxt/anrui/reportcenter/biz/dailyreport/DailyReportMapper.xml +++ b/anrui-reportcenter/anrui-reportcenter-biz/src/main/java/com/yxt/anrui/reportcenter/biz/dailyreport/DailyReportMapper.xml @@ -297,7 +297,7 @@ ifnull(sum(loan_not_count), 0) as loan_not_count, ifnull(sum(loan_not_amount), 0) as loan_not_amount, ifnull(sum(saleAllToThree), 0) as saleAllToThree, - busOrgSid,useOrgSid + busOrgSid,useOrgSid,busOrgName,useOrgName from daily_report ${ew.sqlSegment} diff --git a/anrui-reportcenter/anrui-reportcenter-biz/src/main/java/com/yxt/anrui/reportcenter/biz/dailyreport/DailyReportRest.java b/anrui-reportcenter/anrui-reportcenter-biz/src/main/java/com/yxt/anrui/reportcenter/biz/dailyreport/DailyReportRest.java index f1bb8a441a..1a8ec0c851 100644 --- a/anrui-reportcenter/anrui-reportcenter-biz/src/main/java/com/yxt/anrui/reportcenter/biz/dailyreport/DailyReportRest.java +++ b/anrui-reportcenter/anrui-reportcenter-biz/src/main/java/com/yxt/anrui/reportcenter/biz/dailyreport/DailyReportRest.java @@ -85,8 +85,8 @@ public class DailyReportRest implements DailyReportFeign { } @Override - public ResultBean getReport(String date,String userSid) { - return dailyReportService.getReport(date,userSid); + public ResultBean getReport(String date,String userSid,String orgPath,String type) { + return dailyReportService.getReport(date,userSid,orgPath,type); } @Override @@ -111,10 +111,10 @@ public class DailyReportRest implements DailyReportFeign { return rb.success().setData(pv); } - @Override + /* @Override public ResultBean getReport2(String date, String orgPath,String userSid) { return dailyReportService.getReport2(date,orgPath,userSid); - } + }*/ @Override public ResultBean pageList3(PagerQuery pagerQuery) { @@ -123,8 +123,8 @@ public class DailyReportRest implements DailyReportFeign { return rb.success().setData(pv); } - @Override + /* @Override public ResultBean getReport3(String date, String orgPath,String userSid) { return dailyReportService.getReport3(date,orgPath,userSid); - } + }*/ } diff --git a/anrui-reportcenter/anrui-reportcenter-biz/src/main/java/com/yxt/anrui/reportcenter/biz/dailyreport/DailyReportService.java b/anrui-reportcenter/anrui-reportcenter-biz/src/main/java/com/yxt/anrui/reportcenter/biz/dailyreport/DailyReportService.java index 87d90a9d61..a12b7507b8 100644 --- a/anrui-reportcenter/anrui-reportcenter-biz/src/main/java/com/yxt/anrui/reportcenter/biz/dailyreport/DailyReportService.java +++ b/anrui-reportcenter/anrui-reportcenter-biz/src/main/java/com/yxt/anrui/reportcenter/biz/dailyreport/DailyReportService.java @@ -631,12 +631,26 @@ public class DailyReportService extends MybatisBaseService getReport(String date, String userSid) { + public ResultBean getReport(String date, String userSid,String orgPath,String type) { ResultBean rb = ResultBean.fireFail(); QueryWrapper qw = new QueryWrapper<>(); if (StringUtils.isNotBlank(date)) { qw.like("createTime", date); } + if(StringUtils.isNotBlank(type)){//事业部或分公司 + if("syb".equals(type)){ + if (StringUtils.isNotBlank(orgPath)) { + List stringList = Arrays.asList(orgPath.split("/")); + String busOrgSid = orgPath.substring(37, 73); + qw.eq("busOrgSid", busOrgSid); + } + }else if("fgs".equals(type)){ + if (StringUtils.isNotBlank(orgPath)) { + String useOrgSid = sysStaffOrgFeign.getOrgSidByPath(orgPath).getData(); + qw.eq("useOrgSid", useOrgSid); + } + } + } ReportVo reportVo = baseMapper.getReport(qw); String ratio = ""; if (StringUtils.isBlank(reportVo.getSaleAllToThree())) { diff --git a/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanoverduebank/LoanOverdueBankAppDetailsVo.java b/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanoverduebank/LoanOverdueBankAppDetailsVo.java new file mode 100644 index 0000000000..f8e1bd21bf --- /dev/null +++ b/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanoverduebank/LoanOverdueBankAppDetailsVo.java @@ -0,0 +1,39 @@ +package com.yxt.anrui.riskcenter.api.loanoverduebank; + +import com.yxt.anrui.riskcenter.api.loanoverduebankdetails.LoanOverdueBankDetailsDto; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.util.ArrayList; +import java.util.List; + +/** + * @description: + * @author: dimengzhe + * @date: 2024/1/16 + **/ +@Data +public class LoanOverdueBankAppDetailsVo { + + //发起部门 + @ApiModelProperty("申请部门") + private String createDept; + //发起人 + @ApiModelProperty("申请人") + private String createByName; + //发起日期 + @ApiModelProperty("发起日期") + private String createDate; + //截止时间 + @ApiModelProperty("截止时间") + private String stopDate; + //备注 + @ApiModelProperty("备注") + private String remarks; + //附件 + private List filesList = new ArrayList<>(); + private String files; + //逾期客户列表 + private List detailsVoList = new ArrayList<>(); + +} diff --git a/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanoverduebank/LoanOverdueBankDetailsAppVo.java b/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanoverduebank/LoanOverdueBankDetailsAppVo.java new file mode 100644 index 0000000000..a9c10ed98b --- /dev/null +++ b/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanoverduebank/LoanOverdueBankDetailsAppVo.java @@ -0,0 +1,33 @@ +package com.yxt.anrui.riskcenter.api.loanoverduebank; + +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +/** + * @description: + * @author: dimengzhe + * @date: 2024/1/16 + **/ +@Data +public class LoanOverdueBankDetailsAppVo { + @ApiModelProperty("sid") + private String sid; + @ApiModelProperty("贷款合同编号") + private String loanContractNo; + @ApiModelProperty("客户名称") + private String customerName; + @ApiModelProperty("贷款人") + private String loanName; + @ApiModelProperty("资方合同编号") + private String bankContractNo; + @ApiModelProperty("资方") + private String bankName; + @ApiModelProperty("期数") + private String period; + @ApiModelProperty("平台逾期月还") + private String overdueMoney; + @ApiModelProperty("资方逾期月还") + private String bankOverdueMoney; + @ApiModelProperty("差异金额") + private String diffMoney; +} diff --git a/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanoverduebank/LoanOverdueBankFeign.java b/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanoverduebank/LoanOverdueBankFeign.java index 453e48c638..27576aaefe 100644 --- a/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanoverduebank/LoanOverdueBankFeign.java +++ b/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanoverduebank/LoanOverdueBankFeign.java @@ -85,4 +85,8 @@ public interface LoanOverdueBankFeign { @PostMapping(value = "/delegate") @ResponseBody public ResultBean delegate(@RequestBody OverBankApplyDelegateQuery query); + + @ApiOperation(value = "详情") + @GetMapping(value = "/getAppDetails") + ResultBean getAppDetails(@RequestParam("sid") String sid); } diff --git a/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanoverduefin/LoanOverdueFinAppVo.java b/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanoverduefin/LoanOverdueFinAppVo.java new file mode 100644 index 0000000000..72b57eb7cb --- /dev/null +++ b/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanoverduefin/LoanOverdueFinAppVo.java @@ -0,0 +1,37 @@ +package com.yxt.anrui.riskcenter.api.loanoverduefin; + +import com.yxt.anrui.riskcenter.api.loanoverduefindetails.LoanOverdueFinAppDetailsVo; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.util.ArrayList; +import java.util.List; + +/** + * @description: + * @author: dimengzhe + * @date: 2024/1/16 + **/ +@Data +public class LoanOverdueFinAppVo { + + //发起部门 + @ApiModelProperty("发起部门") + private String createDept; + //发起人 + @ApiModelProperty("发起人") + private String createByName; + @ApiModelProperty("发起日期") + private String createDate; + @ApiModelProperty("截止时间") + private String stopDate; + @ApiModelProperty("备注") + private String remarks; + //附件 + private List filesList = new ArrayList<>(); + private String files; + //逾期客户列表 + @ApiModelProperty("逾期客户列表") + private List detailsVoList = new ArrayList<>(); + +} diff --git a/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanoverduefin/LoanOverdueFinFeign.java b/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanoverduefin/LoanOverdueFinFeign.java index 30c0dc7623..815ef4e003 100644 --- a/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanoverduefin/LoanOverdueFinFeign.java +++ b/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanoverduefin/LoanOverdueFinFeign.java @@ -45,7 +45,7 @@ public interface LoanOverdueFinFeign { @ApiOperation(value = "导入") @PostMapping("/getExcelInfo") - ResultBean> getExcelInfo(@RequestParam(value = "file") MultipartFile file, HttpServletRequest request,@RequestParam(value = "useOrgSid")String useOrgSid) throws IOException; + ResultBean> getExcelInfo(@RequestParam(value = "file") MultipartFile file, HttpServletRequest request, @RequestParam(value = "useOrgSid") String useOrgSid) throws IOException; @ApiOperation("删除/批量删除") @DeleteMapping("/delBySids") @@ -81,8 +81,12 @@ public interface LoanOverdueFinFeign { @ApiOperation(value = "加签") @PostMapping(value = "/delegate") - @ResponseBody public ResultBean delegate(@RequestBody OverFinApplyDelegateQuery query); + @ApiOperation(value = "移动端审批详情") + @PostMapping(value = "/getAppDetails") + @ResponseBody + ResultBean getAppDetails(@RequestParam("sid") String sid); + } diff --git a/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanoverduefindetails/LoanOverdueFinAppDetailsVo.java b/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanoverduefindetails/LoanOverdueFinAppDetailsVo.java new file mode 100644 index 0000000000..6f32041c88 --- /dev/null +++ b/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanoverduefindetails/LoanOverdueFinAppDetailsVo.java @@ -0,0 +1,34 @@ +package com.yxt.anrui.riskcenter.api.loanoverduefindetails; + +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +/** + * @description: + * @author: dimengzhe + * @date: 2024/1/16 + **/ +@Data +public class LoanOverdueFinAppDetailsVo { + + @ApiModelProperty("明细sid") + private String sid; + @ApiModelProperty("客户名称") + private String customerName; + @ApiModelProperty("客户sid") + private String customerSid; + @ApiModelProperty("贷款人sid") + private String loanSid; + @ApiModelProperty("贷款人") + private String loanName; + @ApiModelProperty("当前逾期金额") + private String overdueMoney; + @ApiModelProperty("累欠") + private String tiredDeficiency; + @ApiModelProperty("差异金额") + private String diffMoney; + @ApiModelProperty("车架号") + private String vinNo; + @ApiModelProperty("销售订单关联的车辆sid") + private String busVinSid; +} diff --git a/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanoverduebank/LoanOverdueBankMapper.java b/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanoverduebank/LoanOverdueBankMapper.java index d016c7c72d..3713b3ae25 100644 --- a/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanoverduebank/LoanOverdueBankMapper.java +++ b/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanoverduebank/LoanOverdueBankMapper.java @@ -5,6 +5,7 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.core.toolkit.Constants; import com.yxt.anrui.riskcenter.api.loanoverduebank.LoanOverdueBank; +import com.yxt.anrui.riskcenter.api.loanoverduebank.LoanOverdueBankAppDetailsVo; import com.yxt.anrui.riskcenter.api.loanoverduebank.LoanOverdueBankDetailVo; import com.yxt.anrui.riskcenter.api.loanoverduebank.LoanOverdueBankVo; import com.yxt.anrui.riskcenter.api.loanoverduebankdetails.LoanOverdueBankDetailsDto; @@ -30,4 +31,6 @@ public interface LoanOverdueBankMapper extends BaseMapper { int updateFlowFiled(Map beanToMap); List detailsList(@Param("useOrgSid") String useOrgSid, @Param(Constants.WRAPPER) QueryWrapper qw, @Param("stopDate") String stopDate); + + LoanOverdueBankAppDetailsVo getAppDetails(String sid); } diff --git a/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanoverduebank/LoanOverdueBankMapper.xml b/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanoverduebank/LoanOverdueBankMapper.xml index 09d9d03a90..b508b7e744 100644 --- a/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanoverduebank/LoanOverdueBankMapper.xml +++ b/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanoverduebank/LoanOverdueBankMapper.xml @@ -103,4 +103,15 @@ ${ew.sqlSegment} + + \ No newline at end of file diff --git a/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanoverduebank/LoanOverdueBankRest.java b/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanoverduebank/LoanOverdueBankRest.java index 9068a1c80f..f62cd5c42c 100644 --- a/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanoverduebank/LoanOverdueBankRest.java +++ b/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanoverduebank/LoanOverdueBankRest.java @@ -10,6 +10,7 @@ import com.yxt.common.base.utils.ExportExcelUtils; import com.yxt.common.core.query.PagerQuery; import com.yxt.common.core.result.ResultBean; import com.yxt.common.core.vo.PagerVo; +import io.swagger.annotations.Api; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RestController; @@ -30,6 +31,7 @@ import java.util.List; **/ @RestController @RequestMapping("v1/LoanOverdueBank") +@Api(tags = "逾期对账申请资方") public class LoanOverdueBankRest implements LoanOverdueBankFeign { @Autowired @@ -121,4 +123,9 @@ public class LoanOverdueBankRest implements LoanOverdueBankFeign { public ResultBean delegate(OverBankApplyDelegateQuery query) { return loanOverdueBankService.delegate(query); } + + @Override + public ResultBean getAppDetails(String sid) { + return loanOverdueBankService.getAppDetails(sid); + } } diff --git a/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanoverduebank/LoanOverdueBankService.java b/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanoverduebank/LoanOverdueBankService.java index 294dd41696..bff4651f2a 100644 --- a/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanoverduebank/LoanOverdueBankService.java +++ b/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanoverduebank/LoanOverdueBankService.java @@ -816,4 +816,24 @@ public class LoanOverdueBankService extends MybatisBaseService getAppDetails(String sid) { + ResultBean rb = ResultBean.fireFail(); + LoanOverdueBank loanOverdueBank = fetchBySid(sid); + if (loanOverdueBank == null) { + return rb.setMsg("该申请不存在"); + } + LoanOverdueBankAppDetailsVo loanOverdueBankAppDetailsVo = baseMapper.getAppDetails(sid); + String files = loanOverdueBankAppDetailsVo.getFiles(); + if (StringUtils.isNotBlank(files)) { + List fileList = Arrays.asList(files.split(",")).stream().map(c -> fileUploadComponent.getUrlPrefix() + c).collect(Collectors.toList()); + loanOverdueBankAppDetailsVo.setFilesList(fileList); + } + List detailsVoList = loanOverdueBankDetailsService.getAppDetails(sid); + detailsVoList.removeAll(Collections.singleton(null)); + if (!detailsVoList.isEmpty()) { + loanOverdueBankAppDetailsVo.setDetailsVoList(detailsVoList); + } + return rb.success().setData(loanOverdueBankAppDetailsVo); + } } diff --git a/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanoverduebankdetails/LoanOverdueBankDetailsMapper.java b/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanoverduebankdetails/LoanOverdueBankDetailsMapper.java index bc623b0cfa..87b76f9b32 100644 --- a/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanoverduebankdetails/LoanOverdueBankDetailsMapper.java +++ b/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanoverduebankdetails/LoanOverdueBankDetailsMapper.java @@ -1,6 +1,7 @@ package com.yxt.anrui.riskcenter.biz.loanoverduebankdetails; import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.yxt.anrui.riskcenter.api.loanoverduebank.LoanOverdueBankDetailsAppVo; import com.yxt.anrui.riskcenter.api.loanoverduebankdetails.LoanOverdueBankDetails; import com.yxt.anrui.riskcenter.api.loanoverduebankdetails.LoanOverdueBankDetailsDto; import com.yxt.anrui.riskcenter.api.loanrepaymentschedule.LoanRepaymentScheduleDetailsVo; @@ -21,4 +22,6 @@ public interface LoanOverdueBankDetailsMapper extends BaseMapper selectByMainSid(String sid); List selectBankContractNo(@Param("bankContractNo") String bankContractNo, @Param("useOrgSid") String useOrgSid); + + List getAppDetails(String sid); } diff --git a/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanoverduebankdetails/LoanOverdueBankDetailsMapper.xml b/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanoverduebankdetails/LoanOverdueBankDetailsMapper.xml index b694bd8ea5..215b622f57 100644 --- a/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanoverduebankdetails/LoanOverdueBankDetailsMapper.xml +++ b/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanoverduebankdetails/LoanOverdueBankDetailsMapper.xml @@ -29,7 +29,28 @@ + + \ No newline at end of file diff --git a/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanoverduebankdetails/LoanOverdueBankDetailsService.java b/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanoverduebankdetails/LoanOverdueBankDetailsService.java index 57a584d5b7..41686e8e9e 100644 --- a/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanoverduebankdetails/LoanOverdueBankDetailsService.java +++ b/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanoverduebankdetails/LoanOverdueBankDetailsService.java @@ -2,6 +2,7 @@ package com.yxt.anrui.riskcenter.biz.loanoverduebankdetails; import cn.hutool.core.bean.BeanUtil; import com.yxt.anrui.riskcenter.api.loanoverduebank.LoanOverdueBank; +import com.yxt.anrui.riskcenter.api.loanoverduebank.LoanOverdueBankDetailsAppVo; import com.yxt.anrui.riskcenter.api.loanoverduebankdetails.LoanOverdueBankDetails; import com.yxt.anrui.riskcenter.api.loanoverduebankdetails.LoanOverdueBankDetailsDto; import com.yxt.anrui.riskcenter.api.loanoverduefindetails.LoanOverdueFinDetails; @@ -40,4 +41,8 @@ public class LoanOverdueBankDetailsService extends MybatisBaseService selectBankContractNo(String bankContractNo, String useOrgSid) { return baseMapper.selectBankContractNo(bankContractNo,useOrgSid); } + + public List getAppDetails(String sid) { + return baseMapper.getAppDetails(sid); + } } diff --git a/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanoverduefin/LoanOverdueFinMapper.java b/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanoverduefin/LoanOverdueFinMapper.java index 1643ba8245..a1d9c1b0f9 100644 --- a/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanoverduefin/LoanOverdueFinMapper.java +++ b/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanoverduefin/LoanOverdueFinMapper.java @@ -5,6 +5,7 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.core.toolkit.Constants; import com.yxt.anrui.riskcenter.api.loanoverduefin.LoanOverdueFin; +import com.yxt.anrui.riskcenter.api.loanoverduefin.LoanOverdueFinAppVo; import com.yxt.anrui.riskcenter.api.loanoverduefin.LoanOverdueFinDetailVo; import com.yxt.anrui.riskcenter.api.loanoverduefin.LoanOverdueFinVo; import com.yxt.anrui.riskcenter.api.loanoverduefindetails.LoanOverdueFinDetailsDto; @@ -30,4 +31,6 @@ public interface LoanOverdueFinMapper extends BaseMapper { int updateFlowFiled(Map beanToMap); List detailsList(@Param("useOrgSid") String useOrgSid, @Param(Constants.WRAPPER) QueryWrapper qw, @Param("stopDate") String stopDate); + + LoanOverdueFinAppVo getAppDetails(String sid); } diff --git a/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanoverduefin/LoanOverdueFinMapper.xml b/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanoverduefin/LoanOverdueFinMapper.xml index d51f166fd3..98d6fbe992 100644 --- a/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanoverduefin/LoanOverdueFinMapper.xml +++ b/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanoverduefin/LoanOverdueFinMapper.xml @@ -93,4 +93,15 @@ ${ew.sqlSegment} + + \ No newline at end of file diff --git a/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanoverduefin/LoanOverdueFinRest.java b/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanoverduefin/LoanOverdueFinRest.java index c3a0fd2941..60db54ab9f 100644 --- a/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanoverduefin/LoanOverdueFinRest.java +++ b/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanoverduefin/LoanOverdueFinRest.java @@ -10,6 +10,7 @@ import com.yxt.common.base.utils.ExportExcelUtils; import com.yxt.common.core.query.PagerQuery; import com.yxt.common.core.result.ResultBean; import com.yxt.common.core.vo.PagerVo; +import io.swagger.annotations.Api; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RestController; @@ -30,6 +31,7 @@ import java.util.List; **/ @RestController @RequestMapping("v1/LoanOverdueFin") +@Api(tags = "逾期对账申请财务") public class LoanOverdueFinRest implements LoanOverdueFinFeign { @Autowired @@ -121,4 +123,9 @@ public class LoanOverdueFinRest implements LoanOverdueFinFeign { public ResultBean delegate(OverFinApplyDelegateQuery query) { return loanOverdueFinService.delegate(query); } + + @Override + public ResultBean getAppDetails(String sid) { + return loanOverdueFinService.getAppDetails(sid); + } } diff --git a/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanoverduefin/LoanOverdueFinService.java b/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanoverduefin/LoanOverdueFinService.java index 5e7ef75933..5547145517 100644 --- a/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanoverduefin/LoanOverdueFinService.java +++ b/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanoverduefin/LoanOverdueFinService.java @@ -30,6 +30,7 @@ import com.yxt.anrui.riskcenter.api.loanoverduefin.flowable.OverFinApplyDelegate import com.yxt.anrui.riskcenter.api.loanoverduefin.flowable.OverdueApplyNodeQuery; import com.yxt.anrui.riskcenter.api.loanoverduefin.flowable.OverdueApplyNodeVo; import com.yxt.anrui.riskcenter.api.loanoverduefin.flowable.OverdueApplyTaskQuery; +import com.yxt.anrui.riskcenter.api.loanoverduefindetails.LoanOverdueFinAppDetailsVo; import com.yxt.anrui.riskcenter.api.loanoverduefindetails.LoanOverdueFinDetailsDto; import com.yxt.anrui.riskcenter.api.loanrepaymentschedule.LoanRepaymentScheduleDetailsVo; import com.yxt.anrui.riskcenter.biz.loanoverduefindetails.LoanOverdueFinDetailsService; @@ -837,4 +838,24 @@ public class LoanOverdueFinService extends MybatisBaseService getAppDetails(String sid) { + ResultBean rb = ResultBean.fireFail(); + LoanOverdueFin loanOverdueFin = fetchBySid(sid); + if (loanOverdueFin == null) { + return rb.setMsg("该申请不存在"); + } + LoanOverdueFinAppVo loanOverdueFinAppVo = baseMapper.getAppDetails(sid); + String files = loanOverdueFinAppVo.getFiles(); + if (StringUtils.isNotBlank(files)) { + List fileList = Arrays.asList(files.split(",")).stream().map(c -> fileUploadComponent.getUrlPrefix() + c).collect(Collectors.toList()); + loanOverdueFinAppVo.setFilesList(fileList); + } + List detailsVoList = loanOverdueFinDetailsService.getAppDetails(sid); + detailsVoList.removeAll(Collections.singleton(null)); + if (!detailsVoList.isEmpty()) { + loanOverdueFinAppVo.setDetailsVoList(detailsVoList); + } + return rb.success().setData(loanOverdueFinAppVo); + } } diff --git a/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanoverduefindetails/LoanOverdueFinDetailsMapper.java b/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanoverduefindetails/LoanOverdueFinDetailsMapper.java index bad5ba0337..99ca968b13 100644 --- a/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanoverduefindetails/LoanOverdueFinDetailsMapper.java +++ b/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanoverduefindetails/LoanOverdueFinDetailsMapper.java @@ -1,6 +1,7 @@ package com.yxt.anrui.riskcenter.biz.loanoverduefindetails; import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.yxt.anrui.riskcenter.api.loanoverduefindetails.LoanOverdueFinAppDetailsVo; import com.yxt.anrui.riskcenter.api.loanoverduefindetails.LoanOverdueFinDetails; import com.yxt.anrui.riskcenter.api.loanoverduefindetails.LoanOverdueFinDetailsDto; import com.yxt.anrui.riskcenter.api.loanrepaymentschedule.LoanRepaymentScheduleDetailsVo; @@ -21,4 +22,6 @@ public interface LoanOverdueFinDetailsMapper extends BaseMapper selectByMainSid(String sid); List selectByCustomerNo(@Param("customerNo") String customerNo, @Param("useOrgSid") String useOrgSid); + + List getAppDetails(String sid); } diff --git a/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanoverduefindetails/LoanOverdueFinDetailsMapper.xml b/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanoverduefindetails/LoanOverdueFinDetailsMapper.xml index c6ec31b5be..c4a5a92191 100644 --- a/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanoverduefindetails/LoanOverdueFinDetailsMapper.xml +++ b/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanoverduefindetails/LoanOverdueFinDetailsMapper.xml @@ -25,9 +25,27 @@ + + \ No newline at end of file diff --git a/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanoverduefindetails/LoanOverdueFinDetailsService.java b/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanoverduefindetails/LoanOverdueFinDetailsService.java index 2a5a76a92f..534ba0a4e5 100644 --- a/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanoverduefindetails/LoanOverdueFinDetailsService.java +++ b/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanoverduefindetails/LoanOverdueFinDetailsService.java @@ -1,6 +1,7 @@ package com.yxt.anrui.riskcenter.biz.loanoverduefindetails; import cn.hutool.core.bean.BeanUtil; +import com.yxt.anrui.riskcenter.api.loanoverduefindetails.LoanOverdueFinAppDetailsVo; import com.yxt.anrui.riskcenter.api.loanoverduefindetails.LoanOverdueFinDetails; import com.yxt.anrui.riskcenter.api.loanoverduefindetails.LoanOverdueFinDetailsDto; import com.yxt.anrui.riskcenter.api.loanrepaymentschedule.LoanRepaymentScheduleDetailsVo; @@ -45,4 +46,8 @@ public class LoanOverdueFinDetailsService extends MybatisBaseService selectByCustomerNo(String customerNo,String useOrgSid) { return baseMapper.selectByCustomerNo(customerNo,useOrgSid); } + + public List getAppDetails(String sid) { + return baseMapper.getAppDetails(sid); + } } diff --git a/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/risk/becollection/AppBeCollectionVehDetailsVo.java b/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/risk/becollection/AppBeCollectionVehDetailsVo.java index 8ba4dbecc1..6220469b8c 100644 --- a/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/risk/becollection/AppBeCollectionVehDetailsVo.java +++ b/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/risk/becollection/AppBeCollectionVehDetailsVo.java @@ -87,6 +87,8 @@ public class AppBeCollectionVehDetailsVo implements Vo { private String lockCarMoney; @ApiModelProperty("远程控制状态") private String lockCarState; + @ApiModelProperty("提示信息") + private String notice; @ApiModelProperty("还款协议附件") private List appHkxy = new ArrayList<>(); diff --git a/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/risk/overduebank/OverdueBankDetailsAppVo.java b/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/risk/overduebank/OverdueBankDetailsAppVo.java new file mode 100644 index 0000000000..3745fb705b --- /dev/null +++ b/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/risk/overduebank/OverdueBankDetailsAppVo.java @@ -0,0 +1,34 @@ +package com.yxt.anrui.terminal.api.risk.overduebank; + +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +/** + * @description: + * @author: dimengzhe + * @date: 2024/1/16 + **/ +@Data +public class OverdueBankDetailsAppVo { + + @ApiModelProperty("sid") + private String sid; + @ApiModelProperty("贷款合同编号") + private String loanContractNo; + @ApiModelProperty("客户名称") + private String customerName; + @ApiModelProperty("贷款人") + private String loanName; + @ApiModelProperty("资方合同编号") + private String bankContractNo; + @ApiModelProperty("资方") + private String bankName; + @ApiModelProperty("期数") + private String period; + @ApiModelProperty("平台逾期月还") + private String overdueMoney; + @ApiModelProperty("资方逾期月还") + private String bankOverdueMoney; + @ApiModelProperty("差异金额") + private String diffMoney; +} diff --git a/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/risk/overduebank/OverdueBankFeign.java b/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/risk/overduebank/OverdueBankFeign.java index 649753079a..070a67f03b 100644 --- a/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/risk/overduebank/OverdueBankFeign.java +++ b/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/risk/overduebank/OverdueBankFeign.java @@ -7,10 +7,7 @@ import com.yxt.common.core.result.ResultBean; import io.swagger.annotations.ApiOperation; import org.springframework.cloud.openfeign.FeignClient; import org.springframework.cloud.openfeign.SpringQueryMap; -import org.springframework.web.bind.annotation.GetMapping; -import org.springframework.web.bind.annotation.PutMapping; -import org.springframework.web.bind.annotation.RequestBody; -import org.springframework.web.bind.annotation.ResponseBody; +import org.springframework.web.bind.annotation.*; /** * @description: @@ -48,4 +45,9 @@ public interface OverdueBankFeign { @GetMapping("/getFlowOperateTitle") @ResponseBody ResultBean getFlowOperateTitle(@SpringQueryMap OverdueBankQuery query); + + @ApiOperation("详情") + @GetMapping("/getOverdueBankApply/{sid}") + @ResponseBody + ResultBean getOverdueBankApply(@PathVariable("sid") String sid); } diff --git a/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/risk/overduebank/OverdueBankVo.java b/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/risk/overduebank/OverdueBankVo.java new file mode 100644 index 0000000000..33116c8ba2 --- /dev/null +++ b/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/risk/overduebank/OverdueBankVo.java @@ -0,0 +1,36 @@ +package com.yxt.anrui.terminal.api.risk.overduebank; + +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.util.ArrayList; +import java.util.List; + +/** + * @description: + * @author: dimengzhe + * @date: 2024/1/16 + **/ +@Data +public class OverdueBankVo { + + //发起部门 + @ApiModelProperty("申请部门") + private String createDept; + //发起人 + @ApiModelProperty("申请人") + private String createByName; + //发起日期 + @ApiModelProperty("发起日期") + private String createDate; + //截止时间 + @ApiModelProperty("截止时间") + private String stopDate; + //备注 + @ApiModelProperty("备注") + private String remarks; + //附件 + private List filesList = new ArrayList<>(); + //逾期客户列表 + private List detailsVoList = new ArrayList<>(); +} diff --git a/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/risk/overduefin/OverDueFnAppVo.java b/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/risk/overduefin/OverDueFnAppVo.java new file mode 100644 index 0000000000..13a24a9bf4 --- /dev/null +++ b/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/risk/overduefin/OverDueFnAppVo.java @@ -0,0 +1,36 @@ +package com.yxt.anrui.terminal.api.risk.overduefin; + +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.util.ArrayList; +import java.util.List; + +/** + * @description: + * @author: dimengzhe + * @date: 2024/1/16 + **/ +@Data +public class OverDueFnAppVo { + + //发起部门 + @ApiModelProperty("发起部门") + private String createDept; + //发起人 + @ApiModelProperty("发起人") + private String createByName; + @ApiModelProperty("发起日期") + private String createDate; + @ApiModelProperty("截止时间") + private String stopDate; + @ApiModelProperty("备注") + private String remarks; + //附件 + private List filesList = new ArrayList<>(); + //逾期客户列表 + @ApiModelProperty("逾期客户列表") + private List detailsVoList = new ArrayList<>(); + + +} diff --git a/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/risk/overduefin/OverdueFinAppDetailsVo.java b/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/risk/overduefin/OverdueFinAppDetailsVo.java new file mode 100644 index 0000000000..4ba9d71887 --- /dev/null +++ b/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/risk/overduefin/OverdueFinAppDetailsVo.java @@ -0,0 +1,34 @@ +package com.yxt.anrui.terminal.api.risk.overduefin; + +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +/** + * @description: + * @author: dimengzhe + * @date: 2024/1/16 + **/ +@Data +public class OverdueFinAppDetailsVo { + + @ApiModelProperty("明细sid") + private String sid; + @ApiModelProperty("客户名称") + private String customerName; + @ApiModelProperty("客户sid") + private String customerSid; + @ApiModelProperty("贷款人sid") + private String loanSid; + @ApiModelProperty("贷款人") + private String loanName; + @ApiModelProperty("当前逾期金额") + private String overdueMoney; + @ApiModelProperty("累欠") + private String tiredDeficiency; + @ApiModelProperty("差异金额") + private String diffMoney; + @ApiModelProperty("车架号") + private String vinNo; + @ApiModelProperty("销售订单关联的车辆sid") + private String busVinSid; +} diff --git a/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/risk/overduefin/OverdueFinFeign.java b/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/risk/overduefin/OverdueFinFeign.java index 48bc252287..ed9914fed9 100644 --- a/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/risk/overduefin/OverdueFinFeign.java +++ b/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/risk/overduefin/OverdueFinFeign.java @@ -7,10 +7,7 @@ import com.yxt.common.core.result.ResultBean; import io.swagger.annotations.ApiOperation; import org.springframework.cloud.openfeign.FeignClient; import org.springframework.cloud.openfeign.SpringQueryMap; -import org.springframework.web.bind.annotation.GetMapping; -import org.springframework.web.bind.annotation.PutMapping; -import org.springframework.web.bind.annotation.RequestBody; -import org.springframework.web.bind.annotation.ResponseBody; +import org.springframework.web.bind.annotation.*; /** * @description: @@ -48,4 +45,9 @@ public interface OverdueFinFeign { @GetMapping("/getFlowOperateTitle") @ResponseBody ResultBean getFlowOperateTitle(@SpringQueryMap OverdueFinQuery query); + + @ApiOperation("详情") + @GetMapping("/getOverdueFinApply/{sid}") + @ResponseBody + ResultBean getOverdueFinApply(@PathVariable("sid") String sid); } diff --git a/anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/risk/becollection/BeCollectionService.java b/anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/risk/becollection/BeCollectionService.java index 7ae3e785f2..07152ad54c 100644 --- a/anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/risk/becollection/BeCollectionService.java +++ b/anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/risk/becollection/BeCollectionService.java @@ -75,6 +75,7 @@ import org.springframework.stereotype.Service; import java.math.BigDecimal; import java.util.ArrayList; +import java.util.Arrays; import java.util.Collections; import java.util.List; @@ -273,6 +274,13 @@ public class BeCollectionService { public ResultBean collectionDetail(String sid) { ResultBean rb = ResultBean.fireFail(); LoanBeCollectionApplyDetailsVo loanBeCollectionApplyDetailsVo = loanBeCollectionApplyFeign.fetchDetailsBySid(sid).getData(); + String lockCarRemarks = loanBeCollectionApplyDetailsVo.getLockCarRemarks(); + List vinNo = new ArrayList<>(); + if (StringUtils.isNotBlank(lockCarRemarks)){ + lockCarRemarks = lockCarRemarks.substring(lockCarRemarks.indexOf('号') + 1, lockCarRemarks.indexOf('已')); + String[] vinNos = lockCarRemarks.split(","); + vinNo = Arrays.asList(vinNos); + } AppBeCollectionApplyDetailsVo appBeCollectionApplyDetailsVo = new AppBeCollectionApplyDetailsVo(); appBeCollectionApplyDetailsVo.setPublishInfo(loanBeCollectionApplyDetailsVo.getDeptName() + "-" + loanBeCollectionApplyDetailsVo.getCreateByName()); appBeCollectionApplyDetailsVo.setTime(loanBeCollectionApplyDetailsVo.getCreateTime()); @@ -314,6 +322,15 @@ public class BeCollectionService { appBeCollectionVehDetailsVo.setInstalments(loanBeCollectionVehDetail.getBeOverduePeriod()); appBeCollectionVehDetailsVo.setBeOverdueMoney(loanBeCollectionVehDetail.getBeOverdueMoney()); appBeCollectionVehDetailsVo.setBeOverdueMoneyAndPeriod(loanBeCollectionVehDetail.getBeOverdueMoneyAndPeriod()); + if (vinNo != null && vinNo.size() > 0){ + if (vinNo.contains(loanBeCollectionVehDetail.getVinNo())){ + appBeCollectionVehDetailsVo.setNotice("注：车架号" + loanBeCollectionVehDetail.getVinNo() + "已超过制度规定的远程控制次数，应要求客户全部结清车款。"); + }else { + appBeCollectionVehDetailsVo.setNotice(""); + } + } + appBeCollectionVehDetailsVo.setLockCarState(loanBeCollectionVehDetail.getLockCarState()); + appBeCollectionVehDetailsVo.setLockCarMoney(loanBeCollectionVehDetail.getLockCarMoney()); List hkxyFiles = loanBeCollectionVehDetail.getHkxyFiles(); ArrayList appHkxys = new ArrayList<>(); if (hkxyFiles != null && hkxyFiles.size() > 0) { diff --git a/anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/risk/overduebank/OverdueBankRest.java b/anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/risk/overduebank/OverdueBankRest.java index 2e0cdf1a3b..e88bfd39ed 100644 --- a/anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/risk/overduebank/OverdueBankRest.java +++ b/anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/risk/overduebank/OverdueBankRest.java @@ -1,10 +1,12 @@ package com.yxt.anrui.terminal.biz.risk.overduebank; import com.yxt.anrui.terminal.api.risk.overduebank.OverdueBankFeign; +import com.yxt.anrui.terminal.api.risk.overduebank.OverdueBankVo; import com.yxt.anrui.terminal.api.risk.overduebank.flowable.OverdueBankDto; import com.yxt.anrui.terminal.api.risk.overduebank.flowable.OverdueBankQuery; import com.yxt.anrui.terminal.api.risk.overduebank.flowable.OverdueBankTaskQuery; import com.yxt.common.core.result.ResultBean; +import io.swagger.annotations.Api; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Controller; import org.springframework.web.bind.annotation.RequestMapping; @@ -16,6 +18,7 @@ import org.springframework.web.bind.annotation.RequestMapping; **/ @Controller @RequestMapping("/risk/v1/overduebank") +@Api(tags = "逾期对账申请资方") public class OverdueBankRest implements OverdueBankFeign { @Autowired @@ -45,4 +48,9 @@ public class OverdueBankRest implements OverdueBankFeign { public ResultBean getFlowOperateTitle(OverdueBankQuery query) { return overdueBankService.getFlowOperateTitle(query); } + + @Override + public ResultBean getOverdueBankApply(String sid) { + return overdueBankService.getOverdueBankApply(sid); + } } diff --git a/anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/risk/overduebank/OverdueBankService.java b/anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/risk/overduebank/OverdueBankService.java index 81e663d1cc..52a4815c9f 100644 --- a/anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/risk/overduebank/OverdueBankService.java +++ b/anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/risk/overduebank/OverdueBankService.java @@ -1,6 +1,7 @@ package com.yxt.anrui.terminal.biz.risk.overduebank; import cn.hutool.core.bean.BeanUtil; +import com.yxt.anrui.riskcenter.api.loanoverduebank.LoanOverdueBankAppDetailsVo; import com.yxt.anrui.riskcenter.api.loanoverduebank.LoanOverdueBankFeign; import com.yxt.anrui.riskcenter.api.loanoverduebank.flowable.CompleteBankDto; import com.yxt.anrui.riskcenter.api.loanoverduebank.flowable.OverdueBankApplyNodeQuery; @@ -10,6 +11,7 @@ import com.yxt.anrui.riskcenter.api.loantemplate.flowable.TemplateApplyNodeQuery import com.yxt.anrui.riskcenter.api.loantemplate.flowable.TemplateApplyNodeVo; import com.yxt.anrui.riskcenter.api.loantemplate.flowable.TemplateApplyTaskQuery; import com.yxt.anrui.riskcenter.api.loantemplate.flowable.TemplateCompleteDto; +import com.yxt.anrui.terminal.api.risk.overduebank.OverdueBankVo; import com.yxt.anrui.terminal.api.risk.overduebank.flowable.OverdueBankDto; import com.yxt.anrui.terminal.api.risk.overduebank.flowable.OverdueBankQuery; import com.yxt.anrui.terminal.api.risk.overduebank.flowable.OverdueBankTaskQuery; @@ -104,4 +106,16 @@ public class OverdueBankService { } return rb.success().setData(data); } + + public ResultBean getOverdueBankApply(String sid) { + ResultBean rb = ResultBean.fireFail(); + OverdueBankVo overdueBankVo = new OverdueBankVo(); + ResultBean resultBean = loanOverdueBankFeign.getAppDetails(sid); + if (!resultBean.getSuccess()) { + return rb.setMsg(resultBean.getMsg()); + } + LoanOverdueBankAppDetailsVo loanOverdueBankAppDetailsVo = resultBean.getData(); + BeanUtil.copyProperties(loanOverdueBankAppDetailsVo, overdueBankVo); + return rb.success().setData(overdueBankVo); + } } diff --git a/anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/risk/overduefin/OverdueFinRest.java b/anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/risk/overduefin/OverdueFinRest.java index ad19abad2c..81ffde4a1e 100644 --- a/anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/risk/overduefin/OverdueFinRest.java +++ b/anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/risk/overduefin/OverdueFinRest.java @@ -1,10 +1,12 @@ package com.yxt.anrui.terminal.biz.risk.overduefin; +import com.yxt.anrui.terminal.api.risk.overduefin.OverDueFnAppVo; import com.yxt.anrui.terminal.api.risk.overduefin.OverdueFinFeign; import com.yxt.anrui.terminal.api.risk.overduefin.flowable.OverdueFinDto; import com.yxt.anrui.terminal.api.risk.overduefin.flowable.OverdueFinQuery; import com.yxt.anrui.terminal.api.risk.overduefin.flowable.OverdueFinTaskQuery; import com.yxt.common.core.result.ResultBean; +import io.swagger.annotations.Api; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Controller; import org.springframework.web.bind.annotation.RequestMapping; @@ -16,6 +18,7 @@ import org.springframework.web.bind.annotation.RequestMapping; **/ @Controller @RequestMapping("/risk/v1/overduefin") +@Api(tags = "逾期对账申请财务") public class OverdueFinRest implements OverdueFinFeign { @Autowired @@ -45,4 +48,9 @@ public class OverdueFinRest implements OverdueFinFeign { public ResultBean getFlowOperateTitle(OverdueFinQuery query) { return overdueFinService.getFlowOperateTitle(query); } + + @Override + public ResultBean getOverdueFinApply(String sid) { + return overdueFinService.getOverdueFinApply(sid); + } } diff --git a/anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/risk/overduefin/OverdueFinService.java b/anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/risk/overduefin/OverdueFinService.java index e4b1a52740..bc7711c363 100644 --- a/anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/risk/overduefin/OverdueFinService.java +++ b/anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/risk/overduefin/OverdueFinService.java @@ -1,11 +1,13 @@ package com.yxt.anrui.terminal.biz.risk.overduefin; import cn.hutool.core.bean.BeanUtil; +import com.yxt.anrui.riskcenter.api.loanoverduefin.LoanOverdueFinAppVo; import com.yxt.anrui.riskcenter.api.loanoverduefin.LoanOverdueFinFeign; import com.yxt.anrui.riskcenter.api.loanoverduefin.flowable.CompleteDto; import com.yxt.anrui.riskcenter.api.loanoverduefin.flowable.OverdueApplyNodeQuery; import com.yxt.anrui.riskcenter.api.loanoverduefin.flowable.OverdueApplyNodeVo; import com.yxt.anrui.riskcenter.api.loanoverduefin.flowable.OverdueApplyTaskQuery; +import com.yxt.anrui.terminal.api.risk.overduefin.OverDueFnAppVo; import com.yxt.anrui.terminal.api.risk.overduefin.flowable.OverdueFinDto; import com.yxt.anrui.terminal.api.risk.overduefin.flowable.OverdueFinQuery; import com.yxt.anrui.terminal.api.risk.overduefin.flowable.OverdueFinTaskQuery; @@ -99,4 +101,16 @@ public class OverdueFinService { } return rb.success().setData(data); } + + public ResultBean getOverdueFinApply(String sid) { + ResultBean rb = ResultBean.fireFail(); + OverDueFnAppVo overDueFnAppVo = new OverDueFnAppVo(); + ResultBean resultBean = loanOverdueFinFeign.getAppDetails(sid); + if (!resultBean.getSuccess()) { + return rb.setMsg(resultBean.getMsg()); + } + LoanOverdueFinAppVo loanOverdueFinAppVo = resultBean.getData(); + BeanUtil.copyProperties(loanOverdueFinAppVo, overDueFnAppVo); + return rb.success().setData(overDueFnAppVo); + } }