|
@@ -11,7 +11,7 @@ import com.etotem.cfc.service.FileStorageService;
|
|
|
import com.etotem.cfc.service.GrowthGuidanceService;
|
|
import com.etotem.cfc.service.GrowthGuidanceService;
|
|
|
import com.etotem.cfc.service.ReportParseService;
|
|
import com.etotem.cfc.service.ReportParseService;
|
|
|
import com.etotem.cfc.service.StorageService;
|
|
import com.etotem.cfc.service.StorageService;
|
|
|
-import com.etotem.cfc.service.TaskPlanInstanceService;
|
|
|
|
|
|
|
+import com.etotem.cfc.service.TaskPlanService;
|
|
|
import com.etotem.cfc.entity.TaskPlanInstance;
|
|
import com.etotem.cfc.entity.TaskPlanInstance;
|
|
|
import io.swagger.v3.oas.annotations.Operation;
|
|
import io.swagger.v3.oas.annotations.Operation;
|
|
|
import io.swagger.v3.oas.annotations.tags.Tag;
|
|
import io.swagger.v3.oas.annotations.tags.Tag;
|
|
@@ -55,7 +55,7 @@ public class AssessmentReportController {
|
|
|
private UserMapper userMapper;
|
|
private UserMapper userMapper;
|
|
|
|
|
|
|
|
@Resource
|
|
@Resource
|
|
|
- private TaskPlanInstanceService taskPlanInstanceService;
|
|
|
|
|
|
|
+ private TaskPlanService taskPlanService;
|
|
|
|
|
|
|
|
@Operation(summary = "获取用户已生成的测评方案列表")
|
|
@Operation(summary = "获取用户已生成的测评方案列表")
|
|
|
@PostMapping("/plans/list")
|
|
@PostMapping("/plans/list")
|
|
@@ -66,9 +66,9 @@ public class AssessmentReportController {
|
|
|
// 如果传了 childId,只查该孩子的方案;否则查整个家庭的方案
|
|
// 如果传了 childId,只查该孩子的方案;否则查整个家庭的方案
|
|
|
List<TaskPlanInstance> plans;
|
|
List<TaskPlanInstance> plans;
|
|
|
if (childId != null) {
|
|
if (childId != null) {
|
|
|
- plans = taskPlanInstanceService.getListByChildAndFamily(childId, familyId);
|
|
|
|
|
|
|
+ plans = taskPlanService.getChildPlans(childId);
|
|
|
} else {
|
|
} else {
|
|
|
- plans = taskPlanInstanceService.getListByFamily(familyId);
|
|
|
|
|
|
|
+ plans = taskPlanService.getFamilyPlans(familyId);
|
|
|
}
|
|
}
|
|
|
|
|
|
|
|
// 按创建时间倒序排列
|
|
// 按创建时间倒序排列
|