From 20eab34ce6c3a0be06aaa45884aa88a88ea400dd Mon Sep 17 00:00:00 2001 From: dimengzhe Date: Mon, 5 Feb 2024 09:56:51 +0800 Subject: [PATCH 1/3] =?UTF-8?q?=E4=BA=8C=E6=AC=A1=E9=94=80=E5=94=AE?= =?UTF-8?q?=E7=AB=9E=E4=BB=B7?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../LoanSecondarySalesBiddingService.java | 15 ++++++++++----- 1 file changed, 10 insertions(+), 5 deletions(-) diff --git a/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loansecondarysalesbidding/LoanSecondarySalesBiddingService.java b/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loansecondarysalesbidding/LoanSecondarySalesBiddingService.java index b096cdfdf7..409a10a213 100644 --- a/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loansecondarysalesbidding/LoanSecondarySalesBiddingService.java +++ b/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loansecondarysalesbidding/LoanSecondarySalesBiddingService.java @@ -57,14 +57,19 @@ public class LoanSecondarySalesBiddingService extends MybatisBaseService Date: Mon, 5 Feb 2024 10:15:45 +0800 Subject: [PATCH 2/3] =?UTF-8?q?=E5=AE=8C=E5=96=84=E7=AB=9E=E4=BB=B7?= =?UTF-8?q?=E5=8A=9F=E8=83=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../notificationannouncement.js | 47 ++ .../publicPage/financialschemeInfo.vue | 333 ++++++++++ anrui-system-ui/src/router/index.js | 4 + anrui-system-ui/src/views/Home/Home.vue | 4 +- .../relation/secondarysaleannouncement.vue | 597 ++++++++++++++++++ 5 files changed, 982 insertions(+), 3 deletions(-) create mode 100644 anrui-system-ui/src/components/publicPage/financialschemeInfo.vue create mode 100644 anrui-system-ui/src/views/notificationannouncement/relation/secondarysaleannouncement.vue diff --git a/anrui-system-ui/src/api/notificationannouncement/notificationannouncement.js b/anrui-system-ui/src/api/notificationannouncement/notificationannouncement.js index e853e00cbb..1c19cd7cd3 100644 --- a/anrui-system-ui/src/api/notificationannouncement/notificationannouncement.js +++ b/anrui-system-ui/src/api/notificationannouncement/notificationannouncement.js @@ -44,6 +44,53 @@ export function saveOrUpdate(data) { }) } +// 车辆二次销售回显 +export function getdetails(data) { + return request({ + url: '/riskcenter/v1/LoanSecondarySalesApply/details', + method: 'post', + data: data, + headers: { 'Content-Type': 'application/json' } + }) +} + +// 销售订单 -- 金融方案初始化 +export function selectDetailss(data) { + return request({ + url: '/riskcenter/v1/loansolutions/selectDetailss', + method: 'get', + params: data + }) +} + +// 竞价列表 +export function getList(data) { + return request({ + url: '/riskcenter/v1/LoanSecondarySalesBidding/getList', + method: 'get', + params: data + }) +} + +// 竞价列表--我要竞价--初始化 +export function getPrice(data) { + return request({ + url: '/riskcenter/v1/LoanSecondarySalesBidding/getPrice', + method: 'get', + params: data + }) +} + +// 竞价列表--我要竞价--保存 +export function save(data) { + return request({ + url: '/riskcenter/v1/LoanSecondarySalesBidding/save', + method: 'post', + data: data, + headers: { 'Content-Type': 'application/json' } + }) +} + export function delBySids(data) { return request({ url: '/portal/v1/SysNotice/delBySids', diff --git a/anrui-system-ui/src/components/publicPage/financialschemeInfo.vue b/anrui-system-ui/src/components/publicPage/financialschemeInfo.vue new file mode 100644 index 0000000000..dc618e910e --- /dev/null +++ b/anrui-system-ui/src/components/publicPage/financialschemeInfo.vue @@ -0,0 +1,333 @@ + + + + diff --git a/anrui-system-ui/src/router/index.js b/anrui-system-ui/src/router/index.js index e87dd2374b..7d3b170e84 100644 --- a/anrui-system-ui/src/router/index.js +++ b/anrui-system-ui/src/router/index.js @@ -359,6 +359,10 @@ export const constantRoutes = [ path: '/haveread', component: () => import('@/views/flow/havereadList.vue') }, + { + path: '/notificationannouncement/relation/secondarysaleannouncement', + component: () => import('@/views/notificationannouncement/relation/secondarysaleannouncement.vue') + }, // { // path: '/', diff --git a/anrui-system-ui/src/views/Home/Home.vue b/anrui-system-ui/src/views/Home/Home.vue index df2c617ffc..810bf06c8e 100644 --- a/anrui-system-ui/src/views/Home/Home.vue +++ b/anrui-system-ui/src/views/Home/Home.vue @@ -270,6 +270,7 @@ export default { // 查看通知公告详情 lookInfo(item) { if (item.pcUrl !== '' && item.pcUrl !== null) { + window.open('/' + item.pcUrl + '?token=' + getStorage() + '&sid=' + item.sid, '_blank') } else { this.formobj = { content: '', @@ -365,9 +366,6 @@ export default { dangerouslyUseHTMLString: true }) }, - toNavbar(name) { - let myPopup = window.open(name + '?token=' + getStorage(), '_blank') - }, changeOrg(value) { const choose = this.orgDept_list.filter((item) => item.orgName === value) this.defaultOrgPathName = choose[0].orgName diff --git a/anrui-system-ui/src/views/notificationannouncement/relation/secondarysaleannouncement.vue b/anrui-system-ui/src/views/notificationannouncement/relation/secondarysaleannouncement.vue new file mode 100644 index 0000000000..4b0e259454 --- /dev/null +++ b/anrui-system-ui/src/views/notificationannouncement/relation/secondarysaleannouncement.vue @@ -0,0 +1,597 @@ + + + + + From 9b07ddaff6ddfbdf8cc0f13cca9bd60715bd9e6c Mon Sep 17 00:00:00 2001 From: dimengzhe Date: Mon, 5 Feb 2024 11:35:13 +0800 Subject: [PATCH 3/3] =?UTF-8?q?=E4=BA=8C=E6=AC=A1=E9=94=80=E5=94=AE?= =?UTF-8?q?=E7=AB=9E=E4=BB=B7=E7=A7=BB=E5=8A=A8=E7=AB=AF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../LoanSecondarySalesBiddingFeign.java | 6 +++++ .../SalesBiddingVo.java | 19 ++++++++++++++++ .../LoanSecondarySalesApplyService.java | 4 ++-- .../LoanSecondarySalesBiddingMapper.java | 2 ++ .../LoanSecondarySalesBiddingMapper.xml | 9 ++++++++ .../LoanSecondarySalesBiddingRest.java | 10 +++++++++ .../LoanSecondarySalesBiddingService.java | 22 +++++++++++++++++-- 7 files changed, 68 insertions(+), 4 deletions(-) create mode 100644 anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loansecondarysalesbidding/SalesBiddingVo.java diff --git a/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loansecondarysalesbidding/LoanSecondarySalesBiddingFeign.java b/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loansecondarysalesbidding/LoanSecondarySalesBiddingFeign.java index 3a98067af5..195e450b40 100644 --- a/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loansecondarysalesbidding/LoanSecondarySalesBiddingFeign.java +++ b/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loansecondarysalesbidding/LoanSecondarySalesBiddingFeign.java @@ -1,6 +1,8 @@ package com.yxt.anrui.riskcenter.api.loansecondarysalesbidding; +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.ApiOperation; import org.springframework.cloud.openfeign.FeignClient; import org.springframework.web.bind.annotation.GetMapping; @@ -33,4 +35,8 @@ public interface LoanSecondarySalesBiddingFeign { @ApiOperation("当前竞价最高") @GetMapping("/getPrice") ResultBean getPrice(@RequestParam("sid") String sid); + + @ApiOperation("竞价列表") + @GetMapping("/getBiddingList") + ResultBean getBiddingList(@RequestParam("sid") String sid); } diff --git a/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loansecondarysalesbidding/SalesBiddingVo.java b/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loansecondarysalesbidding/SalesBiddingVo.java new file mode 100644 index 0000000000..69e9a1fc53 --- /dev/null +++ b/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loansecondarysalesbidding/SalesBiddingVo.java @@ -0,0 +1,19 @@ +package com.yxt.anrui.riskcenter.api.loansecondarysalesbidding; + +import lombok.Data; + +import java.util.ArrayList; +import java.util.List; + +/** + * @description: + * @author: dimengzhe + * @date: 2024/2/5 + **/ +@Data +public class SalesBiddingVo { + + private String vinNo; + + private List biddingList = new ArrayList<>(); +} diff --git a/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loansecondarysalesapply/LoanSecondarySalesApplyService.java b/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loansecondarysalesapply/LoanSecondarySalesApplyService.java index 4d58b277e1..0e6d02c8a9 100644 --- a/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loansecondarysalesapply/LoanSecondarySalesApplyService.java +++ b/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loansecondarysalesapply/LoanSecondarySalesApplyService.java @@ -484,12 +484,12 @@ public class LoanSecondarySalesApplyService extends MybatisBaseService getList(String sid); String getPrice(String sid); + + String getVinNo(String sid); } diff --git a/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loansecondarysalesbidding/LoanSecondarySalesBiddingMapper.xml b/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loansecondarysalesbidding/LoanSecondarySalesBiddingMapper.xml index c60d445623..381b79e4ec 100644 --- a/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loansecondarysalesbidding/LoanSecondarySalesBiddingMapper.xml +++ b/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loansecondarysalesbidding/LoanSecondarySalesBiddingMapper.xml @@ -24,4 +24,13 @@ order by price desc limit 1 + + \ No newline at end of file diff --git a/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loansecondarysalesbidding/LoanSecondarySalesBiddingRest.java b/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loansecondarysalesbidding/LoanSecondarySalesBiddingRest.java index ebe92b8462..40019c7693 100644 --- a/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loansecondarysalesbidding/LoanSecondarySalesBiddingRest.java +++ b/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loansecondarysalesbidding/LoanSecondarySalesBiddingRest.java @@ -3,7 +3,10 @@ package com.yxt.anrui.riskcenter.biz.loansecondarysalesbidding; import com.yxt.anrui.riskcenter.api.loansecondarysalesbidding.BiddingVo; import com.yxt.anrui.riskcenter.api.loansecondarysalesbidding.LoanSecondarySalesBiddingDto; import com.yxt.anrui.riskcenter.api.loansecondarysalesbidding.LoanSecondarySalesBiddingFeign; +import com.yxt.anrui.riskcenter.api.loansecondarysalesbidding.SalesBiddingVo; +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; @@ -38,4 +41,11 @@ public class LoanSecondarySalesBiddingRest implements LoanSecondarySalesBiddingF public ResultBean getPrice(String sid) { return loanSecondarySalesBiddingService.getPrice(sid); } + + @Override + public ResultBean getBiddingList(String sid) { + return loanSecondarySalesBiddingService.getBiddingList(sid); + } + + } diff --git a/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loansecondarysalesbidding/LoanSecondarySalesBiddingService.java b/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loansecondarysalesbidding/LoanSecondarySalesBiddingService.java index 409a10a213..0d3341652b 100644 --- a/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loansecondarysalesbidding/LoanSecondarySalesBiddingService.java +++ b/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loansecondarysalesbidding/LoanSecondarySalesBiddingService.java @@ -1,5 +1,7 @@ package com.yxt.anrui.riskcenter.biz.loansecondarysalesbidding; +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.core.metadata.IPage; import com.yxt.anrui.portal.api.sysorganization.SysOrganizationFeign; import com.yxt.anrui.portal.api.sysorganization.SysOrganizationVo; import com.yxt.anrui.portal.api.sysstafforg.SysStaffOrgFeign; @@ -8,9 +10,13 @@ import com.yxt.anrui.portal.api.sysuser.SysUserVo; import com.yxt.anrui.riskcenter.api.loansecondarysalesbidding.BiddingVo; import com.yxt.anrui.riskcenter.api.loansecondarysalesbidding.LoanSecondarySalesBidding; import com.yxt.anrui.riskcenter.api.loansecondarysalesbidding.LoanSecondarySalesBiddingDto; +import com.yxt.anrui.riskcenter.api.loansecondarysalesbidding.SalesBiddingVo; import com.yxt.common.base.service.MybatisBaseService; +import com.yxt.common.base.utils.PagerUtil; import com.yxt.common.base.utils.StringUtils; +import com.yxt.common.core.query.PagerQuery; import com.yxt.common.core.result.ResultBean; +import com.yxt.common.core.vo.PagerVo; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; @@ -40,7 +46,7 @@ public class LoanSecondarySalesBiddingService extends MybatisBaseService getBiddingList(String sid) { + ResultBean rb = ResultBean.fireFail(); + SalesBiddingVo salesBiddingVo = new SalesBiddingVo(); + List list = baseMapper.getList(sid); + list.removeAll(Collections.singleton(null)); + salesBiddingVo.setBiddingList(list); + String vinNo = baseMapper.getVinNo(sid); + salesBiddingVo.setVinNo(vinNo); + return rb.success().setData(salesBiddingVo); + } }