Ver código fonte

格式化代码

chenshudong 3 meses atrás
pai
commit
704da082fa

+ 10 - 5
airport-system/src/main/resources/mapper/portrait/AdministrativePenaltyIndicatorMapper.xml

@@ -18,12 +18,17 @@
18 18
     </select>
19 19
 
20 20
     <!-- 查询组织行政类处罚情况统计 -->
21
-    <select id="queryOrgAdministrativePenaltyStats" resultType="com.sundot.airport.system.domain.portrait.AdministrativePenaltyStats">
21
+    <select id="queryOrgAdministrativePenaltyStats"
22
+            resultType="com.sundot.airport.system.domain.portrait.AdministrativePenaltyStats">
22 23
         SELECT
23
-            COALESCE(SUM(CASE WHEN administrative_status IS NOT NULL AND administrative_status != '' AND administrative_status != '无' THEN 1 ELSE 0 END), 0) AS penalizedCount,
24
-            COUNT(*) AS totalCount,
25
-            COALESCE(ROUND(SUM(CASE WHEN administrative_status IS NOT NULL AND administrative_status != '' AND administrative_status != '无' THEN 1 ELSE 0 END) / COUNT(*), 4), 0) AS penaltyPercentage        FROM sys_user
26
-        WHERE user_id in <include refid="userIdsCondition" /> and   del_flag='0' and status='0'
24
+        COALESCE(SUM(CASE WHEN administrative_status IS NOT NULL AND administrative_status != '' AND
25
+        administrative_status != '无' THEN 1 ELSE 0 END), 0) AS penalizedCount,
26
+        COUNT(*) AS totalCount,
27
+        COALESCE(ROUND(SUM(CASE WHEN administrative_status IS NOT NULL AND administrative_status != '' AND
28
+        administrative_status != '无' THEN 1 ELSE 0 END) / COUNT(*), 4), 0) AS penaltyPercentage FROM sys_user
29
+        WHERE user_id in
30
+        <include refid="userIdsCondition"/>
31
+        and del_flag='0' and status='0'
27 32
     </select>
28 33
 
29 34
 </mapper>

+ 56 - 44
airport-system/src/main/resources/mapper/portrait/AgeIndicatorMapper.xml

@@ -12,57 +12,69 @@
12 12
 
13 13
     <!-- 查询个人年龄 -->
14 14
     <select id="queryPersonalAge" resultType="java.lang.Integer">
15
-        SELECT 
16
-            CASE 
17
-                WHEN LENGTH(card_number) = 18 THEN TIMESTAMPDIFF(YEAR, STR_TO_DATE(SUBSTRING(card_number, 7, 8), '%Y%m%d'), CURDATE())
18
-                WHEN LENGTH(card_number) = 15 THEN TIMESTAMPDIFF(YEAR, STR_TO_DATE(CONCAT('19', SUBSTRING(card_number, 7, 6)), '%y%m%d'), CURDATE())
19
-                ELSE NULL
20
-            END AS age
15
+        SELECT CASE
16
+                   WHEN LENGTH(card_number) = 18 THEN TIMESTAMPDIFF(YEAR,
17
+                           STR_TO_DATE(SUBSTRING(card_number, 7, 8), '%Y%m%d'), CURDATE())
18
+                   WHEN LENGTH(card_number) = 15 THEN TIMESTAMPDIFF(YEAR,
19
+                           STR_TO_DATE(CONCAT('19', SUBSTRING(card_number, 7, 6)), '%y%m%d'), CURDATE())
20
+                   ELSE NULL
21
+                   END AS age
21 22
         FROM sys_user
22 23
         WHERE user_id = #{userId}
23 24
     </select>
24 25
 
25 26
     <!-- 查询组织年龄统计 -->
26 27
     <select id="queryOrgAgeStats" resultType="com.sundot.airport.system.domain.portrait.AgeStats">
