成绩管理增加平均分字段

hehai
rong.liu 4 years ago
parent 7510a8fc60
commit ce20c1ab84
  1. 3
      src/main/java/com/msdw/tms/dao/AchievementManagementDao.java
  2. 12
      src/main/java/com/msdw/tms/service/impl/AchievementManagementServiceImpl.java
  3. 4
      src/main/resources/mapper/tms/AchievementManagementDao.xml

@ -51,6 +51,9 @@ public interface AchievementManagementDao extends BaseMapper<ExperimentalReportE
IPage<AchievementManagementVO> queryEvaluationReport(Page<T> tPage, String searchContant, Integer projectId); IPage<AchievementManagementVO> queryEvaluationReport(Page<T> tPage, String searchContant, Integer projectId);
//实验成绩管理查看成绩 统计平均分
String getAVG(Integer projectId);
List<AchievementImportRequest> queryAchievement(@Param("ids") List<Integer> ids); List<AchievementImportRequest> queryAchievement(@Param("ids") List<Integer> ids);
List<AchievementManagementVO> queryFictitiousRecord(Integer systemId, String searchContant, String startingtime, String endtime, Integer month, List<Integer> projectIds); List<AchievementManagementVO> queryFictitiousRecord(Integer systemId, String searchContant, String startingtime, String endtime, Integer month, List<Integer> projectIds);

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

@ -166,6 +166,10 @@
ORDER BY tpr.submitTime DESC ORDER BY tpr.submitTime DESC
</select> </select>
<select id="getAVG" parameterType="java.lang.Integer" resultType="java.lang.String">
SELECT AVG(score) from tms_project_record WHERE projectId = #{projectId}
</select>
<select id="queryAchievement" resultType="com.msdw.tms.entity.request.AchievementImportRequest"> <select id="queryAchievement" resultType="com.msdw.tms.entity.request.AchievementImportRequest">
SELECT SELECT
u.userName, u.userName,

Loading…
Cancel
Save