From f2032d8331cd8939bb8dd4ef372033a2dcdbc850 Mon Sep 17 00:00:00 2001
From: liuyg <liuyg@qq.com>
Date: Thu, 17 Feb 2022 16:10:55 +0800
Subject: [PATCH] +添加法人变更，以及跨区域备案字段更改
---
src/main/java/org/springblade/modules/exam/service/impl/ExamScoreServiceImpl.java | 64 +++++++++++++++++++++++++++++--
1 files changed, 59 insertions(+), 5 deletions(-)
diff --git a/src/main/java/org/springblade/modules/exam/service/impl/ExamScoreServiceImpl.java b/src/main/java/org/springblade/modules/exam/service/impl/ExamScoreServiceImpl.java
index c4386ea..8a3a54f 100644
--- a/src/main/java/org/springblade/modules/exam/service/impl/ExamScoreServiceImpl.java
+++ b/src/main/java/org/springblade/modules/exam/service/impl/ExamScoreServiceImpl.java
@@ -18,9 +18,10 @@
import org.springblade.modules.exam.service.ExamScoreService;
import org.springblade.modules.exam.service.ExamSubjectChoicesService;
import org.springblade.modules.exam.util.SecurityPaperUtil;
-import org.springblade.modules.exam.vo.ExamResultVO;
-import org.springblade.modules.exam.vo.ExamScoreVO;
-import org.springblade.modules.exam.vo.UpdateParamVo;
+import org.springblade.modules.exam.vo.*;
+import org.springblade.modules.information.entity.Information;
+import org.springblade.modules.information.service.IInformationService;
+import org.springblade.modules.information.vo.InformationVO;
import org.springblade.modules.securitypaper.entity.SecurityPaper;
import org.springblade.modules.securitypaper.service.SecurityPaperService;
import org.springblade.modules.system.entity.User;
@@ -67,6 +68,11 @@
@Autowired
private ExamAnswerRecordService examAnswerRecordService;
+
+ @Autowired
+ private IInformationService informationService;
+
+
/**
* 自定义分页数据
@@ -483,8 +489,8 @@
}
@Override
- public IPage<ExamScoreVO> scorePage(IPage page, String deptid, String jurisdiction) {
- return page.setRecords(baseMapper.scorePage(page,deptid,jurisdiction));
+ public IPage<ExamScoreVO> scorePage(IPage page, ExamScoreVO examScore) {
+ return page.setRecords(baseMapper.scorePage(page,examScore));
}
/**
@@ -825,4 +831,52 @@
}
return false;
}
+
+ /**
+ * 考试情况统计，按月统计各个培训学校考试合格人数和不合格人数
+ * @param
+ */
+ @Override
+ public Object getExamStatisInfo(InformationVO information) {
+ //获取培训学校信息
+ Information information2 = new Information();
+ information2.setStats("1");
+ List<Information> informationList = informationService.list(Condition.getQueryWrapper(information2));
+ //创建 objectList 集合
+ List<Object> objectList = new ArrayList<>();
+ for (Information information1 : informationList) {
+ //查询各个培训学校本年每月考试情况统计,不是测试学校
+ if(!information1.getId().equals(469)) {
+ //合格和不合格
+ ExamSocreStatisVo statisVo = new ExamSocreStatisVo();
+ ExamSocreStatisVo statisVo1 = new ExamSocreStatisVo();
+
+ information.setDepartmentid(information1.getDepartmentid());
+ //统计数据查询
+ List<ExamSocreStatis> examStatisInfo = baseMapper.getExamStatisInfo(information);
+ //数据转换
+ List<Integer> list = new ArrayList<>();
+ List<Integer> list1 = new ArrayList<>();
+ for (ExamSocreStatis examSocreStatis : examStatisInfo) {
+ //合格人数集合
+ list.add(examSocreStatis.getHgnum());
+ //不合格人数集合
+ list1.add(examSocreStatis.getBhgnum());
+ }
+ //合格
+ statisVo.setName(information1.getEnterprisename());
+ statisVo.setType(1);
+ statisVo.setExamSocreStatis(list);
+ //不合格
+ statisVo1.setName(information1.getEnterprisename());
+ statisVo1.setType(2);
+ statisVo1.setExamSocreStatis(list1);
+ //数据封装
+ objectList.add(statisVo);
+ objectList.add(statisVo1);
+ }
+ }
+ //返回数据
+ return objectList;
+ }
}
--
Gitblit v1.9.3