Commit 94e87ddd authored by Mindfaker's avatar Mindfaker

fix

parent a556a2b1
package cn.exploring.engine.server.db.domain; package cn.exploring.engine.server.db.domain;
import org.springframework.format.annotation.DateTimeFormat;
import java.time.LocalDateTime; import java.time.LocalDateTime;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.Arrays; import java.util.Arrays;
...@@ -75,6 +77,7 @@ public class StudentInfo { ...@@ -75,6 +77,7 @@ public class StudentInfo {
* *
* @mbg.generated * @mbg.generated
*/ */
@DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
private LocalDateTime addTime; private LocalDateTime addTime;
/** /**
...@@ -84,6 +87,7 @@ public class StudentInfo { ...@@ -84,6 +87,7 @@ public class StudentInfo {
* *
* @mbg.generated * @mbg.generated
*/ */
@DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
private LocalDateTime updateTime; private LocalDateTime updateTime;
/** /**
...@@ -552,4 +556,4 @@ public class StudentInfo { ...@@ -552,4 +556,4 @@ public class StudentInfo {
} }
} }
} }
} }
\ No newline at end of file
package cn.exploring.engine.server.db.domain; package cn.exploring.engine.server.db.domain;
import org.springframework.format.annotation.DateTimeFormat;
import java.time.LocalDateTime; import java.time.LocalDateTime;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.Arrays; import java.util.Arrays;
...@@ -68,7 +66,6 @@ public class StudentPointInfo { ...@@ -68,7 +66,6 @@ public class StudentPointInfo {
* *
* @mbg.generated * @mbg.generated
*/ */
@DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
private LocalDateTime recordTime; private LocalDateTime recordTime;
/** /**
...@@ -78,6 +75,7 @@ public class StudentPointInfo { ...@@ -78,6 +75,7 @@ public class StudentPointInfo {
* *
* @mbg.generated * @mbg.generated
*/ */
private LocalDateTime addTime; private LocalDateTime addTime;
/** /**
......
...@@ -3,6 +3,7 @@ package cn.exploring.engine.server.wx.web; ...@@ -3,6 +3,7 @@ package cn.exploring.engine.server.wx.web;
import cn.exploring.engine.server.core.util.ResponseUtil; import cn.exploring.engine.server.core.util.ResponseUtil;
import cn.exploring.engine.server.db.domain.StudentPointInfo; import cn.exploring.engine.server.db.domain.StudentPointInfo;
import cn.exploring.engine.server.db.service.StudentPointService; import cn.exploring.engine.server.db.service.StudentPointService;
import org.springframework.util.StringUtils;
import org.springframework.validation.annotation.Validated; import org.springframework.validation.annotation.Validated;
import org.springframework.web.bind.annotation.*; import org.springframework.web.bind.annotation.*;
...@@ -18,9 +19,13 @@ public class PointController { ...@@ -18,9 +19,13 @@ public class PointController {
StudentPointService pointService; StudentPointService pointService;
@GetMapping("selectPoint") @GetMapping("selectPoint")
public Object selectPoint(@RequestParam String studentName, @RequestParam String studentUniqueId,@RequestParam Integer classId,@RequestParam String startTime,@RequestParam String endTime, public Object selectPoint(@RequestParam String studentName, @RequestParam String studentUniqueId, @RequestParam Integer classId, @RequestParam String startTime, @RequestParam String endTime,
@RequestParam(required = false, defaultValue = "1") Integer page, @RequestParam(required = false, defaultValue = "10") Integer limit, @RequestParam(required = false, defaultValue = "1") Integer page, @RequestParam(required = false, defaultValue = "10") Integer limit,
@RequestParam(required = false, defaultValue = "add_time") String sort, @RequestParam(required = false, defaultValue = "desc") String order) { @RequestParam(required = false, defaultValue = "add_time") String sort, @RequestParam(required = false, defaultValue = "desc") String order) {
studentUniqueId = StringUtils.isEmpty(studentUniqueId) ? null : studentUniqueId;
studentName = StringUtils.isEmpty(studentName) ? null : studentName;
startTime = StringUtils.isEmpty(startTime) ? null : startTime;
endTime = StringUtils.isEmpty(endTime) ? null : endTime;
return ResponseUtil.ok(pointService.selectPointByWeb(studentName, studentUniqueId, classId, startTime, endTime, page, limit, sort, order)); return ResponseUtil.ok(pointService.selectPointByWeb(studentName, studentUniqueId, classId, startTime, endTime, page, limit, sort, order));
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment