Переглянути джерело

设计绩效-修改爆款

yangzian 2 роки тому
батько
коміт
ed100e687c

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

@@ -60,6 +60,10 @@
             AND plan_id = #{userId}
         </if>
 
+        <if test="roleName == 'all'.toString()">
+            AND (plan_id = #{userId} or clip_id = #{userId} or shot_id = #{userId} or leader_id = #{userId})
+        </if>
+
     </select>
 
 
@@ -265,6 +269,7 @@
                 (v.plan_id = #{userId}
                     OR v.clip_id = #{userId}
                     or v.shot_id =#{userId}
+                    or v.leader_id = #{userId}
                     )
           AND DATE_FORMAT( h.hot_date, '%Y' ) = #{yearTime}
           AND QUARTER( h.hot_date) = #{monthTime}

+ 2 - 0
jeecg-boot-module-system/src/main/java/cn/com/ctop/common/module/achievements/service/impl/DesignerServiceImpl.java

@@ -85,6 +85,8 @@ public class DesignerServiceImpl implements IDesignerService {
             roleName = "shot";
         }else if (roleCode.contains("plan")){
             roleName = "plan";
+        }else {
+            roleName = "all";
         }
 
         //获取季度的开始和截止时间