27
-        SELECT 
28
-            MAX(
29
-                CASE 
30
-                    WHEN card_number IS NOT NULL AND card_number != '' AND (LENGTH(card_number) = 18 OR LENGTH(card_number) = 15) THEN
31
-                        CASE 
32
-                            WHEN LENGTH(card_number) = 18 THEN TIMESTAMPDIFF(YEAR, STR_TO_DATE(SUBSTRING(card_number, 7, 8), '%Y%m%d'), CURDATE())
33
-                            WHEN LENGTH(card_number) = 15 THEN TIMESTAMPDIFF(YEAR, STR_TO_DATE(CONCAT('19', SUBSTRING(card_number, 7, 6)), '%y%m%d'), CURDATE())
34
-                            ELSE NULL
35
-                        END
36
-                    ELSE NULL
37
-                END
38
-            ) AS maxAge,
39
-            MIN(
40
-                CASE 
41
-                    WHEN card_number IS NOT NULL AND card_number != '' AND (LENGTH(card_number) = 18 OR LENGTH(card_number) = 15) THEN
42
-                        CASE 
43
-                            WHEN LENGTH(card_number) = 18 THEN TIMESTAMPDIFF(YEAR, STR_TO_DATE(SUBSTRING(card_number, 7, 8), '%Y%m%d'), CURDATE())
44
-                            WHEN LENGTH(card_number) = 15 THEN TIMESTAMPDIFF(YEAR, STR_TO_DATE(CONCAT('19', SUBSTRING(card_number, 7, 6)), '%y%m%d'), CURDATE())
45
-                            ELSE NULL
46
-                        END
47
-                    ELSE NULL
48
-                END
49
-            ) AS minAge,
50
-            CASE 
51
-                WHEN COUNT(*) > 0 THEN ROUND(SUM(
52
-                    CASE 
53
-                        WHEN card_number IS NOT NULL AND card_number != '' AND (LENGTH(card_number) = 18 OR LENGTH(card_number) = 15) THEN
54
-                            CASE 
55
-                                WHEN LENGTH(card_number) = 18 THEN TIMESTAMPDIFF(YEAR, STR_TO_DATE(SUBSTRING(card_number, 7, 8), '%Y%m%d'), CURDATE())
56
-                                WHEN LENGTH(card_number) = 15 THEN TIMESTAMPDIFF(YEAR, STR_TO_DATE(CONCAT('19', SUBSTRING(card_number, 7, 6)), '%y%m%d'), CURDATE())
57
-                                ELSE 0
58
-                            END
59
-                        ELSE 0
60
-                    END
61
-                ) / COUNT(*), 2)
62
-                ELSE 0
63
-            END AS averageAge
28
+        SELECT
29
+        MAX(
30
+        CASE
31
+        WHEN card_number IS NOT NULL AND card_number != '' AND (LENGTH(card_number) = 18 OR LENGTH(card_number) = 15)
32
+        THEN
33
+        CASE
34
+        WHEN LENGTH(card_number) = 18 THEN TIMESTAMPDIFF(YEAR, STR_TO_DATE(SUBSTRING(card_number, 7, 8), '%Y%m%d'),
35
+        CURDATE())
36
+        WHEN LENGTH(card_number) = 15 THEN TIMESTAMPDIFF(YEAR, STR_TO_DATE(CONCAT('19', SUBSTRING(card_number, 7, 6)),
37
+        '%y%m%d'), CURDATE())
38
+        ELSE NULL
39
+        END
40
+        ELSE NULL
41
+        END
42
+        ) AS maxAge,
43
+        MIN(
44
+        CASE
45
+        WHEN card_number IS NOT NULL AND card_number != '' AND (LENGTH(card_number) = 18 OR LENGTH(card_number) = 15)
46
+        THEN
47
+        CASE
48
+        WHEN LENGTH(card_number) = 18 THEN TIMESTAMPDIFF(YEAR, STR_TO_DATE(SUBSTRING(card_number, 7, 8), '%Y%m%d'),
49
+        CURDATE())
50
+        WHEN LENGTH(card_number) = 15 THEN TIMESTAMPDIFF(YEAR, STR_TO_DATE(CONCAT('19', SUBSTRING(card_number, 7, 6)),
51
+        '%y%m%d'), CURDATE())
52
+        ELSE NULL
53
+        END
54
+        ELSE NULL
55
+        END
56
+        ) AS minAge,
57
+        CASE
58
+        WHEN COUNT(*) > 0 THEN ROUND(SUM(
59
+        CASE
60
+        WHEN card_number IS NOT NULL AND card_number != '' AND (LENGTH(card_number) = 18 OR LENGTH(card_number) = 15)
61
+        THEN
62
+        CASE
63
+        WHEN LENGTH(card_number) = 18 THEN TIMESTAMPDIFF(YEAR, STR_TO_DATE(SUBSTRING(card_number, 7, 8), '%Y%m%d'),
64
+        CURDATE())
65
+        WHEN LENGTH(card_number) = 15 THEN TIMESTAMPDIFF(YEAR, STR_TO_DATE(CONCAT('19', SUBSTRING(card_number, 7, 6)),
66
+        '%y%m%d'), CURDATE())
67
+        ELSE 0
68
+        END
69
+        ELSE 0
70
+        END
71
+        ) / COUNT(*), 2)
72
+        ELSE 0
73
+        END AS averageAge
64 74
         FROM sys_user
