Просмотр исходного кода

卡统计限制老师及校区条件

mingfu 1 месяц назад
Родитель
Сommit
4f7025207c

+ 12 - 0
ie-admin/src/main/java/com/ruoyi/web/controller/dz/DzCardsController.java

@@ -331,8 +331,14 @@ public class DzCardsController extends BaseController
     {
         java.util.Map<String, Object> params = new java.util.HashMap<>();
         SysUser sysUser = SecurityUtils.getLoginUser().getUser();
+        Long campusId = null;
+        Long teacherId = null;
         if (UserTypeEnum.isAgent(sysUser.getUserType())) {
             agentId = sysUser.getUserTypeId();
+        } else if (UserTypeEnum.isSchool(sysUser.getUserType())) {
+            campusId = sysUser.getUserTypeId();
+        } else if (UserTypeEnum.isTeacher(sysUser.getUserType())) {
+            teacherId = sysUser.getUserTypeId();
         } else if(!UserTypeEnum.isSys(sysUser.getUserType())) {
             deptId = sysUser.getDeptId();
         }
@@ -342,6 +348,12 @@ public class DzCardsController extends BaseController
         if (agentId != null) {
             params.put("agentId", agentId);
         }
+        if (campusId != null) {
+            params.put("campusId", campusId);
+        }
+        if (teacherId != null) {
+            params.put("teacherId", teacherId);
+        }
         if (openTimeBegin != null && !openTimeBegin.isEmpty()) {
             params.put("openTimeBegin", openTimeBegin);
         }

+ 6 - 0
ie-system/src/main/resources/mapper/dz/DzCardsMapper.xml

@@ -397,6 +397,12 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <if test="agentId != null">
             AND (T0.agent_id = #{agentId} OR T0.leaf_agent_id = #{agentId})
         </if>
+        <if test="campusId != null">
+            AND T0.campus_id = #{campusId}
+        </if>
+        <if test="teacherId != null">
+            AND T0.class_id IN ( SELECT t.class_id FROM dz_teacher_class t WHERE t.teacher_id=#{teacherId} and now() &lt; t.out_date )
+        </if>
         <if test="openTimeBegin != null and openTimeBegin != ''">
             AND date(T0.open_time) &gt;= date(#{openTimeBegin})
         </if>