xiaozhan
/
tobacco
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

产品修改代码

Browse Source
master
username 6 months ago
parent 834e4af13f
commit 60a2d3ae4c
11 changed files with 92 additions and 58 deletions
Show Stats Download Patch File Download Diff File

28
bs-admin/src/main/java/com/bs/df/controller/DfBizClueController.java
Unescape View File

@ -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<DfBizClue> 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<DfBizClue> list = dfBizClueService.list(queryWrapper);
Map<String, Integer> 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<DfBizClue> sortedList = newList.stream()
.sorted((o1, o2) -> o2.getBrowseTime().compareTo(o1.getBrowseTime())) // 倒序
.collect(Collectors.toList());
Integer start = (pageNum - 1) * pageSize;
List<DfBizClue> result = newList.stream()
List<DfBizClue> 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);
}

2
bs-admin/src/main/java/com/bs/df/controller/DfBrokerController.java
Unescape View File

@ -60,7 +60,7 @@ public class DfBrokerController extends BaseController {
@ApiOperation("分页查询代理商经纪列表")
@GetMapping("/pageList")
public TableDataInfo pageList(DfBroker dfBroker) {
startPage();
// startPage();
LambdaQueryWrapper<DfBroker> queryWrapper = new LambdaQueryWrapper();
if (!SecurityUtils.isAdmin(SecurityUtils.getUserId())) {
List<Long> longs = dfBrokerService.filterByUser();

5
bs-admin/src/main/java/com/bs/df/controller/DfOrderController.java
Unescape View File

@ -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<DfOrder> 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())) {

4
bs-admin/src/main/java/com/bs/df/controller/DfProductInfoController.java
Unescape View File

@ -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);
}
}
//城市名称

9
bs-admin/src/main/java/com/bs/df/domain/DfOrder.java
Unescape View File

@ -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;
/** 贷款期限（月） */

11
bs-admin/src/main/java/com/bs/web/controller/system/SysUserController.java
Unescape View File

