yangzhe
/
gunshi-project-ss
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

大屏部分接口修改

master
wany 2026-02-08 17:44:18 +08:00
parent 2641ac9282
commit a6e17a5154
1 changed files with 12 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/main/java/com/gunshi/project/ss/controller/ScreenResponsibilityController.java
View File

@ -4,6 +4,7 @@ package com.gunshi.project.ss.controller;
import com.gunshi.core.result.R; import com.gunshi.core.result.R;
import com.gunshi.project.ss.entity.vo.ScreenPositionTrainingVo; import com.gunshi.project.ss.entity.vo.ScreenPositionTrainingVo;
import com.gunshi.project.ss.model.ResPerson; import com.gunshi.project.ss.model.ResPerson;
import com.gunshi.project.ss.service.FileAssociationsService;
import com.gunshi.project.ss.service.ScreenResponsibilityService; import com.gunshi.project.ss.service.ScreenResponsibilityService;
import io.swagger.v3.oas.annotations.tags.Tag; import io.swagger.v3.oas.annotations.tags.Tag;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
@ -21,6 +22,9 @@ public class ScreenResponsibilityController {
@Autowired @Autowired
private ScreenResponsibilityService screenResponsibilityService; private ScreenResponsibilityService screenResponsibilityService;
@Autowired
private FileAssociationsService fileService;
@GetMapping("/getPerson") @GetMapping("/getPerson")
public R<List<ResPerson>> getPerson(){ public R<List<ResPerson>> getPerson(){
List<ResPerson> vo = screenResponsibilityService.getPerson(); List<ResPerson> vo = screenResponsibilityService.getPerson();
@ -37,7 +41,15 @@ public class ScreenResponsibilityController {
@GetMapping("/getTraining") @GetMapping("/getTraining")
public R<ScreenPositionTrainingVo> getTraining(){ public R<ScreenPositionTrainingVo> getTraining(){
ScreenPositionTrainingVo vo = screenResponsibilityService.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); return R.ok(vo);
} }
public String getGroupId() {
return "personnelPlan";
}
} }