|
@@ -496,7 +496,10 @@ public class MaterialStareServiceImpl implements MaterialStareService {
|
|
|
JSONObject newEffect = materialStareMapper.getBytedanceAccountBaseByUserId(ids, 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") + newUnitNumNow);//组
|
|
|
+ Integer unitNum = Check.isNull(newEffect) ? 0 : newEffect.getInteger("newUnitNum");//组
|
|
|
+ Integer unitNum1 = Check.isNull(newEffect) ? 0 : newEffect.getInteger("newUnitNum2");//组
|
|
|
+ newUnitNumNow = Math.addExact(unitNum,unitNum1);
|
|
|
+ operate.setNewUnitNum(newUnitNumNow);//组
|
|
|
operate.setNewProjectNum(Check.isNull(newEffect) ? 0 : newEffect.getInteger("newCpdProjectNum"));//组
|
|
|
|
|
|
//List<KuaiShouOperateVo> userOperate = materialStareMapper.getKuaiShouOperateInfo(lastTimeStart,lastTimeEnd,userSet);
|
|
@@ -609,7 +612,10 @@ public class MaterialStareServiceImpl implements MaterialStareService {
|
|
|
JSONObject newEffect = materialStareMapper.getBytedanceAccountBaseByUserId(ids, 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") + newUnitNumNow);//组
|
|
|
+ Integer unitNum = Check.isNull(newEffect) ? 0 : newEffect.getInteger("newUnitNum");//组
|
|
|
+ Integer unitNum1 = Check.isNull(newEffect) ? 0 : newEffect.getInteger("newUnitNum2");//组
|
|
|
+ newUnitNumNow = Math.addExact(unitNum,unitNum1);
|
|
|
+ operate.setNewUnitNum(newUnitNumNow);//组
|
|
|
|
|
|
//List<KuaiShouOperateVo> userOperate = materialStareMapper.getKuaiShouOperateInfo(lastTimeStart,lastTimeEnd,userSet);
|
|
|
List<KuaiShouOperateVo> userOperate = materialStareMapper.getBytedanceOperateInfo(lastTimeStart, lastTimeEnd, ids);
|
|
@@ -755,7 +761,10 @@ public class MaterialStareServiceImpl implements MaterialStareService {
|
|
|
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"));//爆款
|
|
|
- projectInfo.setNewUnitNum(Check.isNull(newEffect) ? 0 : newEffect.getInteger("newUnitNum"));//基建数
|
|
|
+ Integer unitNum = Check.isNull(newEffect) ? 0 : newEffect.getInteger("newUnitNum");//组
|
|
|
+ Integer unitNum1 = Check.isNull(newEffect) ? 0 : newEffect.getInteger("newUnitNum2");//组
|
|
|
+ newUnitNumNow = Math.addExact(unitNum,unitNum1);
|
|
|
+ projectInfo.setNewUnitNum(newUnitNumNow);//基建数
|
|
|
projectInfo.setNewProjectNum(Check.isNull(newEffect) ? 0 : newEffect.getInteger("newCpdProjectNum"));//基建数
|
|
|
//projectInfo.setTrustUnitNum(Check.isNull(newEffect) ? 0 : newEffect.getInteger("trustUnitNum"));//智能托管
|
|
|
|
|
@@ -937,7 +946,10 @@ public class MaterialStareServiceImpl implements MaterialStareService {
|
|
|
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"));//爆款
|
|
|
- projectInfo.setNewUnitNum(Check.isNull(newEffect) ? 0 : newEffect.getInteger("newUnitNum"));//基建数
|
|
|
+ Integer unitNum = Check.isNull(newEffect) ? 0 : newEffect.getInteger("newUnitNum");//组
|
|
|
+ Integer unitNum1 = Check.isNull(newEffect) ? 0 : newEffect.getInteger("newUnitNum2");//组
|
|
|
+ newUnitNumNow = Math.addExact(unitNum,unitNum1);
|
|
|
+ projectInfo.setNewUnitNum(newUnitNumNow);//基建数
|
|
|
//projectInfo.setTrustUnitNum(Check.isNull(newEffect) ? 0 : newEffect.getInteger("trustUnitNum"));//智能托管
|
|
|
|
|
|
|
|
@@ -1576,7 +1588,9 @@ public class MaterialStareServiceImpl implements MaterialStareService {
|
|
|
|
|
|
if (mediaType.equals("1")) {
|
|
|
JSONObject newEffect = materialStareMapper.getBytedanceAccountBaseByUserId(operatorUserIds, null, null, startDate, entDate);
|
|
|
- newUnitNumNow = Check.isNull(newEffect) ? 0 : newEffect.getInteger("newUnitNum");//组
|
|
|
+ Integer unitNum = Check.isNull(newEffect) ? 0 : newEffect.getInteger("newUnitNum");//组
|
|
|
+ Integer unitNum1 = Check.isNull(newEffect) ? 0 : newEffect.getInteger("newUnitNum2");//组
|
|
|
+ newUnitNumNow = Math.addExact(unitNum,unitNum1);
|
|
|
groupVo.setNewProjectNum(Check.isNull(newEffect) ? 0 : newEffect.getInteger("newCpdProjectNum"));
|
|
|
} else {
|
|
|
//查询 历史上新组
|
|
@@ -1728,11 +1742,14 @@ public class MaterialStareServiceImpl implements MaterialStareService {
|
|
|
if (mediaType.equals("1")) {
|
|
|
//查询 当天有效 上新计划 上新组
|
|
|
newEffect = materialStareMapper.getBytedanceAccountBaseByUserId(operatorUserIds, null, null, nowDate, nowDate);
|
|
|
+ Integer unitNum = Check.isNull(newEffect) ? 0 : newEffect.getInteger("newUnitNum");//组
|
|
|
+ Integer unitNum1 = Check.isNull(newEffect) ? 0 : newEffect.getInteger("newUnitNum2");//组
|
|
|
+ newUnitNumNow = Math.addExact(unitNum,unitNum1);
|
|
|
} else {
|
|
|
//查询 当天有效 上新计划 上新组
|
|
|
newEffect = materialStareMapper.getKuaiShouAccountNowBaseByUserId(operatorUserIds, null, null, nowDate, nowDate);
|
|
|
+ newUnitNumNow = Check.isNull(newEffect) ? 0 : newEffect.getInteger("newUnitNum");//组
|
|
|
}
|
|
|
- newUnitNumNow = Check.isNull(newEffect) ? 0 : newEffect.getInteger("newUnitNum");//组
|
|
|
}
|
|
|
|
|
|
if (mediaType.equals("1")) {
|