From 86c9c80068bae52602b4d052240e8b8e5247ddf5 Mon Sep 17 00:00:00 2001 From: username <1532322479@qq.com> Date: Thu, 29 Aug 2024 16:36:36 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E4=BA=A7=E5=93=81=E4=BF=A1?= =?UTF-8?q?=E6=81=AF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../bs/df/controller/DfOrderController.java | 122 ++++++++++++++++-- .../DfProductArticleController.java | 2 +- .../controller/DfProductInfoController.java | 2 +- .../controller/DfProductMomentController.java | 2 +- .../controller/DfProductPosterController.java | 21 ++- .../main/java/com/bs/df/domain/DfOrder.java | 4 + .../controller/system/SysUserController.java | 1 + .../product/components/BrokerProduct.vue | 2 +- .../components/BrokerProductByUserId.vue | 2 + .../product/components/BrokerProductTwo.vue | 2 + .../product/components/DfBrokerUser.vue | 2 +- bs-ui/src/views/poster/poster/index.vue | 33 ++--- bs-ui/src/views/product/info/index.vue | 4 +- 13 files changed, 162 insertions(+), 37 deletions(-) diff --git a/bs-admin/src/main/java/com/bs/df/controller/DfOrderController.java b/bs-admin/src/main/java/com/bs/df/controller/DfOrderController.java index 3de0fbd..750b96e 100644 --- a/bs-admin/src/main/java/com/bs/df/controller/DfOrderController.java +++ b/bs-admin/src/main/java/com/bs/df/controller/DfOrderController.java @@ -1,11 +1,13 @@ package com.bs.df.controller; +import java.util.Comparator; import java.util.Date; import java.util.List; import java.util.Map; import java.util.stream.Collectors; import javax.servlet.http.HttpServletResponse; +import com.baomidou.mybatisplus.annotation.TableField; import com.bs.common.annotation.Anonymous; import com.bs.common.constant.Constants; import com.bs.common.core.domain.entity.SysUser; @@ -76,11 +78,9 @@ public class DfOrderController extends BaseController { @ApiOperation("分页查询客户订单列表") @GetMapping("/pageList") public TableDataInfo pageList(DfOrder dfOrder) { -// startPage(); Integer pageNum = ServletUtils.getParameterToInt(Constants.PAGE_NUM); Integer pageSize = ServletUtils.getParameterToInt(Constants.PAGE_SIZE); LambdaQueryWrapper queryWrapper = new LambdaQueryWrapper(); - queryWrapper.orderByDesc(DfOrder::getSubmitTime); condition(queryWrapper, dfOrder); boolean admin = SecurityUtils.isAdmin(SecurityUtils.getUserId()); if (!admin) { @@ -89,23 +89,19 @@ public class DfOrderController extends BaseController { queryWrapper.eq(DfOrder::getBrokerId, SecurityUtils.getUserId()); } } + + String orderByColumn = dfOrder.getOrderByColumn(); + String isAsc = dfOrder.getIsAsc(); + if (StringUtils.isNotEmpty(orderByColumn) && StringUtils.isNotEmpty(isAsc)) { + applyOrderBy(queryWrapper, orderByColumn, isAsc); + } List list = dfOrderService.list(queryWrapper); List dfOrders = setOrderList(list); -// if (StringUtils.isNotEmpty(dfOrder.getUserName())) { -// dfOrders = dfOrders.stream() -// .filter(info -> info.getUserName() != null && info.getUserName().contains(dfOrder.getUserName())) -// .collect(Collectors.toList()); -// } if (StringUtils.isNotEmpty(dfOrder.getBrokerName())) { dfOrders = dfOrders.stream() .filter(info -> info.getBrokerName() != null && info.getBrokerName().contains(dfOrder.getBrokerName())) .collect(Collectors.toList()); } -// if (StringUtils.isNotEmpty(dfOrder.getPhone())) { -// dfOrders = dfOrders.stream() -// .filter(info -> info.getPhone() != null && info.getPhone().contains(dfOrder.getPhone())) -// .collect(Collectors.toList()); -// } Integer start = (pageNum - 1) * pageSize; List result = dfOrders.stream() .skip(start) @@ -116,6 +112,108 @@ public class DfOrderController extends BaseController { return data; } + public void applyOrderBy(LambdaQueryWrapper queryWrapper, String orderName, String orderType) { + boolean isAsc = "ASC".equalsIgnoreCase(orderType); + switch (orderName) { + case "orderNo": + if (isAsc) { + queryWrapper.orderByAsc(DfOrder::getOrderNo); + } else { + queryWrapper.orderByDesc(DfOrder::getOrderNo); + } + break; + case "userName": + if (isAsc) { + queryWrapper.orderByAsc(DfOrder::getUserName); + } else { + queryWrapper.orderByDesc(DfOrder::getUserName); + } + break; + case "productName": + if (isAsc) { + queryWrapper.orderByAsc(DfOrder::getProductName); + } else { + queryWrapper.orderByDesc(DfOrder::getProductName); + } + break; + case "submitTime": + if (isAsc) { + queryWrapper.orderByAsc(DfOrder::getSubmitTime); + } else { + queryWrapper.orderByDesc(DfOrder::getSubmitTime); + } + break; + case "applyAmount": + if (isAsc) { + queryWrapper.orderByAsc(DfOrder::getApplyAmount); + } else { + queryWrapper.orderByDesc(DfOrder::getApplyAmount); + } + break; + case "limitAmount": + if (isAsc) { + queryWrapper.orderByAsc(DfOrder::getLimitAmount); + } else { + queryWrapper.orderByDesc(DfOrder::getLimitAmount); + } + break; + case "loanAmount": + if (isAsc) { + queryWrapper.orderByAsc(DfOrder::getLoanAmount); + } else { + queryWrapper.orderByDesc(DfOrder::getLoanAmount); + } + break; + case "loanRate": + if (isAsc) { + queryWrapper.orderByAsc(DfOrder::getLoanRate); + } else { + queryWrapper.orderByDesc(DfOrder::getLoanRate); + } + break; + case "loadMonth": + if (isAsc) { + queryWrapper.orderByAsc(DfOrder::getLoadMonth); + } else { + queryWrapper.orderByDesc(DfOrder::getLoadMonth); + } + break; + case "isFirst": + if (isAsc) { + queryWrapper.orderByAsc(DfOrder::getIsFirst); + } else { + queryWrapper.orderByDesc(DfOrder::getIsFirst); + } + break; + case "settleAmount": + if (isAsc) { + queryWrapper.orderByAsc(DfOrder::getSettleAmount); + } else { + queryWrapper.orderByDesc(DfOrder::getSettleAmount); + } + break; + case "staus": + if (isAsc) { + queryWrapper.orderByAsc(DfOrder::getStaus); + } else { + queryWrapper.orderByDesc(DfOrder::getStaus); + } + break; + case "remark": + if (isAsc) { + queryWrapper.orderByAsc(DfOrder::getRemark); + } else { + queryWrapper.orderByDesc(DfOrder::getRemark); + } + break; + + default: + queryWrapper.orderByDesc(DfOrder::getSubmitTime); + + break; + } + } + private List setOrderList(List list) { List userList = userService.list(); List clueList = dfBizClueService.list(new LambdaQueryWrapper().orderByDesc(DfBizClue::getCreateTime)); diff --git a/bs-admin/src/main/java/com/bs/df/controller/DfProductArticleController.java b/bs-admin/src/main/java/com/bs/df/controller/DfProductArticleController.java index 1d849c2..1571ec1 100644 --- a/bs-admin/src/main/java/com/bs/df/controller/DfProductArticleController.java +++ b/bs-admin/src/main/java/com/bs/df/controller/DfProductArticleController.java @@ -65,8 +65,8 @@ public class DfProductArticleController extends BaseController { @ApiOperation("分页查询产品文章列表") @GetMapping("/pageList") public TableDataInfo pageList(DfProductArticle dfProductArticle) { - startPage(); SysUser sysUser = sysUserMapper.selectById(getUserId()); + startPage(); String reviewStatus = sysUser.getReviewStatus(); if ("1".equals(reviewStatus)) { return null; diff --git a/bs-admin/src/main/java/com/bs/df/controller/DfProductInfoController.java b/bs-admin/src/main/java/com/bs/df/controller/DfProductInfoController.java index b9a2e20..30aa5a0 100644 --- a/bs-admin/src/main/java/com/bs/df/controller/DfProductInfoController.java +++ b/bs-admin/src/main/java/com/bs/df/controller/DfProductInfoController.java @@ -74,7 +74,6 @@ public class DfProductInfoController extends BaseController { @ApiOperation("分页查询产品信息列表") @GetMapping("/pageList") public TableDataInfo pageList(DfProductInfo dfProductInfo) { - startPage(); SysUser sysUser = sysUserMapper.selectById(getUserId()); String reviewStatus = sysUser.getReviewStatus(); if ("1".equals(reviewStatus)) { @@ -115,6 +114,7 @@ public class DfProductInfoController extends BaseController { } } condition(queryWrapper,dfProductInfo); + startPage(); List list = dfProductInfoService.list(queryWrapper); List dfOrders = dfOrderService.list(); Map productOrderCounts = new HashMap<>(); diff --git a/bs-admin/src/main/java/com/bs/df/controller/DfProductMomentController.java b/bs-admin/src/main/java/com/bs/df/controller/DfProductMomentController.java index afd18bf..96fcc47 100644 --- a/bs-admin/src/main/java/com/bs/df/controller/DfProductMomentController.java +++ b/bs-admin/src/main/java/com/bs/df/controller/DfProductMomentController.java @@ -63,8 +63,8 @@ public class DfProductMomentController extends BaseController { @ApiOperation("分页查询产品朋友圈列表") @GetMapping("/pageList") public TableDataInfo pageList(DfProductMoment dfProductMoment) { - startPage(); SysUser sysUser = sysUserMapper.selectById(getUserId()); + startPage(); String reviewStatus = sysUser.getReviewStatus(); if ("1".equals(reviewStatus)) { return null; diff --git a/bs-admin/src/main/java/com/bs/df/controller/DfProductPosterController.java b/bs-admin/src/main/java/com/bs/df/controller/DfProductPosterController.java index 14ec284..3c8c60b 100644 --- a/bs-admin/src/main/java/com/bs/df/controller/DfProductPosterController.java +++ b/bs-admin/src/main/java/com/bs/df/controller/DfProductPosterController.java @@ -70,7 +70,6 @@ public class DfProductPosterController extends BaseController { @ApiOperation("分页查询产品海报列表") @GetMapping("/pageList") public TableDataInfo pageList(DfProductPoster dfProductPoster) { - startPage(); SysUser sysUser = sysUserMapper.selectById(getUserId()); String reviewStatus = sysUser.getReviewStatus(); if ("1".equals(reviewStatus)) { @@ -86,10 +85,18 @@ public class DfProductPosterController extends BaseController { } else { List productIdsByBrokerId = dfBrokerService.getProductIdsByBrokerId(); + List list = dfProductPosterService.list(new LambdaQueryWrapper() + .eq(DfProductPoster::getPosterType, "1")); + List productIds = list.stream() + .map(DfProductPoster::getProductId) + .collect(Collectors.toList()); if (productIdsByBrokerId.size() == 0) { productIdsByBrokerId.add(0L); } - queryWrapper.in(DfProductPoster::getProductId, productIdsByBrokerId); + productIdsByBrokerId.addAll(productIds); + queryWrapper.nested(wrapper -> wrapper.in(DfProductPoster::getProductId, productIdsByBrokerId) + .or() + .isNull(DfProductPoster::getProductId)); SysUser byId = userService.getById(SecurityUtils.getUserId()); if ("jj".equals(byId.getUserType()) || "kh".equals(byId.getUserType())) { queryWrapper.eq(DfProductPoster::getStatus,"1"); @@ -97,6 +104,7 @@ public class DfProductPosterController extends BaseController { } } conditionByMPJ(queryWrapper,dfProductPoster); + startPage(); List list = dfProductPosterService.list(queryWrapper); List attachVo = cmAttachService.list(); Map> attachMap = attachVo.stream() @@ -108,6 +116,9 @@ public class DfProductPosterController extends BaseController { if (matchingAttachments != null) { dfProductPosterVo.setFiles(matchingAttachments); } + if ("1".equals(dfProductPosterVo.getPosterType())) { + dfProductPosterVo.setProductName(null); + } } return getDataTable(list); } @@ -161,6 +172,9 @@ public class DfProductPosterController extends BaseController { @Log(title = "产品海报新增", businessType = BusinessType.INSERT) @PostMapping public AjaxResult add(@RequestBody DfProductPoster dfProductPoster) { + if ("1".equals(dfProductPoster.getPosterType())) { + dfProductPoster.setProductId(null); + } return toAjax(dfProductPosterService.save(dfProductPoster)); } @@ -171,6 +185,9 @@ public class DfProductPosterController extends BaseController { @Log(title = "产品海报修改", businessType = BusinessType.UPDATE) @PutMapping public AjaxResult edit(@RequestBody DfProductPoster dfProductPoster) { + if ("1".equals(dfProductPoster.getPosterType())) { + dfProductPoster.setProductId(null); + } return toAjax(dfProductPosterService.updateById(dfProductPoster)); } diff --git a/bs-admin/src/main/java/com/bs/df/domain/DfOrder.java b/bs-admin/src/main/java/com/bs/df/domain/DfOrder.java index 8e61535..04f393d 100644 --- a/bs-admin/src/main/java/com/bs/df/domain/DfOrder.java +++ b/bs-admin/src/main/java/com/bs/df/domain/DfOrder.java @@ -171,7 +171,11 @@ public class DfOrder extends BaseEntity{ @TableField(exist = false) private Date submitTimeEnd; + @TableField(exist = false) + private String orderByColumn; + @TableField(exist = false) + private String isAsc; } diff --git a/bs-admin/src/main/java/com/bs/web/controller/system/SysUserController.java b/bs-admin/src/main/java/com/bs/web/controller/system/SysUserController.java index 31dc770..503f317 100644 --- a/bs-admin/src/main/java/com/bs/web/controller/system/SysUserController.java +++ b/bs-admin/src/main/java/com/bs/web/controller/system/SysUserController.java @@ -315,6 +315,7 @@ public class SysUserController extends BaseController { dfUserBroker.setBrokerId(user.getDeptId()); dfUserBrokerService.updateById(dfUserBroker); } + user.setPassword(null); return toAjax(userService.updateUser(user)); } diff --git a/bs-ui/src/views/broker/product/components/BrokerProduct.vue b/bs-ui/src/views/broker/product/components/BrokerProduct.vue index 8553cd1..c1ad682 100644 --- a/bs-ui/src/views/broker/product/components/BrokerProduct.vue +++ b/bs-ui/src/views/broker/product/components/BrokerProduct.vue @@ -95,7 +95,7 @@ - + @@ -222,11 +221,13 @@ - - - - + + + + + diff --git a/bs-ui/src/views/product/info/index.vue b/bs-ui/src/views/product/info/index.vue index 9aae5d2..0a547b1 100644 --- a/bs-ui/src/views/product/info/index.vue +++ b/bs-ui/src/views/product/info/index.vue @@ -198,14 +198,14 @@ - + - +