|
@@ -616,6 +616,7 @@ public class MaterialStareServiceImpl implements MaterialStareService {
|
|
|
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);
|
|
|
List<KuaiShouOperateVo> userOperate = materialStareMapper.getBytedanceOperateInfo(lastTimeStart, lastTimeEnd, ids);
|
|
@@ -1751,6 +1752,11 @@ public class MaterialStareServiceImpl implements MaterialStareService {
|
|
|
}
|
|
|
|
|
|
if (mediaType.equals("1")) {
|
|
|
+ JSONObject newEffect = materialStareMapper.getBytedanceAccountBaseByUserId(operatorUserIds, null, null, startDate, entDate);
|
|
|
+ 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 {
|
|
|
//查询 历史上新组
|
|
|
JSONObject newEffect = materialStareMapper.getKuaiShouAccountBaseByUserId(operatorUserIds, null, null, startDate, entDate);
|