人员bug修改

amos-boot-module/amos-boot-module-api/amos-boot-module-common-api/src/main/resources/mapper/OrgUsrMapper.xml

@@ -1727,9 +1727,10 @@
         a.biz_org_code AS bizOrgCode,
         (
         CASE
-
         WHEN LENGTH( a.biz_org_code ) > 18 THEN
-                            ( SELECT cou.biz_org_name FROM cb_org_usr cou WHERE cou.biz_org_code = LEFT ( a.biz_org_code, 18 ) AND cou.biz_org_type = 'COMPANY' ) ELSE ( SELECT cou.biz_org_name FROM cb_org_usr cou WHERE cou.biz_org_code = LEFT ( a.biz_org_code, 6 ) AND cou.biz_org_type = 'COMPANY' )
+        ( SELECT cou.biz_org_name FROM cb_org_usr cou WHERE cou.biz_org_code = LEFT ( a.biz_org_code, 18 ) AND
+        cou.biz_org_type = 'COMPANY' ) ELSE ( SELECT cou.biz_org_name FROM cb_org_usr cou WHERE cou.biz_org_code = LEFT
+        ( a.biz_org_code, 6 ) AND cou.biz_org_type = 'COMPANY' )
         END
         ) AS bizOrgName,
         SUM(
@@ -1741,42 +1742,49 @@
         ibsi.station_type AS stationType,
         SUM(
         IF
-			((
+        (
         a.peopleType = '1601'
         AND (
-					SELECT
-					concat( fp.post_qualification_code, ',' ) REGEXP concat( REPLACE ( '1421,1422,1423,1424,1425,1823,1824,1825,1826,1827', ',', ',|' ), ',' )) > 0
+        concat( fp.post_qualification_code, ',' ) REGEXP concat( REPLACE ( '1823,1824,1825,1826,1827', ',', ',|' ), ','
+        ) > 0
+        AND concat( fp.post_qualification_code, ',' ) REGEXP concat( REPLACE ( '1421,1422,1423,1424,1425', ',', ',|' ),
+        ',' ) > 0
         ),
         1,
         0
         )) AS fireIsOk,
+        (
         SUM(
         IF
-			((
+        ( a.peopleType = '1601', 1, 0 )) - SUM(
+        IF
+        (
         a.peopleType = '1601'
         AND (
-					SELECT
-					concat( fp.post_qualification_code, ',' ) REGEXP concat( REPLACE ( '1421,1422,1423,1424,1425,1823,1824,1825,1826,1827', ',', ',|' ), ',' )) = 0
-					OR (
-					SELECT
-						concat( fp.post_qualification_code, ',' ) REGEXP concat( REPLACE ( '1421,1422,1423,1424,1425,1823,1824,1825,1826,1827', ',', ',|' ), ',' ) IS NULL
-						AND a.peopleType = '1601'
-					)),
+        concat( fp.post_qualification_code, ',' ) REGEXP concat( REPLACE ( '1823,1824,1825,1826,1827', ',', ',|' ), ','
+        ) > 0
+        AND concat( fp.post_qualification_code, ',' ) REGEXP concat( REPLACE ( '1421,1422,1423,1424,1425', ',', ',|' ),
+        ',' ) > 0
+        ),
         1,
         0
-			)) AS fireNoCard,
+        ))
+        ) AS fireNoCard,
         SUM(
         IF
         ((
         a.peopleType = '1602'
         AND (
         SELECT
-					concat( fp.post_qualification_code, ',' ) REGEXP concat( REPLACE ( '1427,1428,1429,1430,1431', ',', ',|' ), ',' )) = 0
+        concat( fp.post_qualification_code, ',' ) REGEXP concat( REPLACE ( '1427,1428,1429,1430,1431', ',', ',|' ), ','
+        )) = 0
         OR (
         SELECT
-						concat( fp.post_qualification_code, ',' ) REGEXP concat( REPLACE ( '1427,1428,1429,1430,1431', ',', ',|' ), ',' ) IS NULL
+        concat( fp.post_qualification_code, ',' ) REGEXP concat( REPLACE ( '1427,1428,1429,1430,1431', ',', ',|' ), ','
+        ) IS NULL
         AND a.peopleType = '1602'
-					)),
+        )
+        ),
         1,
         0
         )) AS ywNotOk,
@@ -1784,9 +1792,7 @@
         IF
         ((
         a.peopleType = '1602'
-					AND (
-					SELECT
-					concat( fp.post_qualification_code, ',' ) REGEXP concat( REPLACE ( '1427', ',', ',|' ), ',' )) = 0
+        AND concat( fp.post_qualification_code, ',' ) REGEXP concat( REPLACE ( '1427', ',', ',|' ), ',' ) > 0
         ),
         1,
         0
@@ -1797,7 +1803,7 @@
         a.peopleType = '1602'
         AND (
         SELECT
-					concat( fp.post_qualification_code, ',' ) REGEXP concat( REPLACE ( '1428', ',', ',|' ), ',' )) = 0
+        concat( fp.post_qualification_code, ',' ) REGEXP concat( REPLACE ( '1428', ',', ',|' ), ',' )) > 0
         ),
         1,
         0
@@ -1832,9 +1838,17 @@
         a.biz_org_name IS NOT NULL
         AND a.is_delete = 0
         AND a.biz_org_type = 'PERSON'
-        <if test='bizOrgCode!=null and bizOrgCode!=""'>and LEFT(a.biz_org_code,18) like concat (#{bizOrgCode},'%')</if>
-        <if test='stationType != null and stationType != ""'>and ibsi.station_type like concat ('%', #{stationType},'%')</if>
+        AND fp.is_delete = 0
+        AND LEFT ( a.biz_org_code, 18 ) LIKE concat ( 'LSHLZ1wYXL3mJmHZyG', '%' )
+        <if test='bizOrgCode!=null and bizOrgCode!=""'>
+            and LEFT(a.biz_org_code,18) like concat (#{bizOrgCode},'%')
+        </if>
+        <if test='stationType != null and stationType != ""'>
+            and ibsi.station_type like concat ('%', #{stationType},'%')
+        </if>
         GROUP BY
-		LEFT(a.biz_org_code,18)
+        LEFT (
+        a.biz_org_code,
+        18)
     </select>
 </mapper>