成绩管理增加平均分字段

4 years ago · ce20c1ab84
parent 7510a8fc60
commit ce20c1ab84
3 changed files with 50 additions and 35 deletions
--- a/src/main/java/com/msdw/tms/dao/AchievementManagementDao.java
+++ b/src/main/java/com/msdw/tms/dao/AchievementManagementDao.java
@ -51,6 +51,9 @@ public interface AchievementManagementDao extends BaseMapper<ExperimentalReportE

    IPage<AchievementManagementVO> queryEvaluationReport(Page<T> tPage, String searchContant, Integer projectId);

+    //实验成绩管理查看成绩 统计平均分
+    String getAVG(Integer projectId);
+
    List<AchievementImportRequest> queryAchievement(@Param("ids") List<Integer> ids);

    List<AchievementManagementVO> queryFictitiousRecord(Integer systemId, String searchContant, String startingtime, String endtime, Integer month, List<Integer> projectIds);
@ -71,5 +74,5 @@ public interface AchievementManagementDao extends BaseMapper<ExperimentalReportE

    List<AchievementManagementVO> queryPythonTest(Integer eventId);

-    void updateSignatrue(Integer isSignature,Integer signatureId,Integer reportId,String comment);
+    void updateSignatrue(Integer isSignature, Integer signatureId, Integer reportId, String comment);
 }
