Browse Source

盯盘运营经理-运营数据详情花费环比-master

yangzian 3 years ago
parent
commit
0593adc630

+ 6 - 16
jeecg-boot-material-view/src/main/java/org/jeecg/ctop/material/service/impl/MaterialStareServiceImpl.java

@@ -503,7 +503,8 @@ public class MaterialStareServiceImpl implements MaterialStareService {
             Set<String> userSet = new HashSet<String>(){{
             Set<String> userSet = new HashSet<String>(){{
                 add(operate.getUserId());
                 add(operate.getUserId());
             }};
             }};
-            List<KuaiShouOperateVo> userOperate = materialStareMapper.getKuaiShouOperateInfo(lastTimeStart,lastTimeEnd,userSet);
+            //List<KuaiShouOperateVo> userOperate = materialStareMapper.getKuaiShouOperateInfo(lastTimeStart,lastTimeEnd,userSet);
+            List<KuaiShouOperateVo> userOperate = materialStareMapper.getKuaiShouOrBytedanceOperateInfo(lastTimeStart,lastTimeEnd,operatorUserIds);
             String rate = "0";
             String rate = "0";
             if (!Check.isNull(userOperate)){
             if (!Check.isNull(userOperate)){
                 //环比
                 //环比
@@ -577,7 +578,8 @@ public class MaterialStareServiceImpl implements MaterialStareService {
             Set<String> userSet = new HashSet<String>(){{
             Set<String> userSet = new HashSet<String>(){{
                 add(operate.getUserId());
                 add(operate.getUserId());
             }};
             }};
-            List<KuaiShouOperateVo> userOperate = materialStareMapper.getKuaiShouOperateInfo(lastTimeStart,lastTimeEnd,userSet);
+            //List<KuaiShouOperateVo> userOperate = materialStareMapper.getKuaiShouOperateInfo(lastTimeStart,lastTimeEnd,userSet);
+            List<KuaiShouOperateVo> userOperate = materialStareMapper.getKuaiShouOrBytedanceOperateInfo(lastTimeStart,lastTimeEnd,operatorUserIds);
             String rate = "0";
             String rate = "0";
             if (!Check.isNull(userOperate)){
             if (!Check.isNull(userOperate)){
                 //环比 = (当前 - 上阶段 ) / 上阶段
                 //环比 = (当前 - 上阶段 ) / 上阶段
@@ -1468,13 +1470,7 @@ public class MaterialStareServiceImpl implements MaterialStareService {
                         listOperate = materialStareMapper.getBytedanceOperateInfo(startDate,entDate,operatorUserIds);
                         listOperate = materialStareMapper.getBytedanceOperateInfo(startDate,entDate,operatorUserIds);
                     }
                     }
                 }else {
                 }else {
-                    if (daysBetween <= 1){
-                        //时报
-                        listOperate= materialStareMapper.getBytedanceOperateInfoHourly(startDate,entDate,operatorUserIds);
-                    }else {
-
-                        listOperate = materialStareMapper.getKuaiShouOperateInfo(startDate,entDate,operatorUserIds);
-                    }
+                    listOperate= materialStareMapper.getKuaiShouOperateInfo(startDate,entDate,operatorUserIds);
                 }
                 }
 
 
 
 
@@ -1630,13 +1626,7 @@ public class MaterialStareServiceImpl implements MaterialStareService {
                         listOperate = materialStareMapper.getBytedanceOperateInfo(startDate,entDate,operatorUserIds);
                         listOperate = materialStareMapper.getBytedanceOperateInfo(startDate,entDate,operatorUserIds);
                     }
                     }
                 }else {
                 }else {
-                    if (daysBetween <= 1){
-                        //时报
-                        listOperate= materialStareMapper.getBytedanceOperateInfoHourly(startDate,entDate,operatorUserIds);
-                    }else {
-
-                        listOperate = materialStareMapper.getKuaiShouOperateInfo(startDate,entDate,operatorUserIds);
-                    }
+                    listOperate= materialStareMapper.getBytedanceOperateInfoHourly(startDate,entDate,operatorUserIds);
                 }
                 }
 
 
                 //总花费
                 //总花费