소스 검색

update role

xuzuoyun 3 년 전
부모
커밋
935892df52

+ 10 - 2
jeecg-boot-module-system/src/main/java/cn/com/ctop/kuaishou/modules/report/mapper/xml/EtlKuaishouReportAccountDailyMapper.xml

@@ -511,7 +511,11 @@
         where t1.stat_date >= #{startTime}
         AND t1.stat_date <= #{endTime}
         and
-        t3.responsible_id=#{userId}
+        t3.responsible_id in
+        <foreach item="id" index="index" collection="userIds"
+                 open="(" separator="," close=")">
+            #{id}
+        </foreach>
         GROUP BY t3.id
         HAVING SUM(charge)>0
         <if test="sortCode != '' and sortCode != null ">
@@ -531,7 +535,11 @@
                  where t1.stat_date &gt;= #{startTime}
                    AND t1.stat_date &lt;= #{endTime}
                     and
-                    t3.responsible_id=#{userId}
+                t3.responsible_id in
+                <foreach item="id" index="index" collection="userIds"
+                         open="(" separator="," close=")">
+                    #{id}
+                </foreach>
                  GROUP BY t3.id
                  HAVING SUM(charge) > 0
              ) t

+ 10 - 2
jeecg-boot-module-system/src/main/java/cn/com/ctop/kuaishou/modules/report/mapper/xml/EtlKuaishouReportAccountHourlyMapper.xml

@@ -590,7 +590,11 @@
         where
         stat_date = #{startTime}
         and
-        t3.responsible_id=#{userId}
+        t3.responsible_id in
+        <foreach item="id" index="index" collection="userIds"
+                 open="(" separator="," close=")">
+            #{id}
+        </foreach>
         GROUP BY t3.id
         HAVING SUM(charge)>0
         <if test="sortCode != '' and sortCode != null ">
@@ -610,7 +614,11 @@
         INNER JOIN ctop_project t3 ON t2.project_id = t3.id
         where stat_date = #{startTime}
         and
-        t3.responsible_id=#{userId}
+        t3.responsible_id in
+        <foreach item="id" index="index" collection="userIds"
+                 open="(" separator="," close=")">
+            #{id}
+        </foreach>
         GROUP BY t3.id
         HAVING SUM(charge)>0
         )t

+ 3 - 2
jeecg-boot-module-system/src/main/java/cn/com/ctop/kuaishou/modules/report/service/impl/EtlKuaishouReportAccountHourlyServiceImpl.java

@@ -577,9 +577,10 @@ public class EtlKuaishouReportAccountHourlyServiceImpl extends ServiceImpl<EtlKu
         }
         //参数处理
         configParameter(request);
-        request.put("userId", userId);
+        List<String> userIds = getUserIdList(userId);
+        userIds.add(userId);
         //获取人群集
-        request.put("userIds", getUserIdList(userId));
+        request.put("userIds", userIds);
         List<JSONObject> list = null;
         int total = 0;
         //单日数据