--- a/src/main/java/com/msdw/tms/service/impl/AchievementManagementServiceImpl.java
+++ b/src/main/java/com/msdw/tms/service/impl/AchievementManagementServiceImpl.java
@ -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 {
@ -58,39 +59,39 @@ public class AchievementManagementServiceImpl extends ServiceImpl<AchievementMan
        experimentalReportEntity.setReportId(reportId);
        ExperimentalReportEntity experimentalReportEntity1 = baseMapper.getReport(experimentalReportEntity);
        List<UserScoreVO> score = baseMapper.getScore(userScoreVO);
-        obj.put("score",score);
-        obj.put("experimentalReportEntity",experimentalReportEntity1);
+        obj.put("score", score);
+        obj.put("experimentalReportEntity", experimentalReportEntity1);
        List<Integer> tradingJudgmentPointsIds = baseMapper.queryTradingJudgmentPointsId(reportId);
        Integer size = tradingJudgmentPointsIds.size();
-        for (int i = 0;i<size; i++){
+        for (int i = 0; i < size; i++) {
            Integer tradingJudgmentPointsId = tradingJudgmentPointsIds.get(i);
            List<JudgmentPointsRuleVO> judgmentPointsRuleList = baseMapper.getUserAnswers(tradingJudgmentPointsId);
-            map.put("judgmentPointsRuleList"+i,judgmentPointsRuleList);
+            map.put("judgmentPointsRuleList" + i, judgmentPointsRuleList);
        }
-        obj.put("userAnswersList",map);
-        return R.ok().put("data",obj);
+        obj.put("userAnswersList", map);
+        return R.ok().put("data", obj);
    }

    @Override
    public R getTeacher(Integer projectId) {
        String name = baseMapper.getTeacher(projectId);
-        return R.ok().put("name",name);
+        return R.ok().put("name", name);
    }

    @Override
-    public List<ResultsEntity> list(ResultsVo vo,Integer page,Integer size) {
+    public List<ResultsEntity> list(ResultsVo vo, Integer page, Integer size) {
        List<ResultsEntity> list = achievementManagementDao.list(vo);
        return list;
    }

    @Override
-    public List<ReportEntity> reportList(ResultsVo vo,Integer page,Integer size) {
+    public List<ReportEntity> reportList(ResultsVo vo, Integer page, Integer size) {
        List<ReportEntity> reportList = achievementManagementDao.reportList(vo);
        return reportList;
    }

    @Override
-    public List<ResultsEntity> newList(ResultsVo vo,Integer page,Integer size) {
+    public List<ResultsEntity> newList(ResultsVo vo, Integer page, Integer size) {
        List<ResultsEntity> newList = achievementManagementDao.newList(vo);
        return newList;
    }
@ -152,20 +153,20 @@ public class AchievementManagementServiceImpl extends ServiceImpl<AchievementMan
        Integer eventId = report.getEventId();
        ProjectRecordEntity record = projectRecordDao.queryReport(eventId);
        String userName = userInfoDao.queryUserReport(record.getUserid());
-        if (report.getProjectId()!=null){
+        if (report.getProjectId() != null) {
            String evaluationName = achievementManagementDao.queryEvaluationName(report.getProjectId());
            report.setEvaluationName(evaluationName);
        }
        //python实验数据
        Integer systemId = report.getSystemId();
-        if (systemId==1|systemId==4|systemId==5) {
+        if (systemId == 1 | systemId == 4 | systemId == 5) {
            List<AchievementManagementVO> data = achievementManagementDao.queryPythonTest(eventId);
            map.put("data", data);
        }
        report.setUserName(userName);
-        map.put("report",report);
-        map.put("record",record);
-        return R.ok().put("data",map);
+        map.put("report", report);
+        map.put("record", record);
+        return R.ok().put("data", map);
    }

    @Override
@ -176,12 +177,17 @@ public class AchievementManagementServiceImpl extends ServiceImpl<AchievementMan
    }

    @Override
-    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);
+    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
@ -190,10 +196,10 @@ public class AchievementManagementServiceImpl extends ServiceImpl<AchievementMan
        List<Integer> list = new ArrayList<>();

        String[] split = ids.split(",");
-        for (int i = 0;i<split.length;i++){
+        for (int i = 0; i < split.length; i++) {
            list.add(Integer.parseInt(split[i]));
        }
-        List<AchievementImportRequest> achievement =  achievementManagementDao.queryAchievement(list);
+        List<AchievementImportRequest> achievement = achievementManagementDao.queryAchievement(list);

        //2.加载模板流数据
        ClassPathResource resource = new ClassPathResource("excel-template/川大成绩管理实验记录导出模板.xlsx");
@ -205,7 +211,7 @@ public class AchievementManagementServiceImpl extends ServiceImpl<AchievementMan
    }

    @Override
-    public R queryAchievement(Integer systemId,Integer projectPermissions, String searchContant, String startingtime,
+    public R queryAchievement(Integer systemId, Integer projectPermissions, String searchContant, String startingtime,
                              String endtime, Integer month) {
        try {
            List<AchievementManagementVO> fictitious;
@ -213,14 +219,16 @@ 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==0){//只查询练习项目
+            if (projectPermissions == null) {
+                projectPermissions = -9999;
+            }
+            if (projectPermissions == 0) {//只查询练习项目
                fictitious = achievementManagementDao.queryFictitiousRecord(systemId, searchContant, startingtime, endtime, month, fictitiousResult);
                vo = fictitious;
-            }else if (projectPermissions==1){//只查询考核项目
+            } else if (projectPermissions == 1) {//只查询考核项目
                education = achievementManagementDao.queryEducationRecord(systemId, searchContant, startingtime, endtime, month, educationResult);
                vo = education;
-            }else {//查询练习+考核项目
+            } else {//查询练习+考核项目
                if (educationResult.size() == 0) {
                    if (fictitiousResult.size() > 0) {
                        fictitious = achievementManagementDao.queryFictitiousRecord(systemId, searchContant, startingtime, endtime, month, fictitiousResult);
@ -245,10 +253,10 @@ public class AchievementManagementServiceImpl extends ServiceImpl<AchievementMan
                    }
                }
            }
-            return R.ok().put("data",vo);
-        }catch (RuntimeException e){
+            return R.ok().put("data", vo);
+        } catch (RuntimeException e) {
            log.info(e.getMessage());
-            return R.error(500,"系统异常！！！");
+            return R.error(500, "系统异常！！！");
        }
    }

@ -267,13 +275,13 @@ public class AchievementManagementServiceImpl extends ServiceImpl<AchievementMan
        Integer signatureId = entity.getSignatureId();
        Integer reportId = entity.getReportId();
        String comment = entity.getComment();
-        if (comment==""){
+        if (comment == "") {
            comment = null;
        }
-        if (isSignature==1){
-            achievementManagementDao.updateSignatrue(1,signatureId,reportId,comment);
-        }else {
-            achievementManagementDao.updateSignatrue(0,null,reportId,comment);
+        if (isSignature == 1) {
+            achievementManagementDao.updateSignatrue(1, signatureId, reportId, comment);
+        } else {
+            achievementManagementDao.updateSignatrue(0, null, reportId, comment);
        }
    }

--- a/src/main/resources/mapper/tms/AchievementManagementDao.xml
+++ b/src/main/resources/mapper/tms/AchievementManagementDao.xml
@ -166,6 +166,10 @@
        ORDER BY tpr.submitTime DESC
    </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
        u.userName,