65
-        WHERE user_id in <include refid="userIdsCondition" /> AND del_flag='0' AND status='0'
75
+        WHERE user_id in
76
+        <include refid="userIdsCondition"/>
77
+        AND del_flag='0' AND status='0'
66 78
     </select>
67 79
 
68 80
 </mapper>

+ 15 - 7
airport-system/src/main/resources/mapper/portrait/AvailablePositionsIndicatorMapper.xml

@@ -9,8 +9,9 @@
9 9
         <result property="postName" column="post_name"/>
10 10
         <result property="postCode" column="post_code"/>
11 11
     </resultMap>
12
-    
13
-    <resultMap type="com.sundot.airport.system.domain.portrait.PositionCompetencyStats" id="PositionCompetencyStatsResult">
12
+
13
+    <resultMap type="com.sundot.airport.system.domain.portrait.PositionCompetencyStats"
14
+               id="PositionCompetencyStatsResult">
14 15
         <result property="postName" column="post_name"/>
15 16
         <result property="competentCount" column="competent_count"/>
16 17
         <result property="totalCount" column="total_count"/>
@@ -25,11 +26,13 @@
25 26
 
26 27
     <!-- 查询个人可上岗岗位列表 -->
27 28
     <select id="queryPersonalAvailablePositions" parameterType="Long" resultMap="PositionInfoResult">
28
-        select p.post_name,p.post_id,p.post_code
29
+        select p.post_name, p.post_id, p.post_code
29 30
         from sys_post p
30 31
                  left join sys_user_post up on up.post_id = p.post_id
31 32
                  left join sys_user u on u.user_id = up.user_id
32
-        where u.user_id = #{userId} and u.del_flag='0' and u.status='0'
33
+        where u.user_id = #{userId}
34
+          and u.del_flag = '0'
35
+          and u.status = '0'
33 36
     </select>
34 37
 
35 38
     <!-- 查询组织岗位胜任统计 -->
@@ -38,12 +41,17 @@
38 41
         p.post_id,
39 42
         p.post_name,
40 43
         COUNT(u.user_id) as competent_count,
41
-        (SELECT COUNT(*) FROM sys_user WHERE user_id in <include refid="userIdsCondition" />  and del_flag='0' and status='0') as total_count,
42
-        ROUND(COUNT(u.user_id) * 100.0 / (SELECT COUNT(*) FROM sys_user WHERE user_id in <include refid="userIdsCondition" /> and del_flag='0' and status='0'), 2) as percentage
44
+        (SELECT COUNT(*) FROM sys_user WHERE user_id in
45
+        <include refid="userIdsCondition"/>
46
+        and del_flag='0' and status='0') as total_count,
47
+        ROUND(COUNT(u.user_id) * 100.0 / (SELECT COUNT(*) FROM sys_user WHERE user_id in
48
+        <include refid="userIdsCondition"/>
49
+        and del_flag='0' and status='0'), 2) as percentage
43 50
         from sys_post p
44 51
         left join sys_user_post up on up.post_id = p.post_id
45 52
         left join sys_user u on u.user_id = up.user_id AND u.del_flag='0' and u.status='0'
46
-        WHERE u.user_id in <include refid="userIdsCondition" />
53
+        WHERE u.user_id in
54
+        <include refid="userIdsCondition"/>
47 55
         and u.del_flag='0' and u.status='0'
