diff --git a/src/main/java/com/msdw/tms/api/AchievementManagementApi.java b/src/main/java/com/msdw/tms/api/AchievementManagementApi.java index 8d9fff4..3a43f0e 100644 --- a/src/main/java/com/msdw/tms/api/AchievementManagementApi.java +++ b/src/main/java/com/msdw/tms/api/AchievementManagementApi.java @@ -83,4 +83,6 @@ public interface AchievementManagementApi { R deleteReportByProjectId(@ApiParam(value = "项目id",required = true) Integer projectId); + @ApiOperation(value = "成绩管理:虚拟仿真实验成绩管理", notes = "成绩管理:虚拟仿真实验成绩管理") + R getImitationAchievement(@ApiParam(value = "projectId", required = false) Integer projectId); } diff --git a/src/main/java/com/msdw/tms/controller/AchievementManagementController.java b/src/main/java/com/msdw/tms/controller/AchievementManagementController.java index 932bf2f..1d4e48f 100644 --- a/src/main/java/com/msdw/tms/controller/AchievementManagementController.java +++ b/src/main/java/com/msdw/tms/controller/AchievementManagementController.java @@ -3,6 +3,7 @@ package com.msdw.tms.controller; import com.msdw.tms.api.AchievementManagementApi; import com.msdw.tms.common.utils.R; import com.msdw.tms.entity.*; +import com.msdw.tms.entity.vo.AchievementManagementVO; import com.msdw.tms.entity.vo.ResultsVo; import com.msdw.tms.service.AchievementManagementService; import com.msdw.tms.service.ProjectRecordService; @@ -276,4 +277,14 @@ public class AchievementManagementController implements AchievementManagementApi public R deleteReportByProjectId(@RequestParam Integer projectId) { return service.deleteReportByProjectId(projectId); } + + /** + * 成绩管理:虚拟仿真实验成绩管理 + */ + @Override + @GetMapping("/getImitationAchievement") + public R getImitationAchievement(@RequestParam(required = true) Integer projectId) { + List result = service.getImitationAchievement(projectId); + return R.ok().put("data", result); + } } diff --git a/src/main/java/com/msdw/tms/dao/AchievementManagementDao.java b/src/main/java/com/msdw/tms/dao/AchievementManagementDao.java index d8120c3..959ce8a 100644 --- a/src/main/java/com/msdw/tms/dao/AchievementManagementDao.java +++ b/src/main/java/com/msdw/tms/dao/AchievementManagementDao.java @@ -74,4 +74,7 @@ public interface AchievementManagementDao extends BaseMapper getImitationAchievement(Integer projectId); } diff --git a/src/main/java/com/msdw/tms/service/AchievementManagementService.java b/src/main/java/com/msdw/tms/service/AchievementManagementService.java index ebeb83d..2aad068 100644 --- a/src/main/java/com/msdw/tms/service/AchievementManagementService.java +++ b/src/main/java/com/msdw/tms/service/AchievementManagementService.java @@ -6,6 +6,7 @@ import com.msdw.tms.entity.ExperimentalReportEntity; import com.msdw.tms.entity.ExperimentalTeachingEntity; import com.msdw.tms.entity.ReportEntity; import com.msdw.tms.entity.ResultsEntity; +import com.msdw.tms.entity.vo.AchievementManagementVO; import com.msdw.tms.entity.vo.ResultsVo; import javax.servlet.http.HttpServletResponse; @@ -44,4 +45,6 @@ public interface AchievementManagementService extends IService getImitationAchievement(Integer projectId); } diff --git a/src/main/java/com/msdw/tms/service/impl/AchievementManagementServiceImpl.java b/src/main/java/com/msdw/tms/service/impl/AchievementManagementServiceImpl.java index 9c0a6a9..5b51925 100644 --- a/src/main/java/com/msdw/tms/service/impl/AchievementManagementServiceImpl.java +++ b/src/main/java/com/msdw/tms/service/impl/AchievementManagementServiceImpl.java @@ -292,4 +292,11 @@ public class AchievementManagementServiceImpl extends ServiceImpl getImitationAchievement(Integer projectId) { + List list = achievementManagementDao.getImitationAchievement(projectId); + + return list; + } + } diff --git a/src/main/resources/mapper/tms/AchievementManagementDao.xml b/src/main/resources/mapper/tms/AchievementManagementDao.xml index 44aeaa4..7a50e76 100644 --- a/src/main/resources/mapper/tms/AchievementManagementDao.xml +++ b/src/main/resources/mapper/tms/AchievementManagementDao.xml @@ -482,4 +482,13 @@ WHERE hr_project_management.projectId = #{projectId} + + \ No newline at end of file