Просмотр исходного кода

chore: auto bump version and changelog [skip ci]

iwt 3 недель назад
Родитель
Сommit
fe77b2e68a

+ 4 - 4
cfc-backend/src/main/java/com/etotem/cfc/controller/assessment/AssessmentReportController.java

@@ -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);
             }
             }
             
             
             // 按创建时间倒序排列
             // 按创建时间倒序排列

+ 1 - 1
cfc-web/.last_build_commit

@@ -1 +1 @@
-fe23dcf10f574b2345cb28ca3c34652646a17201
+4ccba6bba306a91f5c9f3899e1da3afa49e1feae