|
@@ -16,6 +16,7 @@ import org.springframework.stereotype.Service;
|
|
|
import java.math.BigDecimal;
|
|
|
import java.text.ParseException;
|
|
|
import java.util.ArrayList;
|
|
|
+import java.util.Arrays;
|
|
|
import java.util.Date;
|
|
|
import java.util.List;
|
|
|
import java.util.Map;
|
|
@@ -130,11 +131,8 @@ public class ManagerSaleValueServiceImpl extends ServiceImpl<ManagerSaleValueMap
|
|
|
//运营一部:李超及其下级 李超 id:f6a6843879c949618e4a859140c8a127
|
|
|
List<Long> oneAccountIds = null;
|
|
|
String lichaoId = "f6a6843879c949618e4a859140c8a127";
|
|
|
- //运营二部:兰兰及其下级 兰兰id:461857c245f54ba5813bcb5900a23092
|
|
|
+ //运营二部:兰兰及其下级 兰兰id:461857c245f54ba5813bcb5900a23092,00d630a129e4487cba5427788a1f08ce
|
|
|
List<Long> twoAccountIds = null;
|
|
|
- List<String> userIds = new ArrayList<>();
|
|
|
- userIds.add("461857c245f54ba5813bcb5900a23092");
|
|
|
- userIds.add("00d630a129e4487cba5427788a1f08ce");
|
|
|
//1 头条
|
|
|
if ("1".equals(mediaId)) {
|
|
|
//查询当日消耗 + 环比
|
|
@@ -155,7 +153,7 @@ public class ManagerSaleValueServiceImpl extends ServiceImpl<ManagerSaleValueMap
|
|
|
hour = 23;
|
|
|
}
|
|
|
//运营一部:李超及其下级 李超 id:f6a6843879c949618e4a859140c8a127
|
|
|
- oneAccountIds = baseMapper.querySalesDirectorAccountIds(companyId, mediaId, saleTeaMber, lichaoId);
|
|
|
+ oneAccountIds = baseMapper.querySalesDirectorAccountIds(companyId, mediaId, saleTeaMber, Arrays.asList(lichaoId));
|
|
|
JSONObject oneResult = baseMapper.queryTtTodayCharge2(startTime, endTime, hour, oneAccountIds, companyId, days);
|
|
|
result.put("oneCharge", oneResult.getBigDecimal("totalCharge"));
|
|
|
result.put("oneChargeRoi", oneResult.getString("chargeRoi"));
|
|
@@ -188,7 +186,7 @@ public class ManagerSaleValueServiceImpl extends ServiceImpl<ManagerSaleValueMap
|
|
|
hour = 23;
|
|
|
}
|
|
|
//运营一部:李超及其下级 李超 id:f6a6843879c949618e4a859140c8a127
|
|
|
- oneAccountIds = baseMapper.querySalesDirectorAccountIds(companyId, mediaId, saleTeaMber, lichaoId);
|
|
|
+ oneAccountIds = baseMapper.querySalesDirectorAccountIds(companyId, mediaId, saleTeaMber, Arrays.asList(lichaoId));
|
|
|
JSONObject oneResult = baseMapper.queryKsTodayCharge2(startTime, endTime, hour, oneAccountIds, companyId, days);
|
|
|
result.put("oneCharge", oneResult.getBigDecimal("totalCharge"));
|
|
|
result.put("oneChargeRoi", oneResult.getString("chargeRoi"));
|
|
@@ -374,15 +372,16 @@ public class ManagerSaleValueServiceImpl extends ServiceImpl<ManagerSaleValueMap
|
|
|
@Override
|
|
|
public PageInfo getProjectChargeTop(String userId, String mediaId, String companyId, String startTime, String endTime, String operate, Integer pageNo, Integer pageSize) throws Exception {
|
|
|
Boolean bjCompany = false;
|
|
|
- String operateUser = null;
|
|
|
+ List<String> operateUser = new ArrayList<>();
|
|
|
if ("d57fecdcf7a94d009736d9c850731582".equals(companyId) && !Check.isNull(operate)) {
|
|
|
bjCompany = true;
|
|
|
if ("1".equals(operate)) {
|
|
|
//运营一部:李超及其下级 李超 id:f6a6843879c949618e4a859140c8a127
|
|
|
- operateUser = "f6a6843879c949618e4a859140c8a127";
|
|
|
+ operateUser.add("f6a6843879c949618e4a859140c8a127");
|
|
|
} else {
|
|
|
//运营二部:兰兰及其下级 兰兰id:461857c245f54ba5813bcb5900a23092
|
|
|
- operateUser = "461857c245f54ba5813bcb5900a23092";
|
|
|
+ operateUser.add("461857c245f54ba5813bcb5900a23092");
|
|
|
+ operateUser.add("00d630a129e4487cba5427788a1f08ce");
|
|
|
}
|
|
|
}
|
|
|
//账户集合
|