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

增加序号信息

Browse Source
master
username 7 months ago
parent c90ca5f883
commit da0bb217b6
15 changed files with 127 additions and 66 deletions
Show Stats Download Patch File Download Diff File

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

@ -200,7 +200,23 @@ public class DfBizClueController extends BaseController {
@ApiOperation("获取业务线索详细信息")
@GetMapping(value = "/{id}")
public AjaxResult getInfo(@PathVariable("id") Long id) {
return success(dfBizClueService.getById(id));
DfBizClue byId = dfBizClueService.getById(id);
List<SysUser> list = userService.list(new LambdaQueryWrapper<SysUser>().eq(SysUser::getUserId, byId.getShareUser()));
if (!list.isEmpty()) {
String realName = list.get(0).getRealName();
if (Validator.isEmpty(realName)) {
String nickName = list.get(0).getNickName();
if (Validator.isEmpty(nickName)) {
String userName = list.get(0).getUserName();
byId.setRealName(userName);
} else {
byId.setRealName(nickName);
}
} else {
byId.setRealName(realName);
}
}
return success(byId);
}
/**

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

@ -81,6 +81,14 @@ public class DfOrderController extends BaseController {
Integer pageNum = ServletUtils.getParameterToInt(Constants.PAGE_NUM);
Integer pageSize = ServletUtils.getParameterToInt(Constants.PAGE_SIZE);
LambdaQueryWrapper<DfOrder> queryWrapper = new LambdaQueryWrapper();
if (Validator.isEmpty(dfOrder.getOrderByColumn())) {
queryWrapper.orderByDesc(DfOrder::getSubmitTime);
}
if (Validator.isNotEmpty(dfOrder.getUserOrProduct())) {
queryWrapper.like(DfOrder::getUserName, dfOrder.getUserOrProduct())
.or()
.like(DfOrder::getProductName, dfOrder.getUserOrProduct());
}
condition(queryWrapper, dfOrder);
boolean admin = SecurityUtils.isAdmin(SecurityUtils.getUserId());
if (!admin) {
@ -89,7 +97,6 @@ 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)) {
@ -216,34 +223,30 @@ public class DfOrderController extends BaseController {
private List<DfOrder> setOrderList(List<DfOrder> list) {
List<SysUser> userList = userService.list();
List<DfBizClue> clueList = dfBizClueService.list(new LambdaQueryWrapper<DfBizClue>().orderByDesc(DfBizClue::getCreateTime));
Map<String, String> userIdToNameMap = clueList.stream()
.filter(clue -> clue.getOrderId() != null && clue.getNickName() != null)
.collect(Collectors.toMap(
DfBizClue::getOrderId,
DfBizClue::getNickName,
(existingValue, newValue) -> existingValue));
Map<String, String> orderIdToPhoneMap = clueList.stream()
.filter(clue -> clue.getOrderId() != null && clue.getPhone() != null)
.collect(Collectors.toMap(
DfBizClue::getOrderId,
DfBizClue::getPhone,
(existingValue, newValue) -> existingValue));
Map<Long, String> userIdToRealNameMapVo = userList.stream()
.filter(user -> user != null && user.getUserId() != null && user.getRealName() != null)
.collect(Collectors.toMap(SysUser::getUserId, SysUser::getRealName));
Map<Long, String> userIdToNickNameMapVo = userList.stream()
.filter(user -> user != null && user.getUserId() != null && user.getNickName() != null)
.collect(Collectors.toMap(SysUser::getUserId, SysUser::getNickName));
Map<Long, String> userIdToNameMapVo = userList.stream()
.filter(user -> user != null && user.getUserId() != null && user.getUserName() != null)
.collect(Collectors.toMap(SysUser::getUserId, SysUser::getUserName));
list.forEach(order -> {
String userName = userIdToNameMap.get(order.getId().toString());
String userJJName = userIdToNameMapVo.get(order.getBrokerId());
String phone = orderIdToPhoneMap.get(order.getId().toString());
// if (null != userName) {
// order.setUserName(userName);
// }
if (null != userJJName) {
order.setBrokerName(userJJName);
String realName = userIdToRealNameMapVo.get(order.getBrokerId());
String nickName = userIdToNickNameMapVo.get(order.getBrokerId());
String userName = userIdToNameMapVo.get(order.getBrokerId());
if (Validator.isEmpty(realName)) {
if (Validator.isEmpty(nickName)) {
order.setBrokerName(userName);
} else {
order.setBrokerName(nickName);
}
} else {
order.setBrokerName(realName);
}
// if (null != phone) {
// order.setPhone(phone);
// }
});
return list;
}
@ -256,6 +259,7 @@ public class DfOrderController extends BaseController {
public AjaxResult list(DfOrder dfOrder) {
LambdaQueryWrapper<DfOrder> queryWrapper = new LambdaQueryWrapper();
condition(queryWrapper, dfOrder);
queryWrapper.orderByDesc(DfOrder::getCreateTime);
List<DfOrder> list = dfOrderService.list(queryWrapper);
return success(list);
}
@ -312,35 +316,21 @@ public class DfOrderController extends BaseController {
@GetMapping(value = "/{id}")
public AjaxResult getInfo(@PathVariable("id") Long id) {
DfOrder byId = dfOrderService.getById(id);
List<SysUser> userList = userService.list();
List<DfBizClue> clueList = dfBizClueService.list(new LambdaQueryWrapper<DfBizClue>().orderByDesc(DfBizClue::getCreateTime));
// 将用户列表转换为 Map，以 userId 为键，userName 为值
Map<String, String> userIdToNameMap = clueList.stream()
.filter(clue -> clue.getOrderId() != null && clue.getNickName() != null)
.collect(Collectors.toMap(
DfBizClue::getOrderId, // Key mapper
DfBizClue::getNickName, // Value mapper
(existingValue, newValue) -> existingValue)); // Merge function (keep existing value)
// Map<String, String> orderIdToPhoneMap = clueList.stream()
// .filter(clue -> clue.getOrderId() != null && clue.getPhone() != null)
// .collect(Collectors.toMap(
// DfBizClue::getOrderId, // Key mapper
// DfBizClue::getPhone, // Value mapper
// (existingValue, newValue) -> existingValue)); // Merge function (keep existing value)
Map<Long, String> userIdToNameMapVo = userList.stream()
.collect(Collectors.toMap(SysUser::getUserId, SysUser::getUserName));
// String userName = userIdToNameMap.get(byId.getId().toString());
String userJJName = userIdToNameMapVo.get(byId.getBrokerId());
// String phone = orderIdToPhoneMap.get(byId.getId().toString());
// if (null != userName) {
// byId.setUserName(userName);
// }
if (null != userJJName) {
byId.setBrokerName(userJJName);
}
//if (null != phone) {
// byId.setPhone(phone);
//}
List<SysUser> list = userService.list(new LambdaQueryWrapper<SysUser>().eq(SysUser::getUserId, byId.getBrokerId()));
if (!list.isEmpty()) {
String realName = list.get(0).getRealName();
if (Validator.isEmpty(realName)) {
String nickName = list.get(0).getNickName();
if (Validator.isEmpty(nickName)) {
String userName = list.get(0).getUserName();
byId.setBrokerName(userName);
} else {
byId.setBrokerName(nickName);
}
} else {
byId.setBrokerName(realName);
}
}
return success(byId);
}

8
bs-admin/src/main/java/com/bs/df/controller/DfProductArticleController.java
Unescape View File

@ -11,9 +11,7 @@ import com.bs.cm.service.ICmAttachService;
import com.bs.common.annotation.Anonymous;
import com.bs.common.core.domain.entity.SysUser;
import com.bs.common.utils.SecurityUtils;
import com.bs.df.domain.DfBizClue;
import com.bs.df.domain.DfProductMoment;
import com.bs.df.domain.DfProductPoster;
import com.bs.df.domain.*;
import com.bs.df.utils.HtmlUtils;
import com.bs.system.mapper.SysUserMapper;
import com.bs.system.service.ISysUserService;
@ -37,7 +35,6 @@ import com.bs.common.enums.BusinessType;
import com.bs.common.utils.poi.ExcelUtil;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import cn.hutool.core.lang.Validator;
import com.bs.df.domain.DfProductArticle;
import com.bs.df.service.IDfProductArticleService;
import javax.annotation.Resource;
@ -83,6 +80,9 @@ public class DfProductArticleController extends BaseController {
}
}
}
if (Validator.isEmpty(dfProductArticle.getOrderByColumn())) {
queryWrapper.orderByAsc(DfProductArticle::getSerialNumber);
}
condition(queryWrapper,dfProductArticle);
List<DfProductArticle> list = dfProductArticleService.list(queryWrapper);
for (DfProductArticle article : list) {

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

@ -80,6 +80,10 @@ public class DfProductInfoController extends BaseController {
return null;
}
LambdaQueryWrapper<DfProductInfo> queryWrapper = new LambdaQueryWrapper();
if (Validator.isEmpty(dfProductInfo.getOrderByColumn())) {
queryWrapper.orderByAsc(DfProductInfo::getSerialNumber);
}
condition(queryWrapper,dfProductInfo);
String brokerIds = dfProductInfo.getBrokerIds();
if ("1".equals(dfProductInfo.getSelectByBroker())) {
if (Validator.isNotEmpty(dfProductInfo.getUserId())) {
@ -113,7 +117,6 @@ public class DfProductInfoController extends BaseController {
.in(DfProductInfo::getCreateDept, SecurityUtils.getDeptId());
}
}
condition(queryWrapper,dfProductInfo);
startPage();
List<DfProductInfo> list = dfProductInfoService.list(queryWrapper);
List<DfOrder> dfOrders = dfOrderService.list();

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

@ -11,6 +11,7 @@ import com.bs.cm.domain.CmAttach;
import com.bs.cm.service.ICmAttachService;
import com.bs.common.core.domain.entity.SysUser;
import com.bs.common.utils.SecurityUtils;
import com.bs.df.domain.DfOrder;
import com.bs.df.domain.DfProductArticle;
import com.bs.df.domain.DfProductInfo;
import com.bs.df.service.IDfBrokerService;
@ -76,6 +77,9 @@ public class DfProductPosterController extends BaseController {
return null;
}
MPJLambdaWrapper<DfProductPoster> queryWrapper = new MPJLambdaWrapper();
if (Validator.isEmpty(dfProductPoster.getOrderByColumn())) {
queryWrapper.orderByAsc(DfProductPoster::getSerialNumber);
}
queryWrapper.selectAll(DfProductPoster.class)
.select(DfProductInfo::getProductName)
.disableSubLogicDel()

3
bs-admin/src/main/java/com/bs/df/domain/DfBizClue.java
Unescape View File

@ -139,4 +139,7 @@ public class DfBizClue extends BaseEntity{
@TableField(exist = false)
private Long brokerId;
@TableField(exist = false)
private String realName;
}

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

@ -161,8 +161,6 @@ public class DfOrder extends BaseEntity{
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss" )
private Date createTimeVo;
@JsonFormat(pattern = "yyyy-MM-dd")
@TableField(exist = false)
private Date submitTimeBegin;
@ -177,5 +175,7 @@ public class DfOrder extends BaseEntity{
@TableField(exist = false)
private String isAsc;
@TableField(exist = false)
private String userOrProduct;
}

7
bs-admin/src/main/java/com/bs/df/domain/DfProductArticle.java
Unescape View File

@ -77,6 +77,10 @@ public class DfProductArticle extends BaseEntity{
@ApiModelProperty(value = "备注")
private String remark;
@Excel(name = "序号")
@ApiModelProperty(value = "序号")
private String serialNumber;
@TableField(exist = false)
private String publishTimeBegin;
@ -89,4 +93,7 @@ public class DfProductArticle extends BaseEntity{
@TableField(exist = false)
private List<CmAttach> files;
@TableField(exist = false)
private String orderByColumn;
}

7
bs-admin/src/main/java/com/bs/df/domain/DfProductInfo.java
Unescape View File

@ -156,6 +156,10 @@ public class DfProductInfo extends BaseEntity{
@ApiModelProperty(value = "备注")
private String remark;
@Excel(name = "序号")
@ApiModelProperty(value = "序号")
private String serialNumber;
@TableField(exist = false)
private Long maxAmountBegin;
@ -195,4 +199,7 @@ public class DfProductInfo extends BaseEntity{
@TableField(exist = false)
private String isSelectBroker;
@TableField(exist = false)
private String orderByColumn;
}

6
bs-admin/src/main/java/com/bs/df/domain/DfProductPoster.java
Unescape View File

@ -78,6 +78,10 @@ public class DfProductPoster extends BaseEntity{
@ApiModelProperty(value = "备注")
private String remark;
@Excel(name = "序号")
@ApiModelProperty(value = "序号")
private String serialNumber;
@TableField(exist = false)
private String[] ids;
@ -85,5 +89,7 @@ public class DfProductPoster extends BaseEntity{
@TableField(exist = false)
private List<CmAttach> files;
@TableField(exist = false)
private String orderByColumn;
}

6
bs-ui/src/views/article/article/index.vue
Unescape View File

@ -125,6 +125,7 @@
<el-table v-loading="loading" :data="articleList" @sort-change="handleSortChange"
@selection-change="handleSelectionChange">
<el-table-column type="selection" width="55" align="center"/>
<el-table-column label="序号" width="80" prop="serialNumber" sortable='custom'/>
<el-table-column label="文章标题" width="180" prop="articleTitle" sortable='custom'/>
<!-- <el-table-column label="文章分类" align="center" prop="articleType" sortable='custom'/>-->
<el-table-column label="分类" prop="articleType" width="80" sortable='custom'>
@ -234,6 +235,11 @@
</el-col>
</el-row>
<el-row>
<el-col :span="12">
<el-form-item label="序号" prop="serialNumber">
<el-input-number v-model="form.serialNumber" placeholder="请输入序号" :disabled="readonly" :min="0" style="width: 100%;"/>
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label="状态" prop="status">
<el-select style="width: 100%;" v-model="form.status" placeholder="请选择状态" :disabled="readonly">

11
bs-ui/src/views/biz/clue/index.vue
Unescape View File

@ -167,6 +167,13 @@
<el-input v-model="form.nickName" placeholder="请输入用户昵称" :disabled="readonly"/>
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label="经纪人" prop="realName">
<el-input v-model="form.realName" placeholder="请输入经纪人" :disabled="readonly"/>
</el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="12">
<el-form-item label="浏览时间" prop="browseTime">
<el-date-picker clearable
@ -179,14 +186,11 @@
</el-date-picker>
</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="请输入手机号" :disabled="readonly"/>
</el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="12">
@ -305,6 +309,7 @@ export default {
clueType: null,
userId: null,
nickName: null,
realName: null,
browseTime: null,
businessLinks: null
};

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

@ -357,6 +357,7 @@ export default {
pageNum: 1,
pageSize: 10,
orderNo: null,
userName: null,
userId: null,
brokerId: null,
productId: null,

7
bs-ui/src/views/poster/poster/index.vue
Unescape View File

@ -122,6 +122,7 @@
<el-table v-loading="loading" :data="posterList" @sort-change="handleSortChange"
@selection-change="handleSelectionChange">
<el-table-column type="selection" width="55" align="center"/>
<el-table-column label="序号" width="80" prop="serialNumber" sortable='custom'/>
<el-table-column label="海报名称" width="120" prop="posterName" sortable='custom'/>
<el-table-column label="分类" prop="posterType" width="80" sortable='custom'>
<template slot-scope="scope">
@ -221,7 +222,11 @@
<!-- <el-input v-model="form.posterFileId" placeholder="请输入海报图片"/>-->
<!-- </el-form-item>-->
<!-- </el-col>-->
<el-col :span="12">
<el-form-item label="序号" prop="serialNumber">
<el-input-number v-model="form.serialNumber" placeholder="请输入序号" :disabled="readonly" :min="0" style="width: 100%;"/>
</el-form-item>
</el-col>
<el-col :span="12" v-if="form.posterType != '1'">
<el-form-item label="产品名称" prop="productId">
<el-select style="width: 100%;" filterable v-model="form.productId" placeholder="请选择产品名称" :disabled="readonly"

8
bs-ui/src/views/product/info/index.vue
Unescape View File

@ -189,6 +189,7 @@
<el-table v-loading="loading" :data="infoList" @sort-change="handleSortChange"
@selection-change="handleSelectionChange">
<el-table-column type="selection" width="55" align="center"/>
<el-table-column label="序号" width="80" prop="serialNumber" sortable='custom' fixed="left"/>
<el-table-column label="产品名称" align="center" prop="productName" sortable='custom' fixed="left" min-width="100"/>
<!-- <el-table-column label="产品简称" align="center" prop="simpleName" sortable='custom' min-width="100"/> -->
<el-table-column label="产品类型" align="center" prop="productType" sortable='custom' min-width="100">
@ -366,6 +367,13 @@
</el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="8">
<el-form-item label="序号" prop="serialNumber">
<el-input-number v-model="form.serialNumber" placeholder="请输入序号" :disabled="readonly" :min="0" style="width: 100%;"/>
</el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="24">
<el-form-item label="申请链接" prop="applicationLink" >

Write Preview
Loading…
Cancel
Save