From f2767f4dfa4a17c0a89e584047db4e3d7d91666d Mon Sep 17 00:00:00 2001
From: Administrator <admin>
Date: Fri, 27 Aug 2021 15:21:33 +0800
Subject: [PATCH] 派遣记录，单位修改
---
src/main/java/org/springblade/modules/system/mapper/UserMapper.xml | 13 ++++++
src/main/java/org/springblade/modules/dispatcher/vo/DispatcherUnitVO.java | 5 ++
src/main/java/org/springblade/modules/system/service/impl/UserServiceImpl.java | 11 +++++
src/main/java/org/springblade/modules/dispatcher/vo/DispatcherVO.java | 5 ++
src/main/java/org/springblade/modules/jurisdiction/mapper/JurisdictionMapper.xml | 1
src/main/java/org/springblade/modules/dispatcher/mapper/DispatcherUnitMapper.xml | 18 +++++++-
src/main/java/org/springblade/modules/system/controller/UserController.java | 11 +++++
src/main/java/org/springblade/modules/system/mapper/UserMapper.java | 7 +++
src/main/java/org/springblade/modules/system/service/IUserService.java | 7 +++
src/main/java/org/springblade/modules/dispatcher/mapper/DispatcherMapper.xml | 12 +++---
10 files changed, 81 insertions(+), 9 deletions(-)
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 ddc31d2..54c87ed 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.*,bu.real_name securityName,sdu.name dispatcherCompany,bu.cardid
+ sd.*,bu.real_name securityName,sdu.name dispatcherCompany,bu.cardid idCardNo
from
sys_dispatcher sd
left join
@@ -45,11 +45,11 @@
<if test="dispatcher.dispatcherCompany!=null and dispatcher.dispatcherCompany!=''">
and sdu.name like concat('%', #{dispatcher.dispatcherCompany},'%')
</if>
- <if test="dispatcher.beginTime!=null and dispatcher.beginTime!=''">
- and sd.dispatcherTime > #{dispatcher.beginTime}
- </if>
- <if test="dispatcher.overTime!=null and dispatcher.overTime!=''">
- and sd.end_time < #{dispatcher.overTime}
+ <if test="dispatcher.beginTime!=null or dispatcher.overTime!=null">
+ <if test="dispatcher.beginTime!='' or dispatcher.overTime!=''">
+ and sd.end_time <= #{dispatcher.overTime} and sd.end_time >= #{dispatcher.beginTime}
+ or ( sd.dispatcherTime <= #{dispatcher.overTime} and sd.dispatcherTime >= #{dispatcher.beginTime})
+ </if>
</if>
</select>
diff --git a/src/main/java/org/springblade/modules/dispatcher/mapper/DispatcherUnitMapper.xml b/src/main/java/org/springblade/modules/dispatcher/mapper/DispatcherUnitMapper.xml
index 5f5cf52..04bcd38 100644
--- a/src/main/java/org/springblade/modules/dispatcher/mapper/DispatcherUnitMapper.xml
+++ b/src/main/java/org/springblade/modules/dispatcher/mapper/DispatcherUnitMapper.xml
@@ -5,13 +5,17 @@
<!--派遣公司分页信息-->
<select id="selectDispatcherUnitPage" resultType="org.springblade.modules.dispatcher.vo.DispatcherUnitVO">
select
- sdu.*,bt.dept_name deptName
+ sdu.*,bt.dept_name deptName,sj.dept_name jurisdictionName
from
sys_dispatcher_unit sdu
LEFT JOIN
blade_dept bt
ON
sdu.dept_id = bt.id
+ left join
+ sys_jurisdiction sj
+ on
+ sj.id = sdu.jurisdiction
WHERE
1=1
<if test="dispatcherUnit.deptName!=null and dispatcherUnit.deptName!=''">
@@ -35,12 +39,17 @@
<if test="dispatcherUnit.jurisdiction!=null">
and sdu.jurisdiction = #{dispatcherUnit.jurisdiction}
</if>
+ <if test="dispatcherUnit.deptId!=null and dispatcherUnit.deptId!=''">
+ and sdu.dept_id = #{dispatcherUnit.deptId}
+ </if>
<if test="dispatcherUnit.district!=null">
and sdu.district = #{dispatcherUnit.district}
</if>
<if test="dispatcherUnit.beginTime!=null or dispatcherUnit.overTime!=null">
- and sdu.end_time <= #{dispatcherUnit.overTime} and sdu.end_time >= #{dispatcherUnit.beginTime}
- or ( sdu.start_time <= #{dispatcherUnit.overTime} and sdu.start_time >= #{dispatcherUnit.beginTime})
+ <if test="dispatcherUnit.beginTime!='' or dispatcherUnit.overTime!=''">
+ and sdu.end_time <= #{dispatcherUnit.overTime} and sdu.end_time >= #{dispatcherUnit.beginTime}
+ or ( sdu.start_time <= #{dispatcherUnit.overTime} and sdu.start_time >= #{dispatcherUnit.beginTime})
+ </if>
</if>
</select>
@@ -59,6 +68,9 @@
<if test="dispatcherUnit.deptName!=null and dispatcherUnit.deptName!=''">
and bt.dept_name like concat('%', #{dispatcherUnit.deptName},'%')
</if>
+ <if test="dispatcherUnit.deptId!=null and dispatcherUnit.deptId!=''">
+ and sdu.dept_id like concat('%', #{dispatcherUnit.deptId},'%')
+ </if>
<if test="dispatcherUnit.name!=null and dispatcherUnit.name!=''">
and sdu.name like concat('%', #{dispatcherUnit.name},'%')
</if>
diff --git a/src/main/java/org/springblade/modules/dispatcher/vo/DispatcherUnitVO.java b/src/main/java/org/springblade/modules/dispatcher/vo/DispatcherUnitVO.java
index 6c598c0..1659ab2 100644
--- a/src/main/java/org/springblade/modules/dispatcher/vo/DispatcherUnitVO.java
+++ b/src/main/java/org/springblade/modules/dispatcher/vo/DispatcherUnitVO.java
@@ -57,4 +57,9 @@
* 结束时间
*/
private String overTime;
+
+ /**
+ * 辖区名称
+ */
+ private String jurisdictionName;
}
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 b736a29..f1579a0 100644
--- a/src/main/java/org/springblade/modules/dispatcher/vo/DispatcherVO.java
+++ b/src/main/java/org/springblade/modules/dispatcher/vo/DispatcherVO.java
@@ -59,4 +59,9 @@
*/
private String securityName;
+ /**
+ * 身份证号
+ */
+ private String idCardNo;
+
}
diff --git a/src/main/java/org/springblade/modules/jurisdiction/mapper/JurisdictionMapper.xml b/src/main/java/org/springblade/modules/jurisdiction/mapper/JurisdictionMapper.xml
index c2ddb03..69f49cf 100644
--- a/src/main/java/org/springblade/modules/jurisdiction/mapper/JurisdictionMapper.xml
+++ b/src/main/java/org/springblade/modules/jurisdiction/mapper/JurisdictionMapper.xml
@@ -86,6 +86,7 @@
FROM
sys_jurisdiction dept
WHERE dept.is_deleted = 0
+ and dept.parent_id = #{param2}
<if test="param1!=null and param1!=''">
and dept.tenant_id = #{param1}
</if>
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 ebd47d2..eea5dfe 100644
--- a/src/main/java/org/springblade/modules/system/controller/UserController.java
+++ b/src/main/java/org/springblade/modules/system/controller/UserController.java
@@ -640,5 +640,16 @@
}
+ /**
+ * 保安员信息
+ * @param user
+ * @return
+ */
+ @GetMapping("/getUserDetails")
+ public R getUserDetails(User user) {
+ return R.data(userService.getUserDetails(user));
+ }
+
+
}
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 77127e7..14be28f 100644
--- a/src/main/java/org/springblade/modules/system/mapper/UserMapper.java
+++ b/src/main/java/org/springblade/modules/system/mapper/UserMapper.java
@@ -138,4 +138,11 @@
* @return
*/
UserVO getUserInfoBySecurityNumber(@Param("securityNumber") String securityNumber);
+
+ /**
+ * 保安员信息
+ * @param user
+ * @return
+ */
+ UserVO getUserDetails(@Param("user") User user);
}
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 0d34e68..120bb98 100644
--- a/src/main/java/org/springblade/modules/system/mapper/UserMapper.xml
+++ b/src/main/java/org/springblade/modules/system/mapper/UserMapper.xml
@@ -379,4 +379,17 @@
select CAST(id AS CHAR) as groupmember,real_name as rname from blade_user
</select>
+ <!--查询保安员信息-->
+ <select id="getUserDetails" resultType="org.springblade.modules.system.vo.UserVO">
+ select
+ bu.*,
+ bd.dept_name deptName
+ from
+ blade_user bu
+ left join
+ blade_dept bd
+ on
+ bu.dept_id = bd.id
+ where bu.id = #{user.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 8587d6b..2ae7039 100644
--- a/src/main/java/org/springblade/modules/system/service/IUserService.java
+++ b/src/main/java/org/springblade/modules/system/service/IUserService.java
@@ -291,4 +291,11 @@
* @return
*/
UserVO getUserInfoBySecurityNumber(String securityNumber);
+
+ /**
+ * 保安员信息
+ * @param user
+ * @return
+ */
+ UserVO getUserDetails(User user);
}
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 2ee9d82..7fef4e8 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
@@ -607,4 +607,15 @@
public UserVO getUserInfoBySecurityNumber(String securityNumber) {
return baseMapper.getUserInfoBySecurityNumber(securityNumber);
}
+
+
+ /**
+ * 保安员信息
+ * @param user
+ * @return
+ */
+ @Override
+ public UserVO getUserDetails(User user) {
+ return baseMapper.getUserDetails(user);
+ }
}
--
Gitblit v1.9.3