浏览代码

设计绩效-修改提成

yangzian 2 年之前
父节点
当前提交
55488e25c4

+ 15 - 6
jeecg-boot-module-system/src/main/java/cn/com/ctop/common/module/achievements/mapper/xml/DesignerMapper.xml

@@ -187,8 +187,11 @@
             (
             d.clip_id = #{userId} OR d.shot_id = #{userId} OR d.plan_id = #{userId}
             )
+
+          AND DATE_FORMAT( stat_date, '%Y' ) = #{yearTime}
+          AND QUARTER( stat_date ) = #{monthTime}
           AND DATE_FORMAT( d.first_cost_day, '%Y' ) = #{yearTime}
-          AND DATE_FORMAT( d.first_cost_day, '%m' ) = #{monthTime}
+          AND QUARTER( d.first_cost_day) = #{monthTime}
         UNION ALL
         SELECT
             QUARTER( d.first_cost_day ) quaterTime,
@@ -202,8 +205,10 @@
             (
             d.clip_id = #{userId} OR d.shot_id = #{userId} OR d.plan_id = #{userId}
             )
+          AND DATE_FORMAT( stat_date, '%Y' ) = #{yearTime}
+          AND QUARTER( stat_date ) = #{monthTime}
           AND DATE_FORMAT( d.first_cost_day, '%Y' ) = #{yearTime}
-          AND DATE_FORMAT( d.first_cost_day, '%m' ) = #{monthTime}
+          AND QUARTER( d.first_cost_day) = #{monthTime}
     </select>
 
    <!-- 管理消耗-->
@@ -213,16 +218,20 @@
                 SELECT SUM(cost) cost,leader_id FROM
                     application.bytedance_material_cost_daily
                 WHERE leader_id = #{userId}
+                  AND DATE_FORMAT( stat_date, '%Y' ) = #{yearTime}
+                  and QUARTER( stat_date ) = #{monthTime}
                   AND DATE_FORMAT( first_cost_day, '%Y' ) = #{yearTime}
-                  AND DATE_FORMAT( first_cost_day, '%m' ) = #{monthTime}
+                  AND QUARTER( first_cost_day ) = #{monthTime}
+
                 UNION
                 SELECT SUM(charge) cost,leader_id FROM
                     application.kuaishou_material_cost_daily
                 WHERE leader_id = #{userId}
-                AND DATE_FORMAT( first_cost_day, '%Y' ) = #{yearTime}
-                AND DATE_FORMAT( first_cost_day, '%m' ) = #{monthTime}
+                  AND DATE_FORMAT( stat_date, '%Y' ) = #{yearTime}
+                  and QUARTER( stat_date ) = #{monthTime}
+                  AND DATE_FORMAT( first_cost_day, '%Y' ) = #{yearTime}
+                  AND QUARTER( first_cost_day ) = #{monthTime}
             )  t
-        GROUP BY leader_id
     </select>