From 60a2d3ae4c64cc3ae0b7cd5e1289e34743e06e8c Mon Sep 17 00:00:00 2001 From: username <1532322479@qq.com> Date: Sun, 29 Sep 2024 16:32:16 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BA=A7=E5=93=81=E4=BF=AE=E6=94=B9=E4=BB=A3?= =?UTF-8?q?=E7=A0=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../bs/df/controller/DfBizClueController.java | 28 +++++--- .../bs/df/controller/DfBrokerController.java | 2 +- .../bs/df/controller/DfOrderController.java | 5 +- .../controller/DfProductInfoController.java | 4 +- .../main/java/com/bs/df/domain/DfOrder.java | 9 +-- .../controller/system/SysUserController.java | 11 ++- .../broker/broker/components/DfBroker.vue | 20 +++--- .../product/components/DfBrokerUser.vue | 1 + bs-ui/src/views/moment/moment/index.vue | 2 +- bs-ui/src/views/order/order/index.vue | 67 ++++++++++--------- .../recommend/components/DfBrokerUser.vue | 1 + 11 files changed, 92 insertions(+), 58 deletions(-) diff --git a/bs-admin/src/main/java/com/bs/df/controller/DfBizClueController.java b/bs-admin/src/main/java/com/bs/df/controller/DfBizClueController.java index 7b0748a..930ec40 100644 --- a/bs-admin/src/main/java/com/bs/df/controller/DfBizClueController.java +++ b/bs-admin/src/main/java/com/bs/df/controller/DfBizClueController.java @@ -10,7 +10,9 @@ import com.bs.common.constant.Constants; import com.bs.common.core.domain.entity.SysUser; import com.bs.common.utils.SecurityUtils; import com.bs.common.utils.ServletUtils; +import com.bs.df.domain.DfOrder; import com.bs.df.mapper.DfBizClueMapper; +import com.bs.system.mapper.SysUserMapper; import com.bs.system.service.ISysUserService; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; @@ -52,6 +54,9 @@ public class DfBizClueController extends BaseController { private DfBizClueMapper dfBizClueMapper; @Resource private ISysUserService userService; + @Resource + private SysUserMapper sysUserMapper; + /** * 分页查询业务线索列表 */ @@ -91,16 +96,20 @@ public class DfBizClueController extends BaseController { LambdaQueryWrapper queryWrapper = new LambdaQueryWrapper(); queryWrapper.eq(DfBizClue::getDataType,dfBizClue.getDataType()); //传入hasOrder参数为1时，查询出存在orderId的数据 - if (Validator.isNotEmpty(dfBizClue.getHasOrder())) { - queryWrapper.isNotNull(DfBizClue::getOrderId); - if (Validator.isNotEmpty(dfBizClue.getBrokerId())) { - queryWrapper.eq(DfBizClue::getShareUser,dfBizClue.getBrokerId()); + SysUser sysUser = sysUserMapper.selectById(getUserId()); + if (!sysUser.getDeptId().equals(-1L)) { + if (Validator.isNotEmpty(dfBizClue.getHasOrder())) { + queryWrapper.isNotNull(DfBizClue::getOrderId); + if (Validator.isNotEmpty(dfBizClue.getBrokerId())) { + queryWrapper.eq(DfBizClue::getShareUser,dfBizClue.getBrokerId()); + } else { + queryWrapper.eq(DfBizClue::getShareUser,SecurityUtils.getUserId()); + } } else { queryWrapper.eq(DfBizClue::getShareUser,SecurityUtils.getUserId()); } - } else { - queryWrapper.eq(DfBizClue::getShareUser,SecurityUtils.getUserId()); } + queryWrapper.orderByDesc(DfBizClue::getBrowseTime); List list = dfBizClueService.list(queryWrapper); Map visitsNum = new HashMap<>(); for (DfBizClue clue : list) { @@ -122,13 +131,16 @@ public class DfBizClueController extends BaseController { int visits = visitsNum.getOrDefault(key, 0); clue.setVisitsNum(visits); } + List sortedList = newList.stream() + .sorted((o1, o2) -> o2.getBrowseTime().compareTo(o1.getBrowseTime())) // 倒序 + .collect(Collectors.toList()); Integer start = (pageNum - 1) * pageSize; - List result = newList.stream() + List result = sortedList.stream() .skip(start) .limit(pageSize) .collect(Collectors.toList()); TableDataInfo data = getDataTable(result); - data.setTotal(newList.size()); + data.setTotal(sortedList.size()); return data; // return getDataTable(newList); } diff --git a/bs-admin/src/main/java/com/bs/df/controller/DfBrokerController.java b/bs-admin/src/main/java/com/bs/df/controller/DfBrokerController.java index aa49d59..0543562 100644 --- a/bs-admin/src/main/java/com/bs/df/controller/DfBrokerController.java +++ b/bs-admin/src/main/java/com/bs/df/controller/DfBrokerController.java @@ -60,7 +60,7 @@ public class DfBrokerController extends BaseController { @ApiOperation("分页查询代理商经纪列表") @GetMapping("/pageList") public TableDataInfo pageList(DfBroker dfBroker) { - startPage(); + // startPage(); LambdaQueryWrapper queryWrapper = new LambdaQueryWrapper(); if (!SecurityUtils.isAdmin(SecurityUtils.getUserId())) { List longs = dfBrokerService.filterByUser(); 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 94136a6..82bf669 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 @@ -80,6 +80,10 @@ public class DfOrderController extends BaseController { public TableDataInfo pageList(DfOrder dfOrder) { Integer pageNum = ServletUtils.getParameterToInt(Constants.PAGE_NUM); Integer pageSize = ServletUtils.getParameterToInt(Constants.PAGE_SIZE); + SysUser sysUser = userService.selectUserById(SecurityUtils.getUserId()); + if (sysUser.getDeptId().equals(-1L)) { + dfOrder.setBrokerId(null); + } LambdaQueryWrapper queryWrapper = new LambdaQueryWrapper(); if (Validator.isEmpty(dfOrder.getOrderByColumn())) { queryWrapper.orderByDesc(DfOrder::getSubmitTime); @@ -92,7 +96,6 @@ public class DfOrderController extends BaseController { condition(queryWrapper, dfOrder); boolean admin = SecurityUtils.isAdmin(SecurityUtils.getUserId()); if (!admin) { - SysUser sysUser = userService.selectUserById(SecurityUtils.getUserId()); if (!sysUser.getDeptId().equals(-1L)) { SysUser byId = userService.getById(SecurityUtils.getUserId()); if ("jj".equals(byId.getUserType())) { 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 3ec5b5c..e1321d1 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 @@ -165,7 +165,7 @@ public class DfProductInfoController extends BaseController { // 计算申请人数 for (DfOrder order : dfOrders) { if (!productOrderCounts.containsKey(order.getProductId())) { - productOrderCounts.put(order.getProductId(), 1); + productOrderCounts.put(order.getProductId(), 1000); // 从1000开始计数 } else { productOrderCounts.put(order.getProductId(), productOrderCounts.get(order.getProductId()) + 1); } @@ -175,7 +175,7 @@ public class DfProductInfoController extends BaseController { if (productOrderCounts.containsKey(productId)) { productInfo.setApplicantNum(Long.valueOf(productOrderCounts.get(productId))); } else { - productInfo.setApplicantNum(0L); + productInfo.setApplicantNum(1000L); } } //城市名称 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 2615c91..3cdfb1e 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 @@ -1,5 +1,6 @@ package com.bs.df.domain; +import java.math.BigDecimal; import java.util.Date; import com.fasterxml.jackson.annotation.JsonFormat; import com.bs.common.annotation.Excel; @@ -85,25 +86,25 @@ public class DfOrder extends BaseEntity{ @Excel(name = "申请额") @ApiModelProperty(value = "申请额（万元）") - private Long applyAmount; + private BigDecimal applyAmount; /** 授信额（万元） */ @Excel(name = "授信额") @ApiModelProperty(value = "授信额（万元）") - private Long limitAmount; + private BigDecimal limitAmount; /** 放款额（万元） */ @Excel(name = "放款额") @ApiModelProperty(value = "放款额（万元）") - private Long loanAmount; + private BigDecimal loanAmount; /** 放款利率 */ @Excel(name = "放款利率") @ApiModelProperty(value = "放款利率") - private Long loanRate; + private BigDecimal loanRate; /** 贷款期限（月） */ 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 8ffcdfd..7479ba9 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 @@ -254,7 +254,11 @@ public class SysUserController extends BaseController { public TableDataInfo getInfosById(SysUser user) { SysUser sysUser = userService.selectUserById(user.getUserId()); Long deptId = sysUser.getDeptId(); - List list = dfBrokerService.list(new LambdaQueryWrapper().eq(DfBroker::getParentId, deptId)); + LambdaQueryWrapper dfBrokerLambdaQueryWrapper = new LambdaQueryWrapper<>(); + if (!sysUser.getDeptId().equals(-1L)) { + dfBrokerLambdaQueryWrapper.eq(DfBroker::getParentId, deptId); + } + List list = dfBrokerService.list(dfBrokerLambdaQueryWrapper); List idList = list.stream() .map(DfBroker::getId) .collect(Collectors.toList()); @@ -307,6 +311,9 @@ public class SysUserController extends BaseController { } user.setIsTenant(SecurityUtils.getLoginUser().getIsTenant()); user.setIsTenantAdmin("N"); + if (!"kh".equals(user.getUserType())) { + user.setUserType("jj"); + } user.setCreateBy(getUsername()); user.setPassword(SecurityUtils.encryptPassword(user.getPassword())); if (Validator.isNotEmpty(user.getUserIdNew())) { @@ -346,6 +353,8 @@ public class SysUserController extends BaseController { DfUserBroker dfUserBroker = list.get(0); dfUserBroker.setBrokerId(user.getDeptId()); dfUserBrokerService.updateById(dfUserBroker); + } else { + user.setUserType("jj"); } user.setPassword(null); if (null == user.getDeptId()) { diff --git a/bs-ui/src/views/broker/broker/components/DfBroker.vue b/bs-ui/src/views/broker/broker/components/DfBroker.vue index e18d055..1f4f731 100644 --- a/bs-ui/src/views/broker/broker/components/DfBroker.vue +++ b/bs-ui/src/views/broker/broker/components/DfBroker.vue @@ -83,9 +83,9 @@ - @@ -142,13 +142,13 @@ - + + + + + + + @@ -268,7 +268,7 @@ import "@riophae/vue-treeselect/dist/vue-treeselect.css"; export default { name: "DfBroker", - // mixins: [AutoTableHeight], + mixins: [AutoTableHeight], dicts: ["df_broker_staus","sys_yes_no"], components: {Treeselect}, data() { diff --git a/bs-ui/src/views/broker/product/components/DfBrokerUser.vue b/bs-ui/src/views/broker/product/components/DfBrokerUser.vue index f0d5928..5adea77 100644 --- a/bs-ui/src/views/broker/product/components/DfBrokerUser.vue +++ b/bs-ui/src/views/broker/product/components/DfBrokerUser.vue @@ -17,6 +17,7 @@ + - + diff --git a/bs-ui/src/views/order/order/index.vue b/bs-ui/src/views/order/order/index.vue index 6d8ec0b..17e230b 100644 --- a/bs-ui/src/views/order/order/index.vue +++ b/bs-ui/src/views/order/order/index.vue @@ -80,18 +80,18 @@ - - - - - - - - - - - - + + 修改 + + @@ -120,7 +120,7 @@ - + @@ -148,7 +148,7 @@ - + @@ -170,29 +177,29 @@ - + - + - + - + - + @@ -200,7 +207,7 @@ - + @@ -215,11 +222,11 @@ @@ -228,24 +235,24 @@ - + - + - + - + @@ -268,7 +275,7 @@ - + @@ -397,9 +404,9 @@ export default { submitTime: [ {required: true, message: "提交时间不能为空", trigger: "blur"} ], - staus: [ - {required: true, message: "状态不能为空", trigger: "blur"} - ], + // staus: [ + // {required: true, message: "状态不能为空", trigger: "blur"} + // ], } }; }, diff --git a/bs-ui/src/views/product/recommend/components/DfBrokerUser.vue b/bs-ui/src/views/product/recommend/components/DfBrokerUser.vue index 58400dd..8557b2a 100644 --- a/bs-ui/src/views/product/recommend/components/DfBrokerUser.vue +++ b/bs-ui/src/views/product/recommend/components/DfBrokerUser.vue @@ -17,6 +17,7 @@ +