29832 【中心级】一张图全景监控>人员管理>人员配置>二级页面，在站端视角下，驻站消防员/运维人员已取证人数与列表的已取证人数不一致

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

@@ -1695,14 +1695,31 @@
         ( CASE a.peopleType WHEN '1601' THEN '驻站消防员' WHEN '1602' THEN '运维人员' END ) AS peopleType,
         (
         CASE
-        WHEN a.peopleType = '1601' THEN
-        IFNULL((
-        SELECT
-        concat( fp.post_qualification_code, ',' ) REGEXP concat( REPLACE ( '1421,1422,1423,1424,1425,1823,1824,1825,1826,1827', ',', ',|' ), ',' )), 0)
         WHEN a.peopleType = '1602' THEN
-        IFNULL((SELECT concat( fp.post_qualification_code, ',' ) REGEXP concat( REPLACE ( '1427,1428,1429,1430,1431', ',', ',|' ), ',' )), 0) END
+        (
+        IF
+        ((
+        SELECT
+        concat( fp.post_qualification_code, ',' ) REGEXP concat( REPLACE ( '1427,1428,1429,1430,1431', ',', ',|' ), ',' )) > 0,
+        1,
+        0
+        )
+        )
+        WHEN a.peopleType = '1601' THEN
+        (
+        IF
+        (
+        (
+        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
+        )) ELSE 0
+        END
         ) AS isOk,
-        fp.post_qualification_code AS qualificationCode
+        fp.post_qualification_code AS qualificationCode,
+        fp.post_qualification as qualificationName
         FROM
         (
         SELECT

amos-boot-module/amos-boot-module-biz/amos-boot-module-common-biz/src/main/java/com/yeejoin/amos/boot/module/common/biz/service/impl/OrgUsrServiceImpl.java

@@ -3921,28 +3921,6 @@ public class OrgUsrServiceImpl extends BaseService<OrgUsrDto, OrgUsr, OrgUsrMapp
 			peopleTypeCode = "ZZXFY".equalsIgnoreCase(peopleTypeCode) ? "1601" : "YWRY".equalsIgnoreCase(peopleTypeCode) ? "1602" : "";
 		}
 		IPage<Map<String, Object>> iPage = this.baseMapper.getPage(page, bizOrgCode, peopleTypeCode);
-		iPage.getRecords().stream().forEach(e->{
-			StringBuilder cardNames = new StringBuilder("");
-			List<String> codes = Arrays.asList(String.valueOf(e.get("qualificationCode")).split(","));
-			if (CollectionUtils.isNotEmpty(codes)) {
-				for (String code : codes) {
-					if (YJJYY.contains(code)) {
-						cardNames.append("应急救援员证");
-						cardNames.append(",");
-					} else if (ZCXFGCS.contains(code)) {
-						cardNames.append("注册消防工程师证");
-						cardNames.append(",");
-					} else if (XFY.contains(code)) {
-						cardNames.append("消防员证");
-						cardNames.append(",");
-					} else if (XFSSCZY.contains(code)) {
-						cardNames.append("消防设施操作员证");
-						cardNames.append(",");
-					}
-				}
-			}
-			e.put("qualificationName", cardNames.length() > 0 ? cardNames.substring(0, cardNames.length() - 1) : "");
-		});
 		return iPage;
 	}