|
|
@ -16,6 +16,7 @@ import com.yipin.liuwanr.entity.Student; |
|
|
|
import com.yipin.liuwanr.mapper.ExperimentalClassMapper; |
|
|
|
import com.yipin.liuwanr.mapper.ExperimentalClassMapper; |
|
|
|
import com.yipin.liuwanr.mapper.TeacherProjectAndCourseMapper; |
|
|
|
import com.yipin.liuwanr.mapper.TeacherProjectAndCourseMapper; |
|
|
|
import com.yipin.liuwanr.vo.ExperimentalClassVo; |
|
|
|
import com.yipin.liuwanr.vo.ExperimentalClassVo; |
|
|
|
|
|
|
|
import org.springframework.util.StringUtils; |
|
|
|
|
|
|
|
|
|
|
|
@Service |
|
|
|
@Service |
|
|
|
public class ExperimentalClassService { |
|
|
|
public class ExperimentalClassService { |
|
|
@ -97,12 +98,13 @@ public class ExperimentalClassService { |
|
|
|
return resp; |
|
|
|
return resp; |
|
|
|
} |
|
|
|
} |
|
|
|
|
|
|
|
|
|
|
|
public HashMap<String, Object> queryExperimentalClass(Integer schoolId) { |
|
|
|
public HashMap<String, Object> queryExperimentalClass(Integer schoolId,Integer courseId) { |
|
|
|
HashMap<String, Object> resp = new HashMap<String, Object>(); |
|
|
|
HashMap<String, Object> resp = new HashMap<String, Object>(); |
|
|
|
try { |
|
|
|
try { |
|
|
|
resp.put("retvalue", experimentalClassMapper.queryExperimentalClass(schoolId)); |
|
|
|
if(!StringUtils.isEmpty(courseId)){ |
|
|
|
List<ExperimentalClass> a = experimentalClassMapper.queryExperimentalClass(schoolId); |
|
|
|
resp.put("retvalue", experimentalClassMapper.queryExperimentalClass(schoolId,courseId)); |
|
|
|
resp.put("retcode", 200); |
|
|
|
resp.put("retcode", 200); |
|
|
|
|
|
|
|
} |
|
|
|
} catch (RuntimeException e) { |
|
|
|
} catch (RuntimeException e) { |
|
|
|
logger.error(e.getMessage()); |
|
|
|
logger.error(e.getMessage()); |
|
|
|
resp.put("retcode", 500); |
|
|
|
resp.put("retcode", 500); |
|
|
|