@ -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<DfBroker> list = dfBrokerService.list(new LambdaQueryWrapper<DfBroker>().eq(DfBroker::getParentId, deptId));
LambdaQueryWrapper<DfBroker> dfBrokerLambdaQueryWrapper = new LambdaQueryWrapper<>();
if (!sysUser.getDeptId().equals(-1L)) {
dfBrokerLambdaQueryWrapper.eq(DfBroker::getParentId, deptId);
}
List<DfBroker> list = dfBrokerService.list(dfBrokerLambdaQueryWrapper);
List<Long> 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()) {

20
bs-ui/src/views/broker/broker/components/DfBroker.vue
Unescape View File

@ -83,9 +83,9 @@
</el-col>
<right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
</el-row>
<el-table v-loading="loading" :data="brokerList" @sort-change="handleSortChange"
<el-table v-loading="loading" :data="brokerList" @sort-change="handleSortChange"
@selection-change="handleSelectionChange" row-key="id" :highlight-current-row="true" @row-click="handleRowClick"
default-expand-all
default-expand-all :height="tableHeight + 300"
:tree-props="{children: 'children', hasChildren: 'hasChildren'}">
<el-table-column type="selection" width="55" align="center"/>
<!-- <el-table-column label="id" align="center" prop="id" sortable='custom'/>-->
@ -142,13 +142,13 @@
</el-table-column>
</el-table>
<pagination
:total="total"
:pageSizes="[5, 10, 30, 50]"
:page.sync="queryParams.pageNum"
:limit.sync="queryParams.pageSize"
@pagination="getList"
/>
<!-- <pagination-->
<!-- :total="total"-->
<!-- :pageSizes="[5, 10, 30, 50]"-->
<!-- :page.sync="queryParams.pageNum"-->
<!-- :limit.sync="queryParams.pageSize"-->
<!-- @pagination="getList"-->
<!-- />-->
<!-- 添加或修改代理商经纪对话框 -->
<el-dialog :title="title" :visible.sync="open" width="70%" append-to-body :close-on-click-modal="false">
@ -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() {

1
bs-ui/src/views/broker/product/components/DfBrokerUser.vue
Unescape View File

@ -17,6 +17,7 @@
<el-table v-loading="loading" :data="userList" @sort-change="handleSortChange" :height="340" ref="table"
@selection-change="handleSelectionChange" row-key="id" :highlight-current-row="true" @row-click="handleRowClick" >
<el-table-column label="经纪人" prop="userName" sortable='custom' min-width="200px"/>
<el-table-column label="真实姓名" prop="realName" sortable='custom' min-width="200px"/>
</el-table>
<pagination
size="small"

2
bs-ui/src/views/moment/moment/index.vue
Unescape View File

@ -204,7 +204,7 @@
<el-row>
<el-col :span="24">
<el-form-item label="朋友圈正文">
<editor v-model="form.momentContent" :min-height="192"/>
<el-input v-model="form.momentContent" type="textarea" :min-height="192"/>
</el-form-item>
</el-col>
<el-col :span="24">

67
bs-ui/src/views/order/order/index.vue
Unescape View File

@ -80,18 +80,18 @@
<!-- >新增-->
<!-- </el-button>-->
<!-- </el-col>-->
<!-- <el-col :span="1.5">-->
<!-- <el-button-->
<!-- type="success"-->
<!-- plain-->
<!-- icon="el-icon-edit"-->
<!-- size="mini"-->
<!-- :disabled="single"-->
<!-- @click="handleUpdate"-->
<!-- v-hasPermi="['order:order:edit']"-->
<!-- >修改-->
<!-- </el-button>-->
<!-- </el-col>-->
<el-col :span="1.5">
<el-button
type="success"
plain
icon="el-icon-edit"
size="mini"
:disabled="single"
@click="handleUpdate"
v-hasPermi="['order:order:edit']"
>修改
</el-button>
</el-col>
<!-- <el-col :span="1.5">-->
<!-- <el-button-->
<!-- type="danger"-->
@ -120,7 +120,7 @@
<el-table v-loading="loading" :data="orderList" @sort-change="handleSortChange"
row-key="id"
>
<!-- <el-table-column type="selection" width="55" align="center"/> -->
<el-table-column type="selection" width="55" align="center"/>
<!-- <el-table-column label="id" align="center" prop="id" sortable='custom' />-->
<el-table-column label="订单号" prop="orderNo" sortable='custom' width="100px"/>
<el-table-column label="客户" width="120" prop="userName"/>
@ -148,7 +148,7 @@
</template>
</el-table-column>
<el-table-column label="备注" prop="remark" sortable='custom'/>
<el-table-column label="操作" align="center" class-name="small-padding fixed-width" fixed="right">
<el-table-column label="操作" align="center" class-name="small-padding fixed-width" fixed="right" width="120px">
<template slot-scope="scope">
<el-button
size="mini"
@ -157,6 +157,13 @@
@click="handleRead(scope.row)"
>查看
</el-button>
<el-button
size="mini"
type="text"
icon="el-icon-edit"
@click="handleUpdate(scope.row)"
>修改
</el-button>
</template>
</el-table-column>
</el-table>
@ -170,29 +177,29 @@
<!-- 添加或修改代理商经纪对话框 -->
<el-dialog :title="title" :visible.sync="open" width="70%" append-to-body :close-on-click-modal="false">
<el-form ref="form" :model="form" :rules="rules" label-width="100px">
<el-form ref="form" :model="form" :rules="rules" label-width="140px">
<el-row>
<el-col :span="12">
<el-form-item label="订单号" prop="orderNo">
<BillNumberInput v-model="form.orderNo" title="订单编号" :disabled="readonly"></BillNumberInput>
<BillNumberInput v-model="form.orderNo" title="订单编号" :disabled="true"></BillNumberInput>
<!-- <el-input v-model="form.orderNo" placeholder="请输入订单号"/>-->
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label="客户" prop="userName">
<el-input v-model="form.userName" placeholder="请输入客户" style="width: 100%" :disabled="readonly"/>
<el-input v-model="form.userName" placeholder="请输入客户" style="width: 100%" :disabled="true"/>
</el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="12">
<el-form-item label="联系方式" prop="phone">
<el-input v-model="form.phone" placeholder="请输入联系方式" style="width: 100%" :disabled="readonly"/>
<el-input v-model="form.phone" placeholder="请输入联系方式" style="width: 100%" :disabled="true"/>
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label="经纪人" prop="brokerName">
<el-input v-model="form.brokerName" placeholder="请输入经纪人" style="width: 100%" :disabled="readonly"/>
<el-input v-model="form.brokerName" placeholder="请输入经纪人" style="width: 100%" :disabled="true"/>
<!-- <el-input v-model="form.brokerId" placeholder="请输入代理商"/>-->
</el-form-item>
</el-col>
@ -200,7 +207,7 @@
<el-row>
<el-col :span="12">
<el-form-item label="产品" prop="productId">
<el-select style="width: 100%;" v-model="form.productId" placeholder="请选择产品" clearable :disabled="readonly">
<el-select style="width: 100%;" v-model="form.productId" placeholder="请选择产品" clearable :disabled="true">
<el-option v-for="info in lsProduct" :key="info.id" :label="info.productName"
:value="info.id"/>
</el-select>
@ -215,11 +222,11 @@
<el-col :span="12">
<el-form-item label="提交时间" prop="submitTime">
<el-date-picker clearable
:disabled="readonly"
:disabled="true"
style="width: 100%"
v-model="form.submitTime"
type="date"
value-format="yyyy-MM-dd"
value-format="yyyy-MM-dd HH:mm:ss"
placeholder="请选择提交时间">
</el-date-picker>
</el-form-item>
@ -228,24 +235,24 @@
<el-row>
<el-col :span="12">
<el-form-item label="申请额(万元)" prop="applyAmount">
<el-input-number v-model="form.applyAmount" placeholder="请输入申请额" :min="0" style="width: 100%" :disabled="readonly"/>
<el-input-number v-model="form.applyAmount" placeholder="请输入申请额" :min="0" style="width: 100%" :precision="2" :disabled="readonly"/>
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label="授信额(万元)" prop="limitAmount">
<el-input-number v-model="form.limitAmount" placeholder="请输入授信额" :min="0" style="width: 100%" :disabled="readonly"/>
<el-input-number v-model="form.limitAmount" placeholder="请输入授信额" :min="0" style="width: 100%" :precision="2" :disabled="readonly"/>
</el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="12">
<el-form-item label="放款额(万元)" prop="loanAmount">
<el-input-number v-model="form.loanAmount" placeholder="请输入放款额" :min="0" style="width: 100%" :disabled="readonly"/>
<el-input-number v-model="form.loanAmount" placeholder="请输入放款额" :min="0" style="width: 100%" :precision="2" :disabled="readonly"/>
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label="放款利率" prop="loanRate">
<el-input-number v-model="form.loanRate" placeholder="请输入放款利率" :min="0" style="width: 100%" :disabled="readonly"/>
<el-input-number v-model="form.loanRate" placeholder="请输入放款利率" :min="0" style="width: 100%" :precision="2" :disabled="readonly"/>
</el-form-item>
</el-col>
</el-row>
@ -268,7 +275,7 @@
<el-row>
<el-col :span="12">
<el-form-item label="可结算金额（万元）" prop="settleAmount">
<el-input-number v-model="form.settleAmount" placeholder="请输入可结算金额" :min="0" style="width: 100%" :disabled="readonly"/>
<el-input-number v-model="form.settleAmount" placeholder="请输入可结算金额" :min="0" style="width: 100%" :precision="2" :disabled="readonly"/>
</el-form-item>
</el-col>
<el-col :span="12">
@ -397,9 +404,9 @@ export default {
submitTime: [
{required: true, message: "提交时间不能为空", trigger: "blur"}
],
staus: [
{required: true, message: "状态不能为空", trigger: "blur"}
],
// staus: [
// {required: true, message: "状态不能为空", trigger: "blur"}
// ],
}
};
},

1
bs-ui/src/views/product/recommend/components/DfBrokerUser.vue
Unescape View File

@ -17,6 +17,7 @@
<el-table v-loading="loading" :data="userList" @sort-change="handleSortChange" :height="340" ref="table"
@selection-change="handleSelectionChange" row-key="id" :highlight-current-row="true" @row-click="handleRowClick" >
<el-table-column label="经纪人" prop="userName" sortable='custom' min-width="200px"/>
<el-table-column label="真实姓名" prop="realName" sortable='custom' min-width="200px"/>
</el-table>
<pagination
size="small"

Write Preview
Loading…
Cancel
Save