48 56
         GROUP BY p.post_id, p.post_name
49 57
     </select>

+ 15 - 13
airport-system/src/main/resources/mapper/portrait/EducationIndicatorMapper.xml

@@ -11,24 +11,26 @@
11 11
     </sql>
12 12
 
13 13
     <select id="queryPersonalEducation" resultType="String">
14
-        SELECT schooling 
15
-        FROM sys_user 
16
-        WHERE user_id = #{userId} AND del_flag = '0'
14
+        SELECT schooling
15
+        FROM sys_user
16
+        WHERE user_id = #{userId}
17
+          AND del_flag = '0'
17 18
     </select>
18 19
 
19 20
     <select id="queryOrgEducationStats" resultType="com.sundot.airport.system.domain.portrait.EducationStats">
20 21
         SELECT
21
-            SUM(IF(schooling = '1', 1, 0)) AS primarySchoolCount,
22
-            SUM(IF(schooling = '2', 1, 0)) AS middleSchoolCount,
23
-            SUM(IF(schooling = '3', 1, 0)) AS highSchoolCount,
24
-            SUM(IF(schooling = '4', 1, 0)) AS collegeCount,
25
-            SUM(IF(schooling = '5', 1, 0)) AS bachelorCount,
26
-            SUM(IF(schooling = '6', 1, 0)) AS masterCount,
27
-            COUNT(*) AS total_count
22
+        SUM(IF(schooling = '1', 1, 0)) AS primarySchoolCount,
23
+        SUM(IF(schooling = '2', 1, 0)) AS middleSchoolCount,
24
+        SUM(IF(schooling = '3', 1, 0)) AS highSchoolCount,
25
+        SUM(IF(schooling = '4', 1, 0)) AS collegeCount,
26
+        SUM(IF(schooling = '5', 1, 0)) AS bachelorCount,
27
+        SUM(IF(schooling = '6', 1, 0)) AS masterCount,
28
+        COUNT(*) AS total_count
28 29
         FROM sys_user
29
-        WHERE del_flag = '0' 
30
-          AND status = '0'
31
-          AND user_id IN <include refid="userIdsCondition"/>
30
+        WHERE del_flag = '0'
31
+        AND status = '0'
32
+        AND user_id IN
33
+        <include refid="userIdsCondition"/>
32 34
 
33 35
     </select>
34 36
 

+ 8 - 4
airport-system/src/main/resources/mapper/portrait/PhysicalHealthIndicatorMapper.xml

@@ -21,11 +21,15 @@
21 21
     <!-- 查询组织身体健康状况统计 (身体情况为空或者空字符串的人数)-->
22 22
     <select id="queryOrgHealthStats" resultType="com.sundot.airport.system.domain.portrait.PhysicalHealthStats">
23 23
         SELECT
24
-            SUM(CASE WHEN physical_health_status IS NULL  OR TRIM(physical_health_status) = '' THEN 1 ELSE 0 END) AS healthyCount,
25
-            COUNT(*) AS totalCount,
26
-            ROUND(SUM(CASE WHEN physical_health_status IS NULL  OR TRIM(physical_health_status) = '' THEN 1 ELSE 0 END) / COUNT(*), 4) AS healthyPercentage
24
+        SUM(CASE WHEN physical_health_status IS NULL OR TRIM(physical_health_status) = '' THEN 1 ELSE 0 END) AS
25
+        healthyCount,
26
+        COUNT(*) AS totalCount,
27
+        ROUND(SUM(CASE WHEN physical_health_status IS NULL OR TRIM(physical_health_status) = '' THEN 1 ELSE 0 END) /
28
+        COUNT(*), 4) AS healthyPercentage
27 29
         FROM sys_user
28
-        WHERE user_id in <include refid="userIdsCondition" /> and   del_flag='0' and status='0'
30
+        WHERE user_id in
31
+        <include refid="userIdsCondition"/>
32
+        and del_flag='0' and status='0'
29 33
     </select>
30 34
 
31 35
 </mapper>

+ 9 - 6
airport-system/src/main/resources/mapper/portrait/PoliticalReviewIndicatorMapper.xml

@@ -19,13 +19,16 @@
19 19
     </select>
20 20
 
