update

mec-biz/src/main/java/com/ym/mec/biz/dal/dto/ExportDto.java

@@ -8,6 +8,9 @@ import java.util.Map;
 
 public class ExportDto {
 
+    public ExportDto() {
+    }
+
     public ExportDto(ExportEnum exportEnum) {
         this.exportEnum = exportEnum;
     }

mec-biz/src/main/java/com/ym/mec/biz/dal/page/TeacherQueryInfo.java

@@ -27,6 +27,17 @@ public class TeacherQueryInfo extends QueryInfo {
     @ApiModelProperty(value = "是否结算课酬")
     private Boolean isSettlementSalary;
 
+    @ApiModelProperty(value = "是否离职")
+    private Boolean demissionFlag;
+
+    public Boolean getDemissionFlag() {
+        return demissionFlag;
+    }
+
+    public void setDemissionFlag(Boolean demissionFlag) {
+        this.demissionFlag = demissionFlag;
+    }
+
     public Boolean getIsSettlementSalary() {
         return isSettlementSalary;
     }

mec-biz/src/main/java/com/ym/mec/biz/service/impl/TeacherServiceImpl.java

@@ -603,27 +603,27 @@ public class TeacherServiceImpl extends BaseServiceImpl<Integer, Teacher> implem
         PageInfo<Teacher> pageInfo = queryPage(queryInfo);
         List<Teacher> rows = pageInfo.getRows();
         if (rows != null && rows.size() > 0) {
-            Set<Integer> teachers = rows.stream().map(e -> e.getId()).collect(Collectors.toSet());
-            String teacherIds = StringUtils.join(teachers, ",");
-            //获取小课数量
-            Map<Integer, Integer> vipNumMap = JSONObject.parseObject(JSONObject.toJSONString(MapUtil.convertIntegerMap(classGroupDao.countTeacherVipNum(teacherIds))), HashMap.class);
-            //获取试听课数量
-            Map<Integer, Integer> demoNumMap = JSONObject.parseObject(JSONObject.toJSONString(MapUtil.convertIntegerMap(demoGroupDao.countTeacherDemoGroupNum(teacherIds))), HashMap.class);
-
-            Set<Integer> organIds = rows.stream().map(e -> e.getTeacherOrganId()).collect(Collectors.toSet());
-            Map<Integer, String> organNames = MapUtil.convertMybatisMap(organizationDao.findOrganNameMapList(organIds));
-
-
-            for (Teacher e : rows) {
-                e.setSubjectName(subjectDao.findBySubIds(e.getSubjectId()));
-                e.setOrganName(organNames.get(e.getTeacherOrganId()));
-                if (StringUtils.isNotEmpty(e.getSplitSubjectName())) {
-                    e.setSubjectName(Arrays.asList(e.getSplitSubjectName().split(",")));
+            if(rows.size() < 30){
+                Set<Integer> teachers = rows.stream().map(e -> e.getId()).collect(Collectors.toSet());
+                String teacherIds = StringUtils.join(teachers, ",");
+                //获取小课数量
+                Map<Integer, Integer> vipNumMap = JSONObject.parseObject(JSONObject.toJSONString(MapUtil.convertIntegerMap(classGroupDao.countTeacherVipNum(teacherIds))), HashMap.class);
+                //获取试听课数量
+                Map<Integer, Integer> demoNumMap = JSONObject.parseObject(JSONObject.toJSONString(MapUtil.convertIntegerMap(demoGroupDao.countTeacherDemoGroupNum(teacherIds))), HashMap.class);
+
+                Set<Integer> organIds = rows.stream().map(e -> e.getTeacherOrganId()).collect(Collectors.toSet());
+                Map<Integer, String> organNames = MapUtil.convertMybatisMap(organizationDao.findOrganNameMapList(organIds));
+                for (Teacher e : rows) {
+                    e.setSubjectName(subjectDao.findBySubIds(e.getSubjectId()));
+                    e.setOrganName(organNames.get(e.getTeacherOrganId()));
+                    if (StringUtils.isNotEmpty(e.getSplitSubjectName())) {
+                        e.setSubjectName(Arrays.asList(e.getSplitSubjectName().split(",")));
+                    }
+                    Integer num = vipNumMap.get(e.getId());
+                    e.setVipNum(num == null ? 0 : num);
+                    Integer demoNum = demoNumMap.get(e.getId());
+                    e.setDemoNum(demoNum == null ? 0 : demoNum);
                 }
-                Integer num = vipNumMap.get(e.getId());
-                e.setVipNum(num == null ? 0 : num);
-                Integer demoNum = demoNumMap.get(e.getId());
-                e.setDemoNum(demoNum == null ? 0 : demoNum);
             }
         }
         return pageInfo;

mec-biz/src/main/resources/config/mybatis/TeacherMapper.xml

@@ -414,6 +414,12 @@
             <if test="lockFlag != null">
                 AND su.lock_flag_ = #{lockFlag}
             </if>
+            <if test="demissionFlag != null and demissionFlag == true">
+                AND t.demission_date_ is not null
+            </if>
+            <if test="demissionFlag != null and demissionFlag == false">
+                AND t.demission_date_ is null
+            </if>
             <if test="teacherId != null">
                 AND t.id_ IN
                 <foreach collection="teacherId" separator="," open="(" close=")" item="item">
@@ -909,7 +915,7 @@
     <select id="findByFlowOrganRangeTeachers" resultMap="TeacherBasicDto">
         SELECT su.id_,su.username_,su.real_name_,t.organ_id_ FROM teacher t
         LEFT JOIN sys_user su ON t.id_ = su.id_
-        WHERE su.del_flag_ = 0 AND su.lock_flag_=0
+        WHERE su.del_flag_ = 0 AND su.lock_flag_ = 0 AND t.demission_date_ is null
             AND (INTE_ARRAY(#{organId},t.flow_organ_range_) OR FIND_IN_SET(t.organ_id_,#{organId}))
     </select>