From c199d41a417faa6e0370d75f3437cd78cffff0b5 Mon Sep 17 00:00:00 2001
From: Administrator <admin>
Date: Mon, 09 Aug 2021 20:42:52 +0800
Subject: [PATCH] 1.派遣记录查询接口修改 2.取消报名接口新增 3.保安列表（未持证）查询接口新增
---
src/main/java/org/springblade/modules/system/mapper/UserMapper.xml | 64 +++++++++++++++++++++
src/main/java/org/springblade/modules/system/service/impl/UserServiceImpl.java | 15 +++++
src/main/java/org/springblade/modules/dispatcher/vo/DispatcherVO.java | 5 +
src/main/java/org/springblade/modules/apply/controller/ApplyController.java | 14 ++--
src/main/java/org/springblade/modules/system/controller/UserController.java | 20 ++++++
src/main/java/org/springblade/modules/apply/entity/Apply.java | 6 --
src/main/java/org/springblade/modules/system/mapper/UserMapper.java | 9 +++
src/main/java/org/springblade/modules/system/service/IUserService.java | 10 +++
src/main/java/org/springblade/modules/dispatcher/mapper/DispatcherMapper.xml | 2
src/main/java/org/springblade/modules/system/vo/UserVO.java | 12 ++++
10 files changed, 143 insertions(+), 14 deletions(-)
diff --git a/src/main/java/org/springblade/modules/apply/controller/ApplyController.java b/src/main/java/org/springblade/modules/apply/controller/ApplyController.java
index a3cfdf7..b035508 100644
--- a/src/main/java/org/springblade/modules/apply/controller/ApplyController.java
+++ b/src/main/java/org/springblade/modules/apply/controller/ApplyController.java
@@ -100,9 +100,9 @@
return R.data(201,"已报名，不能重复报名");
}
//去生成准考证号码
- apply.setCandidateNo(getCandidateNo(apply));
+// apply.setCandidateNo(getCandidateNo(apply));
//去生成考试编号
- apply.setApplyCode(getApplyCode(apply));
+// apply.setApplyCode(getApplyCode(apply));
//默认通过
apply.setApplyStatus(2);
//默认为未考试状态
@@ -110,11 +110,11 @@
apply.setApplyTime(new Date());
}
boolean status = applyService.saveOrUpdate(apply);
-// if (status){
-// //内网新增
-//// arg.test01(arg.url+"/apply/save",apply);
-// return R.data(200,"报名成功");
-// }
+ if (status){
+ //内网新增
+// arg.test01(arg.url+"/apply/save",apply);
+ return R.data(200,"报名成功");
+ }
// //内网修改
// if(null!=apply.getId()){
// //修改
diff --git a/src/main/java/org/springblade/modules/apply/entity/Apply.java b/src/main/java/org/springblade/modules/apply/entity/Apply.java
index 0298a1d..5bda2fe 100644
--- a/src/main/java/org/springblade/modules/apply/entity/Apply.java
+++ b/src/main/java/org/springblade/modules/apply/entity/Apply.java
@@ -176,10 +176,4 @@
*/
@TableField("is_exam")
private Integer isExam;
-
-
- /**
- * 行政区
- */
- private String jurisdiction;
}
diff --git a/src/main/java/org/springblade/modules/dispatcher/mapper/DispatcherMapper.xml b/src/main/java/org/springblade/modules/dispatcher/mapper/DispatcherMapper.xml
index 91ffb4b..1c5dfa7 100644
--- a/src/main/java/org/springblade/modules/dispatcher/mapper/DispatcherMapper.xml
+++ b/src/main/java/org/springblade/modules/dispatcher/mapper/DispatcherMapper.xml
@@ -15,7 +15,7 @@
<!--派遣记录分页数据-->
<select id="selectDispatcherPage" resultType="org.springblade.modules.dispatcher.vo.DispatcherVO">
select
- sd.*,sdu.name dispatcherCompany
+ sd.*,sd.name securityName,sdu.name dispatcherCompany
from
sys_dispatcher sd
left join
diff --git a/src/main/java/org/springblade/modules/dispatcher/vo/DispatcherVO.java b/src/main/java/org/springblade/modules/dispatcher/vo/DispatcherVO.java
index e30878d..b736a29 100644
--- a/src/main/java/org/springblade/modules/dispatcher/vo/DispatcherVO.java
+++ b/src/main/java/org/springblade/modules/dispatcher/vo/DispatcherVO.java
@@ -54,4 +54,9 @@
*/
private String overTime;
+ /**
+ * 保安人员名称
+ */
+ private String securityName;
+
}
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 296d681..9ca8728 100644
--- a/src/main/java/org/springblade/modules/system/controller/UserController.java
+++ b/src/main/java/org/springblade/modules/system/controller/UserController.java
@@ -335,4 +335,24 @@
return pages;
}
+ /**
+ * 自定义用户列表(只有保安员)
+ */
+ @GetMapping("/page-security-units")
+ public R pageSecurityUnits(@ApiIgnore User user, Query query, Long deptId, BladeUser bladeUser) {
+ bladeUser.setTenantId("000000");
+ List<User> pages = userService.selectUserPageSecurityUnit(Condition.getPage(query), user, deptId, "000000");
+ return R.data(pages);
+ }
+
+ /**
+ * 保安员列表，帅选无保安证
+ */
+ @GetMapping("/page-security-apply")
+ public R<IPage<UserVO>> pageSecurityApply(@ApiIgnore UserVO user, Query query, Long deptId, BladeUser bladeUser) {
+ bladeUser.setTenantId("000000");
+ IPage<UserVO> pages = userService.selectUserPageSecurityApply(Condition.getPage(query), user, deptId, "000000");
+ return R.data(pages);
+ }
+
}
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 6721f5d..675305a 100644
--- a/src/main/java/org/springblade/modules/system/mapper/UserMapper.java
+++ b/src/main/java/org/springblade/modules/system/mapper/UserMapper.java
@@ -72,4 +72,13 @@
* 自定义用户列表(只有保安员)
*/
List<User> selectUserPageSecurity(IPage<User> page, @Param("user") User user, @Param("deptIdList") List<Long> deptIdList, @Param("tenantId") String tenantId);
+
+ /**
+ * 保安员列表，帅选无保安证
+ * @param page
+ * @param user
+ * @param tenantId
+ * @return
+ */
+ IPage<UserVO> selectUserPageSecurityApply(IPage<UserVO> page,@Param("user") UserVO user, @Param("deptIdList")List<Long> deptIdList, @Param("tenantId") String tenantId);
}
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 e7bd303..abb9443 100644
--- a/src/main/java/org/springblade/modules/system/mapper/UserMapper.xml
+++ b/src/main/java/org/springblade/modules/system/mapper/UserMapper.xml
@@ -204,4 +204,68 @@
ORDER BY bu.id
</select>
+ <select id="selectUserPageSecurityApply" resultMap="userResultMap">
+ select
+ bu.*,
+ sa.id applyId,sa.apply_status applyStatus,
+ bd.dept_name
+ from
+ blade_user bu
+ left join
+ blade_dept bd
+ on
+ bu.dept_id = bd.id
+ left join
+ sys_apply sa
+ on
+ sa.user_id = bu.id
+ where
+ bu.is_deleted = 0
+ and
+ bd.dept_category = 1
+ and
+ (hold = 2 or hold = 3)
+ <if test="tenantId!=null and tenantId != ''">
+ and bu.tenant_id = #{tenantId}
+ </if>
+ <if test="user.account!=null and user.account != ''">
+ and bu.account = #{user.account}
+ </if>
+ <if test="user.deptId!=null and user.deptId != ''">
+ and bu.dept_id = #{user.deptId}
+ </if>
+ <if test="user.applyStatus!=null">
+ and sa.apply_status = #{user.applyStatus}
+ </if>
+ <if test="user.roleId!=null and user.roleId != ''">
+ and bu.role_id = #{user.roleId}
+ </if>
+ <if test="user.status!=null and user.status != ''">
+ and bu.status = #{user.status}
+ </if>
+ <if test="user.realName!=null and user.realName != ''">
+ and bu.real_name like concat('%', #{user.realName},'%')
+ </if>
+ <if test="user.userType!=null and user.userType != ''">
+ and bu.user_type = #{user.userType}
+ </if>
+ <if test="user.securitynumber!=null and user.securitynumber != ''">
+ and bu.securitynumber = #{user.securitynumber}
+ </if>
+ <if test="deptIdList!=null and deptIdList.size>0">
+ and bu.id in (
+ SELECT
+ user_id
+ FROM
+ blade_user_dept
+ WHERE
+ dept_id IN
+ <foreach collection="deptIdList" index="index" item="item" open="(" separator="," close=")">
+ #{item}
+ </foreach>
+ )
+ </if>
+ ORDER BY bu.id
+ </select>
+
</mapper>
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 b3fd83a..be3c139 100644
--- a/src/main/java/org/springblade/modules/system/service/IUserService.java
+++ b/src/main/java/org/springblade/modules/system/service/IUserService.java
@@ -223,4 +223,14 @@
* 自定义用户列表(只有保安员),根据保安员查
*/
List<User> selectUserPageSecurityUnit(IPage<User> page, User user, Long deptId, String s);
+
+ /**
+ * 保安员列表，帅选无保安证
+ * @param page
+ * @param user
+ * @param deptId
+ * @param s
+ * @return
+ */
+ IPage<UserVO> selectUserPageSecurityApply(IPage<UserVO> page, UserVO user, Long deptId, String s);
}
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 9832ab0..a83eccc 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
@@ -429,4 +429,19 @@
List<Long> deptIdList = SysCache.getDeptChildIds(deptId);
return baseMapper.selectUserPageSecurity(page, user, deptIdList, tenantId);
}
+
+
+ /**
+ * 保安员列表，帅选无保安证
+ * @param page
+ * @param user
+ * @param deptId
+ * @param tenantId
+ * @return
+ */
+ @Override
+ public IPage<UserVO> selectUserPageSecurityApply(IPage<UserVO> page, UserVO user, Long deptId, String tenantId) {
+ List<Long> deptIdList = SysCache.getDeptChildIds(deptId);
+ return baseMapper.selectUserPageSecurityApply(page, user, null, tenantId);
+ }
}
diff --git a/src/main/java/org/springblade/modules/system/vo/UserVO.java b/src/main/java/org/springblade/modules/system/vo/UserVO.java
index f42ae9c..debb952 100644
--- a/src/main/java/org/springblade/modules/system/vo/UserVO.java
+++ b/src/main/java/org/springblade/modules/system/vo/UserVO.java
@@ -91,4 +91,16 @@
* 纬度
*/
private String latitude;
+
+ /**
+ * 报名状态
+ */
+ private Integer applyStatus;
+
+ /**
+ * 报名id
+ */
+ private Long applyId;
+
+
}
--
Gitblit v1.9.3