21 21
     <!-- 查询组织政审通过情况统计 -->
22
-    <select id="queryOrgPoliticalReviewStats" resultType="com.sundot.airport.system.domain.portrait.PoliticalReviewStats">
23
-        SELECT 
24
-            SUM(CASE WHEN political_review_situation  = '1' THEN 1 ELSE 0 END) AS passedCount,
25
-            COUNT(*) AS totalCount,
26
-            ROUND(SUM(CASE WHEN political_status  = '1' THEN 1 ELSE 0 END) / COUNT(*), 4) AS passPercentage
22
+    <select id="queryOrgPoliticalReviewStats"
23
+            resultType="com.sundot.airport.system.domain.portrait.PoliticalReviewStats">
24
+        SELECT
25
+        SUM(CASE WHEN political_review_situation = '1' THEN 1 ELSE 0 END) AS passedCount,
26
+        COUNT(*) AS totalCount,
27
+        ROUND(SUM(CASE WHEN political_status = '1' THEN 1 ELSE 0 END) / COUNT(*), 4) AS passPercentage
27 28
         FROM sys_user
28
-        WHERE user_id in <include refid="userIdsCondition" /> and   del_flag='0' and status='0'
29
+        WHERE user_id in
30
+        <include refid="userIdsCondition"/>
31
+        and del_flag='0' and status='0'
29 32
     </select>
30 33
 
31 34
 </mapper>

+ 13 - 9
airport-system/src/main/resources/mapper/portrait/PoliticalStatusIndicatorMapper.xml

@@ -19,20 +19,24 @@
19 19
 
20 20
     <!-- 查询个人政治面貌 -->
21 21
     <select id="queryPersonalPoliticalStatus" parameterType="Long" resultType="String">
22
-        SELECT political_status 
23
-        FROM sys_user 
22
+        SELECT political_status
23
+        FROM sys_user
24 24
         WHERE user_id = #{userId}
25 25
     </select>
26 26
 
27 27
     <!-- 查询组织政治面貌统计 -->
28 28
     <select id="queryOrgPoliticalStatusStats" resultMap="PoliticalStatusStatsResult">
29
-        SELECT 
30
-            political_status,
31
-            COUNT(*) as count,
32
-            (SELECT COUNT(*) FROM sys_user WHERE user_id in <include refid="userIdsCondition" />  and del_flag='0' and status='0') as total_count,
33
-            ROUND(COUNT(*) * 100.0 / (SELECT COUNT(*) FROM sys_user WHERE user_id in <include refid="userIdsCondition" />), 2) as percentage
34
-        FROM sys_user 
35
-        WHERE user_id in <include refid="userIdsCondition" />
29
+        SELECT
30
+        political_status,
31
+        COUNT(*) as count,
32
+        (SELECT COUNT(*) FROM sys_user WHERE user_id in
33
+        <include refid="userIdsCondition"/>
34
+        and del_flag='0' and status='0') as total_count,
35
+        ROUND(COUNT(*) * 100.0 / (SELECT COUNT(*) FROM sys_user WHERE user_id in<include refid="userIdsCondition"/>), 2)
36
+        as percentage
37
+        FROM sys_user
38
+        WHERE user_id in
39
+        <include refid="userIdsCondition"/>
36 40
         and del_flag='0' and status='0'
37 41
         GROUP BY political_status
38 42
     </select>

+ 12 - 9
airport-system/src/main/resources/mapper/portrait/QualificationLevelIndicatorMapper.xml

@@ -20,21 +20,24 @@
20 20
 
21 21
     <!-- 查询个人资质等级 -->
22 22
     <select id="queryPersonalQualificationLevel" parameterType="Long" resultType="String">
23
-        SELECT qualification_level 
24
-        FROM sys_user 
23
+        SELECT qualification_level
24
+        FROM sys_user
25 25
         WHERE user_id = #{userId}
26 26
     </select>
27 27
 
28 28
     <!-- 查询组织资质等级统计 -->
29 29
     <select id="queryOrgQualificationLevelStats" resultMap="QualificationStatsResult">
