diff --git a/src/main/java/com/gunshi/project/ss/controller/ScreenResponsibilityController.java b/src/main/java/com/gunshi/project/ss/controller/ScreenResponsibilityController.java index cf5a299..20c48cb 100644 --- a/src/main/java/com/gunshi/project/ss/controller/ScreenResponsibilityController.java +++ b/src/main/java/com/gunshi/project/ss/controller/ScreenResponsibilityController.java @@ -4,6 +4,7 @@ package com.gunshi.project.ss.controller; import com.gunshi.core.result.R; import com.gunshi.project.ss.entity.vo.ScreenPositionTrainingVo; import com.gunshi.project.ss.model.ResPerson; +import com.gunshi.project.ss.service.FileAssociationsService; import com.gunshi.project.ss.service.ScreenResponsibilityService; import io.swagger.v3.oas.annotations.tags.Tag; import org.springframework.beans.factory.annotation.Autowired; @@ -21,6 +22,9 @@ public class ScreenResponsibilityController { @Autowired private ScreenResponsibilityService screenResponsibilityService; + @Autowired + private FileAssociationsService fileService; + @GetMapping("/getPerson") public R> getPerson(){ List vo = screenResponsibilityService.getPerson(); @@ -37,7 +41,15 @@ public class ScreenResponsibilityController { @GetMapping("/getTraining") public R getTraining(){ ScreenPositionTrainingVo vo = screenResponsibilityService.getTraining(); + if(vo.getLatestPersonnelLog() != null){ + vo.getLatestPersonnelLog().setFiles1(fileService.getFiles(getGroupId(),vo.getLatestPersonnelLog().getId().toString(),"1")); + vo.getLatestPersonnelLog().setFiles2(fileService.getFiles(getGroupId(),vo.getLatestPersonnelLog().getId().toString(),"2")); + } return R.ok(vo); } + public String getGroupId() { + return "personnelPlan"; + } + }