|
@@ -16,7 +16,6 @@ import org.springframework.stereotype.Service;
|
|
import java.math.BigDecimal;
|
|
import java.math.BigDecimal;
|
|
import java.text.ParseException;
|
|
import java.text.ParseException;
|
|
import java.util.ArrayList;
|
|
import java.util.ArrayList;
|
|
-import java.util.Arrays;
|
|
|
|
import java.util.Date;
|
|
import java.util.Date;
|
|
import java.util.List;
|
|
import java.util.List;
|
|
import java.util.Map;
|
|
import java.util.Map;
|
|
@@ -152,7 +151,11 @@ public class ManagerSaleValueServiceImpl extends ServiceImpl<ManagerSaleValueMap
|
|
if (!startTime.equals(statDay)) {
|
|
if (!startTime.equals(statDay)) {
|
|
hour = 23;
|
|
hour = 23;
|
|
}
|
|
}
|
|
- //运营一部:李超及其下级 李超 id:f6a6843879c949618e4a859140c8a127
|
|
|
|
|
|
+ JSONObject oneResult = baseMapper.queryTtTodayCharge2(startTime, endTime, hour, accountIds, companyId, days);
|
|
|
|
+ result.put("oneCharge", oneResult.getBigDecimal("totalCharge"));
|
|
|
|
+ result.put("oneChargeRoi", oneResult.getString("chargeRoi"));
|
|
|
|
+
|
|
|
|
+ /*//运营一部:李超及其下级 李超 id:f6a6843879c949618e4a859140c8a127
|
|
oneAccountIds = baseMapper.querySalesDirectorAccountIds(companyId, mediaId, saleTeaMber, Arrays.asList(lichaoId));
|
|
oneAccountIds = baseMapper.querySalesDirectorAccountIds(companyId, mediaId, saleTeaMber, Arrays.asList(lichaoId));
|
|
JSONObject oneResult = baseMapper.queryTtTodayCharge2(startTime, endTime, hour, oneAccountIds, companyId, days);
|
|
JSONObject oneResult = baseMapper.queryTtTodayCharge2(startTime, endTime, hour, oneAccountIds, companyId, days);
|
|
result.put("oneCharge", oneResult.getBigDecimal("totalCharge"));
|
|
result.put("oneCharge", oneResult.getBigDecimal("totalCharge"));
|
|
@@ -166,7 +169,7 @@ public class ManagerSaleValueServiceImpl extends ServiceImpl<ManagerSaleValueMap
|
|
|
|
|
|
JSONObject twoResult2 = baseMapper.queryTtTodayCharge3(startTime, endTime, mediaId, hour, companyId, days);
|
|
JSONObject twoResult2 = baseMapper.queryTtTodayCharge3(startTime, endTime, mediaId, hour, companyId, days);
|
|
result.put("twoCharge2", twoResult2.getBigDecimal("totalCharge"));
|
|
result.put("twoCharge2", twoResult2.getBigDecimal("totalCharge"));
|
|
- result.put("twoChargeRoi2", twoResult2.getString("chargeRoi"));
|
|
|
|
|
|
+ result.put("twoChargeRoi2", twoResult2.getString("chargeRoi"));*/
|
|
}
|
|
}
|
|
} else if ("2".equals(mediaId)) {
|
|
} else if ("2".equals(mediaId)) {
|
|
result = baseMapper.queryKsTodayCharge(statDay, hour, accountIds, companyId);
|
|
result = baseMapper.queryKsTodayCharge(statDay, hour, accountIds, companyId);
|
|
@@ -185,6 +188,11 @@ public class ManagerSaleValueServiceImpl extends ServiceImpl<ManagerSaleValueMap
|
|
if (!startTime.equals(statDay)) {
|
|
if (!startTime.equals(statDay)) {
|
|
hour = 23;
|
|
hour = 23;
|
|
}
|
|
}
|
|
|
|
+ JSONObject oneResult = baseMapper.queryKsTodayCharge2(startTime, endTime, hour, accountIds, companyId, days);
|
|
|
|
+ result.put("oneCharge", oneResult.getBigDecimal("totalCharge"));
|
|
|
|
+ result.put("oneChargeRoi", oneResult.getString("chargeRoi"));
|
|
|
|
+ /*result.put("oneCharge", oneResult.getBigDecimal("totalCharge"));
|
|
|
|
+ result.put("oneChargeRoi", oneResult.getString("chargeRoi"));
|
|
//运营一部:李超及其下级 李超 id:f6a6843879c949618e4a859140c8a127
|
|
//运营一部:李超及其下级 李超 id:f6a6843879c949618e4a859140c8a127
|
|
oneAccountIds = baseMapper.querySalesDirectorAccountIds(companyId, mediaId, saleTeaMber, Arrays.asList(lichaoId));
|
|
oneAccountIds = baseMapper.querySalesDirectorAccountIds(companyId, mediaId, saleTeaMber, Arrays.asList(lichaoId));
|
|
JSONObject oneResult = baseMapper.queryKsTodayCharge2(startTime, endTime, hour, oneAccountIds, companyId, days);
|
|
JSONObject oneResult = baseMapper.queryKsTodayCharge2(startTime, endTime, hour, oneAccountIds, companyId, days);
|
|
@@ -200,9 +208,7 @@ public class ManagerSaleValueServiceImpl extends ServiceImpl<ManagerSaleValueMap
|
|
|
|
|
|
JSONObject twoResult2 = baseMapper.queryKsTodayCharge3(startTime, endTime, mediaId, hour, companyId, days);
|
|
JSONObject twoResult2 = baseMapper.queryKsTodayCharge3(startTime, endTime, mediaId, hour, companyId, days);
|
|
result.put("twoCharge2", twoResult2.getBigDecimal("totalCharge"));
|
|
result.put("twoCharge2", twoResult2.getBigDecimal("totalCharge"));
|
|
- result.put("twoChargeRoi2", twoResult2.getString("chargeRoi"));
|
|
|
|
-
|
|
|
|
-
|
|
|
|
|
|
+ result.put("twoChargeRoi2", twoResult2.getString("chargeRoi"));*/
|
|
}
|
|
}
|
|
}
|
|
}
|
|
result.put("weeklyGoalValue", baseMapper.getWeekly(userId, companyId, mediaId));
|
|
result.put("weeklyGoalValue", baseMapper.getWeekly(userId, companyId, mediaId));
|