From 2ef17dfc006e96a0948b202df410d77f7a3b9436 Mon Sep 17 00:00:00 2001
From: Mlxa0324 <mlx950324@163.com>
Date: Tue, 29 Nov 2022 10:14:24 +0800
Subject: [PATCH] =?UTF-8?q?=E5=9F=BA=E7=A1=80=E6=8E=A5=E5=8F=A3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../admin/core/web/CoreUserController.java    | 16 ++++++++++++-
 .../jlw/service/TeacherOpenCourseService.java | 19 +++++++++++++++
 .../jlw/web/TeacherOpenCourseController.java  | 23 +++++++++++++++++++
 .../web/UniversitiesCollegesController.java   |  5 +---
 4 files changed, 58 insertions(+), 5 deletions(-)

diff --git a/admin-core/src/main/java/com/ibeetl/admin/core/web/CoreUserController.java b/admin-core/src/main/java/com/ibeetl/admin/core/web/CoreUserController.java
index 25f95347..f888f169 100644
--- a/admin-core/src/main/java/com/ibeetl/admin/core/web/CoreUserController.java
+++ b/admin-core/src/main/java/com/ibeetl/admin/core/web/CoreUserController.java
@@ -1,6 +1,7 @@
 package com.ibeetl.admin.core.web;
 
 import cn.hutool.core.bean.BeanUtil;
+import cn.hutool.core.lang.Assert;
 import com.ibeetl.admin.core.conf.PasswordConfig.PasswordEncryptService;
 import com.ibeetl.admin.core.dao.CoreUserRoleDao;
 import com.ibeetl.admin.core.entity.CoreOrg;
@@ -139,9 +140,10 @@ public class CoreUserController {
 	 */
 	@PostMapping(API + "/edit.do")
 	@ResponseBody
-	public JsonResult edit(CoreUser coreUser) {
+	public JsonResult editDo(CoreUser coreUser) {
 		// 获取当前登录用户
 		CoreUser user = getUser();
+		Assert.notNull(user, "请登录后再操作");
 
 		// 禁止修改的一些属性，先给去掉
 		coreUser.setCode(null);
@@ -155,6 +157,18 @@ public class CoreUserController {
 		return JsonResult.success();
 	}
 
+	/**
+	 * 对当前登录多用户，支持修改一些属性
+	 * 修改基础资料
+	 * @param coreUser
+	 * @return
+	 */
+	@PostMapping(MODEL + "/edit.json")
+	@ResponseBody
+	public JsonResult edit(CoreUser coreUser) {
+		return editDo(coreUser);
+	}
+
 	/**
 	 * 用户能查看的菜单
 	 * 
diff --git a/web/src/main/java/com/ibeetl/jlw/service/TeacherOpenCourseService.java b/web/src/main/java/com/ibeetl/jlw/service/TeacherOpenCourseService.java
index 7625888d..9d8df92f 100644
--- a/web/src/main/java/com/ibeetl/jlw/service/TeacherOpenCourseService.java
+++ b/web/src/main/java/com/ibeetl/jlw/service/TeacherOpenCourseService.java
@@ -23,6 +23,7 @@ import org.springframework.cache.annotation.Cacheable;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
+import javax.validation.constraints.NotBlank;
 import javax.validation.constraints.NotNull;
 import java.util.ArrayList;
 import java.util.Date;
@@ -159,6 +160,24 @@ public class TeacherOpenCourseService extends CoreBaseService<TeacherOpenCourse>
         return msg;
     }
 
+    /**
+     * 功能描述: <br>
+     * 〈批量修改开课状态（开课审核）〉
+     *
+     * @param teacherOpenCourseIds
+     * @param status
+     * @Author: 87966
+     * @Date: 2022/11/29 9:17
+     */
+    public void batchEditStatus(@NotBlank String teacherOpenCourseIds, @NotNull Integer status){
+        for (String id : teacherOpenCourseIds.split(",")) {
+            TeacherOpenCourse entity = new TeacherOpenCourse();
+            entity.setTeacherOpenCourseId(Long.valueOf(id));
+            entity.setTeacherOpenCourseStatus(status);
+            teacherOpenCourseDao.updateById(entity);
+        }
+    }
+
     public String updateGivenByIds(TeacherOpenCourseQuery teacherOpenCourseQuery){
         String msg = "";
         if(StringUtils.isNotBlank(teacherOpenCourseQuery.get_given())){
diff --git a/web/src/main/java/com/ibeetl/jlw/web/TeacherOpenCourseController.java b/web/src/main/java/com/ibeetl/jlw/web/TeacherOpenCourseController.java
index 3c3307c6..888011bf 100644
--- a/web/src/main/java/com/ibeetl/jlw/web/TeacherOpenCourseController.java
+++ b/web/src/main/java/com/ibeetl/jlw/web/TeacherOpenCourseController.java
@@ -270,5 +270,28 @@ public class TeacherOpenCourseController{
         return JsonResult.success(teacherOpenCourseService.myCourse(student));
     }
 
+    /**
+     * 功能描述: <br>
+     * 〈批量修改开课状态（开课审核）〉
+     *
+     * @param teacherOpenCourseIds
+     * @param status
+     * @param result
+     * @param coreUser
+     * @return {@link JsonResult< String>}
+     * @Author: 87966
+     * @Date: 2022/11/29 9:17
+     */
+    @PostMapping(MODEL + "/batchEditStatus.json")
+    @Function("teacherOpenCourse.edit")
+    @ResponseBody
+    public JsonResult<String> batchEditStatus(String teacherOpenCourseIds, Integer status, BindingResult result, @SCoreUser CoreUser coreUser) {
+        if(result.hasErrors()){
+            return JsonResult.failMessage(result);
+        }else {
+            teacherOpenCourseService.batchEditStatus(teacherOpenCourseIds, status);
+            return JsonResult.success();
+        }
+    }
 
 }
diff --git a/web/src/main/java/com/ibeetl/jlw/web/UniversitiesCollegesController.java b/web/src/main/java/com/ibeetl/jlw/web/UniversitiesCollegesController.java
index 79c1dc25..541722ff 100644
--- a/web/src/main/java/com/ibeetl/jlw/web/UniversitiesCollegesController.java
+++ b/web/src/main/java/com/ibeetl/jlw/web/UniversitiesCollegesController.java
@@ -1,7 +1,6 @@
 package com.ibeetl.jlw.web;
 
 import cn.hutool.core.date.DateUtil;
-import cn.hutool.core.lang.Assert;
 import cn.hutool.core.util.StrUtil;
 import cn.jlw.Interceptor.SCoreUser;
 import cn.jlw.validate.ValidateConfig;
@@ -39,7 +38,6 @@ import java.util.Map;
 
 import static com.ibeetl.admin.core.util.ExcelUtil.convertData;
 import static com.ibeetl.admin.core.util.ExcelUtil.write;
-import static com.ibeetl.admin.core.util.user.CacheUserUtil.getUser;
 
 /**
  * UniversitiesColleges 接口
@@ -255,8 +253,7 @@ public class UniversitiesCollegesController{
     @PostMapping(MODEL + "/info.json")
     @Function("universitiesColleges.query")
     @ResponseBody
-    public JsonResult info() {
-        Assert.notNull(getUser(), "getUser请登录后再操作");
+    public JsonResult info(@SCoreUser CoreUser coreUser) {
         return JsonResult.success(universitiesCollegesService.info());
     }
 }