From 5ffa5d2c1cf6015815a77ed1042313aca1d9fc37 Mon Sep 17 00:00:00 2001
From: Helius <wangdoubleone@gmail.com>
Date: Thu, 22 Jul 2021 11:56:12 +0800
Subject: [PATCH] fix
---
gc-user/src/main/java/com/xzx/gc/user/service/DistribService.java | 41 +++++++++++++++++++++++++++++++++++++----
1 files changed, 37 insertions(+), 4 deletions(-)
diff --git a/gc-user/src/main/java/com/xzx/gc/user/service/DistribService.java b/gc-user/src/main/java/com/xzx/gc/user/service/DistribService.java
index 36a4b62..ccedcc9 100644
--- a/gc-user/src/main/java/com/xzx/gc/user/service/DistribService.java
+++ b/gc-user/src/main/java/com/xzx/gc/user/service/DistribService.java
@@ -233,8 +233,7 @@
return data;
}
- public void adddistrib(AdddistribDto model) {
- String id = model.getId();
+ public void adddistrib(String id) {
AccountInfo accountInfo = accountMapper.selectByPrimaryKey(id);
accountInfo.setIsHead(1);
accountMapper.updateByPrimaryKey(accountInfo);
@@ -305,6 +304,9 @@
if(CollUtil.isNotEmpty(orderItemsVos)){
for(OrderItemsVo orderItemsVo : orderItemsVos){
if(ObjectUtil.isNotEmpty(orderItemsVo)){
+ String nickname = orderItemsVo.getNickname();
+ String decode = StringUtils.decode(nickname);
+ orderItemsVo.setNickname(decode);
Long orderId = orderItemsVo.getOrderId();
List<JhyOrderItems> jhyOrderItems = accountMapper.selectOrderById(orderId);
if(CollUtil.isNotEmpty(jhyOrderItems)){
@@ -346,9 +348,9 @@
String decode = StringUtils.decode(nickname);
distribDataListVo.setNickname(decode);
String id = distribDataListVo.getId();
- String kg = accountMapper.selectOrderByHeadUserId(id);
+ String kg = accountMapper.selectOrderByHeadUserId(id,distribDataListDto);
distribDataListVo.setKg(kg);
- String jdsl = accountMapper.selectJDSLByHeadUserId(id);
+ String jdsl = accountMapper.selectJDSLByHeadUserId(id,distribDataListDto);
distribDataListVo.setJdsl(jdsl);
}
}
@@ -365,4 +367,35 @@
public DistribDataInfoVo distribDataInfo(DistribDataInfoDto distribDataInfoDto) {
return accountMapper.selectDistribDataInfoVo();
}
+
+ public Map<String, Object> distribDataExport(ExportDistribDataListDto distribDataListDto) {
+ if(StrUtil.isNotEmpty(distribDataListDto.getQueryCol())){
+ String decode = StringUtils.encode(distribDataListDto.getQueryCol());
+ distribDataListDto.setName(decode);
+ distribDataListDto.setPhone(distribDataListDto.getQueryCol());
+ }
+ List<DistribDataListVo> distribDataListVos = accountMapper.distribDataExport(distribDataListDto);
+ if(CollUtil.isNotEmpty(distribDataListVos)){
+ for(DistribDataListVo distribDataListVo : distribDataListVos){
+ if(ObjectUtil.isNotEmpty(distribDataListVo)){
+ String nickname = distribDataListVo.getNickname();
+ String decode = StringUtils.decode(nickname);
+ distribDataListVo.setNickname(decode);
+ String id = distribDataListVo.getId();
+ String kg = accountMapper.selectOrderExportByHeadUserId(id,distribDataListDto);
+ distribDataListVo.setKg(kg);
+ String jdsl = accountMapper.selectJDSLExportByHeadUserId(id,distribDataListDto);
+ distribDataListVo.setJdsl(jdsl);
+ }
+ }
+ }
+ PageInfo<DistribDataListVo> pageInfo = new PageInfo<>(distribDataListVos);
+ Map<String, Object> data = new HashMap<>();
+ int count = Convert.toInt(pageInfo.getTotal());
+ data.put("data", distribDataListVos);
+ data.put("count", count);
+ data.put("code", 0);
+ return data;
+ }
+
}
--
Gitblit v1.9.1