消防人员需求变更，影响教育培训模块的成绩

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

@@ -265,12 +265,14 @@ LEFT JOIN cb_fire_team cft ON cff.fire_team_id = cft.sequence_nbr
     </select>
 
     <select id="getPersonByCodes" resultType="com.yeejoin.amos.boot.module.common.api.entity.Firefighters">
-        select * from cb_firefighters where
-        employee_number in
+        select cf.employee_number, cd.name as gender from cb_firefighters cf
+        left join cb_data_dictionary cd on cf.gender = cd.code
+        where
+        cf.employee_number in
         <foreach  item="item" collection="list" index="index"  open="(" separator="," close=")">
             #{item}
         </foreach>
-        and is_delete = 0
+        and cf.is_delete = 0
     </select>
     <select id="exportToExcelNew" resultType="com.yeejoin.amos.boot.module.common.api.dto.OrgUsrFireExcelDto">
         select
@@ -575,9 +577,16 @@ LEFT JOIN cb_fire_team cft ON cff.fire_team_id = cft.sequence_nbr
     <select id="getUsrSignInfoByBizOrgCode" resultType="java.util.Map">
         SELECT
         count( 1 ) AS total,
-        count( DISTINCT cs.user_id ) AS signNum,
+        count( DISTINCT cs.user_id ) AS qualifiedNum,
         (
-        count( 1 ) - count( DISTINCT cs.user_id )) AS notSignNum
+        count( 1 ) - count( DISTINCT cs.user_id )) AS unQualifiedNum,
+        (TRUNCATE (
+        abs(
+        count( DISTINCT cs.user_id ) /
+        IF
+        (( count( 1 ) = 0 ), 1, count( 1 ) )) * 100,
+        2
+        )) as qualifiedAbs
         FROM
         cb_org_usr u
         LEFT JOIN cb_sign cs ON cs.user_id = u.amos_org_id