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

Merge remote-tracking branch 'origin/beetlsql3-dev' into beetlsql3-dev

Browse Source
beetlsql3-dev
Mlxa0324
parent b8b0a90c8c da167b67f5
commit 57db578803
2 changed files with 16 additions and 6 deletions

10
web/src/main/java/com/ibeetl/jlw/web/TeacherOpenCourseMergeSchoolClassController.java
Unescape Escape View File

@ -1,5 +1,6 @@
package com.ibeetl.jlw.web;
import cn.hutool.core.bean.BeanUtil;
import cn.jlw.Interceptor.SCoreUser;
import cn.jlw.validate.ValidateConfig;
import com.ibeetl.admin.core.annotation.Function;
@ -135,14 +136,17 @@ public class TeacherOpenCourseMergeSchoolClassController{
@PostMapping(MODEL + "/addAll.json")
@Function("teacherOpenCourseMergeSchoolClass.add")
public JsonResult addAll(TeacherOpenCourseMergeSchoolClassQuery teacherOpenCourseMergeSchoolClassQuery,@SCoreUser CoreUser coreUser){
public JsonResult addAll(List<TeacherOpenCourseMergeSchoolClassQuery> teacherOpenCourseMergeSchoolClassQuerys,@SCoreUser CoreUser coreUser){
if(null == coreUser){
return JsonResult.failMessage("请登录后再操作");
}else{
for (TeacherOpenCourseMergeSchoolClassQuery teacherOpenCourseMergeSchoolClassQuery : teacherOpenCourseMergeSchoolClassQuerys) {
teacherOpenCourseMergeSchoolClassQuery.setUserId(coreUser.getId());
teacherOpenCourseMergeSchoolClassQuery.setOrgId(coreUser.getOrgId());
String msg = teacherOpenCourseMergeSchoolClassService.addAll(teacherOpenCourseMergeSchoolClassQuery);
if (StringUtils.isBlank(msg)) {
}
List<TeacherOpenCourseMergeSchoolClass> teacherOpenCourseMergeSchoolClasses = BeanUtil.copyToList(teacherOpenCourseMergeSchoolClassQuerys, TeacherOpenCourseMergeSchoolClass.class);
Boolean msg = teacherOpenCourseMergeSchoolClassService.insertBatch(teacherOpenCourseMergeSchoolClasses);
if (msg) {
return JsonResult.success();
} else {
return JsonResult.failMessage("新增失败,"+msg);

12
web/src/main/java/com/ibeetl/jlw/web/TeacherOpenCourseMergeStudentController.java
Unescape Escape View File

@ -1,5 +1,6 @@
package com.ibeetl.jlw.web;
import cn.hutool.core.bean.BeanUtil;
import cn.jlw.Interceptor.SCoreUser;
import cn.jlw.Interceptor.TStudent;
import cn.jlw.validate.ValidateConfig;
@ -9,6 +10,7 @@ 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.Student;
import com.ibeetl.jlw.entity.TeacherOpenCourseMergeSchoolClass;
import com.ibeetl.jlw.entity.TeacherOpenCourseMergeStudent;
import com.ibeetl.jlw.entity.dto.RandomStudentListDTO;
import com.ibeetl.jlw.service.TeacherOpenCourseMergeStudentService;
@ -178,14 +180,18 @@ public class TeacherOpenCourseMergeStudentController{
@PostMapping(MODEL + "/addAll.json")
@Function("teacherOpenCourseMergeStudent.add")
public JsonResult addAll(TeacherOpenCourseMergeStudentQuery teacherOpenCourseMergeStudentQuery,@SCoreUser CoreUser coreUser){
public JsonResult addAll(List<TeacherOpenCourseMergeStudentQuery> teacherOpenCourseMergeStudentQuerys,@SCoreUser CoreUser coreUser){
if(null == coreUser){
return JsonResult.failMessage("请登录后再操作");
}else{
for (TeacherOpenCourseMergeStudentQuery teacherOpenCourseMergeStudentQuery : teacherOpenCourseMergeStudentQuerys) {
teacherOpenCourseMergeStudentQuery.setUserId(coreUser.getId());
teacherOpenCourseMergeStudentQuery.setOrgId(coreUser.getOrgId());
String msg = teacherOpenCourseMergeStudentService.addAll(teacherOpenCourseMergeStudentQuery);
if (StringUtils.isBlank(msg)) {
}
List<TeacherOpenCourseMergeStudent> teacherOpenCourseMergeSchoolClasses = BeanUtil.copyToList(teacherOpenCourseMergeStudentQuerys, TeacherOpenCourseMergeStudent.class);
Boolean msg = teacherOpenCourseMergeStudentService.insertBatch(teacherOpenCourseMergeSchoolClasses);
if (msg) {
return JsonResult.success();
} else {
return JsonResult.failMessage("新增失败,"+msg);

Write Preview
Loading…
Cancel
Save