tianzeOrg
/
tianze-pro
8
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

修复

Browse Source
beetlsql3-dev
yaodan 2 years ago
parent 101cd4fc97
commit 021549fa60
9 changed files with 75 additions and 24 deletions
Show Stats Download Patch File Download Diff File

2
web/src/main/java/com/ibeetl/jlw/entity/vo/ResourcesCourseInfoAuthDetailsVO.java
Unescape Escape View File

@ -102,7 +102,7 @@ public class ResourcesCourseInfoAuthDetailsVO extends BaseEntity {
" AND ( now() BETWEEN tb.use_start_time AND tb.use_end_time )\n" +
" AND t.course_info_status = 1\n" +
" AND t.course_info_type = 1\n" +
" AND FIND_IN_SET(td.course_label_type, '理论课程类')")
" AND td.course_label_type='理论课程类'")
private List<CourseInfo> theoryCourseList;
/**
* 考证课程类

13
web/src/main/java/com/ibeetl/jlw/service/HandsOnSimulationTasksService.java
Unescape Escape View File

@ -11,10 +11,14 @@ import com.ibeetl.admin.core.web.JsonResult;
import com.ibeetl.admin.core.web.JsonReturnCode;
import com.ibeetl.jlw.dao.HandsOnSimulationTasksDao;
import com.ibeetl.jlw.dao.ResourcesQuestionDao;
import com.ibeetl.jlw.dao.TeacherOpenCourseMergeResourcesQuestionDao;
import com.ibeetl.jlw.entity.*;
import com.ibeetl.jlw.entity.HandsOnSimulationTasks;
import com.ibeetl.jlw.entity.HandsOnSimulationTasksAssessment;
import com.ibeetl.jlw.entity.HandsOnSimulationTasksFile;
import com.ibeetl.jlw.entity.ResourcesQuestion;
import com.ibeetl.jlw.entity.vo.HandsOnTaskProblemVO;
import com.ibeetl.jlw.web.query.*;
import com.ibeetl.jlw.web.query.HandsOnSimulationTasksAssessmentQuery;
import com.ibeetl.jlw.web.query.HandsOnSimulationTasksFileQuery;
import com.ibeetl.jlw.web.query.HandsOnSimulationTasksQuery;
import org.apache.commons.collections4.CollectionUtils;
import org.apache.commons.lang3.StringUtils;
import org.beetl.sql.core.SqlId;
@ -25,7 +29,6 @@ import org.springframework.transaction.annotation.Transactional;
import java.math.BigDecimal;
import java.util.ArrayList;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
import java.util.stream.Collectors;
@ -140,7 +143,7 @@ public class HandsOnSimulationTasksService extends CoreBaseService<HandsOnSimula
handsOnSimulationTasks.setTaskOrder("1");
}else {
String taskOrder1 = single.getTaskOrder();
if (!NumberUtil.isNumber(taskOrder)) {
if (!NumberUtil.isNumber(taskOrder1)) {
handsOnSimulationTasks.setTaskOrder("2");
}else {
BigDecimal bigDecimal = NumberUtil.toBigDecimal(taskOrder1);

3
web/src/main/java/com/ibeetl/jlw/service/ResourcesQuestionService.java
Unescape Escape View File

@ -657,7 +657,8 @@ public class ResourcesQuestionService extends CoreBaseService<ResourcesQuestion>
}else {
pojo.setAddType(ADMIN_ADD);
}
pojo.setUserId(coreUser.getId());
pojo.setOrgId(coreUser.getOrgId());
insert(pojo);

1
web/src/main/java/com/ibeetl/jlw/service/TeacherOpenCourseMergeCourseInfoService.java
Unescape Escape View File

@ -823,7 +823,6 @@ public class TeacherOpenCourseMergeCourseInfoService extends CoreBaseService<Tea
// 拷贝课程章节。返回的Map是不可修改的。
Map<Long, Long> courseInfoIdPair = copyFromCourseInfo(courseInfoIds, teacherOpenCourseId);
// 开启并行处理
courseInfoIds.stream().parallel().forEach(courseInfoId -> {
// 当前的课程节点信息
// CourseInfo currentCourseInfo = courseInfoService.getById(courseInfoId);

3
web/src/main/java/com/ibeetl/jlw/service/TeacherOpenCourseQuestionLogService.java
Unescape Escape View File

@ -453,7 +453,8 @@ public class TeacherOpenCourseQuestionLogService extends CoreBaseService<Teacher
// 参数获取
QuestionLogAddTypeEnum addType = questionLogAddDTO.getQuestionLogAddType();
Date addTime = questionLogAddDTO.getAddTime(); Long studentId = student.getStudentId();
Date addTime = questionLogAddDTO.getAddTime();
Long studentId = student.getStudentId();
Long questionSettingId = questionLogAddDTO.getQuestionSettingId();
Map<String, String> questionLogMap = questionLogAddDTO.getQuestionLogMap();
// 查询符合条件的日志表

33
web/src/main/java/com/ibeetl/jlw/web/HandsOnController.java
Unescape Escape View File

@ -2,6 +2,7 @@ package com.ibeetl.jlw.web;
import cn.hutool.core.collection.CollectionUtil;
import cn.hutool.core.lang.Assert;
import cn.hutool.core.util.StrUtil;
import cn.hutool.json.JSONUtil;
import cn.jlw.Interceptor.SCoreUser;
import cn.jlw.validate.ValidateConfig;
@ -9,8 +10,10 @@ import com.ibeetl.admin.core.annotation.Function;
import com.ibeetl.admin.core.entity.CoreUser;
import com.ibeetl.admin.core.file.FileService;
import com.ibeetl.admin.core.web.JsonResult;
import com.ibeetl.jlw.entity.CourseInfo;
import com.ibeetl.jlw.entity.HandsOn;
import com.ibeetl.jlw.entity.HandsOnSimulationTasks;
import com.ibeetl.jlw.entity.vo.ResourcesCourseInfoAuthDetailsVO;
import com.ibeetl.jlw.service.HandsOnService;
import com.ibeetl.jlw.service.HandsOnSimulationTasksService;
import com.ibeetl.jlw.service.UniversitiesCollegesJurisdictionCurriculumResourcesService;
@ -30,10 +33,13 @@ import org.springframework.web.bind.annotation.ResponseBody;
import org.springframework.web.bind.annotation.RestController;
import org.springframework.web.servlet.ModelAndView;
import java.util.ArrayList;
import java.util.Date;
import java.util.List;
import java.util.Map;
import java.io.Serializable;
import java.util.*;
import java.util.stream.Collectors;
import static cn.hutool.core.util.ArrayUtil.join;
import static cn.hutool.core.util.ObjectUtil.defaultIfNull;
import static com.ibeetl.admin.core.util.StreamUtils.listJoin;
/**
* HandsOn 课程实操 接口
@ -149,12 +155,21 @@ public class HandsOnController{
@PostMapping(MODEL + "/list.json")
@Function("handsOn.query")
public JsonResult<PageQuery> list(HandsOnQuery condition, @SCoreUser CoreUser coreUser){
if (!coreUser.isAdmin()) {
String courseInfoIds = universitiesCollegesJurisdictionCurriculumResourcesService.getResourcesCourseInfoAuthDetails(coreUser.getOrgId()).getAllAuthCourseInfoIds();
condition.setCourseInfoIds(courseInfoIds);
condition.setOrgId(coreUser.getOrgId());
if (coreUser.isUniAdmin()) {
condition.setOrgIdPlural(join(Arrays.asList(coreUser.getOrgId(), 1L).toArray(), ","));
// 查询已经授权的课程ID。
// 理论课程：授权表universities_colleges_jurisdiction_curriculum_resources，查询理论课程授权给院校的数据
Serializable courseInfoIds = defaultIfNull(condition.getCourseInfoId(), condition.getCourseInfoIds());
ResourcesCourseInfoAuthDetailsVO resourcesCourseInfoAuthDetails =
universitiesCollegesJurisdictionCurriculumResourcesService.getResourcesCourseInfoAuthDetails(coreUser.getOrgId());
Serializable ifNullCourseInfoIds = defaultIfNull(courseInfoIds, listJoin(resourcesCourseInfoAuthDetails.getTheoryCourseList(), CourseInfo::getCourseInfoId));
String ids = Arrays.stream(ifNullCourseInfoIds.toString().split(",")).map(item -> "_" + item + "_").collect(Collectors.joining("|"));
// 如果为空字符串，那么代表这个学校，还没有授权的课程，所以是不会显示任何东西的。
condition.setCourseInfoFullIdStr(StrUtil.blankToDefault(ids, "未授权应用"));
}
if ( condition.getHandsOnStatus() != null && 0 == condition.getHandsOnStatus()) {
condition.setHandsOnStatus(2);
}

11
web/src/main/java/com/ibeetl/jlw/web/TeacherController.java
Unescape Escape View File

@ -1382,7 +1382,8 @@ public class TeacherController extends BaseController {
condition.setTeacherStatus(1);
PageQuery page = condition.getPageQuery();
page.setPageNumber(1); page.setPageSize(Integer.MAX_VALUE);
page.setPageNumber(1);
page.setPageSize(Integer.MAX_VALUE);
PageQuery<Teacher> pageQuery = teacherService.queryByCondition(page);
@ -1393,10 +1394,10 @@ public class TeacherController extends BaseController {
header.put("teacherName", "教师姓名");
header.put("teacherJobNumber", "教师工号");
header.put("universitiesCollegesName", "所属院校");
header.put("universityFacultyIdText", "所属院系");
header.put("universitySystemIdText", "所属专业");
header.put("studentMobile", "电话");
header.put("studentEmail", "邮箱");
//header.put("universityFacultyIdText", "所属院系");
//header.put("universitySystemIdText", "所属专业");
header.put("teacherMobile", "电话");
header.put("teacherEmail", "邮箱");
header.put("addTime", "创建时间");
List<Map<String, Object>> maps = BeanCopyUtil.baseEntity2MapWithParallel(list);

21
web/src/main/java/com/ibeetl/jlw/web/query/HandsOnQuery.java
Unescape Escape View File

@ -40,6 +40,10 @@ public class HandsOnQuery extends PageParam {
private String handsOnIdPlural;
private String orgIdPlural;
private String CourseInfoFullIdStr;
public Long getCourseInfoId_0() {
return courseInfoId_0;
}
@ -178,4 +182,21 @@ public class HandsOnQuery extends PageParam {
public void setHandsOnIdPlural(String handsOnIdPlural) {
this.handsOnIdPlural = handsOnIdPlural;
}
public String getOrgIdPlural() {
return orgIdPlural;
}
public void setOrgIdPlural(String orgIdPlural) {
this.orgIdPlural = orgIdPlural;
}
public String getCourseInfoFullIdStr() {
return CourseInfoFullIdStr;
}
public void setCourseInfoFullIdStr(String courseInfoFullIdStr) {
CourseInfoFullIdStr = courseInfoFullIdStr;
}
}

12
web/src/main/resources/sql/jlw/handsOn.md
Unescape Escape View File

@ -7,6 +7,7 @@ queryByCondition
t.*
@}
from hands_on t
LEFT JOIN course_info a on t.course_info_id = a.course_info_id
where 1=1
@//数据权限，该sql语句功能点,如果不考虑数据权限，可以删除此行
and #function("handsOn.query")#
@ -40,7 +41,16 @@ queryByCondition
@if(!isEmpty(courseInfoId_0)){
and t.course_info_id =#courseInfoId_0#
@}
@if(!isEmpty(orgIdPlural)){
and find_in_set(t.org_id,#orgIdPlural#)
@}
@if(!isEmpty(courseInfoFullIdStr)){
and a.course_info_full_id regexp #courseInfoFullIdStr#
@// 未授权任何应用的话，这里直接返回空数据
@if(courseInfoFullIdStr == '未授权应用'){
and false
@}
@}
queryByConditionQuery

Write Preview
Loading…
Cancel
Save