30
-        SELECT 
31
-            qualification_level as level_name,
32
-            COUNT(*) as count,
33
-            (SELECT COUNT(*) FROM sys_user WHERE user_id in <include refid="userIdsCondition" /> and del_flag='0' and status='0' ) as total_count,
34
-            ROUND(COUNT(*) * 100.0 / (SELECT COUNT(*) FROM sys_user WHERE user_id in <include refid="userIdsCondition" />), 2) as percentage
35
-        FROM sys_user 
30
+        SELECT
31
+        qualification_level as level_name,
32
+        COUNT(*) as count,
33
+        (SELECT COUNT(*) FROM sys_user WHERE user_id in
34
+        <include refid="userIdsCondition"/>
35
+        and del_flag='0' and status='0' ) as total_count,
36
+        ROUND(COUNT(*) * 100.0 / (SELECT COUNT(*) FROM sys_user WHERE user_id in<include refid="userIdsCondition"/>), 2)
37
+        as percentage
38
+        FROM sys_user
36 39
         WHERE user_id in
37
-        <include refid="userIdsCondition" />
40
+        <include refid="userIdsCondition"/>
38 41
         and del_flag='0' and status='0'
39 42
         GROUP BY qualification_level
40 43
     </select>

+ 26 - 18
airport-system/src/main/resources/mapper/portrait/RewardPenaltyIndicatorMapper.xml

@@ -19,39 +19,47 @@
19 19
     <!-- 查询个人工作奖励次数 -->
20 20
     <select id="queryPersonalWorkRewards" resultType="java.lang.Integer">
21 21
         SELECT CASE WHEN work_rewards_number IS NOT NULL THEN work_rewards_number ELSE 0 END
22
-        FROM sys_user 
23
-        WHERE user_id = #{userId} AND del_flag = '0'
22
+        FROM sys_user
23
+        WHERE user_id = #{userId}
24
+          AND del_flag = '0'
24 25
     </select>
25 26
 
26 27
     <!-- 查询组织工作奖励统计 -->
27 28
     <select id="queryOrgWorkRewardsStats" resultMap="RewardPenaltyStatsResult">
28
-        SELECT 
29
-            COALESCE(SUM(CASE WHEN work_rewards_number IS NOT NULL THEN work_rewards_number ELSE 0 END), 0) AS total_person_times,
30
-            COUNT(*) AS total_count,
31
-            COALESCE(ROUND(SUM(CASE WHEN work_rewards_number IS NOT NULL THEN work_rewards_number ELSE 0 END) / COUNT(*), 2), 0) AS average_times
29
+        SELECT
30
+        COALESCE(SUM(CASE WHEN work_rewards_number IS NOT NULL THEN work_rewards_number ELSE 0 END), 0) AS
31
+        total_person_times,
32
+        COUNT(*) AS total_count,
33
+        COALESCE(ROUND(SUM(CASE WHEN work_rewards_number IS NOT NULL THEN work_rewards_number ELSE 0 END) / COUNT(*),
34
+        2), 0) AS average_times
32 35
         FROM sys_user
33
-        WHERE del_flag = '0' 
34
-          AND status = '0'
35
-          AND user_id IN <include refid="userIdsCondition"/>
36
+        WHERE del_flag = '0'
37
+        AND status = '0'
38
+        AND user_id IN
39
+        <include refid="userIdsCondition"/>
36 40
     </select>
37 41
 
38 42
     <!-- 查询个人工作处罚次数 -->
39 43
     <select id="queryPersonalWorkPenalties" resultType="java.lang.Integer">
40 44
         SELECT CASE WHEN work_penalties_number IS NOT NULL THEN work_penalties_number ELSE 0 END
41
-        FROM sys_user 
42
-        WHERE user_id = #{userId} AND del_flag = '0'
45
+        FROM sys_user
46
+        WHERE user_id = #{userId}
47
+          AND del_flag = '0'
43 48
     </select>
44 49
 
45 50
     <!-- 查询组织工作处罚统计 -->
46 51
     <select id="queryOrgWorkPenaltiesStats" resultMap="RewardPenaltyStatsResult">
