From ef8c725ba73fea5b88bb7f77684639ddf8e51e95 Mon Sep 17 00:00:00 2001
From: tangzy <tangzy123456>
Date: Sat, 04 Dec 2021 16:32:23 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
src/main/java/org/springblade/modules/system/mapper/UserMapper.xml | 23 ++++++++++-
src/main/java/org/springblade/modules/information/controller/InformationsController.java | 34 +++++++++++++++++
src/main/java/org/springblade/modules/information/mapper/InformationMapper.java | 1
src/main/java/org/springblade/modules/system/vo/UserVO.java | 6 ++
4 files changed, 60 insertions(+), 4 deletions(-)
diff --git a/src/main/java/org/springblade/modules/information/controller/InformationsController.java b/src/main/java/org/springblade/modules/information/controller/InformationsController.java
index 38c1167..f1e1ae5 100644
--- a/src/main/java/org/springblade/modules/information/controller/InformationsController.java
+++ b/src/main/java/org/springblade/modules/information/controller/InformationsController.java
@@ -8,6 +8,7 @@
import org.springblade.modules.information.service.IInformationService;
import org.springblade.modules.information.vo.InformationVO;
import org.springblade.modules.information.vo.ResponseVo;
+import org.springblade.modules.system.vo.UserVO;
import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RestController;
@@ -246,4 +247,37 @@
}
return R.data(lists);
}
+
+ /**
+ * 根据辖区及保安公司统计未缴纳社保人员
+ * @param query 分页条件
+ * @param information 查询条件
+ * @return
+ */
+ @GetMapping("/getNotSocialNumber")
+ public R<IPage<UserVO>> getNotSocialNumber(InformationVO information, Query query){
+ return R.data(informationService.getNotSocialAndInsuranceAndDispatcherNumber(Condition.getPage(query), information,1));
+ }
+
+ /**
+ * 根据辖区及保安公司统计未缴纳保险人员
+ * @param query 分页条件
+ * @param information 查询条件
+ * @return
+ */
+ @GetMapping("/getNotInsuranceNumber")
+ public R<IPage<UserVO>> getNotInsuranceNumber(InformationVO information, Query query){
+ return R.data(informationService.getNotSocialAndInsuranceAndDispatcherNumber(Condition.getPage(query), information,2));
+ }
+
+ /**
+ * 根据辖区及保安公司统计未派遣人员
+ * @param query 分页条件
+ * @param information 查询条件
+ * @return
+ */
+ @GetMapping("/getNotDispatcherNumber")
+ public R<IPage<UserVO>> getNotDispatcherNumber(InformationVO information, Query query){
+ return R.data(informationService.getNotSocialAndInsuranceAndDispatcherNumber(Condition.getPage(query), information,3));
+ }
}
diff --git a/src/main/java/org/springblade/modules/information/mapper/InformationMapper.java b/src/main/java/org/springblade/modules/information/mapper/InformationMapper.java
index 245fe39..dc8ae91 100644
--- a/src/main/java/org/springblade/modules/information/mapper/InformationMapper.java
+++ b/src/main/java/org/springblade/modules/information/mapper/InformationMapper.java
@@ -25,6 +25,7 @@
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import org.springblade.modules.information.vo.ResponseVo;
+import org.springblade.modules.system.vo.UserVO;
import org.springframework.boot.autoconfigure.quartz.QuartzDataSource;
import java.util.List;
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 d6b0830..ec1ed1a 100644
--- a/src/main/java/org/springblade/modules/system/mapper/UserMapper.xml
+++ b/src/main/java/org/springblade/modules/system/mapper/UserMapper.xml
@@ -222,15 +222,20 @@
blade_role br
on
br.id = bu.role_id
+ left join
+ sys_information si
+ on
+ bd.id = si.departmentid
+ left join
+ sys_jurisdiction sj
+ on
+ sj.id = si.jurisdiction
where
bu.is_deleted = 0
and
br.role_alias = '安保人员'
and
bu.status = 1
- and bd.parent_id!=1425365577303621633
- and bd.id != 1425365577303621633
- and bd.id != 1432625856013971457
<if test="user.cardid!=null and user.cardid != ''">
and bu.cardid like concat(concat('%', #{user.cardid}),'%')
</if>
@@ -243,6 +248,18 @@
<if test="user.realName!=null and user.realName != ''">
and bu.real_name like concat(concat('%', #{user.realName}),'%')
</if>
+ <if test="user.jurisdiction!=null and user.jurisdiction != ''">
+ and (sj.id = #{user.jurisdiction} or sj.parent_id = #{user.jurisdiction})
+ </if>
+ <if test="user.dispatch!=null and user.dispatch != ''">
+ and bu.dispatch = #{user.dispatch}
+ </if>
+ <if test="user.soil!=null and user.soil != ''">
+ and bu.soil = #{user.soil}
+ </if>
+ <if test="user.insurance!=null and user.insurance != ''">
+ and bu.insurance = #{user.insurance}
+ </if>
<if test="user.userType!=null and user.userType != ''">
and bu.user_type = #{user.userType}
</if>
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 72aa7bc..026eb1a 100644
--- a/src/main/java/org/springblade/modules/system/vo/UserVO.java
+++ b/src/main/java/org/springblade/modules/system/vo/UserVO.java
@@ -95,5 +95,9 @@
*/
private Integer age;
private Integer type;
- private String types;
+
+ /**
+ * 辖区
+ */
+ private String jurisdiction;
}
--
Gitblit v1.9.3