deason 1 year ago
parent
commit
94548b1c7f

+ 4 - 4
examcloud-core-oe-admin-api-provider/src/main/java/cn/com/qmth/examcloud/core/oe/admin/api/controller/ExamStatisticController.java

@@ -74,8 +74,8 @@ public class ExamStatisticController extends ControllerSupport {
         String filePath = systemConfig.getTempDataDir() + File.separator + System.currentTimeMillis() + ".xlsx";
         String filePath = systemConfig.getTempDataDir() + File.separator + System.currentTimeMillis() + ".xlsx";
         File file = new File(filePath);
         File file = new File(filePath);
 
 
-        ExcelWriter.write(new String[]{"考试ID", "考试名称", "课程名称", "课程代码", "应考人数", "实考人数", "缺考人数", "缺考率",
-                        "及格人数", "及格率", "优秀人数", "优秀率", "违纪人数", "违纪率"},
+        ExcelWriter.write(new String[]{"考试ID", "考试名称", "课程名称", "课程代码", "应考人数", "实考人数", "缺考人数", "缺考率(%)",
+                        "及格人数", "及格率(%)", "优秀人数", "优秀率(%)", "违纪人数", "违纪率(%)"},
                 new Class[]{Long.class, String.class, String.class, String.class, Integer.class, Integer.class,
                 new Class[]{Long.class, String.class, String.class, String.class, Integer.class, Integer.class,
                         Integer.class, Double.class, Integer.class, Double.class, Integer.class, Double.class,
                         Integer.class, Double.class, Integer.class, Double.class, Integer.class, Double.class,
                         Integer.class, Double.class},
                         Integer.class, Double.class},
@@ -108,8 +108,8 @@ public class ExamStatisticController extends ControllerSupport {
         String filePath = systemConfig.getTempDataDir() + File.separator + System.currentTimeMillis() + ".xlsx";
         String filePath = systemConfig.getTempDataDir() + File.separator + System.currentTimeMillis() + ".xlsx";
         File file = new File(filePath);
         File file = new File(filePath);
 
 
-        ExcelWriter.write(new String[]{"考试ID", "考试名称", "学习中心", "应考人数", "实考人数", "缺考人数", "缺考率",
-                        "及格人数", "及格率", "优秀人数", "优秀率", "违纪人数", "违纪率"},
+        ExcelWriter.write(new String[]{"考试ID", "考试名称", "学习中心", "应考人数", "实考人数", "缺考人数", "缺考率(%)",
+                        "及格人数", "及格率(%)", "优秀人数", "优秀率(%)", "违纪人数", "违纪率(%)"},
                 new Class[]{Long.class, String.class, String.class, Integer.class, Integer.class, Integer.class,
                 new Class[]{Long.class, String.class, String.class, Integer.class, Integer.class, Integer.class,
                         Double.class, Integer.class, Double.class, Integer.class, Double.class,
                         Double.class, Integer.class, Double.class, Integer.class, Double.class,
                         Integer.class, Double.class},
                         Integer.class, Double.class},

+ 15 - 0
examcloud-core-oe-admin-service/src/main/java/cn/com/qmth/examcloud/core/oe/admin/service/impl/ExamStatisticServiceImpl.java

@@ -15,10 +15,13 @@ import cn.com.qmth.examcloud.core.oe.admin.service.ExamStatisticService;
 import cn.com.qmth.examcloud.core.oe.admin.service.bean.statistic.ExamStatisticInfo;
 import cn.com.qmth.examcloud.core.oe.admin.service.bean.statistic.ExamStatisticInfo;
 import cn.com.qmth.examcloud.core.oe.admin.service.bean.statistic.ExamStudentScoreInfo;
 import cn.com.qmth.examcloud.core.oe.admin.service.bean.statistic.ExamStudentScoreInfo;
 import cn.com.qmth.examcloud.examwork.api.ExamCloudService;
 import cn.com.qmth.examcloud.examwork.api.ExamCloudService;
+import cn.com.qmth.examcloud.examwork.api.bean.ExamBean;
 import cn.com.qmth.examcloud.examwork.api.request.GetExamCourseIdsReq;
 import cn.com.qmth.examcloud.examwork.api.request.GetExamCourseIdsReq;
 import cn.com.qmth.examcloud.examwork.api.request.GetExamCourseReq;
 import cn.com.qmth.examcloud.examwork.api.request.GetExamCourseReq;
+import cn.com.qmth.examcloud.examwork.api.request.GetExamMapsReq;
 import cn.com.qmth.examcloud.examwork.api.response.GetExamCourseIdsResp;
 import cn.com.qmth.examcloud.examwork.api.response.GetExamCourseIdsResp;
 import cn.com.qmth.examcloud.examwork.api.response.GetExamCourseResp;
 import cn.com.qmth.examcloud.examwork.api.response.GetExamCourseResp;
+import cn.com.qmth.examcloud.examwork.api.response.GetExamMapsResp;
 import cn.com.qmth.examcloud.support.CacheConstants;
 import cn.com.qmth.examcloud.support.CacheConstants;
 import cn.com.qmth.examcloud.web.redis.RedisClient;
 import cn.com.qmth.examcloud.web.redis.RedisClient;
 import org.apache.commons.collections4.CollectionUtils;
 import org.apache.commons.collections4.CollectionUtils;
@@ -198,6 +201,18 @@ public class ExamStatisticServiceImpl implements ExamStatisticService {
             info.setIllegalityRate(MathUtils.percentage(info.getIllegalityCount(), info.getAllCount()));
             info.setIllegalityRate(MathUtils.percentage(info.getIllegalityCount(), info.getAllCount()));
         }
         }
 
 
+        // 获取考试信息
+        Set<Long> examIds = new HashSet<>();
+        examIds.add(examId);
+        GetExamMapsReq examsReq = new GetExamMapsReq();
+        examsReq.setExamIds(examIds);
+        GetExamMapsResp examsResp = examCloudService.getExamMaps(examsReq);
+        Map<Long, ExamBean> examMaps = examsResp.getExamMaps();
+        ExamBean exam = examMaps.get(examId);
+        if (exam != null) {
+            info.setExamName(exam.getName());
+        }
+
         return info;
         return info;
     }
     }