From 94b21d51b93b141d3a3e6aedeb921e88f19838d7 Mon Sep 17 00:00:00 2001
From: xuliangtong <1124839262@qq.com>
Date: Fri, 17 Mar 2023 23:27:59 +0800
Subject: [PATCH] 1
---
.../ibeetl/jlw/service/HandsOnService.java | 10 +++++-
.../service/StudentHandsOnTaskPptService.java | 9 ++++-
.../StudentHandsOnTaskReportService.java | 33 +++++++++++++++++--
.../StudentHandsOnTaskStepService.java | 7 +++-
.../StudentHandsOnTaskVideoService.java | 7 +++-
.../com/ibeetl/jlw/web/HandsOnController.java | 22 +++++++++++--
.../web/StudentHandsOnTaskPptController.java | 14 ++++----
.../StudentHandsOnTaskReportController.java | 22 ++++++-------
.../web/StudentHandsOnTaskStepController.java | 16 ++++-----
.../StudentHandsOnTaskVideoController.java | 16 ++++-----
.../ibeetl/jlw/web/query/HandsOnQuery.java | 10 ++++++
.../web/query/StudentHandsOnTaskPptQuery.java | 6 ++--
web/src/main/resources/sql/jlw/handsOn.md | 13 +++++++-
13 files changed, 137 insertions(+), 48 deletions(-)
diff --git a/web/src/main/java/com/ibeetl/jlw/service/HandsOnService.java b/web/src/main/java/com/ibeetl/jlw/service/HandsOnService.java
index 6123d68a..6026876d 100644
--- a/web/src/main/java/com/ibeetl/jlw/service/HandsOnService.java
+++ b/web/src/main/java/com/ibeetl/jlw/service/HandsOnService.java
@@ -1,8 +1,10 @@
package com.ibeetl.jlw.service;
+import cn.hutool.core.collection.CollectionUtil;
import cn.jlw.util.ToolUtils;
import com.alibaba.fastjson.JSON;
import com.alibaba.fastjson.JSONObject;
+import com.ibeetl.admin.core.entity.CoreUser;
import com.ibeetl.admin.core.service.CoreBaseService;
import com.ibeetl.admin.core.util.PlatformException;
import com.ibeetl.admin.core.web.JsonResult;
@@ -57,8 +59,14 @@ public class HandsOnService extends CoreBaseService<HandsOn>{
}
}
- public void deleteHandsOn(String ids){
+ public void deleteHandsOn(String ids, CoreUser coreUser){
try {
+ List<HandsOn> select = handsOnDao.createLambdaQuery().andIn(HandsOn::getHandsOnId, CollectionUtil.toList(ids.split(","))).select();
+ for (HandsOn handsOn : select) {
+ if (!handsOn.getOrgId().equals(coreUser.getOrgId())) {
+ return;
+ }
+ }
handsOnDao.deleteHandsOnByIds(ids);
} catch (Exception e) {
throw new PlatformException("批量删除HandsOn失败", e);
diff --git a/web/src/main/java/com/ibeetl/jlw/service/StudentHandsOnTaskPptService.java b/web/src/main/java/com/ibeetl/jlw/service/StudentHandsOnTaskPptService.java
index 4cb7df63..72bf3652 100644
--- a/web/src/main/java/com/ibeetl/jlw/service/StudentHandsOnTaskPptService.java
+++ b/web/src/main/java/com/ibeetl/jlw/service/StudentHandsOnTaskPptService.java
@@ -122,7 +122,14 @@ public class StudentHandsOnTaskPptService extends CoreBaseService<StudentHandsOn
return jsonResult;
}
- public String edit(StudentHandsOnTaskPptQuery studentHandsOnTaskPptQuery){
+ public String edit(StudentHandsOnTaskPptQuery studentHandsOnTaskPptQuery, CoreUser coreUser){
+ if (!coreUser.isStudent()) {
+ return null;
+ }
+ Student student = studentService.getByUserId(coreUser.getId());
+ studentHandsOnTaskPptQuery.setStudentId(student.getStudentId());
+ studentHandsOnTaskPptQuery.setStudentSn(student.getStudentSn());
+ studentHandsOnTaskPptQuery.setStudentName(student.getStudentName());
String msg = "";
StudentHandsOnTaskPpt studentHandsOnTaskPpt = studentHandsOnTaskPptQuery.pojo();
String pptFile = studentHandsOnTaskPpt.getPptFile();
diff --git a/web/src/main/java/com/ibeetl/jlw/service/StudentHandsOnTaskReportService.java b/web/src/main/java/com/ibeetl/jlw/service/StudentHandsOnTaskReportService.java
index 9ead70df..cf2814a1 100644
--- a/web/src/main/java/com/ibeetl/jlw/service/StudentHandsOnTaskReportService.java
+++ b/web/src/main/java/com/ibeetl/jlw/service/StudentHandsOnTaskReportService.java
@@ -6,12 +6,14 @@ import cn.hutool.core.util.ObjectUtil;
import cn.jlw.util.ToolUtils;
import com.alibaba.fastjson.JSON;
import com.alibaba.fastjson.JSONObject;
+import com.ibeetl.admin.core.entity.CoreUser;
import com.ibeetl.admin.core.service.CoreBaseService;
import com.ibeetl.admin.core.util.PlatformException;
import com.ibeetl.admin.core.web.JsonResult;
import com.ibeetl.admin.core.web.JsonReturnCode;
import com.ibeetl.jlw.dao.StudentHandsOnTaskReportDao;
import com.ibeetl.jlw.dao.TeacherOpenCourseHandsOnSimulationTasksDao;
+import com.ibeetl.jlw.entity.Student;
import com.ibeetl.jlw.entity.StudentHandsOnTaskReport;
import com.ibeetl.jlw.entity.TeacherOpenCourseHandsOnSimulationTasks;
import com.ibeetl.jlw.web.query.StudentHandsOnTaskReportQuery;
@@ -43,6 +45,9 @@ public class StudentHandsOnTaskReportService extends CoreBaseService<StudentHand
@Autowired
private TeacherOpenCourseHandsOnSimulationTasksDao tasksService;
+ @Autowired
+ private StudentService studentService;
+
public PageQuery<StudentHandsOnTaskReport>queryByCondition(PageQuery query){
PageQuery ret = studentHandsOnTaskReportDao.queryByCondition(query);
queryListAfter(ret.getList());
@@ -96,7 +101,13 @@ public class StudentHandsOnTaskReportService extends CoreBaseService<StudentHand
return msg;
}
- public JsonResult add(StudentHandsOnTaskReportQuery studentHandsOnTaskReportQuery){
+ public JsonResult add(StudentHandsOnTaskReportQuery studentHandsOnTaskReportQuery, CoreUser coreUser){
+ if (!coreUser.isStudent()) {
+ return JsonResult.fail("");
+ }
+ Student student = studentService.getByUserId(coreUser.getId());
+ studentHandsOnTaskReportQuery.setStudentId(student.getId());
+
String msg = "";
StudentHandsOnTaskReport studentHandsOnTaskReport = studentHandsOnTaskReportQuery.pojo();
Long handsOnTaskId = studentHandsOnTaskReport.getHandsOnTaskId();
@@ -142,7 +153,15 @@ public class StudentHandsOnTaskReportService extends CoreBaseService<StudentHand
return jsonResult;
}
- public String edit(StudentHandsOnTaskReportQuery studentHandsOnTaskReportQuery){
+ public String edit(StudentHandsOnTaskReportQuery studentHandsOnTaskReportQuery, CoreUser coreUser){
+ if (!coreUser.isStudent()) {
+ return null;
+ }
+ Student student = studentService.getByUserId(coreUser.getId());
+ studentHandsOnTaskReportQuery.setStudentId(student.getStudentId());
+ if (studentHandsOnTaskReportQuery.getHandsOnTaskId() ==null) {
+ return null;
+ }
String msg = "";
StudentHandsOnTaskReport studentHandsOnTaskReport = studentHandsOnTaskReportQuery.pojo();
@@ -186,7 +205,15 @@ public class StudentHandsOnTaskReportService extends CoreBaseService<StudentHand
}
}
- public StudentHandsOnTaskReport getInfo (StudentHandsOnTaskReportQuery studentHandsOnTaskReportQuery){
+ public StudentHandsOnTaskReport getInfo (StudentHandsOnTaskReportQuery studentHandsOnTaskReportQuery, CoreUser coreUser){
+ if (!coreUser.isStudent()) {
+ return null;
+ }
+ if (studentHandsOnTaskReportQuery.getHandsOnTaskId() == null) {
+ return null;
+ }
+ Student student = studentService.getByUserId(coreUser.getId());
+ studentHandsOnTaskReportQuery.setStudentId(student.getStudentId());
List<StudentHandsOnTaskReport> list = studentHandsOnTaskReportDao.getValuesByQuery(studentHandsOnTaskReportQuery);
if(null != list && list.size()>0){
return list.get(0);
diff --git a/web/src/main/java/com/ibeetl/jlw/service/StudentHandsOnTaskStepService.java b/web/src/main/java/com/ibeetl/jlw/service/StudentHandsOnTaskStepService.java
index 74cb7bf5..ea96b6e6 100644
--- a/web/src/main/java/com/ibeetl/jlw/service/StudentHandsOnTaskStepService.java
+++ b/web/src/main/java/com/ibeetl/jlw/service/StudentHandsOnTaskStepService.java
@@ -120,7 +120,12 @@ public class StudentHandsOnTaskStepService extends CoreBaseService<StudentHandsO
return jsonResult;
}
- public String edit(StudentHandsOnTaskStepQuery studentHandsOnTaskStepQuery){
+ public String edit(StudentHandsOnTaskStepQuery studentHandsOnTaskStepQuery, CoreUser coreUser){
+ if (!coreUser.isStudent()) {
+ return null;
+ }
+ Student student = studentService.getByUserId(coreUser.getId());
+ studentHandsOnTaskStepQuery.setStudentId(student.getStudentId());
String msg = "";
StudentHandsOnTaskStep studentHandsOnTaskStep = studentHandsOnTaskStepQuery.pojo();
String stem = studentHandsOnTaskStep.getStem();
diff --git a/web/src/main/java/com/ibeetl/jlw/service/StudentHandsOnTaskVideoService.java b/web/src/main/java/com/ibeetl/jlw/service/StudentHandsOnTaskVideoService.java
index b68e02e8..9741ffc2 100644
--- a/web/src/main/java/com/ibeetl/jlw/service/StudentHandsOnTaskVideoService.java
+++ b/web/src/main/java/com/ibeetl/jlw/service/StudentHandsOnTaskVideoService.java
@@ -130,7 +130,12 @@ public class StudentHandsOnTaskVideoService extends CoreBaseService<StudentHands
return jsonResult;
}
- public String edit(StudentHandsOnTaskVideoQuery studentHandsOnTaskVideoQuery){
+ public String edit(StudentHandsOnTaskVideoQuery studentHandsOnTaskVideoQuery, CoreUser coreUser){
+ if (!coreUser.isStudent()) {
+ return null;
+ }
+ Student student = studentService.getByUserId(coreUser.getId());
+ studentHandsOnTaskVideoQuery.setStudentId(student.getStudentId());
String msg = "";
StudentHandsOnTaskVideo studentHandsOnTaskVideo = studentHandsOnTaskVideoQuery.pojo();
String videoFile = studentHandsOnTaskVideo.getVideoFile();
diff --git a/web/src/main/java/com/ibeetl/jlw/web/HandsOnController.java b/web/src/main/java/com/ibeetl/jlw/web/HandsOnController.java
index eb6164d5..2f26cec1 100644
--- a/web/src/main/java/com/ibeetl/jlw/web/HandsOnController.java
+++ b/web/src/main/java/com/ibeetl/jlw/web/HandsOnController.java
@@ -11,6 +11,7 @@ import com.ibeetl.jlw.entity.HandsOn;
import com.ibeetl.jlw.entity.HandsOnSimulationTasks;
import com.ibeetl.jlw.service.HandsOnService;
import com.ibeetl.jlw.service.HandsOnSimulationTasksService;
+import com.ibeetl.jlw.service.UniversitiesCollegesJurisdictionCurriculumResourcesService;
import com.ibeetl.jlw.web.query.HandsOnQuery;
import com.ibeetl.jlw.web.query.HandsOnSimulationTasksQuery;
import org.apache.commons.collections4.CollectionUtils;
@@ -51,6 +52,9 @@ public class HandsOnController{
@Autowired private HandsOnSimulationTasksService handsOnSimulationTasksService;
+ @Autowired private UniversitiesCollegesJurisdictionCurriculumResourcesService universitiesCollegesJurisdictionCurriculumResourcesService;
+
+
/* 前端接口 */
@PostMapping(API + "/getPageList.do")
@@ -58,6 +62,11 @@ public class HandsOnController{
if(null == coreUser){
return JsonResult.failMessage("请登录后再操作");
}else{
+ if (!coreUser.isAdmin()) {
+ String courseInfoIds = universitiesCollegesJurisdictionCurriculumResourcesService.getResourcesCourseInfoAuthDetails(coreUser.getOrgId()).getAllAuthCourseInfoIds();
+ condition.setCourseInfoIds(courseInfoIds);
+ condition.setOrgId(coreUser.getOrgId());
+ }
PageQuery page = condition.getPageQuery();
handsOnService.queryByConditionQuery(page);
return JsonResult.success(page);
@@ -137,7 +146,14 @@ public class HandsOnController{
@PostMapping(MODEL + "/list.json")
@Function("handsOn.query")
- public JsonResult<PageQuery> list(HandsOnQuery condition){
+ 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());
+ }
+
PageQuery page = condition.getPageQuery();
handsOnService.queryByCondition(page);
return JsonResult.success(page);
@@ -333,8 +349,8 @@ public class HandsOnController{
@PostMapping(MODEL + "/delete.json")
@Function("handsOn.delete")
@ResponseBody
- public JsonResult delete(String ids) {
- handsOnService.deleteHandsOn(ids);
+ public JsonResult delete(String ids, @SCoreUser CoreUser coreUser) {
+ handsOnService.deleteHandsOn(ids, coreUser);
return JsonResult.success();
}
diff --git a/web/src/main/java/com/ibeetl/jlw/web/StudentHandsOnTaskPptController.java b/web/src/main/java/com/ibeetl/jlw/web/StudentHandsOnTaskPptController.java
index 9685a354..8bd8edc4 100644
--- a/web/src/main/java/com/ibeetl/jlw/web/StudentHandsOnTaskPptController.java
+++ b/web/src/main/java/com/ibeetl/jlw/web/StudentHandsOnTaskPptController.java
@@ -182,13 +182,13 @@ public class StudentHandsOnTaskPptController{
@PostMapping(MODEL + "/edit.json")
@Function("studentHandsOnTaskPpt.edit")
- public JsonResult<String> update(@Validated(ValidateConfig.UPDATE.class) StudentHandsOnTaskPptQuery studentHandsOnTaskPptQuery, BindingResult result) {
+ public JsonResult<String> update(@Validated(ValidateConfig.UPDATE.class) StudentHandsOnTaskPptQuery studentHandsOnTaskPptQuery, @SCoreUser CoreUser coreUser, BindingResult result) {
if(result.hasErrors()){
return JsonResult.failMessage(result);
}else {
- studentHandsOnTaskPptQuery.setUserId(null);
- studentHandsOnTaskPptQuery.setOrgId(null);
- String msg = studentHandsOnTaskPptService.edit(studentHandsOnTaskPptQuery);
+ studentHandsOnTaskPptQuery.setUserId(coreUser.getId());
+ studentHandsOnTaskPptQuery.setOrgId(coreUser.getOrgId());
+ String msg = studentHandsOnTaskPptService.edit(studentHandsOnTaskPptQuery, coreUser);
if (StringUtils.isBlank(msg)) {
return JsonResult.success();
} else {
@@ -575,9 +575,9 @@ public class StudentHandsOnTaskPptController{
if(result.hasErrors()){
return JsonResult.failMessage(result);
}else {
- studentHandsOnTaskPptQuery.setUserId(null);
- studentHandsOnTaskPptQuery.setOrgId(null);
- String msg = studentHandsOnTaskPptService.edit(studentHandsOnTaskPptQuery);
+ studentHandsOnTaskPptQuery.setOrgId(coreUser.getOrgId());
+ studentHandsOnTaskPptQuery.setUserId(coreUser.getId());
+ String msg = studentHandsOnTaskPptService.edit(studentHandsOnTaskPptQuery, coreUser);
if (StringUtils.isBlank(msg)) {
return JsonResult.success();
} else {
diff --git a/web/src/main/java/com/ibeetl/jlw/web/StudentHandsOnTaskReportController.java b/web/src/main/java/com/ibeetl/jlw/web/StudentHandsOnTaskReportController.java
index b2e887a0..049c27af 100644
--- a/web/src/main/java/com/ibeetl/jlw/web/StudentHandsOnTaskReportController.java
+++ b/web/src/main/java/com/ibeetl/jlw/web/StudentHandsOnTaskReportController.java
@@ -66,7 +66,7 @@ public class StudentHandsOnTaskReportController{
if(null == coreUser){
return JsonResult.failMessage("请登录后再操作");
}else{
- StudentHandsOnTaskReport studentHandsOnTaskReport = studentHandsOnTaskReportService.getInfo(param);
+ StudentHandsOnTaskReport studentHandsOnTaskReport = studentHandsOnTaskReportService.getInfo(param, coreUser);
return JsonResult.success(studentHandsOnTaskReport);
}
}
@@ -150,19 +150,19 @@ public class StudentHandsOnTaskReportController{
}else{
studentHandsOnTaskReportQuery.setUserId(coreUser.getId());
studentHandsOnTaskReportQuery.setOrgId(coreUser.getOrgId());
- return studentHandsOnTaskReportService.add(studentHandsOnTaskReportQuery);
+ return studentHandsOnTaskReportService.add(studentHandsOnTaskReportQuery, coreUser);
}
}
@PostMapping(MODEL + "/edit.json")
@Function("studentHandsOnTaskReport.edit")
- public JsonResult<String> update(@Validated(ValidateConfig.UPDATE.class) StudentHandsOnTaskReportQuery studentHandsOnTaskReportQuery, BindingResult result) {
+ public JsonResult<String> update(@Validated(ValidateConfig.UPDATE.class) StudentHandsOnTaskReportQuery studentHandsOnTaskReportQuery, @SCoreUser CoreUser coreUser, BindingResult result) {
if(result.hasErrors()){
return JsonResult.failMessage(result);
}else {
- studentHandsOnTaskReportQuery.setUserId(null);
- studentHandsOnTaskReportQuery.setOrgId(null);
- String msg = studentHandsOnTaskReportService.edit(studentHandsOnTaskReportQuery);
+ studentHandsOnTaskReportQuery.setUserId(coreUser.getId());
+ studentHandsOnTaskReportQuery.setOrgId(coreUser.getOrgId());
+ String msg = studentHandsOnTaskReportService.edit(studentHandsOnTaskReportQuery, coreUser);
if (StringUtils.isBlank(msg)) {
return JsonResult.success();
} else {
@@ -202,18 +202,18 @@ public class StudentHandsOnTaskReportController{
}else{
studentHandsOnTaskReportQuery.setUserId(coreUser.getId());
studentHandsOnTaskReportQuery.setOrgId(coreUser.getOrgId());
- return studentHandsOnTaskReportService.add(studentHandsOnTaskReportQuery);
+ return studentHandsOnTaskReportService.add(studentHandsOnTaskReportQuery, coreUser);
}
}
@PostMapping(API + "/edit.do")
- public JsonResult<String> editStudentHandsOnTaskReport(@RequestBody @Validated(ValidateConfig.UPDATE.class) StudentHandsOnTaskReportQuery studentHandsOnTaskReportQuery, BindingResult result) {
+ public JsonResult<String> editStudentHandsOnTaskReport(@RequestBody @Validated(ValidateConfig.UPDATE.class) StudentHandsOnTaskReportQuery studentHandsOnTaskReportQuery,@SCoreUser CoreUser coreUser, BindingResult result) {
if(result.hasErrors()){
return JsonResult.failMessage(result);
}else {
- studentHandsOnTaskReportQuery.setUserId(null);
- studentHandsOnTaskReportQuery.setOrgId(null);
- String msg = studentHandsOnTaskReportService.edit(studentHandsOnTaskReportQuery);
+ studentHandsOnTaskReportQuery.setUserId(coreUser.getId());
+ studentHandsOnTaskReportQuery.setOrgId(coreUser.getOrgId());
+ String msg = studentHandsOnTaskReportService.edit(studentHandsOnTaskReportQuery, coreUser);
if (StringUtils.isBlank(msg)) {
return JsonResult.success();
} else {
diff --git a/web/src/main/java/com/ibeetl/jlw/web/StudentHandsOnTaskStepController.java b/web/src/main/java/com/ibeetl/jlw/web/StudentHandsOnTaskStepController.java
index 7e406441..c8178641 100644
--- a/web/src/main/java/com/ibeetl/jlw/web/StudentHandsOnTaskStepController.java
+++ b/web/src/main/java/com/ibeetl/jlw/web/StudentHandsOnTaskStepController.java
@@ -182,13 +182,13 @@ public class StudentHandsOnTaskStepController{
@PostMapping(MODEL + "/edit.json")
@Function("studentHandsOnTaskStep.edit")
- public JsonResult<String> update(@Validated(ValidateConfig.UPDATE.class) StudentHandsOnTaskStepQuery studentHandsOnTaskStepQuery, BindingResult result) {
+ public JsonResult<String> update(@Validated(ValidateConfig.UPDATE.class) StudentHandsOnTaskStepQuery studentHandsOnTaskStepQuery,@SCoreUser CoreUser coreUser, BindingResult result) {
if(result.hasErrors()){
return JsonResult.failMessage(result);
}else {
- studentHandsOnTaskStepQuery.setUserId(null);
- studentHandsOnTaskStepQuery.setOrgId(null);
- String msg = studentHandsOnTaskStepService.edit(studentHandsOnTaskStepQuery);
+ studentHandsOnTaskStepQuery.setUserId(coreUser.getId());
+ studentHandsOnTaskStepQuery.setOrgId(coreUser.getOrgId());
+ String msg = studentHandsOnTaskStepService.edit(studentHandsOnTaskStepQuery, coreUser);
if (StringUtils.isBlank(msg)) {
return JsonResult.success();
} else {
@@ -586,13 +586,13 @@ public class StudentHandsOnTaskStepController{
}
@PostMapping(API + "/edit.do")
- public JsonResult<String> editDo(@Validated(ValidateConfig.UPDATE.class) StudentHandsOnTaskStepQuery studentHandsOnTaskStepQuery, BindingResult result) {
+ public JsonResult<String> editDo(@Validated(ValidateConfig.UPDATE.class) StudentHandsOnTaskStepQuery studentHandsOnTaskStepQuery,@SCoreUser CoreUser coreUser, BindingResult result) {
if(result.hasErrors()){
return JsonResult.failMessage(result);
}else {
- studentHandsOnTaskStepQuery.setUserId(null);
- studentHandsOnTaskStepQuery.setOrgId(null);
- String msg = studentHandsOnTaskStepService.edit(studentHandsOnTaskStepQuery);
+ studentHandsOnTaskStepQuery.setUserId(coreUser.getId());
+ studentHandsOnTaskStepQuery.setOrgId(coreUser.getOrgId());
+ String msg = studentHandsOnTaskStepService.edit(studentHandsOnTaskStepQuery, coreUser);
if (StringUtils.isBlank(msg)) {
return JsonResult.success();
} else {
diff --git a/web/src/main/java/com/ibeetl/jlw/web/StudentHandsOnTaskVideoController.java b/web/src/main/java/com/ibeetl/jlw/web/StudentHandsOnTaskVideoController.java
index a42e993f..521d00d7 100644
--- a/web/src/main/java/com/ibeetl/jlw/web/StudentHandsOnTaskVideoController.java
+++ b/web/src/main/java/com/ibeetl/jlw/web/StudentHandsOnTaskVideoController.java
@@ -182,13 +182,13 @@ public class StudentHandsOnTaskVideoController{
@PostMapping(MODEL + "/edit.json")
@Function("studentHandsOnTaskVideo.edit")
- public JsonResult<String> update(@Validated(ValidateConfig.UPDATE.class) StudentHandsOnTaskVideoQuery studentHandsOnTaskVideoQuery, BindingResult result) {
+ public JsonResult<String> update(@Validated(ValidateConfig.UPDATE.class) StudentHandsOnTaskVideoQuery studentHandsOnTaskVideoQuery, @SCoreUser CoreUser coreUser, BindingResult result) {
if(result.hasErrors()){
return JsonResult.failMessage(result);
}else {
- studentHandsOnTaskVideoQuery.setUserId(null);
- studentHandsOnTaskVideoQuery.setOrgId(null);
- String msg = studentHandsOnTaskVideoService.edit(studentHandsOnTaskVideoQuery);
+ studentHandsOnTaskVideoQuery.setUserId(coreUser.getId());
+ studentHandsOnTaskVideoQuery.setOrgId(coreUser.getOrgId());
+ String msg = studentHandsOnTaskVideoService.edit(studentHandsOnTaskVideoQuery, coreUser);
if (StringUtils.isBlank(msg)) {
return JsonResult.success();
} else {
@@ -569,13 +569,13 @@ public class StudentHandsOnTaskVideoController{
}
@PostMapping(API + "/editDo")
- public JsonResult<String> editDo(@Validated(ValidateConfig.UPDATE.class) StudentHandsOnTaskVideoQuery studentHandsOnTaskVideoQuery, BindingResult result) {
+ public JsonResult<String> editDo(@Validated(ValidateConfig.UPDATE.class) StudentHandsOnTaskVideoQuery studentHandsOnTaskVideoQuery, @SCoreUser CoreUser coreUser, BindingResult result) {
if(result.hasErrors()){
return JsonResult.failMessage(result);
}else {
- studentHandsOnTaskVideoQuery.setUserId(null);
- studentHandsOnTaskVideoQuery.setOrgId(null);
- String msg = studentHandsOnTaskVideoService.edit(studentHandsOnTaskVideoQuery);
+ studentHandsOnTaskVideoQuery.setUserId(coreUser.getId());
+ studentHandsOnTaskVideoQuery.setOrgId(coreUser.getOrgId());
+ String msg = studentHandsOnTaskVideoService.edit(studentHandsOnTaskVideoQuery, coreUser);
if (StringUtils.isBlank(msg)) {
return JsonResult.success();
} else {
diff --git a/web/src/main/java/com/ibeetl/jlw/web/query/HandsOnQuery.java b/web/src/main/java/com/ibeetl/jlw/web/query/HandsOnQuery.java
index 83c8752c..fb0f7fed 100644
--- a/web/src/main/java/com/ibeetl/jlw/web/query/HandsOnQuery.java
+++ b/web/src/main/java/com/ibeetl/jlw/web/query/HandsOnQuery.java
@@ -38,6 +38,16 @@ public class HandsOnQuery extends PageParam {
@Query(name = "数据集", display = false)
private String trainingData;
+ private String courseInfoIds;
+
+ public String getCourseInfoIds() {
+ return courseInfoIds;
+ }
+
+ public void setCourseInfoIds(String courseInfoIds) {
+ this.courseInfoIds = courseInfoIds;
+ }
+
private Integer handsOnStatus;
public Integer getHandsOnStatus() {
diff --git a/web/src/main/java/com/ibeetl/jlw/web/query/StudentHandsOnTaskPptQuery.java b/web/src/main/java/com/ibeetl/jlw/web/query/StudentHandsOnTaskPptQuery.java
index 2cd0b379..5ab29335 100644
--- a/web/src/main/java/com/ibeetl/jlw/web/query/StudentHandsOnTaskPptQuery.java
+++ b/web/src/main/java/com/ibeetl/jlw/web/query/StudentHandsOnTaskPptQuery.java
@@ -40,14 +40,14 @@ public class StudentHandsOnTaskPptQuery extends PageParam {
@Query(name = "学生ID", display = false)
private Long studentId;
- private Long studentSn;
+ private String studentSn;
private String studentName;
- public Long getStudentSn() {
+ public String getStudentSn() {
return studentSn;
}
- public void setStudentSn(Long studentSn) {
+ public void setStudentSn(String studentSn) {
this.studentSn = studentSn;
}
diff --git a/web/src/main/resources/sql/jlw/handsOn.md b/web/src/main/resources/sql/jlw/handsOn.md
index 4a57b31c..14b6e92c 100644
--- a/web/src/main/resources/sql/jlw/handsOn.md
+++ b/web/src/main/resources/sql/jlw/handsOn.md
@@ -31,6 +31,12 @@ queryByCondition
@if(!isEmpty(handsOnStatus)){
and t.hands_on_status =#handsOnStatus#
@}
+ @if(!isEmpty(orgId)){
+ or t.orgId =#orgId#
+ @}
+ @if(!isEmpty(courseInfoIds)){
+ and find_in_set(t.courseInfoId,#handsOnStatus#)
+ @}
queryByConditionQuery
@@ -64,7 +70,12 @@ queryByConditionQuery
@if(!isEmpty(handsOnStatus)){
and t.hands_on_status =#handsOnStatus#
@}
-
+ @if(!isEmpty(orgId)){
+ or t.orgId =#orgId#
+ @}
+ @if(!isEmpty(courseInfoIds)){
+ and find_in_set(t.courseInfoId,#handsOnStatus#)
+ @}