From 934b32c0af147ef324736c835e0e877962e893fe Mon Sep 17 00:00:00 2001
From: guoshilong <123456>
Date: Tue, 19 Dec 2023 11:47:09 +0800
Subject: [PATCH] 审批功能
---
src/main/java/org/springblade/modules/system/mapper/UserMapper.xml | 15 +++++++++++++++
src/main/java/org/springblade/modules/system/service/impl/UserServiceImpl.java | 5 +++++
src/main/java/org/springblade/modules/exam/vo/ExamScoreVO.java | 2 ++
src/main/java/org/springblade/modules/exam/mapper/ExamScoreMapper.xml | 14 +++++++++++++-
src/main/java/org/springblade/modules/system/controller/UserController.java | 7 +++++++
src/main/java/org/springblade/modules/system/entity/User.java | 10 +++++-----
src/main/java/org/springblade/modules/system/mapper/UserMapper.java | 2 ++
src/main/java/org/springblade/modules/system/service/IUserService.java | 2 ++
8 files changed, 51 insertions(+), 6 deletions(-)
diff --git a/src/main/java/org/springblade/modules/exam/mapper/ExamScoreMapper.xml b/src/main/java/org/springblade/modules/exam/mapper/ExamScoreMapper.xml
index e67c4bd..65dc420 100644
--- a/src/main/java/org/springblade/modules/exam/mapper/ExamScoreMapper.xml
+++ b/src/main/java/org/springblade/modules/exam/mapper/ExamScoreMapper.xml
@@ -525,13 +525,17 @@
id
</select>
<select id="getList" resultType="org.springblade.modules.exam.vo.ExamScoreVO">
+ SELECT * FROM (
SELECT
es.id,es.theory_grade theoryGrade,ifnull(learn_grade,-1) learnGrade,es.user_id userId,es.exam_id examId,
es.exam_time examTime,all_grade allGrade,exam_end_time examEndTime,qualified,es.candidate_no candidateNo,
ke.exam_name examName,date_format(ke.start_time,'%Y-%m-%d') startTime,date_format(ke.end_time,'%Y-%m-%d %H:%i:%s') endTime,
str.is_exam isExam,
bu.real_name securityName,company,bu.account,bu.sex,bu.paper_time paperTime,bu.securitynumber securityNumber,bu.avatar,
- bd.dept_name companyName,bd.id as deptId,bu.user_type isPaper,bud.unit_name unitName
+ bd.dept_name companyName,bd.id as deptId,bu.user_type isPaper,bud.unit_name unitName,
+ CASE WHEN ssir.id IS NULL THEN
+ '未签到' ELSE '已签到'
+ END AS state
from
exam_score es
left join ksxt_exam ke on ke.id = es.exam_id
@@ -541,6 +545,7 @@
left join sys_information si on si.departmentid = bd.id
left join sys_jurisdiction sj on sj.id = si.jurisdiction
left join sys_training_registration str on str.id = es.apply_id
+ LEFT JOIN sys_sign_in_records ssir ON ssir.candidate_no = str.candidate_no
where 1=1 and es.is_deleted = 0
and (str.is_exam = 2 or str.is_exam = 3 or str.is_exam = 4 or str.is_exam = 5)
<if test="examScore.examName!=null and examScore.examName!=''">
@@ -609,6 +614,13 @@
<if test="examScore.sortName==null or examScore.sortName==''">
order by es.id desc
</if>
+ ) result WHERE 1=1
+ <if test="examScore.state != null and examScore.state !='' ">
+ AND result.state = #{examScore.state}
+ </if>
+
+
+
</select>
diff --git a/src/main/java/org/springblade/modules/exam/vo/ExamScoreVO.java b/src/main/java/org/springblade/modules/exam/vo/ExamScoreVO.java
index f138c64..8276a11 100644
--- a/src/main/java/org/springblade/modules/exam/vo/ExamScoreVO.java
+++ b/src/main/java/org/springblade/modules/exam/vo/ExamScoreVO.java
@@ -154,4 +154,6 @@
*/
private String unitName;
+ //签到情况
+ private String state;
}
diff --git a/src/main/java/org/springblade/modules/system/controller/UserController.java b/src/main/java/org/springblade/modules/system/controller/UserController.java
index e0a6058..4ed23d0 100644
--- a/src/main/java/org/springblade/modules/system/controller/UserController.java
+++ b/src/main/java/org/springblade/modules/system/controller/UserController.java
@@ -1394,4 +1394,11 @@
return R.data(userInfoDetail);
}
+ @PostMapping("/batchAudit")
+ public R batchAudit(String ids,String auditStatus){
+ boolean result = userService.batchAudit(ids,auditStatus);
+ return R.status(result);
+ }
+
+
}
diff --git a/src/main/java/org/springblade/modules/system/entity/User.java b/src/main/java/org/springblade/modules/system/entity/User.java
index b8847fc..45ac5b4 100644
--- a/src/main/java/org/springblade/modules/system/entity/User.java
+++ b/src/main/java/org/springblade/modules/system/entity/User.java
@@ -254,9 +254,9 @@
* 是否冻结 0：否 1：是
*/
private Integer isFreeze;
-//
-// /**
-// * 审核状态：1、审核通过；2、审核不通过 10、待审核
-// */
-// private Integer auditStatus;
+
+ /**
+ * 审核状态：1、审核通过；2、审核不通过 10、待审核
+ */
+ private Integer auditStatus;
}
diff --git a/src/main/java/org/springblade/modules/system/mapper/UserMapper.java b/src/main/java/org/springblade/modules/system/mapper/UserMapper.java
index e0add12..fd3856d 100644
--- a/src/main/java/org/springblade/modules/system/mapper/UserMapper.java
+++ b/src/main/java/org/springblade/modules/system/mapper/UserMapper.java
@@ -319,4 +319,6 @@
List<User> getNotGlList();
UserInfoDetail getUserInfoDetail(@Param("id") String id);
+
+ boolean batchAudit(@Param("ids") String ids, @Param("auditStatus") String auditStatus);
}
diff --git a/src/main/java/org/springblade/modules/system/mapper/UserMapper.xml b/src/main/java/org/springblade/modules/system/mapper/UserMapper.xml
index 3fc64b9..9fcfc83 100644
--- a/src/main/java/org/springblade/modules/system/mapper/UserMapper.xml
+++ b/src/main/java/org/springblade/modules/system/mapper/UserMapper.xml
@@ -104,6 +104,9 @@
<if test="user.roleId!=null and user.roleId != ''">
and bu.role_id = #{user.roleId}
</if>
+ <if test="user.auditStatus != null and user.auditStatus != ''">
+ and bu.audit_status = #{user.auditStatus}
+ </if>
<if test="user.roleAlias!=null and user.roleAlias != ''">
and br.role_alias = '保安'
</if>
@@ -287,6 +290,9 @@
</if>
<if test="user.userType!=null and user.userType != ''">
and bu.user_type = #{user.userType}
+ </if>
+ <if test="user.auditStatus != null and user.auditStatus != ''">
+ and bu.audit_status = #{user.auditStatus}
</if>
<if test="user.securitynumber!=null and user.securitynumber != ''">
and bu.securitynumber like concat('%', #{user.securitynumber},'%')
@@ -1131,6 +1137,15 @@
</choose>
</update>
+
+ <update id="batchAudit">
+ UPDATE BLADE_USER SET audit_status = #{auditStatus}
+ WHERE is_deleted = 0 and id in
+ <foreach collection="ids.split(',')" item="item" open="(" separator="," close=")">
+ #{item}
+ </foreach>
+ </update>
+
<!--判断是否报名-->
<select id="getUserIsApply" resultType="org.springblade.modules.system.entity.User">
select bu.* from blade_user bu
diff --git a/src/main/java/org/springblade/modules/system/service/IUserService.java b/src/main/java/org/springblade/modules/system/service/IUserService.java
index 140a5d7..fdfedb6 100644
--- a/src/main/java/org/springblade/modules/system/service/IUserService.java
+++ b/src/main/java/org/springblade/modules/system/service/IUserService.java
@@ -436,4 +436,6 @@
Boolean wxRegister(User user);
UserInfoDetail getUserInfoDetail(String id);
+
+ boolean batchAudit(String ids, String auditStatus);
}
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 a6f8582..f12e6e3 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
@@ -1931,4 +1931,9 @@
public UserInfoDetail getUserInfoDetail(String id) {
return baseMapper.getUserInfoDetail(id);
}
+
+ @Override
+ public boolean batchAudit(String ids, String auditStatus) {
+ return baseMapper.batchAudit(ids,auditStatus);
+ }
}
--
Gitblit v1.9.3