From 5cceb01ea15fa807ebe0011c5b38780cb3e3e2c3 Mon Sep 17 00:00:00 2001
From: Administrator <admin>
Date: Fri, 12 Nov 2021 23:50:26 +0800
Subject: [PATCH] 部门数菜单修改，考试审核修改
---
src/main/java/org/springblade/modules/system/mapper/DeptMapper.java | 6 +++
src/main/java/org/springblade/modules/system/mapper/DeptMapper.xml | 24 ++++++++++++
src/main/java/org/springblade/modules/system/service/impl/UserServiceImpl.java | 38 +++++++++++++++++++
src/main/java/org/springblade/modules/system/service/impl/DeptServiceImpl.java | 2
src/main/java/org/springblade/modules/exam/service/impl/ExamScoreServiceImpl.java | 2
src/main/java/org/springblade/modules/exam/service/impl/ScoreAuditRecordsServiceImpl.java | 2
src/main/java/org/springblade/modules/exam/controller/ExamPaperController.java | 15 +++++++
src/main/java/org/springblade/modules/exam/mapper/ExamPaperMapper.xml | 2
src/main/java/org/springblade/modules/exam/controller/ExamScoreController.java | 2
9 files changed, 88 insertions(+), 5 deletions(-)
diff --git a/src/main/java/org/springblade/modules/exam/controller/ExamPaperController.java b/src/main/java/org/springblade/modules/exam/controller/ExamPaperController.java
index cbc2943..0f9ce13 100644
--- a/src/main/java/org/springblade/modules/exam/controller/ExamPaperController.java
+++ b/src/main/java/org/springblade/modules/exam/controller/ExamPaperController.java
@@ -35,6 +35,8 @@
import org.springblade.modules.exam.vo.ExamPaperVO;
import org.springblade.modules.exam.vo.ExamSubjectChoicesVO;
import org.springblade.modules.exam.wrapper.ExamPaperWrapper;
+import org.springblade.modules.system.entity.User;
+import org.springblade.modules.system.service.IUserService;
import org.springblade.modules.training.entity.TrainExam;
import org.springblade.modules.training.entity.TrainingRegistration;
import org.springblade.modules.training.service.TrainingRegistrationService;
@@ -61,6 +63,9 @@
private final TrainingRegistrationService trainingRegistrationService;
+
+
+ private final IUserService userService;
/**
@@ -272,6 +277,16 @@
//审核通过，则生成准考证号
if (examPaper.getAuditStatus()==1) {
trainingRegistration.setAuditStatus(1);
+ //查询当前用户审核状态，如果异常，则审核不通过
+ User user = userService.getById(trainingRegistration.getUserId());
+ if (null!=user){
+ if (null!=user.getExaminationType() && !user.getExaminationType().equals("")){
+ if (user.getExaminationType().equals("1")){
+ //审核不通过
+ trainingRegistration.setAuditStatus(2);
+ }
+ }
+ }
//生成准考证号
trainingRegistration.setCandidateNo(getCandidateNo(examPaper));
}
diff --git a/src/main/java/org/springblade/modules/exam/controller/ExamScoreController.java b/src/main/java/org/springblade/modules/exam/controller/ExamScoreController.java
index 23b8888..bcaf81c 100644
--- a/src/main/java/org/springblade/modules/exam/controller/ExamScoreController.java
+++ b/src/main/java/org/springblade/modules/exam/controller/ExamScoreController.java
@@ -162,7 +162,7 @@
ExamPaper paper = examPaperService.getById(examScore.getExamId());
// if (paper.getExamType() == 1) {
//如果已有保安证编号，不更新用户信息
- if (null==user1.getSecuritynumber() || user1.getSecuritynumber()=="") {
+ if (null==user1.getSecuritynumber() || user1.getSecuritynumber().equals("")) {
//去生成保安证编号
String pre = SecurityPaperUtil.getSecurityPaper();
//查询当前年份已有的保安证编号
diff --git a/src/main/java/org/springblade/modules/exam/mapper/ExamPaperMapper.xml b/src/main/java/org/springblade/modules/exam/mapper/ExamPaperMapper.xml
index b3ce2b6..a1e2cb4 100644
--- a/src/main/java/org/springblade/modules/exam/mapper/ExamPaperMapper.xml
+++ b/src/main/java/org/springblade/modules/exam/mapper/ExamPaperMapper.xml
@@ -220,7 +220,7 @@
<!--查询当前考试已报名的人员培训报名数据集合-->
<select id="getTrainList" resultType="org.springblade.modules.training.entity.TrainingRegistration">
SELECT
- str.id
+ str.id,str.user_id userId
FROM
sys_training_registration str
left join
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 9396217..77273b8 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
@@ -279,7 +279,7 @@
//正式考试通过生成保安证编号
// if (examPaper.getExamType()==1) {
//如果已有保安证编号，不更新用户信息
- if (null==user.getSecuritynumber() || user.getSecuritynumber()=="") {
+ if (null==user.getSecuritynumber() || user.getSecuritynumber().equals("")) {
//去生成保安证编号
String pre = SecurityPaperUtil.getSecurityPaper();
//查询当前年份已有的保安证编号
diff --git a/src/main/java/org/springblade/modules/exam/service/impl/ScoreAuditRecordsServiceImpl.java b/src/main/java/org/springblade/modules/exam/service/impl/ScoreAuditRecordsServiceImpl.java
index 877d8cf..bf285b9 100644
--- a/src/main/java/org/springblade/modules/exam/service/impl/ScoreAuditRecordsServiceImpl.java
+++ b/src/main/java/org/springblade/modules/exam/service/impl/ScoreAuditRecordsServiceImpl.java
@@ -142,7 +142,7 @@
//设置为未制证的状态
user.setUserType(7);
//如果已有保安证编号，不更保安证编号信息
- if (null == user.getSecuritynumber() || user.getSecuritynumber() == "") {
+ if (null == user.getSecuritynumber() || user.getSecuritynumber().equals("")) {
//去生成保安证编号
String pre = SecurityPaperUtil.getSecurityPaper();
//查询当前年份已有的保安证编号
diff --git a/src/main/java/org/springblade/modules/system/mapper/DeptMapper.java b/src/main/java/org/springblade/modules/system/mapper/DeptMapper.java
index 5c6cd16..81ca99f 100644
--- a/src/main/java/org/springblade/modules/system/mapper/DeptMapper.java
+++ b/src/main/java/org/springblade/modules/system/mapper/DeptMapper.java
@@ -165,4 +165,10 @@
* @return
*/
UserVO getUserInfoById(String userId);
+
+ /**
+ * 查所有公安局数据
+ * @return
+ */
+ List<DeptVO> lazyTreeByJurisdiction();
}
diff --git a/src/main/java/org/springblade/modules/system/mapper/DeptMapper.xml b/src/main/java/org/springblade/modules/system/mapper/DeptMapper.xml
index 3e4a26e..16728bc 100644
--- a/src/main/java/org/springblade/modules/system/mapper/DeptMapper.xml
+++ b/src/main/java/org/springblade/modules/system/mapper/DeptMapper.xml
@@ -730,4 +730,28 @@
where bu.id = #{param1}
</select>
+ <!--查所有公安局数据 tree -->
+ <select id="lazyTreeByJurisdiction" resultMap="treeNodeResultMap" >
+ SELECT
+ dept.id,
+ dept.parent_id,
+ dept.dept_name AS title,
+ dept.id AS "value",
+ dept.id AS "key",
+ (
+ SELECT
+ CASE WHEN count(1) > 0 THEN 1 ELSE 0 END
+ FROM
+ sys_jurisdiction
+ WHERE
+ parent_id = sj.id and is_deleted = 0
+ ) AS "has_children"
+ FROM
+ sys_jurisdiction sj
+ left join
+ blade_dept dept
+ on
+ sj.dept_name = dept.dept_name
+ </select>
+
</mapper>
diff --git a/src/main/java/org/springblade/modules/system/service/impl/DeptServiceImpl.java b/src/main/java/org/springblade/modules/system/service/impl/DeptServiceImpl.java
index 441a4d7..e207043 100644
--- a/src/main/java/org/springblade/modules/system/service/impl/DeptServiceImpl.java
+++ b/src/main/java/org/springblade/modules/system/service/impl/DeptServiceImpl.java
@@ -123,7 +123,7 @@
}
if (dept.getParentId().equals(0L)){
//南昌市公安局
- return ForestNodeMerger.merge(baseMapper.lazyTree(tenantId, null,2));
+ return ForestNodeMerger.merge(baseMapper.lazyTreeByJurisdiction());
}
}
}
diff --git a/src/main/java/org/springblade/modules/system/service/impl/UserServiceImpl.java b/src/main/java/org/springblade/modules/system/service/impl/UserServiceImpl.java
index 082b299..3e6a6bd 100644
--- a/src/main/java/org/springblade/modules/system/service/impl/UserServiceImpl.java
+++ b/src/main/java/org/springblade/modules/system/service/impl/UserServiceImpl.java
@@ -955,6 +955,44 @@
}
+// /**
+// * 导入保安员（测试，用来更新数据用）
+// *
+// * @param data
+// * @param isCovered
+// */
+// @Override
+//// @Transactional(rollbackFor = Exception.class)
+// public void importSecurity(List<SecurityExcel> data, Boolean isCovered, String deptId) {
+// //将不能导入的保安员账号存起来
+// List<String> errorList = new ArrayList<>();
+// //导入状态，默认为true ,如果有一个出现问题则为 false
+// AtomicBoolean status = new AtomicBoolean(true);
+// data.forEach(userExcel -> {
+// //判断当前用户是否已在本单位，如果是的更新数据
+// User user1 = new User();
+// user1.setAccount(userExcel.getCardid());
+// user1.setIsDeleted(0);
+// user1.setStatus(1);
+// User user2 = this.getOne(Condition.getQueryWrapper(user1));
+// if (null!=user2){
+// if (null!=userExcel.getRegistered() && userExcel.getRegistered()!=""){
+// user2.setRegistered(userExcel.getRegistered());
+// user2.setUserType(7);
+// }
+// this.updateById(user2);
+// }else {
+// errorList.add(userExcel.getCardid());
+// }
+// });
+// //如果所有数据导入有一个异常
+// if (!status.get()){
+// String errorAccount = StringUtils.join(errorList, "\\\n");
+// throw new ServiceException("用户:["+errorAccount+"]导入失败!已在其他单位存在!");
+// }
+// }
+
+
/**
* 根据保安员编码查询保安信息
*
--
Gitblit v1.9.3