|
|
|
@ -28,6 +28,7 @@ import org.springframework.transaction.annotation.Transactional; |
|
|
|
|
import javax.servlet.http.HttpServletResponse; |
|
|
|
|
import java.io.InputStream; |
|
|
|
|
import java.util.*; |
|
|
|
|
|
|
|
|
|
@Slf4j |
|
|
|
|
@Service |
|
|
|
|
public class AchievementManagementServiceImpl extends ServiceImpl<AchievementManagementDao, ExperimentalReportEntity> implements AchievementManagementService { |
|
|
|
@ -179,9 +180,14 @@ public class AchievementManagementServiceImpl extends ServiceImpl<AchievementMan |
|
|
|
|
public R queryEvaluationReport(String searchContant, Integer projectId, Integer page, Integer size) { |
|
|
|
|
Page<T> tPage = new Page<>(page, size); |
|
|
|
|
IPage<AchievementManagementVO> data = achievementManagementDao.queryEvaluationReport(tPage, searchContant, projectId); |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
String avg = achievementManagementDao.getAVG(projectId); |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
PageUtils result = new PageUtils(data); |
|
|
|
|
|
|
|
|
|
return R.ok().put("data",result); |
|
|
|
|
return R.ok().put("data", result).put("avg", avg); |
|
|
|
|
} |
|
|
|
|
|
|
|
|
|
@Override |
|
|
|
@ -213,7 +219,9 @@ public class AchievementManagementServiceImpl extends ServiceImpl<AchievementMan |
|
|
|
|
List<AchievementManagementVO> vo = new ArrayList<>(); |
|
|
|
|
List<Integer> educationResult = achievementManagementDao.countEducationProjectId();//获取教学实验的主键id
|
|
|
|
|
List<Integer> fictitiousResult = achievementManagementDao.countFictitiousProjectId();//获取教学实验的主键id
|
|
|
|
|
if (projectPermissions==null){projectPermissions=-9999;} |
|
|
|
|
if (projectPermissions == null) { |
|
|
|
|
projectPermissions = -9999; |
|
|
|
|
} |
|
|
|
|
if (projectPermissions == 0) {//只查询练习项目
|
|
|
|
|
fictitious = achievementManagementDao.queryFictitiousRecord(systemId, searchContant, startingtime, endtime, month, fictitiousResult); |
|
|
|
|
vo = fictitious; |
|
|
|
|