snihwxf 1 неделя назад
Родитель
Сommit
b2ff3d5096

+ 6 - 0
src/main/java/com/xjrsoft/module/classtime/dto/ClassCourseTimeStatisticsSetPageDto.java

@@ -35,4 +35,10 @@ public class ClassCourseTimeStatisticsSetPageDto extends PageInput {
      */
     @ApiModelProperty("课程名称")
     private String courseName;
+
+    /**
+     * 类别(1:权重 2:费用设置 3:课时量)
+     */
+    @ApiModelProperty("类别(1:权重 2:费用设置 3:课时量)")
+    private Integer category;
 }

+ 5 - 5
src/main/java/com/xjrsoft/module/classtime/service/impl/ClassCourseTimeStatisticsSetServiceImpl.java

@@ -108,7 +108,7 @@ public class ClassCourseTimeStatisticsSetServiceImpl extends MPJBaseServiceImpl<
                             setCourseId(courseId);
                             setClassId(classId);
                             setCreateDate(LocalDateTime.now());
-                            setCategory(2);
+                            setCategory(dto.getCategory());
                             setJsonContent(dto.getJsonContent());
                             setIsDefault(0);
                             setDeleteMark(DeleteMark.NODELETE.getCode());
@@ -126,7 +126,7 @@ public class ClassCourseTimeStatisticsSetServiceImpl extends MPJBaseServiceImpl<
             setCourseIds(courseIds);
             setClassIds(classIds);
             setCreateDate(LocalDateTime.now());
-            setCategory(2);
+            setCategory(dto.getCategory());
             setJsonContent(dto.getJsonContent());
             setIsDefault(0);
             setDeleteMark(DeleteMark.NODELETE.getCode());
@@ -148,7 +148,7 @@ public class ClassCourseTimeStatisticsSetServiceImpl extends MPJBaseServiceImpl<
                             setCourseId(0L);
                             setClassId(classId);
                             setCreateDate(LocalDateTime.now());
-                            setCategory(2);
+                            setCategory(dto.getCategory());
                             setJsonContent(dto.getJsonContent());
                             setIsDefault(1);
                             setDeleteMark(DeleteMark.NODELETE.getCode());
@@ -256,7 +256,7 @@ public class ClassCourseTimeStatisticsSetServiceImpl extends MPJBaseServiceImpl<
                                 setCourseId(courseId);
                                 setClassId(classId);
                                 setCreateDate(LocalDateTime.now());
-                                setCategory(2);
+                                setCategory(dto.getCategory());
                                 setJsonContent(dto.getJsonContent());
                                 setIsDefault(0);
                                 setDeleteMark(DeleteMark.NODELETE.getCode());
@@ -282,7 +282,7 @@ public class ClassCourseTimeStatisticsSetServiceImpl extends MPJBaseServiceImpl<
             setCourseIds(courseIds);
             setClassIds(classIds);
             setCreateDate(LocalDateTime.now());
-            setCategory(2);
+            setCategory(dto.getCategory());
             setJsonContent(dto.getJsonContent());
             setIsDefault(0);
             setDeleteMark(DeleteMark.NODELETE.getCode());

+ 10 - 0
src/main/java/com/xjrsoft/module/system/controller/LoginController.java

@@ -1,6 +1,9 @@
 package com.xjrsoft.module.system.controller;
 
 import cn.dev33.satoken.annotation.SaCheckPermission;
+import cn.dev33.satoken.context.SaHolder;
+import cn.dev33.satoken.context.model.SaCookie;
+import cn.dev33.satoken.context.model.SaResponse;
 import cn.dev33.satoken.session.SaSession;
 import cn.dev33.satoken.stp.StpUtil;
 import cn.hutool.core.util.IdUtil;
@@ -147,6 +150,13 @@ public class LoginController {
 
         String token = redisUtil.get(dto.getLoginCode());
 
+        SaResponse res = SaHolder.getResponse();
+        SaCookie cookie = new SaCookie()
+                .setName("Authorization")
+                .setValue(token);
+
+        res.addCookie(cookie);
+
         loginCheckQRCodeVo.setToken(token);
         loginCheckQRCodeVo.setStatus(0);
         return RT.ok(loginCheckQRCodeVo);

+ 3 - 0
src/main/resources/mapper/classtime/ClassCourseTimeStatisticsSetMapper.xml

@@ -14,6 +14,9 @@
         <if test="dto.courseName != null and dto.courseName != ''">
             and t3.name like concat('%', #{dto.courseName},'%')
         </if>
+        <if test="dto.category != null and dto.category != ''">
+            and t1.category = #{dto.category}
+        </if>
         order by t1.create_date desc
     </select>
 </mapper>