1、修复17号测试bug

web/src/main/java/com/ibeetl/jlw/dao/TeacherOpenCourseHandsOnSimulationTasksDao.java

@@ -25,6 +25,6 @@ public interface TeacherOpenCourseHandsOnSimulationTasksDao extends BaseMapper<T
     int updateGivenByIds(TeacherOpenCourseHandsOnSimulationTasksQuery teacherOpenCourseHandsOnSimulationTasksQuery);
     List<TeacherOpenCourseHandsOnSimulationTasks> getByIds(String ids);
     List<TeacherOpenCourseHandsOnSimulationTasks> getValuesByQuery(TeacherOpenCourseHandsOnSimulationTasksQuery teacherOpenCourseHandsOnSimulationTasksQuery);
-    List<TeacherOpenCourseHandsOnSimulationTasks> getValuesByQueryNotWithPermission(TeacherOpenCourseHandsOnSimulationTasksQuery teacherOpenCourseHandsOnSimulationTasksQuery);
+    List<TeacherOpenCourseHandsOnSimulationTasks>   getValuesByQueryNotWithPermission(TeacherOpenCourseHandsOnSimulationTasksQuery teacherOpenCourseHandsOnSimulationTasksQuery);
 
 }

web/src/main/java/com/ibeetl/jlw/entity/ResourcesApplication.java

@@ -4,8 +4,10 @@ import cn.hutool.core.util.BooleanUtil;
 import cn.jlw.validate.ValidateConfig;
 import com.ibeetl.admin.core.entity.BaseEntity;
 import org.beetl.sql.annotation.entity.AutoID;
+import org.beetl.sql.annotation.entity.InsertIgnore;
 
 import javax.validation.constraints.NotNull;
+import java.util.Date;
 
 /* 
 * 资源管理 - 应用管理
@@ -82,6 +84,12 @@ public class ResourcesApplication extends BaseEntity{
     //应用详细介绍（原始数据）
 
     private String applicationInfoOriginal ;
+
+    /**
+     * 新增时间
+     */
+    @InsertIgnore
+    private Date addTime;
 	
     public ResourcesApplication(){
     }
@@ -339,4 +347,12 @@ public class ResourcesApplication extends BaseEntity{
     public void setCanUsed(Boolean canUsed) {
         this.set("canUsed", canUsed);
     }
+
+    public Date getAddTime() {
+        return addTime;
+    }
+
+    public void setAddTime(Date addTime) {
+        this.addTime = addTime;
+    }
 }

web/src/main/java/com/ibeetl/jlw/entity/ResourcesCompetition.java

@@ -3,9 +3,11 @@ package com.ibeetl.jlw.entity;
 import cn.jlw.validate.ValidateConfig;
 import com.ibeetl.admin.core.entity.BaseEntity;
 import org.beetl.sql.annotation.entity.AutoID;
+import org.beetl.sql.annotation.entity.InsertIgnore;
 
 import javax.validation.constraints.NotBlank;
 import javax.validation.constraints.NotNull;
+import java.util.Date;
 
 /* 
 * 资源管理 - 竞赛案例管理
@@ -50,6 +52,12 @@ public class ResourcesCompetition extends BaseEntity{
 
     private Integer resourcesCompetitionStatus;
 
+    /**
+     * 新增时间
+     */
+    @InsertIgnore
+    private Date addTime;
+
     public Integer getResourcesCompetitionStatus() {
         return resourcesCompetitionStatus;
     }
@@ -152,6 +160,13 @@ public class ResourcesCompetition extends BaseEntity{
         this.userId = userId;
     }
 
