From 8e133cdb1da27aea20ec0286e63fcf77d02eade7 Mon Sep 17 00:00:00 2001
From: tangzy <tangzy123456>
Date: Sat, 28 Aug 2021 16:31:10 +0800
Subject: [PATCH] 1.统计
---
src/main/java/org/springblade/modules/social/mapper/SocialMapper.xml | 2
src/main/java/org/springblade/modules/social/service/impl/SocialServiceImpl.java | 5 --
src/main/java/org/springblade/modules/information/mapper/InformationMapper.xml | 51 +++++++++++++++++--------
src/main/java/org/springblade/modules/information/service/IInformationService.java | 2
src/main/java/org/springblade/modules/information/controller/InformationController.java | 4 +-
src/main/java/org/springblade/modules/information/mapper/InformationMapper.java | 2
src/main/java/org/springblade/modules/information/service/impl/InformationServiceImpl.java | 4 +-
7 files changed, 42 insertions(+), 28 deletions(-)
diff --git a/src/main/java/org/springblade/modules/information/controller/InformationController.java b/src/main/java/org/springblade/modules/information/controller/InformationController.java
index c91f9cf..a564b5c 100644
--- a/src/main/java/org/springblade/modules/information/controller/InformationController.java
+++ b/src/main/java/org/springblade/modules/information/controller/InformationController.java
@@ -312,8 +312,8 @@
* 社保统计
*/
@PostMapping("/selectSoil")
- public R selectSoil(String deptid) {
- List<Map<Object, Object>> lists = informationService.selectSoil(deptid);
+ public R selectSoil(String deptid,String jurisdiction) {
+ List<Map<Object, Object>> lists = informationService.selectSoil(deptid,jurisdiction);
List<Map<String, Object>> list = new ArrayList<>();
for (int i = 0; i < lists.size(); i++) {
Map<String, Object> map = new HashMap<String, Object>();
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 a11dd3d..c66e1ed 100644
--- a/src/main/java/org/springblade/modules/information/mapper/InformationMapper.java
+++ b/src/main/java/org/springblade/modules/information/mapper/InformationMapper.java
@@ -52,7 +52,7 @@
List<Map<Object,Object>> selectHold(String deptid,String jurisdiction);
List<Map<Object,Object>> selectDis(String deptid);
List<Map<Object,Object>> selectDisp(String deptid,String jurisdiction);
- List<Map<Object,Object>> selectSoil(String deptid);
+ List<Map<Object,Object>> selectSoil(String deptid,String jurisdiction);
/**
* 查询培训单位信息(可以报名)
diff --git a/src/main/java/org/springblade/modules/information/mapper/InformationMapper.xml b/src/main/java/org/springblade/modules/information/mapper/InformationMapper.xml
index 15edf68..98b7c58 100644
--- a/src/main/java/org/springblade/modules/information/mapper/InformationMapper.xml
+++ b/src/main/java/org/springblade/modules/information/mapper/InformationMapper.xml
@@ -217,23 +217,42 @@
</select>
<select id="selectDisp" resultType="java.util.HashMap">
- SELECT IFNULL(A.thisnum, 0) AS pnum,
- IFNULL(B.lastnum, 0) AS wpnum
- FROM (SELECT COUNT(*) AS thisnum, dept_id,jurisdiction
- FROM blade_user
- WHERE role_id = '1412226235153731586' AND `status`=1 AND is_deleted=0
+ SELECT
+ IFNULL( A.thisnum, 0 ) AS pnum,
+ IFNULL( B.lastnum, 0 ) AS wpnum
+ FROM
+ ( SELECT departmentid, jurisdiction FROM sys_information GROUP BY departmentid, jurisdiction ) H
+ LEFT JOIN (
+ SELECT
+ COUNT( * ) AS thisnum,
+ dept_id
+ FROM
+ blade_user
+ WHERE
+ `status` = 1
+ AND is_deleted = 0
AND dispatch = 0
- GROUP BY dept_id,jurisdiction) A
- LEFT JOIN (SELECT COUNT(*) AS lastnum, dept_id,jurisdiction
- FROM blade_user
- WHERE role_id = '1412226235153731586' AND `status`=1 AND is_deleted=0
- AND dispatch = 0
- GROUP BY dept_id,jurisdiction) B ON A.dept_id = B.dept_id where 1=1
+ GROUP BY
+ dept_id
+ ) A ON A.dept_id = H.departmentid
+ LEFT JOIN (
+ SELECT
+ COUNT( * ) AS lastnum,
+ dept_id
+ FROM
+ blade_user
+ WHERE
+ `status` = 1
+ AND is_deleted = 0
+ AND dispatch = 1
+ GROUP BY
+ dept_id
+ ) B ON H.departmentid = B.dept_id where 1=1
<if test="jurisdiction!=null and jurisdiction!='' and jurisdiction!='1123598813738675201'">
- and A.jurisdiction = #{jurisdiction}
+ and H.jurisdiction = #{jurisdiction}
</if>
<if test="deptid!=null and deptid!=''">
- and A.dept_id = #{deptid}
+ and H.departmentid = #{deptid}
</if>
</select>
@@ -248,12 +267,12 @@
LEFT JOIN (SELECT COUNT(*) AS numz, dept_id FROM blade_user WHERE `status` = 1 AND is_deleted = 0 GROUP BY
dept_id) B
ON H.departmentid = B.dept_id where 1=1
- <if test="jurisdiction!=null and jurisdiction!='' and jurisdiction!='1123598813738675201'">
- and H.jurisdiction = #{jurisdiction}
- </if>
<if test="deptid!=null and deptid!=''">
and H.departmentid = #{deptid}
</if>
+ <if test="jurisdiction!=null and jurisdiction!='' and jurisdiction!='1123598813738675201'">
+ and H.jurisdiction = #{jurisdiction}
+ </if>
</select>
<!--查询培训单位信息(可以报名)-->
diff --git a/src/main/java/org/springblade/modules/information/service/IInformationService.java b/src/main/java/org/springblade/modules/information/service/IInformationService.java
index e6f1a06..93cbe77 100644
--- a/src/main/java/org/springblade/modules/information/service/IInformationService.java
+++ b/src/main/java/org/springblade/modules/information/service/IInformationService.java
@@ -53,7 +53,7 @@
List<Map<Object,Object>> selectHold(String deptid,String jurisdiction);
List<Map<Object,Object>> selectDis(String deptid);
List<Map<Object,Object>> selectDisp(String deptid,String jurisdiction);
- List<Map<Object,Object>> selectSoil(String deptid);
+ List<Map<Object,Object>> selectSoil(String deptid,String jurisdiction);
List queryYearKh(String year,String jurisdiction,String deptid);
/**
diff --git a/src/main/java/org/springblade/modules/information/service/impl/InformationServiceImpl.java b/src/main/java/org/springblade/modules/information/service/impl/InformationServiceImpl.java
index 7390cb3..f5f9395 100644
--- a/src/main/java/org/springblade/modules/information/service/impl/InformationServiceImpl.java
+++ b/src/main/java/org/springblade/modules/information/service/impl/InformationServiceImpl.java
@@ -118,8 +118,8 @@
}
@Override
- public List<Map<Object, Object>> selectSoil(String deptid) {
- return baseMapper.selectSoil(deptid);
+ public List<Map<Object, Object>> selectSoil(String deptid,String jurisdiction) {
+ return baseMapper.selectSoil(deptid,jurisdiction);
}
@Override
diff --git a/src/main/java/org/springblade/modules/social/mapper/SocialMapper.xml b/src/main/java/org/springblade/modules/social/mapper/SocialMapper.xml
index 44cea36..5e8cb30 100644
--- a/src/main/java/org/springblade/modules/social/mapper/SocialMapper.xml
+++ b/src/main/java/org/springblade/modules/social/mapper/SocialMapper.xml
@@ -25,7 +25,7 @@
</select>
<update id="upSoil">
- update blade_use set soil=0 where cardid=#{cardid}
+ update blade_user set soil=0 where cardid=#{cardid}
</update>
</mapper>
diff --git a/src/main/java/org/springblade/modules/social/service/impl/SocialServiceImpl.java b/src/main/java/org/springblade/modules/social/service/impl/SocialServiceImpl.java
index e5aa5b3..3a0a965 100644
--- a/src/main/java/org/springblade/modules/social/service/impl/SocialServiceImpl.java
+++ b/src/main/java/org/springblade/modules/social/service/impl/SocialServiceImpl.java
@@ -37,11 +37,7 @@
* @since 2021-07-16
*/
@Service
-@AllArgsConstructor
public class SocialServiceImpl extends ServiceImpl<SocialMapper, Social> implements ISocialService {
- private final ISocialService iSocialService;
-
-
@Override
public IPage<SocialVO> selectSocialPage(IPage<SocialVO> page, SocialVO social) {
return page.setRecords(baseMapper.selectSocialPage(page, social));
@@ -52,7 +48,6 @@
data.forEach(SocialExcel -> {
Social social = Objects.requireNonNull(BeanUtil.copy(SocialExcel, Social.class));
social.setDeptid(deptid);
- iSocialService.upSoil(social.getCardid());
this.save(social);
});
}
--
Gitblit v1.9.3