|
@@ -369,12 +369,10 @@ public class MaterialStareServiceImpl implements MaterialStareService {
|
|
|
for (KuaiShouOperateVo operate : listOperate) {
|
|
|
|
|
|
//查询 有效 上新计划 上新组
|
|
|
- JSONObject newEffect = materialStareMapper.getKuaiShouAccountBaseByUserId(operate.getUserId(),startDate,entDate);
|
|
|
- if (!Check.isNull(newEffect)){
|
|
|
- operate.setNewEffectNum(newEffect.getInteger("newEffectNum"));//有效
|
|
|
- operate.setNewCampaignNum(newEffect.getInteger("newCampaignNum"));//计划
|
|
|
- operate.setNewUnitNum(newEffect.getInteger("newUnitNum"));//组
|
|
|
- }
|
|
|
+ JSONObject newEffect = materialStareMapper.getKuaiShouAccountBaseByUserId(operate.getUserId(),null,null,startDate,entDate);
|
|
|
+ operate.setNewEffectNum(Check.isNull(newEffect) ? 0 : newEffect.getInteger("newEffectNum"));//有效
|
|
|
+ operate.setNewCampaignNum(Check.isNull(newEffect) ? 0 : newEffect.getInteger("newCampaignNum"));//计划
|
|
|
+ operate.setNewUnitNum(Check.isNull(newEffect) ? 0 : newEffect.getInteger("newUnitNum"));//组
|
|
|
|
|
|
Set<String> userSet = new HashSet<String>(){{
|
|
|
add(operate.getUserId());
|
|
@@ -415,12 +413,10 @@ public class MaterialStareServiceImpl implements MaterialStareService {
|
|
|
for (KuaiShouOperateVo operate : listOperate) {
|
|
|
|
|
|
//查询 有效 上新计划 上新组
|
|
|
- JSONObject newEffect = materialStareMapper.getKuaiShouAccountBaseByUserId(operate.getUserId(),startDate,entDate);
|
|
|
- if (!Check.isNull(newEffect)){
|
|
|
- operate.setNewEffectNum(newEffect.getInteger("newEffectNum"));//有效
|
|
|
- operate.setNewCampaignNum(newEffect.getInteger("newCampaignNum"));//计划
|
|
|
- operate.setNewUnitNum(newEffect.getInteger("newUnitNum"));//组
|
|
|
- }
|
|
|
+ JSONObject newEffect = materialStareMapper.getKuaiShouAccountBaseByUserId(operate.getUserId(),null,null,startDate,entDate);
|
|
|
+ operate.setNewEffectNum(Check.isNull(newEffect) ? 0 : newEffect.getInteger("newEffectNum"));//有效
|
|
|
+ operate.setNewCampaignNum(Check.isNull(newEffect) ? 0 : newEffect.getInteger("newCampaignNum"));//计划
|
|
|
+ operate.setNewUnitNum(Check.isNull(newEffect) ? 0 : newEffect.getInteger("newUnitNum"));//组
|
|
|
|
|
|
Set<String> userSet = new HashSet<String>(){{
|
|
|
add(operate.getUserId());
|
|
@@ -490,12 +486,10 @@ public class MaterialStareServiceImpl implements MaterialStareService {
|
|
|
for (KuaiShouOperateProjectVo projectInfo : listOperate) {
|
|
|
|
|
|
//查询 有效 上新视频 爆款视频
|
|
|
- JSONObject newEffect = materialStareMapper.getKuaiShouAccountBaseByUserId(projectInfo.getUserId(),startDate,entDate);
|
|
|
- if (!Check.isNull(newEffect)){
|
|
|
- projectInfo.setNewEffectNum(newEffect.getInteger("newEffectNum"));//有效
|
|
|
- projectInfo.setNewVideoNum(newEffect.getInteger("newVideoNum"));//上新
|
|
|
- projectInfo.setNewHotNum(newEffect.getInteger("newHotNum"));//爆款
|
|
|
- }
|
|
|
+ JSONObject newEffect = materialStareMapper.getKuaiShouAccountBaseByUserId(null,projectInfo.getProjectId(),null,startDate,entDate);
|
|
|
+ projectInfo.setNewEffectNum(Check.isNull(newEffect) ? 0 : newEffect.getInteger("newEffectNum"));//有效
|
|
|
+ projectInfo.setNewVideoNum(Check.isNull(newEffect) ? 0 : newEffect.getInteger("newVideoNum"));//上新
|
|
|
+ projectInfo.setNewHotNum(Check.isNull(newEffect) ? 0 : newEffect.getInteger("newHotNum"));//爆款
|
|
|
|
|
|
|
|
|
String projectId = projectInfo.getProjectId();
|
|
@@ -574,13 +568,10 @@ public class MaterialStareServiceImpl implements MaterialStareService {
|
|
|
for (KuaiShouOperateAccountVo accountInfo : listOperate) {
|
|
|
|
|
|
//查询 有效 上新视频 爆款视频
|
|
|
- JSONObject newEffect = materialStareMapper.getKuaiShouAccountBaseByUserId(accountInfo.getUserId(),startDate,entDate);
|
|
|
- if (!Check.isNull(newEffect)){
|
|
|
- accountInfo.setNewEffectNum(newEffect.getInteger("newEffectNum"));//有效
|
|
|
- accountInfo.setNewVideoNum(newEffect.getInteger("newVideoNum"));//上新
|
|
|
- accountInfo.setNewHotNum(newEffect.getInteger("newHotNum"));//爆款
|
|
|
- }
|
|
|
-
|
|
|
+ JSONObject newEffect = materialStareMapper.getKuaiShouAccountBaseByUserId(null,null,String.valueOf(accountInfo.getAccountId()),startDate,entDate);
|
|
|
+ accountInfo.setNewEffectNum(Check.isNull(newEffect) ? 0 : newEffect.getInteger("newEffectNum"));//有效
|
|
|
+ accountInfo.setNewVideoNum(Check.isNull(newEffect) ? 0 : newEffect.getInteger("newVideoNum"));//上新
|
|
|
+ accountInfo.setNewHotNum(Check.isNull(newEffect) ? 0 : newEffect.getInteger("newHotNum"));//爆款
|
|
|
|
|
|
long accountId = accountInfo.getAccountId();
|
|
|
List<KuaiShouOperateAccountVo> accountYearOnYearInfo = materialStareMapper.getKuaiShouOperateAccountInfo(lastTimeStart,lastTimeEnd,projectId,accountId,operatorUserIds);
|