分数查询

controller/src/main/java/com/koobietech/eas/config/ExceptionAdviceConfiguration.java

@@ -23,12 +23,12 @@ public class ExceptionAdviceConfiguration {
     @ExceptionHandler(Exception.class)
     public JsonResult exceptionHandler(Exception e){
         StackTraceElement[] stackTrace = e.getStackTrace();
-        logger.error("<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<");
+        //logger.error("<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<");
 //        for (StackTraceElement element : stackTrace) {
 //            logger.error(element.toString());
 //        }
-        e.printStackTrace();
-        logger.error(">>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>");
+        //e.printStackTrace();
+        //logger.error(">>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>");
         return JsonResult.fail(e.getMessage(), 500);
     }
 
@@ -37,12 +37,12 @@ public class ExceptionAdviceConfiguration {
     @ExceptionHandler(EasException.class)
     public JsonResult exceptionHandler(EasException e){
         StackTraceElement[] stackTrace = e.getStackTrace();
-        logger.error("||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||");
+//        logger.error("||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||");
 //        for (StackTraceElement element : stackTrace) {
 //            logger.error(element.toString());
 //        }
-        e.printStackTrace();
-        logger.error("&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&");
+//        e.printStackTrace();
+//        logger.error("&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&");
         return JsonResult.fail(e.getMessage(), e.getCode());
     }
 }

controller/src/main/java/com/koobietech/eas/controller/EasEduCategoryController.java

@@ -30,8 +30,7 @@ public class EasEduCategoryController {
     @Operation(summary = "添加课程类别" , description = "用于添加课程类别")
     public JsonResult addEasEduCategory(@RequestBody EasEduCategory easEduCategory ){
         int add = easEduCategoryService.addEasEduCategory( easEduCategory );
-        System.out.println( add );
-        return JsonResult.ok("添加成功");
+        return JsonResult.bool(add > 0);
     }
 
     /**
@@ -39,7 +38,7 @@ public class EasEduCategoryController {
      * @param easEduCategory
      * @return
      */
-    @PostMapping(value = "/update")
+    @PutMapping(value = "/update")
     @Operation(summary = "课程类别更新" , description = "用于课程类别更新")
     public JsonResult updateEasEduCategory(@RequestBody EasEduCategory easEduCategory){
         int i = easEduCategoryService.updateEasEduCategory( easEduCategory );

controller/src/main/java/com/koobietech/eas/controller/EasEduSubjectsController.java

@@ -28,7 +28,7 @@ public class EasEduSubjectsController {
      * @param easEduSubjects
      * @return
      */
-    @PostMapping(value = "/addSubject")
+    @PostMapping(value = "/add")
     @Operation(summary = "添加课程" , description = "用于添加课程")
     public JsonResult addSubject( @RequestBody EasEduSubjects easEduSubjects){
         int addSubject = easEduSubjectsService.addSubject(easEduSubjects);
@@ -41,7 +41,7 @@ public class EasEduSubjectsController {
      * @param easEduSubjects
      * @return
      */
-    @PostMapping(value = "/updateSubjects")
+    @PostMapping(value = "/update")
     @Operation(summary = "修改课程" , description = "用于修改课程")
     public JsonResult updateSubjects( @RequestBody EasEduSubjects easEduSubjects){
         int update_i = easEduSubjectsService.updateSubjects(easEduSubjects);
@@ -57,7 +57,7 @@ public class EasEduSubjectsController {
      * @param id
      * @return
      */
-    @DeleteMapping(value = "/deleteSubjects/{id}")
+    @DeleteMapping(value = "/delete/{id}")
     @Operation(summary = "删除课程",description = "用于删除课程")
     public JsonResult deleteSubjects(@PathVariable Integer id){
         int delete_i = easEduSubjectsService.deleteSubjects(id);
@@ -73,7 +73,7 @@ public class EasEduSubjectsController {
      * @param id
      * @return
      */
-    @GetMapping(value = "/selectById")
+    @GetMapping(value = "/queryById")
     @Operation(summary = "id查询课程" ,description = "根据id查询课程")
     public JsonResult selectById(Integer id){
         EasEduSubjects easEduSubjects = easEduSubjectsService.selectById(id);
@@ -87,7 +87,7 @@ public class EasEduSubjectsController {
      * 查询所有课程及其信息
      * @return
      */
-    @GetMapping(value = "/selectAll")
+    @GetMapping(value = "/queryAll")
     @Operation(summary = "查询所有课程",description = "用于查询所有课程")
     public JsonResult selectAll(){
         List<EasEduSubjects> easEduSubjects = easEduSubjectsService.selectAll();
@@ -101,7 +101,7 @@ public class EasEduSubjectsController {
      * @param pageSize
      * @return
      */
-    @PostMapping(value = "/selectByCondition")
+    @PostMapping(value = "/query")
     @Operation(summary = "根据条件进行查询课程", description = "用于根据条件查询课程")
     public JsonPageResult selectByCondition(@RequestBody EasEduSubjects easEduSubjects,
                                             @RequestParam Integer pageNum, @RequestParam Integer pageSize) {

controller/src/main/java/com/koobietech/eas/controller/EasSysUserInfoController.java

@@ -1,6 +1,7 @@
 package com.koobietech.eas.controller;
 
 import com.github.pagehelper.PageHelper;
+import com.koobietech.eas.common.result.JsonPageResult;
 import com.koobietech.eas.common.result.JsonResult;
 import com.koobietech.eas.common.result.PageDataResult;
 import com.koobietech.eas.mbg.model.EasSysUserinfo;
@@ -52,11 +53,11 @@ public class EasSysUserInfoController {
 
     @PostMapping("/query")
     @Operation(summary = "查询用户信息", description = "根据参数查询用户信息表信息")
-    public JsonResult query(@RequestBody(required = false) EasSysUserinfo userinfo,
-                            @RequestParam Integer pageNum, @RequestParam Integer pageSize) {
+    public JsonPageResult query(@RequestBody(required = false) EasSysUserinfo userinfo,
+                                @RequestParam Integer pageNum, @RequestParam Integer pageSize) {
         PageHelper.startPage(pageNum, pageSize);
         PageDataResult ret = easSysUserInfoService.query(userinfo);
-        return JsonResult.data(ret);
+        return JsonPageResult.data(ret);
     }
 
     @GetMapping("/queryUserById/{uid}")

service/src/main/java/com/koobietech/eas/service/impl/EasArcTlsScoresServiceImpl.java

@@ -120,6 +120,10 @@ public class EasArcTlsScoresServiceImpl implements EasArcTlsScoresService {
             if (StringUtils.hasText(easArcTlsScores.getComment())) {
                 criteria.andCommentLike("%"+easArcTlsScores.getComment()+"%");
             }
+            if (Objects.nonNull(easArcTlsScores.getSubjectId()) && easArcTlsScores.getSubjectId() > 0) {
+                criteria.andSubjectIdEqualTo(easArcTlsScores.getSubjectId());
+            }
+
         }
         List<EasArcTlsScores> easArcTlsScores1 = easArcTlsScoresMapper.selectByExample(easArcTlsScoresExample);
         long l = easArcTlsScoresMapper.countByExample(easArcTlsScoresExample);

service/src/main/java/com/koobietech/eas/service/impl/EasEduSubjectsServiceImpl.java

@@ -58,9 +58,6 @@ public class EasEduSubjectsServiceImpl implements EasEduSubjectsService {
             if (StringUtils.hasText(easEduSubjects.getName())) {
                 criteria.andNameLike("%" + easEduSubjects.getName() + "%");
             }
-//            if (StringUtils.hasText(easEduSubjects.getDescription())) {
-//                criteria.andDescriptionLike("%" + easEduSubjects.getDescription() + "%");
-//            }
             if (Objects.nonNull(easEduSubjects.getCategoryId())){
                 criteria.andCategoryIdEqualTo(easEduSubjects.getCategoryId());
             }

service/src/main/java/com/koobietech/eas/service/impl/EasSysUserInfoServiceImpl.java

@@ -53,7 +53,7 @@ public class EasSysUserInfoServiceImpl implements EasSysUserInfoService {
             userinfo.setUsername(user.getUsername());
         }
         userinfo.setModifyTime(new Date());
-        return easSysUserinfoMapper.updateByPrimaryKey(userinfo) == 1;
+        return easSysUserinfoMapper.updateByPrimaryKeySelective(userinfo) == 1;
     }
 
     @Override