Sfoglia il codice sorgente

Merge remote-tracking branch 'origin/test' into test

syh 5 anni fa
parent
commit
08f720df42

+ 12 - 12
jeecg-boot-module-system/src/main/java/org/jeecg/modules/system/service/impl/PerformanceServiceImpl2.java

@@ -1628,10 +1628,10 @@ public class PerformanceServiceImpl2 extends ServiceImpl<PerformanceMapper, Perf
     public List<UserDto2> kuaishouPerformanceInfoNow() {
         //0 获取当前季度的时间
         Map<String, Integer> dateMap = DateUtils.getYearQuarter(new Date());
-        //Integer year = dateMap.get("year");
-        //Integer quarter = dateMap.get("quarter");
-        int year = 2019;
-        int quarter = 4;
+        Integer year = dateMap.get("year");
+        Integer quarter = dateMap.get("quarter");
+        //int year = 2019;
+        //int quarter = 4;
         Map<String, String> timeMap = DateUtils.quarterStartEndDate(year, quarter);
         String startTime = timeMap.get("startDate");
         String endTime = timeMap.get("endDate");
@@ -1670,10 +1670,10 @@ public class PerformanceServiceImpl2 extends ServiceImpl<PerformanceMapper, Perf
     public List<UserDto2> kuaishouYouhuaPerformanceInfoNow() {
         //0 获取当前季度的时间
         Map<String, Integer> dateMap = DateUtils.getYearQuarter(new Date());
-        //Integer year = dateMap.get("year");
-        //Integer quarter = dateMap.get("quarter");
-        int year = 2019;
-        int quarter = 4;
+        Integer year = dateMap.get("year");
+        Integer quarter = dateMap.get("quarter");
+        //int year = 2019;
+        //int quarter = 4;
         Map<String, String> timeMap = DateUtils.quarterStartEndDate(year, quarter);
         String startTime = timeMap.get("startDate");
         String endTime = timeMap.get("endDate");
@@ -1698,10 +1698,10 @@ public class PerformanceServiceImpl2 extends ServiceImpl<PerformanceMapper, Perf
     public List<UserDto2> toutiaoYouhuaPerformanceInfoNow() {
         //0 获取当前季度的时间
         Map<String, Integer> dateMap = DateUtils.getYearQuarter(new Date());
-        //Integer year = dateMap.get("year");
-        //Integer quarter = dateMap.get("quarter");
-        int year = 2019;
-        int quarter = 4;
+        Integer year = dateMap.get("year");
+        Integer quarter = dateMap.get("quarter");
+        //int year = 2019;
+        //int quarter = 4;
         Map<String, String> timeMap = DateUtils.quarterStartEndDate(year, quarter);
         String startTime = timeMap.get("startDate");
         String endTime = timeMap.get("endDate");

+ 5 - 5
performance-appraisal/src/main/java/cn/com/ctop/userefficientvideomap/mapper/xml/UserEfficientVideoMapMapper.xml

@@ -509,7 +509,7 @@
         where c.signature is not null and d.id is not null
         and DATE_FORMAT(d.create_time,'%Y-%m-%d') &gt;= #{startDate}
         and DATE_FORMAT(d.create_time,'%Y-%m-%d') &lt;= #{endDate}
-        where e.plan_id = #{userId}
+        and e.plan_id = #{userId}
     </select>
 
     <!-- 头条根据clip_id获取视频总消耗 -->
@@ -524,7 +524,7 @@
         where c.signature is not null and d.id is not null
         and DATE_FORMAT(d.create_time,'%Y-%m-%d') &gt;= #{startDate}
         and DATE_FORMAT(d.create_time,'%Y-%m-%d') &lt;= #{endDate}
-        where e.clip_id = #{userId}
+        and e.clip_id = #{userId}
     </select>
 
     <!-- 头条根据shot_id获取视频总消耗 -->
@@ -539,7 +539,7 @@
         where c.signature is not null and d.id is not null
         and DATE_FORMAT(d.create_time,'%Y-%m-%d') &gt;= #{startDate}
         and DATE_FORMAT(d.create_time,'%Y-%m-%d') &lt;= #{endDate}
-        where e.shot_id = #{userId}
+        and e.shot_id = #{userId}
     </select>
 
     <!-- 根据year、quarter、user_id获取季度总绩效 -->
@@ -756,7 +756,7 @@
         left join sys_user u on ud.user_id = u.id
         left join sys_user_role ur on u.id = ur.user_id
         left join sys_role r on ur.role_id = r.id
-        WHERE b.parent_id = '0dd29c09d2c94f98ae91902094c6cf68'  <!-- 快手运营部 -->
+        WHERE b.parent_id = '024b0dc0840045afb048022a8c61253f'  <!-- 快手运营部 -->
     </select>
 
     <!-- 获取北京头条运营部所有优化师得信息 -->
@@ -771,7 +771,7 @@
         left join sys_user u on ud.user_id = u.id
         left join sys_user_role ur on u.id = ur.user_id
         left join sys_role r on ur.role_id = r.id
-        WHERE b.parent_id = '989799ba602e40fcb03f522d5284b705'  <!-- 头条运营部 -->
+        WHERE b.parent_id = 'c869de6bedc44a50803e45a4611df05e'  <!-- 头条运营部 -->
     </select>
 
     <!-- 获取快手单个优化师当前账户下的总消耗 -->