学生、课程

yn147

2023-11-24 26780c533f2c2af6b9216306f649c1bcede94e4a

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

@@ -2,10 +2,7 @@

import java.lang.reflect.InvocationTargetException;
import java.math.BigDecimal;
import java.util.ArrayList;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
import java.util.*;
import java.util.stream.Collectors;

import com.qxueyou.scc.base.model.UserInfoWrapper;
@@ -107,7 +104,7 @@


    @Override
    public Result add(String subjectName, String coverPageFileId, String contentFileId, int type,String startTime,String endTime) {
    public Result add(String subjectName, String coverPageFileId, String contentFileId, int type, Date startTime, Date endTime) {

        Subject subject = new Subject();
        if (StringUtils.isNotEmpty(coverPageFileId)) {
@@ -496,7 +493,8 @@
//        newSubject.setStatus(origSubject.getStatus());
        newSubject.setOrigSubjectId(origSubjectId);
        newSubject.setOrigCopySubjectId(origSubjectId);
        newSubject.setType(Subject.TYPE_CLS_SUBJECT);
//        newSubject.setType(Subject.TYPE_CLS_SUBJECT);
        newSubject.setType(Subject.TYPE_ORG_SUBJECT);
        newSubject.setTeacherName(teacher.getName());
        newSubject.setOrgId(ClientUtils.getOrgId());
        save(newSubject);
@@ -852,7 +850,9 @@
        } else {
            if (StringUtils.isNotEmpty(teacherId)) {
                result = this.findListWithMapByHql(
                        "select distinct origSubjectId as subjectId ,name as subjectName from Subject where deleteFlag is false and type=" + Subject.TYPE_CLS_SUBJECT + " and teacherId='" + teacherId + "'", null);
//                        "select distinct origSubjectId as subjectId ,name as subjectName from Subject where deleteFlag is false and type=" + Subject.TYPE_CLS_SUBJECT + " and teacherId='" + teacherId + "'", null);
                        "select distinct origSubjectId as subjectId ,name as subjectName from Subject where deleteFlag is false and type=" + Subject.TYPE_ORG_SUBJECT + " and teacherId='" + teacherId + "'", null);

            } else {
                result = this.findListWithMapByHql(
                        "select subjectId as subjectId ,name as subjectName from Subject where deleteFlag is false and type=" + Subject.TYPE_ORG_SUBJECT + " and orgId='" + ClientUtils.getOrgId() + "'", null);