fanxp 1 năm trước cách đây
mục cha
commit
1a0765b8a9

+ 1 - 12
src/main/java/com/xjrsoft/module/student/controller/ClassHonorsController.java

@@ -2,7 +2,6 @@ package com.xjrsoft.module.student.controller;
 
 import cn.dev33.satoken.annotation.SaCheckPermission;
 import cn.hutool.core.bean.BeanUtil;
-import cn.hutool.core.util.ObjectUtil;
 import com.alibaba.excel.EasyExcel;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.xjrsoft.common.model.result.RT;
@@ -19,14 +18,7 @@ import com.xjrsoft.module.student.vo.ClassHonorsVo;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import lombok.AllArgsConstructor;
-import org.springframework.web.bind.annotation.DeleteMapping;
-import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.PutMapping;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RequestParam;
-import org.springframework.web.bind.annotation.RestController;
+import org.springframework.web.bind.annotation.*;
 import org.springframework.web.multipart.MultipartFile;
 
 import javax.validation.Valid;
@@ -53,9 +45,6 @@ public class ClassHonorsController {
     @SaCheckPermission("classhonors:detail")
     public RT<List<ClassHonorsSemesterClassTreeVo>> semesterClassTree(){
         List<ClassHonorsSemesterClassTreeVo> list = classHonorsService.getSemesterClassTree();
-        if(ObjectUtil.isNull(list) || list.size() == 0){
-            return RT.error("找不到此数据!");
-        }
         return RT.ok(list);
     }
 

+ 1 - 2
src/main/java/com/xjrsoft/module/student/dto/AddClassHonorsDto.java

@@ -4,7 +4,6 @@ import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
 import java.io.Serializable;
-import java.util.Date;
 
 
 
@@ -53,7 +52,7 @@ public class AddClassHonorsDto implements Serializable {
     * 获奖日期
     */
     @ApiModelProperty("获奖日期")
-    private Date awardDate;
+    private String awardDate;
     /**
     * 附件文件id
     */

+ 2 - 0
src/main/java/com/xjrsoft/module/student/vo/ClassHonorsPageVo.java

@@ -2,6 +2,7 @@ package com.xjrsoft.module.student.vo;
 
 import com.alibaba.excel.annotation.ExcelProperty;
 import com.alibaba.excel.annotation.write.style.ContentStyle;
+import com.fasterxml.jackson.annotation.JsonFormat;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
@@ -57,5 +58,6 @@ public class ClassHonorsPageVo {
     @ContentStyle(dataFormat = 49)
     @ExcelProperty("获奖日期")
     @ApiModelProperty("获奖日期")
+    @JsonFormat(pattern = "yyyy-MM-dd")
     private Date awardDate;
 }

+ 0 - 3
src/main/resources/application-dev.yml

@@ -13,9 +13,6 @@ spring:
           username: root
           password: Zwr~-f6H,u6QE^]C-AD_
 
-
-
-
   redis:
     database: 11
     host: 10.150.10.139