|
@@ -558,15 +558,16 @@ public class ReportSettlementServiceImpl implements IReportSettlementService {
|
|
ProfitReportBytedanceVo voSource = new ProfitReportBytedanceVo();
|
|
ProfitReportBytedanceVo voSource = new ProfitReportBytedanceVo();
|
|
voSource.setAccountId(map.get("accountId")+"");
|
|
voSource.setAccountId(map.get("accountId")+"");
|
|
|
|
|
|
- //查询销售
|
|
|
|
- Map<String,Object> slaeMap = reportSettlementMapper.getProfitBytedanceSale(map.get("accountId")+"");
|
|
|
|
- voSource.setSaleName(Check.isNull(slaeMap) ? "" : slaeMap.getOrDefault("saleName","")+"");//销售
|
|
|
|
-
|
|
|
|
voSource.setAdvertiserName(!Check.isNull(map.get("advertiserName")) ? map.getOrDefault("advertiserName","")+"" : "" );//广告主名称
|
|
voSource.setAdvertiserName(!Check.isNull(map.get("advertiserName")) ? map.getOrDefault("advertiserName","")+"" : "" );//广告主名称
|
|
//产品名称
|
|
//产品名称
|
|
voSource.setProductName(!Check.isNull(map.get("productName")) ? map.getOrDefault("productName","")+"" : "" );
|
|
voSource.setProductName(!Check.isNull(map.get("productName")) ? map.getOrDefault("productName","")+"" : "" );
|
|
|
|
|
|
- Map<String,Object> operateMap = reportSettlementMapper.getProfitBytedanceOperate(map.get("accountId")+"");
|
|
|
|
|
|
+
|
|
|
|
+ //查询销售
|
|
|
|
+ Map<String,Object> slaeMap = reportSettlementMapper.getProfitReportSale(map.get("accountId")+"");
|
|
|
|
+ voSource.setSaleName(Check.isNull(slaeMap) ? "" : slaeMap.getOrDefault("saleName","")+"");//销售
|
|
|
|
+ //查询运营
|
|
|
|
+ Map<String,Object> operateMap = reportSettlementMapper.getProfitReportOperateAndArea(map.get("accountId")+"");
|
|
if (!Check.isNull(operateMap)){
|
|
if (!Check.isNull(operateMap)){
|
|
voSource.setOperateName(operateMap.getOrDefault("operateName","")+"");//运营
|
|
voSource.setOperateName(operateMap.getOrDefault("operateName","")+"");//运营
|
|
voSource.setOperateArea(operateMap.getOrDefault("operateArea","")+"");//运营所属区域
|
|
voSource.setOperateArea(operateMap.getOrDefault("operateArea","")+"");//运营所属区域
|
|
@@ -724,11 +725,11 @@ public class ReportSettlementServiceImpl implements IReportSettlementService {
|
|
voSource.setKsId(map.getOrDefault("ksId", "") + "");//快手id
|
|
voSource.setKsId(map.getOrDefault("ksId", "") + "");//快手id
|
|
voSource.setAdvertiserName(!Check.isNull(map.get("advertiserName")) ? map.getOrDefault("advertiserName", "") + "" : "");//广告主名称
|
|
voSource.setAdvertiserName(!Check.isNull(map.get("advertiserName")) ? map.getOrDefault("advertiserName", "") + "" : "");//广告主名称
|
|
|
|
|
|
- //查询销售
|
|
|
|
- Map<String, Object> slaeMap = reportSettlementMapper.getProfitBytedanceSale(map.get("accountId") + "");
|
|
|
|
|
|
+ //销售
|
|
|
|
+ Map<String, Object> slaeMap = reportSettlementMapper.getProfitReportSale(map.get("accountId") + "");
|
|
voSource.setSaleName(Check.isNull(slaeMap) ? "" : slaeMap.getOrDefault("saleName", "") + "");//销售
|
|
voSource.setSaleName(Check.isNull(slaeMap) ? "" : slaeMap.getOrDefault("saleName", "") + "");//销售
|
|
-
|
|
|
|
- Map<String, Object> operateMap = reportSettlementMapper.getProfitKuaiShouOperate(map.get("accountId") + "");
|
|
|
|
|
|
+ //运营
|
|
|
|
+ Map<String, Object> operateMap = reportSettlementMapper.getProfitReportOperateAndArea(map.get("accountId") + "");
|
|
if (!Check.isNull(operateMap)) {
|
|
if (!Check.isNull(operateMap)) {
|
|
voSource.setOperateName(operateMap.getOrDefault("operateName", "") + "");//运营
|
|
voSource.setOperateName(operateMap.getOrDefault("operateName", "") + "");//运营
|
|
voSource.setOperateArea(operateMap.getOrDefault("operateArea", "") + "");//运营所属区域
|
|
voSource.setOperateArea(operateMap.getOrDefault("operateArea", "") + "");//运营所属区域
|