47
-        SELECT 
48
-            COALESCE(SUM(CASE WHEN work_penalties_number IS NOT NULL THEN work_penalties_number ELSE 0 END), 0) AS total_person_times,
49
-            COUNT(*) AS total_count,
50
-            COALESCE(ROUND(SUM(CASE WHEN work_penalties_number IS NOT NULL THEN work_penalties_number ELSE 0 END) / COUNT(*), 2), 0) AS average_times
52
+        SELECT
53
+        COALESCE(SUM(CASE WHEN work_penalties_number IS NOT NULL THEN work_penalties_number ELSE 0 END), 0) AS
54
+        total_person_times,
55
+        COUNT(*) AS total_count,
56
+        COALESCE(ROUND(SUM(CASE WHEN work_penalties_number IS NOT NULL THEN work_penalties_number ELSE 0 END) /
57
+        COUNT(*), 2), 0) AS average_times
51 58
         FROM sys_user
52
-        WHERE del_flag = '0' 
53
-          AND status = '0'
54
-          AND user_id IN <include refid="userIdsCondition"/>
59
+        WHERE del_flag = '0'
60
+        AND status = '0'
61
+        AND user_id IN
62
+        <include refid="userIdsCondition"/>
55 63
     </select>
56 64
 
57 65
 </mapper>

+ 12 - 9
airport-system/src/main/resources/mapper/portrait/SecurityWorkPositionIndicatorMapper.xml

@@ -4,7 +4,8 @@
4 4
         "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
5 5
 <mapper namespace="com.sundot.airport.system.mapper.portrait.SecurityWorkPositionIndicatorMapper">
6 6
 
7
-    <resultMap type="com.sundot.airport.system.domain.portrait.SecurityWorkPositionStats" id="SecurityWorkPositionStatsResult">
7
+    <resultMap type="com.sundot.airport.system.domain.portrait.SecurityWorkPositionStats"
8
+               id="SecurityWorkPositionStatsResult">
8 9
         <result property="teamLeaderCount" column="team_leader_count"/>
9 10
         <result property="totalCount" column="total_count"/>
10 11
     </resultMap>
@@ -18,19 +19,21 @@
18 19
     <!-- 查询个人在安检工作中担任过的最高职务 -->
19 20
     <select id="queryPersonalSecurityWorkPosition" resultType="String">
20 21
         SELECT security_inspection_position
21
-        FROM sys_user 
22
-        WHERE user_id = #{userId} AND del_flag = '0'
22
+        FROM sys_user
23
+        WHERE user_id = #{userId}
24
+          AND del_flag = '0'
23 25
     </select>
24 26
 
25 27
     <!-- 查询组织担任过班组长的人数统计 -->
26 28
     <select id="queryOrgSecurityWorkPositionStats" resultMap="SecurityWorkPositionStatsResult">
27
-        SELECT 
28
-            COALESCE(SUM(CASE WHEN security_inspection_position = '班组长' THEN 1 ELSE 0 END), 0) AS team_leader_count,
29
-            COUNT(*) AS total_count
29
+        SELECT
30
+        COALESCE(SUM(CASE WHEN security_inspection_position = '班组长' THEN 1 ELSE 0 END), 0) AS team_leader_count,
31
+        COUNT(*) AS total_count
30 32
         FROM sys_user
31
-        WHERE del_flag = '0' 
32
-          AND status = '0'
33
-          AND user_id in <include refid="userIdsCondition" />
33
+        WHERE del_flag = '0'
34
+        AND status = '0'
35
+        AND user_id in
36
+        <include refid="userIdsCondition"/>
34 37
     </select>
35 38
 
36 39
 </mapper>

+ 45 - 42
airport-system/src/main/resources/mapper/portrait/WorkExperienceIndicatorMapper.xml

@@ -17,62 +17,65 @@
17 17
 
18 18
     <!-- 查询个人工作年限 -->
19 19
     <select id="queryPersonalWorkYears" resultType="java.lang.Integer">
20
-        SELECT 
21
-            CASE 
22
-                WHEN start_working_date IS NOT NULL THEN TIMESTAMPDIFF(YEAR, start_working_date, CURDATE())
23
-                ELSE NULL
24
-            END AS work_years
25
-        FROM sys_user 
26
-        WHERE user_id = #{userId} AND del_flag = '0'
20
+        SELECT CASE
21
+                   WHEN start_working_date IS NOT NULL THEN TIMESTAMPDIFF(YEAR, start_working_date, CURDATE())
22
+                   ELSE NULL
23
+                   END AS work_years
24
+        FROM sys_user
25
+        WHERE user_id = #{userId}
26
+          AND del_flag = '0'
27 27
     </select>
