优化班级课程

EricsHu

2023-11-23 784d643c8d073dc31652b03b7f1bd82a9d1c627f

优化班级课程

 src/main/java/com/qxueyou/scc/admin/classes/service/impl/ClsClassService.java

@@ -353,11 +353,11 @@
    @Override
    public List<Map<String,Object>> queryAvailableClassIdAndName(String teacherId,String subjectId) {
        StringBuffer hql = new StringBuffer(1000);
        // and c.endTime>=sysdate() 增加条件过滤掉历史班级
        hql.append("select c.classId as classId ,c.name as className from ClsClass c where c.deleteFlag is false and c.orgId=:orgId and c.createId=:createId " );
        // and c.endTime>=sysdate() 增加条件过滤掉历史班级 and c.createId=:createId
        hql.append("select c.classId as classId ,c.name as className from ClsClass c where c.deleteFlag is false and c.orgId=:orgId " );
        Map<String,Object> queryParam = new HashMap<String,Object>();
        queryParam.put("orgId", ClientUtils.getOrgId());
        queryParam.put("createId", ClientUtils.getUserId());
//        queryParam.put("createId", ClientUtils.getUserId());

        if(StringUtils.isNotEmpty(teacherId)||StringUtils.isNotEmpty(subjectId)){
            hql.append(" and exists (select 1 from ClsClassReSubject r ,Subject s where r.subjectId=s.subjectId and  r.classId =c.classId and r.deleteFlag is false ");

 src/main/java/com/qxueyou/scc/controller/SubjectController.java

@@ -93,7 +93,9 @@
    @GetMapping(value = "/list")
    public Result list(String keyword,String status,Integer type, Integer limit, Integer pageNum) {

        String teacherId = ClientUtils.isAdmin() ? null : ClientUtils.getUserId();
//        String teacherId = ClientUtils.isAdmin() ? null : ClientUtils.getUserId();
        //判断是否是教师
        String teacherId = ClientUtils.isAdmin() ? null : teacherService.getTeacherIdByUserId(ClientUtils.getUserId());

        List<Subject> lst = subjectService.list(keyword, teacherId, status, type, limit, pageNum);


 src/main/java/com/qxueyou/scc/teach/subject/service/impl/SubjectService.java

@@ -207,8 +207,8 @@

    @Override
    public List<Subject> list(String text, String teacherId, String status, Integer type, Integer pageSize, Integer pageNum) {

        StringBuffer hql = new StringBuffer("from Subject where name like ? and orgId=? and deleteFlag is false and origSubjectId is null ");
        //and origSubjectId is null
        StringBuffer hql = new StringBuffer("from Subject where name like ? and orgId=? and deleteFlag is false  ");

        List<Object> args = CollectionUtils.newList(text + "%", ClientUtils.getOrgId());

@@ -222,8 +222,12 @@
            args.add(status);
        }

//        if (!StringUtils.isEmpty(teacherId)) {
//            hql.append(" and createId=?");
//            args.add(teacherId);
//        }
        if (!StringUtils.isEmpty(teacherId)) {
            hql.append(" and createId=?");
            hql.append(" and teacherId=?");
            args.add(teacherId);
        }
        hql.append(" order by createTime desc");
@@ -476,17 +480,17 @@
    @Override
    public Result addClsSubject(String classId, String origSubjectId, String teacherId, Integer schoolYear, Integer term) throws IllegalAccessException, InvocationTargetException {
        //新增老师课程
        Subject newSubject = new Subject();
        Subject origSubject = this.read(origSubjectId);
//        Subject newSubject = new Subject();
        Subject newSubject = this.read(origSubjectId);
        UserTeacher teacher = this.read(UserTeacher.class, teacherId);
        BeanUtils.copyProperties(newSubject, origSubject);
//        BeanUtils.copyProperties(newSubject, origSubject);

        TraceUtils.setCreateTrace(newSubject);
        newSubject.setSubjectId(null);
//        newSubject.setSubjectId(null);
        newSubject.setTeacherId(teacherId);
        newSubject.setSchoolYear(schoolYear);
        newSubject.setTerm(term);
        newSubject.setStatus(origSubject.getStatus());
//        newSubject.setStatus(origSubject.getStatus());
        newSubject.setOrigSubjectId(origSubjectId);
        newSubject.setOrigCopySubjectId(origSubjectId);
        newSubject.setType(Subject.TYPE_CLS_SUBJECT);