|
@@ -143,7 +143,10 @@ public class DanAssessmentController {
|
|
|
return Result.success(assessmentService.getFamilyRecords(familyId));
|
|
return Result.success(assessmentService.getFamilyRecords(familyId));
|
|
|
}
|
|
}
|
|
|
|
|
|
|
|
-@Operation(summary = "获取当前测评")
|
|
|
|
|
|
|
+/**
|
|
|
|
|
+ * 获取当前测评(已废弃,仅兼容保留;无前端调用方,familyId 参数已不再被信任)
|
|
|
|
|
+ */
|
|
|
|
|
+ @Operation(summary = "获取当前测评(已废弃)")
|
|
|
@PostMapping("/record/current")
|
|
@PostMapping("/record/current")
|
|
|
public Result<AssessmentRecord> getCurrentAssessment(@RequestParam Long familyId) {
|
|
public Result<AssessmentRecord> getCurrentAssessment(@RequestParam Long familyId) {
|
|
|
return Result.success(assessmentService.getCurrentAssessment(familyId));
|
|
return Result.success(assessmentService.getCurrentAssessment(familyId));
|
|
@@ -159,21 +162,16 @@ public class DanAssessmentController {
|
|
|
|
|
|
|
|
@Operation(summary = "获取我的测评报告列表")
|
|
@Operation(summary = "获取我的测评报告列表")
|
|
|
@PostMapping("/my-results")
|
|
@PostMapping("/my-results")
|
|
|
- public Result<List<DanAssessmentResult>> getMyResults(@RequestBody Map<String, Object> body) {
|
|
|
|
|
- Long userId = body.get("userId") != null ? Long.valueOf(body.get("userId").toString()) : null;
|
|
|
|
|
- if (userId == null) {
|
|
|
|
|
- return Result.success(assessmentService.getAccessibleResults(0L, "teacher"));
|
|
|
|
|
- }
|
|
|
|
|
- // 这里简化为返回该用户相关的报告,实际可根据角色判断
|
|
|
|
|
- return Result.success(assessmentService.getAccessibleResults(userId, "teacher"));
|
|
|
|
|
|
|
+ public Result<List<DanAssessmentResult>> getMyResults(@RequestAttribute("userId") Long userId,
|
|
|
|
|
+ @RequestAttribute("role") String role) {
|
|
|
|
|
+ return Result.success(assessmentService.getAccessibleResults(userId, role));
|
|
|
}
|
|
}
|
|
|
|
|
|
|
|
@Operation(summary = "获取下级成长规划师的测评报告")
|
|
@Operation(summary = "获取下级成长规划师的测评报告")
|
|
|
@PostMapping("/child-results")
|
|
@PostMapping("/child-results")
|
|
|
- public Result<List<DanAssessmentResult>> getChildResults(@RequestBody Map<String, Object> body) {
|
|
|
|
|
- Long userId = body.get("userId") != null ? Long.valueOf(body.get("userId").toString()) : null;
|
|
|
|
|
- List<DanAssessmentResult> results = assessmentService.getAccessibleResults(
|
|
|
|
|
- userId != null ? userId : 0L, "teacher");
|
|
|
|
|
|
|
+ public Result<List<DanAssessmentResult>> getChildResults(@RequestAttribute("userId") Long userId,
|
|
|
|
|
+ @RequestAttribute("role") String role) {
|
|
|
|
|
+ List<DanAssessmentResult> results = assessmentService.getAccessibleResults(userId, role);
|
|
|
return Result.success(results);
|
|
return Result.success(results);
|
|
|
}
|
|
}
|
|
|
|
|
|
|
@@ -188,8 +186,8 @@ public class DanAssessmentController {
|
|
|
@Operation(summary = "创建测评预约")
|
|
@Operation(summary = "创建测评预约")
|
|
|
@PostMapping("/appointment/create")
|
|
@PostMapping("/appointment/create")
|
|
|
public Result<AssessmentAppointment> createAppointment(@RequestBody Map<String, Object> body,
|
|
public Result<AssessmentAppointment> createAppointment(@RequestBody Map<String, Object> body,
|
|
|
- @RequestAttribute(value = "currentMemberId", required = false) Long currentMemberId) {
|
|
|
|
|
- Long userId = body.get("userId") != null ? Long.valueOf(body.get("userId").toString()) : null;
|
|
|
|
|
|
|
+ @RequestAttribute(value = "currentMemberId", required = false) Long currentMemberId,
|
|
|
|
|
+ @RequestAttribute("userId") Long userId) {
|
|
|
Long memberId = body.get("memberId") != null ? Long.valueOf(body.get("memberId").toString()) : currentMemberId;
|
|
Long memberId = body.get("memberId") != null ? Long.valueOf(body.get("memberId").toString()) : currentMemberId;
|
|
|
Long guideId = Long.valueOf(body.get("guideId").toString());
|
|
Long guideId = Long.valueOf(body.get("guideId").toString());
|
|
|
Long packageId = body.get("packageId") != null ? Long.valueOf(body.get("packageId").toString()) : null;
|
|
Long packageId = body.get("packageId") != null ? Long.valueOf(body.get("packageId").toString()) : null;
|
|
@@ -275,11 +273,11 @@ public class DanAssessmentController {
|
|
|
@PostMapping("/order/create")
|
|
@PostMapping("/order/create")
|
|
|
public Result<AssessmentOrder> createOrder(@RequestBody Map<String, Object> body,
|
|
public Result<AssessmentOrder> createOrder(@RequestBody Map<String, Object> body,
|
|
|
@RequestAttribute(value = "familyId", required = false) Long familyId,
|
|
@RequestAttribute(value = "familyId", required = false) Long familyId,
|
|
|
- @RequestAttribute(value = "currentMemberId", required = false) Long currentMemberId) {
|
|
|
|
|
|
|
+ @RequestAttribute(value = "currentMemberId", required = false) Long currentMemberId,
|
|
|
|
|
+ @RequestAttribute("userId") Long userId) {
|
|
|
if (familyId == null) {
|
|
if (familyId == null) {
|
|
|
return Result.noFamily("请先创建或加入家庭");
|
|
return Result.noFamily("请先创建或加入家庭");
|
|
|
}
|
|
}
|
|
|
- Long userId = body.get("userId") != null ? Long.valueOf(body.get("userId").toString()) : null;
|
|
|
|
|
Long memberId = body.get("memberId") != null ? Long.valueOf(body.get("memberId").toString()) : currentMemberId;
|
|
Long memberId = body.get("memberId") != null ? Long.valueOf(body.get("memberId").toString()) : currentMemberId;
|
|
|
Long guideId = Long.valueOf(body.get("guideId").toString());
|
|
Long guideId = Long.valueOf(body.get("guideId").toString());
|
|
|
Long packageId = body.get("packageId") != null ? Long.valueOf(body.get("packageId").toString()) : null;
|
|
Long packageId = body.get("packageId") != null ? Long.valueOf(body.get("packageId").toString()) : null;
|