28 28
 
29 29
     <!-- 查询组织平均工作年限 -->
30 30
     <select id="queryOrgWorkYearsStats" resultMap="WorkExperienceStatsResult">
31
-        SELECT 
32
-            CASE 
33
-                WHEN COUNT(*) > 0 THEN ROUND(SUM(
34
-                    CASE 
35
-                        WHEN start_working_date IS NOT NULL THEN TIMESTAMPDIFF(YEAR, start_working_date, CURDATE())
36
-                        ELSE 0 
37
-                    END
38
-                ) / COUNT(*), 2)
39
-                ELSE 0 
40
-            END AS average_work_years,
41
-            COUNT(*) AS total_count
31
+        SELECT
32
+        CASE
33
+        WHEN COUNT(*) > 0 THEN ROUND(SUM(
34
+        CASE
35
+        WHEN start_working_date IS NOT NULL THEN TIMESTAMPDIFF(YEAR, start_working_date, CURDATE())
36
+        ELSE 0
37
+        END
38
+        ) / COUNT(*), 2)
39
+        ELSE 0
40
+        END AS average_work_years,
41
+        COUNT(*) AS total_count
42 42
         FROM sys_user
43
-        WHERE del_flag = '0' 
44
-          AND status = '0'
45
-         and user_id in <include refid="userIdsCondition" />
43
+        WHERE del_flag = '0'
44
+        AND status = '0'
45
+        and user_id in
46
+        <include refid="userIdsCondition"/>
46 47
     </select>
47 48
 
48 49
     <!-- 查询个人安检工作年限 -->
49 50
     <select id="queryPersonalSecurityWorkYears" resultType="java.lang.Integer">
50
-        SELECT 
51
-            CASE 
52
-                WHEN security_check_start_date IS NOT NULL THEN TIMESTAMPDIFF(YEAR, security_check_start_date, CURDATE())
53
-                ELSE NULL
54
-            END AS security_work_years
55
-        FROM sys_user 
56
-        WHERE user_id = #{userId} AND del_flag = '0'
51
+        SELECT CASE
52
+                   WHEN security_check_start_date IS NOT NULL
53
+                       THEN TIMESTAMPDIFF(YEAR, security_check_start_date, CURDATE())
54
+                   ELSE NULL
55
+                   END AS security_work_years
56
+        FROM sys_user
57
+        WHERE user_id = #{userId}
58
+          AND del_flag = '0'
57 59
     </select>
58 60
 
59 61
     <!-- 查询组织平均安检工作年限 -->
60 62
     <select id="queryOrgSecurityWorkYearsStats" resultMap="WorkExperienceStatsResult">
61
-        SELECT 
62
-            CASE 
63
-                WHEN COUNT(*) > 0 THEN ROUND(SUM(
64
-                    CASE 
65
-                        WHEN security_check_start_date IS NOT NULL THEN TIMESTAMPDIFF(YEAR, security_check_start_date, CURDATE())
66
-                        ELSE 0 
67
-                    END
68
-                ) / COUNT(*), 2)
69
-                ELSE 0 
70
-            END AS average_work_years,
71
-            COUNT(*) AS total_count
63
+        SELECT
64
+        CASE
65
+        WHEN COUNT(*) > 0 THEN ROUND(SUM(
66
+        CASE
67
+        WHEN security_check_start_date IS NOT NULL THEN TIMESTAMPDIFF(YEAR, security_check_start_date, CURDATE())
68
+        ELSE 0
69
+        END
70
+        ) / COUNT(*), 2)
71
+        ELSE 0
72
+        END AS average_work_years,
73
+        COUNT(*) AS total_count
72 74
         FROM sys_user
73
-        WHERE del_flag = '0' 
74
-          AND status = '0'
75
-         and user_id in <include refid="userIdsCondition" />
75
+        WHERE del_flag = '0'
76
+        AND status = '0'
77
+        and user_id in
78
+        <include refid="userIdsCondition"/>
76 79
     </select>
77 80
 
78 81
 </mapper>