+    public Date getAddTime() {
+        return addTime;
+    }
+
+    public void setAddTime(Date addTime) {
+        this.addTime = addTime;
+    }
 
     public String getResourcesCompetitionContentOriginal() {
         return resourcesCompetitionContentOriginal;

web/src/main/java/com/ibeetl/jlw/entity/ResourcesInfo.java

@@ -6,10 +6,12 @@ import com.ibeetl.admin.core.annotation.DictEnum;
 import com.ibeetl.admin.core.entity.BaseEntity;
 import com.ibeetl.jlw.enums.AddTypeEnum;
 import org.beetl.sql.annotation.entity.AutoID;
+import org.beetl.sql.annotation.entity.InsertIgnore;
 
 import javax.validation.constraints.NotBlank;
 import javax.validation.constraints.NotNull;
 import java.math.BigDecimal;
+import java.util.Date;
 
 /* 
 * 资源管理 - 资源管理
@@ -62,6 +64,10 @@ public class ResourcesInfo extends BaseEntity {
     @DictEnum
 
     private AddTypeEnum addType ;
+
+    //新增时间
+    @InsertIgnore
+    private Date addTime;
     public ResourcesInfo(){
     }
 
@@ -175,4 +181,12 @@ public class ResourcesInfo extends BaseEntity {
     public void setAddType(AddTypeEnum addType) {
         this.addType = addType;
     }
+
+    public Date getAddTime() {
+        return addTime;
+    }
+
+    public void setAddTime(Date addTime) {
+        this.addTime = addTime;
+    }
 }

web/src/main/java/com/ibeetl/jlw/entity/ResourcesQuestion.java

@@ -19,6 +19,7 @@ import javax.validation.constraints.NotNull;
 import java.lang.reflect.Field;
 import java.math.BigDecimal;
 import java.util.ArrayList;
+import java.util.Date;
 import java.util.List;
 import java.util.concurrent.CopyOnWriteArrayList;
 
@@ -99,6 +100,12 @@ public class ResourcesQuestion extends BaseEntity{
     @DictEnum
 
     private AddTypeEnum addType ;
+
+    /**
+     * 新增时间
+     */
+    @InsertIgnore
+    private Date addTime;
 	
     public ResourcesQuestion(){
     }

web/src/main/java/com/ibeetl/jlw/entity/ResourcesTraining.java

@@ -3,9 +3,11 @@ package com.ibeetl.jlw.entity;
 import cn.jlw.validate.ValidateConfig;
 import com.ibeetl.admin.core.entity.BaseEntity;
 import org.beetl.sql.annotation.entity.AutoID;
+import org.beetl.sql.annotation.entity.InsertIgnore;
 
 import javax.validation.constraints.NotBlank;
 import javax.validation.constraints.NotNull;
+import java.util.Date;
 
 /* 
 * 资源管理 - 实训案例管理
@@ -50,6 +52,12 @@ public class ResourcesTraining extends BaseEntity{
 
     private Integer resourcesTrainingStatus;
 
+    /**
+     * 新增时间
+     */
+    @InsertIgnore
+    private Date addTime;
+
     public Integer getResourcesTrainingStatus() {
         return resourcesTrainingStatus;
     }
@@ -152,6 +160,13 @@ public class ResourcesTraining extends BaseEntity{
         this.userId = userId;
     }
 
+    public Date getAddTime() {
+        return addTime;
+    }
+
+    public void setAddTime(Date addTime) {
+        this.addTime = addTime;
+    }
 
     public String getResourcesTrainingContentOriginal() {
         return resourcesTrainingContentOriginal;

web/src/main/java/com/ibeetl/jlw/entity/TeacherOpenCourseStudentSigninSetting.java

@@ -140,6 +140,7 @@ public class TeacherOpenCourseStudentSigninSetting extends BaseEntity{
     @FetchSql("select count(1) from teacher_open_course_merge_student t " +
             "inner join student ta on ta.student_id = t.student_id and ta.student_status = 1 " +
             "where 1 " +
+            "and t.teacher_open_course_school_class_merge_student_status = 1 " +
             "and t.teacher_open_course_id = #teacherOpenCourseId# " +
             "and find_in_set(ta.class_id, #schoolClassIdsRender#) ")
     @UpdateIgnore

web/src/main/java/com/ibeetl/jlw/entity/vo/ResourcesCourseInfoAuthDetailsVO.java

@@ -2,6 +2,7 @@ package com.ibeetl.jlw.entity.vo;
 
 import com.ibeetl.admin.core.entity.BaseEntity;
 import com.ibeetl.jlw.entity.CourseInfo;
+import com.ibeetl.jlw.entity.TeacherOpenCourse;
 import lombok.Data;
 import org.beetl.sql.annotation.entity.Auto;
 import org.beetl.sql.annotation.entity.Table;
@@ -114,6 +115,9 @@ public class ResourcesCourseInfoAuthDetailsVO extends BaseEntity {
             "\t\t\t\t\t\tand t.course_info_type = 1 ")
     private List<CourseInfo> textualResearchCourseList;
 
+
+    private List<TeacherOpenCourse> teacherOpenCourseList;
+
     /**
      * 开课课程、授权课程集合
      */

web/src/main/java/com/ibeetl/jlw/service/ResourcesApplicationService.java

@@ -304,6 +304,11 @@ public class ResourcesApplicationService extends CoreBaseService<ResourcesApplic
         if (orgId != 1) {
             lambdaQuery.andEq(ResourcesApplication::getOrgId, orgId);
         }
+
+        if (stime != null && etime != null) {
+             lambdaQuery.andBetween(ResourcesApplication::getAddTime, stime, etime);
+        }
+
 //        if (stime != null && etime != null) {
 //            return lambdaQuery.andBetween(ResourcesApplication::get, stime, etime).andEq(ResourcesApplication::getTeacherStatus, 1).select();
 //        }

web/src/main/java/com/ibeetl/jlw/service/StatisticalAnalysisService.java

@@ -3,15 +3,23 @@ package com.ibeetl.jlw.service;
 import cn.hutool.core.collection.CollUtil;
 import cn.hutool.core.collection.CollectionUtil;
 import cn.hutool.core.util.NumberUtil;
+import cn.jlw.Interceptor.ResponseControllerAdvice;
+import com.alibaba.fastjson.JSON;
 import com.ibeetl.admin.core.dao.CoreUserDao;
 import com.ibeetl.admin.core.entity.CoreUser;
+import com.ibeetl.admin.core.util.DateUtil;
 import com.ibeetl.admin.core.util.enums.DelFlagEnum;
+import com.ibeetl.jlw.conf.KeyExpiredListener;
 import com.ibeetl.jlw.dao.*;
 import com.ibeetl.jlw.entity.*;
+import com.ibeetl.jlw.entity.vo.StudentLogAnalysisVO;
+import com.ibeetl.jlw.entity.vo.StudentLoginLogVO;
 import com.ibeetl.jlw.enums.*;
 import com.ibeetl.jlw.web.query.*;
 import org.apache.commons.lang3.StringUtils;
+import org.beetl.sql.core.engine.PageQuery;
 import org.beetl.sql.core.query.LambdaQuery;
+import org.beetl.sql.core.query.Query;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
@@ -20,6 +28,7 @@ import java.util.*;
 import java.util.regex.Pattern;
 import java.util.stream.Collectors;
 
+import static cn.jlw.util.CacheUserUtil.getUniAdmin;
 import static com.ibeetl.jlw.enums.ResourcesQuestionSnapshotFromTypeEnum.EXAM;
 import static com.ibeetl.jlw.enums.ResourcesQuestionSnapshotFromTypeEnum.HOMEWORK_FILE;
 
@@ -102,6 +111,9 @@ public class StatisticalAnalysisService {
     @Autowired
     private StudentHandsOnTaskLogService studentHandsOnTaskLogService;
 
+    @Autowired
+    private CourseInfoDao courseInfoDao;
+
     private static final String PATTERN = "(?<=\"code\":\\[\").*?(?=\"\\],)";
     Pattern r = Pattern.compile(PATTERN);
 
@@ -153,7 +165,7 @@ public class StatisticalAnalysisService {
         teacherOpenCourseMergeResourcesInfoQuery.setEndTime(etime);
 
         List<TeacherOpenCourseMergeResourcesInfo> teacherOpenCourseMergeResourcesInfo = teacherOpenCourseMergeResourcesInfoService.getValuesByQuery(teacherOpenCourseMergeResourcesInfoQuery);
-        List<TeacherOpenCourseMergeResourcesInfo> videoCount = teacherOpenCourseMergeResourcesInfo.stream().filter(v ->Objects.equals(v.getResourcesInfoType(),1)).collect(Collectors.toList());
+        List<TeacherOpenCourseMergeResourcesInfo> videoCount = teacherOpenCourseMergeResourcesInfo.stream().filter(v -> Objects.equals(v.getResourcesInfoType(), 1)).collect(Collectors.toList());
         data.put("teachingVideoNum", videoCount.size());
         //非视频资源
         data.put("nonVideoResourcesNum", teacherOpenCourseMergeResourcesInfo.size() - videoCount.size());
@@ -209,7 +221,7 @@ public class StatisticalAnalysisService {
 
         TeacherOpenCourseQuestionLogQuery teacherOpenCourseQuestionLogQuery = new TeacherOpenCourseQuestionLogQuery();
         teacherOpenCourseQuestionLogQuery.setTeacherOpenCourseQuestionSettingIdPlural(collect1);
-        data.put("chapterPeople",StringUtils.isEmpty(collect1)? 0 : teacherOpenCourseQuestionLogService.getChapterExerciseParticipantsValuesNumber(teacherOpenCourseQuestionLogQuery));
+        data.put("chapterPeople", StringUtils.isEmpty(collect1) ? 0 : teacherOpenCourseQuestionLogService.getChapterExerciseParticipantsValuesNumber(teacherOpenCourseQuestionLogQuery));
 
 //        String stringJoiner = CollectionUtil.join(courseQuestionSettings, ",");
 //        if (CollectionUtil.isNotEmpty(collect1)) {
@@ -232,21 +244,21 @@ public class StatisticalAnalysisService {
         //实操任务总数
         String collect2 = handsOns.stream().distinct().map(i -> i.getHandsOnId().toString()).collect(Collectors.joining(","));
 
-        if (StringUtils.isEmpty(collect2)){
+        if (StringUtils.isEmpty(collect2)) {
-            data.put("handsOnTotal",0 );
+            data.put("handsOnTotal", 0);
-            data.put("handsOnPeople",0 );
+            data.put("handsOnPeople", 0);
-        }else {
+        } else {
             TeacherOpenCourseHandsOnSimulationTasksQuery tasksQuery = new TeacherOpenCourseHandsOnSimulationTasksQuery();
             tasksQuery.setTeacherOpenCourseId(teacherOpenCourseId);
             tasksQuery.setHandsOnIdPlural(collect2);
             List<TeacherOpenCourseHandsOnSimulationTasks> tasksList = teacherOpenCourseHandsOnSimulationTasksService.getValues(tasksQuery);
-            data.put("handsOnTotal",tasksList.size());
+            data.put("handsOnTotal", tasksList.size());
 
             //实操参与人数
             String collect3 = tasksList.stream().map(i -> i.getTaskId().toString()).collect(Collectors.joining(","));
             StudentHandsOnTaskLogQuery studentHandsOnTaskLogQuery = new StudentHandsOnTaskLogQuery();
             studentHandsOnTaskLogQuery.setHandsOnTaskIdPlural(collect3);
-            data.put("handsOnPeople",StringUtils.isEmpty(collect3) ? 0 : studentHandsOnTaskLogService.getPracticalOperationParticipantsNumberValues(studentHandsOnTaskLogQuery));
+            data.put("handsOnPeople", StringUtils.isEmpty(collect3) ? 0 : studentHandsOnTaskLogService.getPracticalOperationParticipantsNumberValues(studentHandsOnTaskLogQuery));
         }
 
 //        List<Long> list = handsOns.stream().map(TeacherOpenCourseHandsOn::getHandsOnId).collect(Collectors.toList());
@@ -386,49 +398,74 @@ public class StatisticalAnalysisService {
     }
 
     public Map<String, Object> adminIndexDetail(Date stime, Date etime, UniversitiesColleges universitiesColleges, CoreUser coreUser) {
+        Date startTime = DateUtil.beginOfDay(new Date());
+        Date endTime = DateUtil.endOfDay(new Date());
+        if (!Objects.isNull(stime)) {
+            startTime = DateUtil.beginOfDay(stime);
+        }
+
+        if (!Objects.isNull(stime)) {
+            endTime = DateUtil.endOfDay(etime);
+        }
+
         Long orgId = coreUser.getOrgId();
         Long universitiesCollegesId = (universitiesColleges == null ? orgId : universitiesColleges.getUniversitiesCollegesId());
         Long uniOrgId = (universitiesColleges == null ? orgId : universitiesColleges.getOrgId());
-        List<Student> studentList = studentService.getStudentByStimeAndEtime(stime, etime, uniOrgId);
+
+        List<Student> studentList = studentService.getStudentByStimeAndEtime(startTime, endTime, uniOrgId);
         Map<String, Object> data = new HashMap<>();
         //注册学生数
         data.put("studentNumber", studentList.size());
         //注册老师数
-        List<Teacher> teachers = teacherService.getTeacherByStimeAndEtime(stime, etime, uniOrgId);
+        List<Teacher> teachers = teacherService.getTeacherByStimeAndEtime(startTime, endTime, uniOrgId);
         data.put("teacherNumber", teachers.size());
-        LambdaQuery<CoreUser> lambdaQuery = coreUserDao.createLambdaQuery();
+//        LambdaQuery<CoreUser> lambdaQuery = coreUserDao.createLambdaQuery();
-        if (uniOrgId != null && uniOrgId != 1) {
+//        if (uniOrgId != null && uniOrgId != 1) {
-            lambdaQuery.andEq(CoreUser::getOrgId, uniOrgId);
+//            lambdaQuery.andEq(CoreUser::getOrgId, uniOrgId);
-        }
+//        }
-        List<CoreUser> select = lambdaQuery.select();
+//        List<CoreUser> select = lambdaQuery.select();
-        List<Long> userIds = select.stream().map(CoreUser::getId).collect(Collectors.toList());
+//        List<Long> userIds = select.stream().map(CoreUser::getId).collect(Collectors.toList());
-        LambdaQuery<SysLog> logDaoLambdaQuery = sysLogDao.createLambdaQuery();
+//        LambdaQuery<SysLog> logDaoLambdaQuery = sysLogDao.createLambdaQuery();
-        if (stime != null && etime != null) {
+//        if (stime != null && etime != null) {
-            logDaoLambdaQuery.andBetween(SysLog::getCreateTime, stime, etime);
+//            logDaoLambdaQuery.andBetween(SysLog::getCreateTime, stime, etime);
-        }
+//        }
-        logDaoLambdaQuery.andIn(SysLog::getUserId, userIds);
+//        logDaoLambdaQuery.andIn(SysLog::getUserId, userIds);
 //        long loginCount = logDaoLambdaQuery.andLike(SysLog::getRequestUrl, "%login%").andLike(SysLog::getResult, "%成功%").count();
 //        long loginDistinctCount = CollectionUtil.emptyIfNull(logDaoLambdaQuery.distinct()
 //                .andLike("request_url", "%login%").andLike("result", "%成功%").select("user_id")).size();
 
-        LambdaQuery<CoreUser> loginDistinctCountQuery = coreUserDao.createLambdaQuery();
+//        LambdaQuery<CoreUser> loginDistinctCountQuery = coreUserDao.createLambdaQuery();
-        if (stime != null) {
+//        if (stime != null) {
-            loginDistinctCountQuery.andGreatEq(CoreUser::getLastLoginTime, stime);
+//            loginDistinctCountQuery.andGreatEq(CoreUser::getLastLoginTime, stime);
-        }
+//        }
-        if (etime != null) {
+//        if (etime != null) {
-            loginDistinctCountQuery.andLess(CoreUser::getLastLoginTime, etime);
+//            loginDistinctCountQuery.andLess(CoreUser::getLastLoginTime, etime);
-        }
+//        }
-        if (uniOrgId != null && uniOrgId != 1) {
+//        if (uniOrgId != null && uniOrgId != 1) {
-            loginDistinctCountQuery.andEq(CoreUser::getOrgId, uniOrgId);
+//            loginDistinctCountQuery.andEq(CoreUser::getOrgId, uniOrgId);
+//        }
+//        loginDistinctCountQuery.andIsNotNull(CoreUser::getLoginCount);
+//        long loginDistinctCount = loginDistinctCountQuery.count();
+
+        StudentLoginLogQuery condition = new StudentLoginLogQuery();
+        condition.setLoginStartTime(startTime);
+        condition.setLoginEndTime(endTime);
+        condition.setLoginPath(ResponseControllerAdvice.LOGIN_URL);
+        condition.setLogoutPath(KeyExpiredListener.TOKEN_EXPIRED_MESSAGE);
+        UniversitiesColleges uniAdmin = getUniAdmin();
+        if (null != uniAdmin) {
+            condition.getPageQuery().setPara("universitiesCollegesId", uniAdmin.getUniversitiesCollegesId());
         }
-        loginDistinctCountQuery.andIsNotNull(CoreUser::getLoginCount);
-        long loginDistinctCount = loginDistinctCountQuery.count();
-
-        // 获取登录次数
-        Long loginCount = coreUserDao.getSumLoginCount(stime, etime, orgId == 1 ? null : orgId);
 
         //登录人数
+        PageQuery<StudentLogAnalysisVO> studentLogAnalysisVOPageQuery = studentService.queryStatisticalStatementNumberPeopleByCondition(condition.getPageQuery());
+        long loginDistinctCount = studentLogAnalysisVOPageQuery.getList().stream().mapToLong(i -> Integer.parseInt(i.getLoginCount())).sum();
         data.put("loginNumber", loginDistinctCount);
+
+        // 获取登录次数
+        PageQuery<StudentLoginLogVO> studentLoginLogVOPageQuery = studentService.queryUserLoginLogByCondition(condition.getPageQuery());
+        Long loginCount = studentLoginLogVOPageQuery.getTotalRow();
+//        Long loginCount = coreUserDao.getSumLoginCount(stime, etime, orgId == 1 ? null : orgId);
         //登录人次
         data.put("studentPersonTime", loginCount);
         //上线课程数
@@ -444,12 +481,13 @@ public class StatisticalAnalysisService {
             resourcesApplicationCount = universitiesCollegesJurisdictionExperimentalSystemDao.createLambdaQuery()
                     .andEq(UniversitiesCollegesJurisdictionExperimentalSystem::getUniversitiesCollegesId, universitiesCollegesId)
                     .andNotEq(UniversitiesCollegesJurisdictionExperimentalSystem::getUseType, 0)
+                    .andBetween(UniversitiesCollegesJurisdictionExperimentalSystem::getAddTime, startTime, endTime)
                     .count();
         }
         // 超管
         else {
             //上线应用数
-            resourcesApplicationCount = resourcesApplicationService.getApplicationByStimeAndEtime(stime, etime, uniOrgId);
+            resourcesApplicationCount = resourcesApplicationService.getApplicationByStimeAndEtime(startTime, endTime, uniOrgId);
         }
         data.put("applicationNumber", resourcesApplicationCount);
 
@@ -462,6 +500,8 @@ public class StatisticalAnalysisService {
         }
         teacherOpenCourseQuestionSettingQuery.setTeacherOpenCourseQuestionSettingPushStatus(GlobalPushStatusEnum.PUSH);
         teacherOpenCourseQuestionSettingQuery.setTeacherOpenCourseQuestionSettingStatus(1);
+        teacherOpenCourseQuestionSettingQuery.setStartTime(startTime);
+        teacherOpenCourseQuestionSettingQuery.setEndTime(endTime);
         List<TeacherOpenCourseQuestionSettingPure> courseQuestionSettings = teacherOpenCourseQuestionSettingDao.getValuesByQueryNotWithPermission2(teacherOpenCourseQuestionSettingQuery);
 
         // 学生做题：读取【文档存档】中所有课程的【章节】、【课程实操】、【作业—题库作业】、【考试】，这几个模块的任务数量
@@ -476,6 +516,8 @@ public class StatisticalAnalysisService {
         //课件学习
         TeacherOpenCourseHandsOnSimulationTasksQuery tasksQuery = new TeacherOpenCourseHandsOnSimulationTasksQuery();
         tasksQuery.setTeacherOpenCourseIdPlural(CollectionUtil.join(collect11, ","));
+        tasksQuery.setStartTime(startTime);
+        tasksQuery.setEndTime(endTime);
         if (orgId != 1) {
             tasksQuery.setOrgId(orgId);
         }
@@ -493,28 +535,38 @@ public class StatisticalAnalysisService {
             lambdaQuery2.andEq(CoreUser::getOrgId, uniOrgId);
         }
         int size = lambdaQuery2.andEq(CoreUser::getDelFlag, DelFlagEnum.NORMAL.getValue())
-                .andNotEq(CoreUser::getId, 1).select().size();
+                .andNotEq(CoreUser::getId, 1)
+                .andBetween(CoreUser::getCreateTime, startTime, endTime)
+                .select().size();
         data.put("userNumber", size);
         //案例数量
         LambdaQuery<HandsOn> lambdaQuery3 = handsOnService.createLambdaQuery();
         if (uniOrgId != null && uniOrgId != 1) {
             lambdaQuery3.andEq(HandsOn::getOrgId, uniOrgId);
         }
-        int values = lambdaQuery3.andEq(HandsOn::getHandsOnStatus, 1).select().size();
+        int values = lambdaQuery3.andEq(HandsOn::getHandsOnStatus, 1)
+                .andBetween(HandsOn::getAddTime, startTime, endTime)
+                .select().size();
         LambdaQuery<ResourcesTraining> lambdaQuery4 = resourcesTrainingService.createLambdaQuery();
         if (uniOrgId != null && uniOrgId != 1) {
             lambdaQuery4.andEq(ResourcesTraining::getOrgId, uniOrgId);
         }
-        int values2 = lambdaQuery4.andEq(ResourcesTraining::getResourcesTrainingStatus, 1).select().size();
+        int values2 = lambdaQuery4.andEq(ResourcesTraining::getResourcesTrainingStatus, 1)
+                .andBetween(ResourcesTraining::getAddTime, startTime, endTime)
+                .select().size();
         LambdaQuery<ResourcesCompetition> lambdaQuery5 = resourcesCompetitionService.createLambdaQuery();
         if (uniOrgId != null && uniOrgId != 1) {
             lambdaQuery5.andEq(ResourcesCompetition::getOrgId, uniOrgId);
         }
-        int values3 = lambdaQuery5.andEq(ResourcesCompetition::getResourcesCompetitionStatus, 1).select().size();
+        int values3 = lambdaQuery5.andEq(ResourcesCompetition::getResourcesCompetitionStatus, 1)
+                .andBetween(ResourcesCompetition::getAddTime, startTime, endTime)
+                .select().size();
         data.put("caseNumber", values + values2 + values3);
         //视频数量
         ResourcesInfoQuery resourcesInfoQuery = new ResourcesInfoQuery();
         resourcesInfoQuery.setResourcesInfoType(1);
+        resourcesInfoQuery.setStartTime(stime);
+        resourcesInfoQuery.setEndTime(etime);
         if (uniOrgId != null && uniOrgId != 1) {
             resourcesInfoQuery.setOrgId(uniOrgId);
         }
@@ -526,6 +578,8 @@ public class StatisticalAnalysisService {
         if (uniOrgId != null && uniOrgId != 1) {
             paras1.setOrgId(uniOrgId);
         }
+        paras1.setStartTime(startTime);
+        paras1.setEndTime(endTime);
         List<ResourcesQuestion> questionList = resourcesQuestionService.getValues(paras1);
         data.put("questionNumber", questionList.size());
         //院校数量
@@ -534,6 +588,8 @@ public class StatisticalAnalysisService {
         if (uniOrgId != null && uniOrgId != 1) {
             paras.setOrgId(uniOrgId);
         }
+        paras.setStartTime(startTime);
+        paras.setEndTime(endTime);
         List<UniversitiesColleges> schoolList = universitiesCollegesService.getValues(paras);
         data.put("schoolNumber", schoolList.size());
         return data;
@@ -544,7 +600,7 @@ public class StatisticalAnalysisService {
         LambdaQuery<UniversitiesColleges> lambdaQuery = universitiesCollegesDao.createLambdaQuery();
         lambdaQuery.andEq(UniversitiesColleges::getUniversitiesCollegesStatus, 1);
         if (stime != null && etime != null) {
-            lambdaQuery.andBetween(UniversitiesColleges::getAddTime, stime, etime);
+            lambdaQuery.andBetween(UniversitiesColleges::getAddTime, DateUtil.beginOfDay(stime), DateUtil.endOfDay(etime));
         }
         List<UniversitiesColleges> universitiesColleges = lambdaQuery.select();
         Map<String, Long> collect = universitiesColleges.stream().collect(Collectors.groupingBy(UniversitiesColleges::getUniversitiesCollegesProvince, Collectors.counting()));

web/src/main/java/com/ibeetl/jlw/service/StudentService.java

@@ -963,6 +963,7 @@ public class StudentService extends CoreBaseService<Student>{
     }
 
     public PageQuery<TeacherOpenCourseMergeTeacher>queryByConditionQuery(PageQuery query){
+
         PageQuery ret =  studentDao.queryByConditionQuery(query);
         queryListAfter(ret.getList());
         return ret;

web/src/main/java/com/ibeetl/jlw/service/TeacherOpenCourseHandsOnSimulationTasksService.java

@@ -458,6 +458,7 @@ public class TeacherOpenCourseHandsOnSimulationTasksService extends CoreBaseServ
             }
         }
         PageQuery pageQuery = studentScoreParam.getPageQuery();
+        pageQuery.setPara("studentStatus",1);
         PageQuery<Student> studentPageQuery = studentService.queryByCondition(pageQuery);
         List<Student> list = studentPageQuery.getList();
 

web/src/main/java/com/ibeetl/jlw/service/UniversitiesCollegesJurisdictionCurriculumResourcesService.java

@@ -20,10 +20,7 @@ import org.springframework.cache.annotation.Cacheable;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
-import java.util.ArrayList;
+import java.util.*;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
 
 import static cn.hutool.core.collection.ListUtil.empty;
 import static cn.hutool.core.util.ObjectUtil.defaultIfNull;
@@ -200,6 +197,12 @@ public class UniversitiesCollegesJurisdictionCurriculumResourcesService extends
             authDetailsVO.setApplicationCourseList(defaultIfNull(stringListMap.get("应用课程类"), empty()));
             authDetailsVO.setTheoryCourseList(defaultIfNull(stringListMap.get("理论课程类"), empty()));
             authDetailsVO.setTextualResearchCourseList(defaultIfNull(stringListMap.get("考证课程类"), empty()));
+
+            List<TeacherOpenCourse> teacherOpenCourseList = sqlManager.lambdaQuery(TeacherOpenCourse.class)
+                    .andEq(TeacherOpenCourse::getTeacherOpenCourseStatus, 1)
+                    .select();
+            authDetailsVO.setTeacherOpenCourseList(teacherOpenCourseList);
+
             return authDetailsVO;
         }
         // 其他身份
@@ -227,6 +230,7 @@ public class UniversitiesCollegesJurisdictionCurriculumResourcesService extends
                 map.put("courseType", 0);
                 theoryCourseList.add(map);
             });
+            authDetailsVO.setTeacherOpenCourseList(teacherOpenCourseList);
             authDetailsVO.setTheoryAddOpenCourseList(theoryCourseList);
             return authDetailsVO;
         }
@@ -273,7 +277,11 @@ public class UniversitiesCollegesJurisdictionCurriculumResourcesService extends
         if (ObjectUtil.equal(courseType, 1) || ObjectUtil.isNull(courseType)) {
 
             List<UniversitiesCollegesJurisdictionCurriculumResources> curriculumResources = sqlManager.lambdaQuery(UniversitiesCollegesJurisdictionCurriculumResources.class)
-                    .andEq(UniversitiesCollegesJurisdictionCurriculumResources::getOrgId, orgId).select();
+                    .andEq(UniversitiesCollegesJurisdictionCurriculumResources::getOrgId, orgId)
+                    .andLessEq(UniversitiesCollegesJurisdictionCurriculumResources::getUseStartTime,new Date())
+                    .andGreatEq(UniversitiesCollegesJurisdictionCurriculumResources::getUseEndTime,new Date())
+                    .andIn(UniversitiesCollegesJurisdictionCurriculumResources::getUseType,Arrays.asList(1,2))
+                    .select();
 
             curriculumResources.forEach(item -> {
                 Map<String, Object> map = new HashMap<>();

web/src/main/java/com/ibeetl/jlw/web/CourseInfoController.java

@@ -17,6 +17,7 @@ import com.ibeetl.jlw.service.CourseLabelService;
 import com.ibeetl.jlw.service.ResourcesApplicationCourseService;
 import com.ibeetl.jlw.web.query.CourseInfoQuery;
 import com.ibeetl.jlw.web.query.CourseInfoUniCollegesQuery;
+import org.apache.commons.lang3.StringUtils;
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
 import org.beetl.sql.core.engine.PageQuery;
@@ -31,6 +32,7 @@ import org.springframework.web.servlet.ModelAndView;
 
 import java.util.Date;
 import java.util.List;
+import java.util.Objects;
 
 /**
  * CourseInfo 接口
@@ -238,6 +240,24 @@ public class CourseInfoController{
 //                return JsonResult.failMessage("请选择课程归属的应用");
 //            }
 //        }
+        if (StringUtils.isEmpty(courseInfoQuery.getCourseInfoName())){
+            return JsonResult.failMessage("请输入课程名称");
+        }
+        if (StringUtils.isEmpty(courseInfoQuery.getCourseInfoThumbnail())){
+            return JsonResult.failMessage("请选择课程缩略图");
+        }
+
+        if (Objects.isNull(courseInfoQuery.getCourseInfoType())){
+            return JsonResult.failMessage("请选择课程类别");
+        }
+
+        if (Objects.isNull(courseInfoQuery.getCourseLabelId())){
+            return JsonResult.failMessage("请选择课程标签");
+        }
+        if (StringUtils.isEmpty(courseInfoQuery.getCourseInfoContent())){
+            return JsonResult.failMessage("请输入课程简介");
+        }
+
         if(null != courseInfoQuery.getCourseInfoParentId()){
             CourseInfo ci = courseInfoService.queryById(courseInfoQuery.getCourseInfoParentId());
             courseInfoQuery.setCourseLabelId(ci.getCourseLabelId());

web/src/main/java/com/ibeetl/jlw/web/StudentController.java

@@ -19,6 +19,7 @@ import com.ibeetl.admin.core.file.FileService;
 import com.ibeetl.admin.core.service.CorePlatformService;
 import com.ibeetl.admin.core.service.CoreUserService;
 import com.ibeetl.admin.core.util.BeanCopyUtil;
+import com.ibeetl.admin.core.util.DateUtil;
 import com.ibeetl.admin.core.util.PlatformException;
 import com.ibeetl.admin.core.util.TimeTool;
 import com.ibeetl.admin.core.web.JsonResult;
@@ -2239,6 +2240,7 @@ public class StudentController extends BaseController{
         if(null == coreUser){
             return JsonResult.failMessage("请登录后再操作");
         }else{
+            condition.setStudentStatus(1);
             PageQuery page = condition.getPageQuery();
             studentService.queryByConditionQuery(page);
             return JsonResult.success(page);
@@ -2324,6 +2326,12 @@ public class StudentController extends BaseController{
         Assert.isFalse(coreUser.isStudent(), "暂无权限访问！");
         condition.setLoginPath(ResponseControllerAdvice.LOGIN_URL);
         condition.setLogoutPath(KeyExpiredListener.TOKEN_EXPIRED_MESSAGE);
+        if (!Objects.isNull(condition.getLoginStartTime())){
+            condition.setLoginStartTime(DateUtil.beginOfDay(condition.getLoginStartTime()));
+        }
+        if (!Objects.isNull(condition.getLoginEndTime())){
+            condition.setLoginEndTime(DateUtil.endOfDay(condition.getLoginEndTime()));
+        }
 //        return JsonResult.success(studentService.queryStudentLoginLogByCondition(condition.getPageQuery()));
         return JsonResult.success(studentService.queryUserLoginLogByCondition(condition.getPageQuery()));
     }
@@ -2343,6 +2351,12 @@ public class StudentController extends BaseController{
         Assert.isFalse(coreUser.isStudent(), "暂无权限访问！");
         condition.setLoginPath(ResponseControllerAdvice.LOGIN_URL);
         condition.setLogoutPath(KeyExpiredListener.TOKEN_EXPIRED_MESSAGE);
+        if (!Objects.isNull(condition.getLoginStartTime())){
+            condition.setLoginStartTime(DateUtil.beginOfDay(condition.getLoginStartTime()));
+        }
+        if (!Objects.isNull(condition.getLoginEndTime())){
+            condition.setLoginEndTime(DateUtil.endOfDay(condition.getLoginEndTime()));
+        }
         condition.setPage(1); condition.setLimit(Integer.MAX_VALUE + 0L);
 //        PageQuery<StudentLoginLogVO> page = studentService.queryStudentLoginLogByCondition(condition.getPageQuery());
         PageQuery<StudentLoginLogVO> page = studentService.queryUserLoginLogByCondition(condition.getPageQuery());
@@ -2409,6 +2423,12 @@ public class StudentController extends BaseController{
         Assert.isFalse(coreUser.isStudent(), "暂无权限访问！");
         condition.setLoginPath(ResponseControllerAdvice.LOGIN_URL);
         condition.setLogoutPath(KeyExpiredListener.TOKEN_EXPIRED_MESSAGE);
+        if (!Objects.isNull(condition.getLoginStartTime())){
+            condition.setLoginStartTime(DateUtil.beginOfDay(condition.getLoginStartTime()));
+        }
+        if (!Objects.isNull(condition.getLoginEndTime())){
+            condition.setLoginEndTime(DateUtil.endOfDay(condition.getLoginEndTime()));
+        }
 //        return JsonResult.success(studentService.queryStudentLogAnalysisByCondition(condition.getPageQuery()));
         return JsonResult.success(studentService.queryStatisticalStatementNumberPeopleByCondition(condition.getPageQuery()));
     }
@@ -2430,6 +2450,12 @@ public class StudentController extends BaseController{
         Assert.isFalse(coreUser.isStudent(), "暂无权限访问！");
         condition.setLoginPath(ResponseControllerAdvice.LOGIN_URL);
         condition.setLogoutPath(KeyExpiredListener.TOKEN_EXPIRED_MESSAGE);
+        if (!Objects.isNull(condition.getLoginStartTime())){
+            condition.setLoginStartTime(DateUtil.beginOfDay(condition.getLoginStartTime()));
+        }
+        if (!Objects.isNull(condition.getLoginEndTime())){
+            condition.setLoginEndTime(DateUtil.endOfDay(condition.getLoginEndTime()));
+        }
         condition.setPage(1); condition.setLimit(Integer.MAX_VALUE + 0L);
 //        PageQuery<StudentLogAnalysisVO> page = studentService.queryStudentLogAnalysisByCondition(condition.getPageQuery());
         PageQuery<StudentLogAnalysisVO> page = studentService.queryStatisticalStatementNumberPeopleByCondition(condition.getPageQuery());

web/src/main/java/com/ibeetl/jlw/web/query/ResourcesInfoQuery.java

@@ -4,8 +4,10 @@ import com.ibeetl.admin.core.annotation.Query;
 import com.ibeetl.admin.core.web.query.PageParam;
 import com.ibeetl.jlw.entity.ResourcesInfo;
 import com.ibeetl.jlw.enums.AddTypeEnum;
+import org.beetl.sql.annotation.entity.InsertIgnore;
 
 import java.math.BigDecimal;
+import java.util.Date;
 
 import static com.ibeetl.admin.core.annotation.Query.TYPE_DICT;
 import static com.ibeetl.admin.core.util.enums.CoreDictType.RESOURCES_INFO_TYPE;
@@ -50,6 +52,15 @@ public class ResourcesInfoQuery extends PageParam {
     private String courseInfoId_2;
     private String courseInfoId_3;
 
+
+    //新增时间
+    @InsertIgnore
+    private Date addTime;
+
+    private Date startTime;
+
+    private Date endTime;
+
     public Long getResourcesInfoId(){
         return  resourcesInfoId;
     }
@@ -196,4 +207,28 @@ public class ResourcesInfoQuery extends PageParam {
     public void setCourseInfoId_3(String courseInfoId_3) {
         this.courseInfoId_3 = courseInfoId_3;
     }
+
+    public Date getAddTime() {
+        return addTime;
+    }
+
+    public void setAddTime(Date addTime) {
+        this.addTime = addTime;
+    }
+
+    public Date getStartTime() {
+        return startTime;
+    }
+
+    public void setStartTime(Date startTime) {
+        this.startTime = startTime;
+    }
+
+    public Date getEndTime() {
+        return endTime;
+    }
+
+    public void setEndTime(Date endTime) {
+        this.endTime = endTime;
+    }
 }

web/src/main/java/com/ibeetl/jlw/web/query/ResourcesQuestionQuery.java

@@ -5,8 +5,10 @@ import com.ibeetl.admin.core.util.enums.CoreDictType;
 import com.ibeetl.admin.core.web.query.PageParam;
 import com.ibeetl.jlw.entity.ResourcesQuestion;
 import com.ibeetl.jlw.enums.AddTypeEnum;
+import org.beetl.sql.annotation.entity.InsertIgnore;
 
 import java.math.BigDecimal;
+import java.util.Date;
 
 import static com.ibeetl.admin.core.annotation.Query.TYPE_DICT;
 
@@ -69,6 +71,16 @@ public class ResourcesQuestionQuery extends PageParam {
     private Long courseInfoId_0;
     private Long courseInfoId_1;
 
+    /**
+     * 新增时间
+     */
+    @InsertIgnore
+    private Date addTime;
+
+    private Date startTime;
+
+    private Date endTime;
+
     public Long getCourseInfoId_0() {
         return courseInfoId_0;
     }
@@ -277,4 +289,28 @@ public class ResourcesQuestionQuery extends PageParam {
     public void setOrgIdPlural(String orgIdPlural) {
         this.orgIdPlural = orgIdPlural;
     }
+
+    public Date getAddTime() {
+        return addTime;
+    }
+
+    public void setAddTime(Date addTime) {
+        this.addTime = addTime;
+    }
+
+    public Date getStartTime() {
+        return startTime;
+    }
+
+    public void setStartTime(Date startTime) {
+        this.startTime = startTime;
+    }
+
+    public Date getEndTime() {
+        return endTime;
+    }
+
+    public void setEndTime(Date endTime) {
+        this.endTime = endTime;
+    }
 }

web/src/main/java/com/ibeetl/jlw/web/query/TeacherOpenCourseHandsOnSimulationTasksQuery.java

@@ -54,6 +54,14 @@ public class TeacherOpenCourseHandsOnSimulationTasksQuery extends PageParam {
     private Long sourceFromId;
 
 
+    /**
+     * 开始时间
+     */
+    private Date startTime;
+    /**
+     * 结束时间
+     */
+    private Date endTime;
     /**
      * 附件列表
      */
@@ -297,4 +305,20 @@ public class TeacherOpenCourseHandsOnSimulationTasksQuery extends PageParam {
     public void setTeacherOpenCourseHandsOnSimulationTasksAssessmentList(List<TeacherOpenCourseHandsOnSimulationTasksAssessmentQuery> teacherOpenCourseHandsOnSimulationTasksAssessmentList) {
         this.teacherOpenCourseHandsOnSimulationTasksAssessmentList = teacherOpenCourseHandsOnSimulationTasksAssessmentList;
     }
+
+    public Date getStartTime() {
+        return startTime;
+    }
+
+    public void setStartTime(Date startTime) {
+        this.startTime = startTime;
+    }
+
+    public Date getEndTime() {
+        return endTime;
+    }
+
+    public void setEndTime(Date endTime) {
+        this.endTime = endTime;
+    }
 }

web/src/main/java/com/ibeetl/jlw/web/query/TeacherOpenCourseQuestionSettingQuery.java

@@ -79,6 +79,15 @@ public class TeacherOpenCourseQuestionSettingQuery extends PageParam {
     @Query(name = "用户ID", display = false)
     private Long userId;
 
+    /**
+     * 开始时间
+     */
+    private Date startTime;
+    /**
+     * 结束时间
+     */
+    private Date endTime;
+
     /**
      * 根据题目类型动态配置题目。
      *

web/src/main/java/com/ibeetl/jlw/web/query/UniversitiesCollegesQuery.java

@@ -46,6 +46,10 @@ public class UniversitiesCollegesQuery extends PageParam {
 
     private String useTypes;// 使用级别(0不使用 1购买 2试用 12购买+使用)
 
+    private Date startTime;
+
+    private Date endTime;
+
     public Long getUniversitiesCollegesId(){
         return  universitiesCollegesId;
     }
@@ -166,4 +170,20 @@ public class UniversitiesCollegesQuery extends PageParam {
     public void setUniversitiesCollegesDefaultAdminUserId(String universitiesCollegesDefaultAdminUserId) {
         this.universitiesCollegesDefaultAdminUserId = universitiesCollegesDefaultAdminUserId;
     }
+
+    public Date getStartTime() {
+        return startTime;
+    }
+
+    public void setStartTime(Date startTime) {
+        this.startTime = startTime;
+    }
+
+    public Date getEndTime() {
+        return endTime;
+    }
+
+    public void setEndTime(Date endTime) {
+        this.endTime = endTime;
+    }
 }

web/src/main/resources/sql/jlw/resourcesInfo.md

@@ -154,6 +154,9 @@ getResourcesInfoValues
       @if(!isEmpty(userId)){
         and t.user_id =#userId#
       @}
+      @if(!isEmpty(startTime) && !isEmpty(endTime)){
+      and t.add_time between #startTime# AND #endTime#
+      @}
 
 getCourseInfoQuestionCountGroup
 ===

web/src/main/resources/sql/jlw/resourcesQuestion.md

@@ -350,6 +350,9 @@ getResourcesQuestionValues
       @if(!isEmpty(questionStatus)){
         and t.question_status =#questionStatus#
       @}
+      @if(!isEmpty(startTime) && !isEmpty(endTime)) {
+      AND t.add_time between #startTime# AND #endTime#
+      @}
 
 
 getValuesToCourseInfo

web/src/main/resources/sql/jlw/schoolClass.md

@@ -28,7 +28,7 @@ queryByCondition
         and t.class_name like #'%'+className+'%'#
       @}
       @if(!isEmpty(classSn)){
-        and t.class_sn =#classSn#
+        and t.class_sn like #'%'+classSn+'%'#
       @}
       @if(!isEmpty(classStatus)){
         and t.class_status =#classStatus#

web/src/main/resources/sql/jlw/student.md

@@ -2065,7 +2065,7 @@ queryStatisticalStatementNumberPeopleByCondition
     AND uc.universities_colleges_id = #universitiesCollegesId#
     @}
     @if(!isEmpty(loginStartTime) && !isEmpty(loginEndTime)) {
-    AND a.create_time between #loginStartTime# AND date_add(#loginEndTime#,interval 1 day)
+    AND a.create_time between #loginStartTime# AND #loginEndTime#
     @}
     GROUP BY `time`,uc.universities_colleges_name,uc.universities_colleges_province,a.user_id
     ORDER BY any_value(a.create_time) DESC

web/src/main/resources/sql/jlw/teacherOpenCourseHandsOnSimulationTasks.md

@@ -489,4 +489,7 @@ getValuesByQueryNotWithPermission
   @if(!isEmpty(addTime)){
   and t.add_time =#addTime#
   @}
+  @if(!isEmpty(startTime) && !isEmpty(endTime)){
+  and t.add_time between #startTime# AND #endTime#
+  @}
 

web/src/main/resources/sql/jlw/teacherOpenCourseQuestionSetting.md

@@ -598,6 +598,9 @@ getValuesByQueryNotWithPermission
   @if(!isEmpty(userIdPlural)){
   and find_in_set(t.user_id,#userIdPlural#)
   @}
+  @if(!isEmpty(startTime) && !isEmpty(endTime)){
+  and t.teacher_open_course_question_setting_add_time between #startTime# AND #endTime#
+  @}
 
 
 getValuesByQueryNotWithPermission2

web/src/main/resources/sql/jlw/universitiesColleges.md

@@ -153,7 +153,9 @@ getUniversitiesCollegesValues
       @if(!isEmpty(userId)){
         and t.user_id =#userId#
       @}
-
+      @if(!isEmpty(startTime) && !isEmpty(endTime)){
+      and t.add_time between #startTime# AND #endTime#
+      @}
 
 getValuesByQuery
 ===

web/src/main/resources/sql/jlw/universityFaculty.md

@@ -18,7 +18,7 @@ queryByCondition
         and find_in_set(t.university_faculty_id,#universityFacultyIdPlural#)
       @}
       @if(!isEmpty(universityFacultyName)){
-        and t.university_faculty_name =#universityFacultyName#
+        and t.university_faculty_name like #'%'+universityFacultyName+'%'#
       @}
       @if(!isEmpty(universityFacultyContact)){
         and t.university_faculty_contact =#universityFacultyContact#
@@ -53,6 +53,7 @@ queryByCondition
       @if(!isEmpty(orgIdPlural)){
         and find_in_set(t.org_id,#orgIdPlural#)
       @}
+    ORDER BY t.university_faculty_add_time DESC
     
     
 queryByConditionQuery
@@ -364,7 +365,7 @@ getAllUniversityFacultyWithColleges
   GROUP_CONCAT( CONCAT_WS( '___ID', ta.university_faculty_name, ta.university_faculty_id ) SEPARATOR '|||' ) AS val
   FROM
   universities_colleges t
-  LEFT JOIN university_faculty ta ON t.universities_colleges_id = ta.universities_colleges_id
+  LEFT JOIN university_faculty ta ON t.universities_colleges_id = ta.universities_colleges_id AND ta.university_faculty_status = 1
   WHERE
   1
   AND t.universities_colleges_status = 1

web/src/main/resources/sql/jlw/universitySystem.md

@@ -19,7 +19,7 @@ queryByCondition
         and find_in_set(t.university_system_id,#universitySystemIdPlural#)
       @}
       @if(!isEmpty(universitySystemName)){
-        and t.university_system_name =#universitySystemName#
+        and t.university_system_name like #'%'+universitySystemName+'%'#
       @}
       @if(!isEmpty(universitySystemContact)){
         and t.university_system_contact =#universitySystemContact#
@@ -54,6 +54,7 @@ queryByCondition
       @if(!isEmpty(orgIdPlural)){
         and find_in_set(t.org_id,#orgIdPlural#)
       @}
+    ORDER BY t.university_system_add_time DESC
     
     
 queryByConditionQuery
@@ -356,7 +357,7 @@ getAllUniversityFacultyWithSystem
   GROUP_CONCAT( CONCAT_WS( '___ID', ta.university_system_name, ta.university_system_id ) SEPARATOR '|||' ) AS val
   FROM
   university_faculty t
-  LEFT JOIN university_system ta ON t.university_faculty_id = ta.university_faculty_id
+  LEFT JOIN university_system ta ON t.university_faculty_id = ta.university_faculty_id AND ta.university_system_status = 1
   WHERE
   1
   AND t.university_faculty_status = 1