bug xiugai

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

@@ -554,7 +554,7 @@ LEFT JOIN cb_fire_team cft ON cff.fire_team_id = cft.sequence_nbr
         WHERE
         @s > DATEDIFF( date_add( curdate(), INTERVAL - DAY ( curdate()) + 1 DAY ), CURDATE() )) t
         LEFT JOIN cb_sign cs ON cs.date = t.date
-        LEFT JOIN cb_org_usr ou ON ou.`amos_org_id` = cs.`user_id`
+        LEFT JOIN cb_org_usr ou ON ou.`biz_org_code` = cs.`biz_org_code`
         AND ou.is_delete = 0
         LEFT JOIN idx_biz_station_info si ON si.`code` = ou.`code`
         GROUP BY
@@ -578,26 +578,24 @@ 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 qualifiedNum,
+        a.qualifiedNum,
+        a.allNum - a.qualifiedNum AS unQualifiedNum,
         (
-        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
+        TRUNCATE ( abs( a.qualifiedNum / IF (( a.allNum = 0 ), 1, a.allNum )) * 100, 2 )) AS qualifiedAbs
         FROM
-        cb_org_usr u
-        LEFT JOIN cb_sign cs ON cs.user_id = u.sequence_nbr
-        WHERE
-        u.is_delete = 0
-        AND u.biz_org_type = 'PERSON'
+        (
+        SELECT
+        ( SELECT count( DISTINCT user_id ) FROM `cb_sign` WHERE `date` = CURRENT_DATE
         <if test="bizOrgCode != null and bizOrgCode != ''">
             AND u.`biz_org_code` LIKE concat(#{bizOrgCode}, '%')
         </if>
+        ) AS qualifiedNum,
+        ( SELECT count( 1 ) FROM cb_org_usr WHERE is_delete = 0 AND biz_org_type = 'PERSON'
+        <if test="bizOrgCode != null and bizOrgCode != ''">
+            AND u.`biz_org_code` LIKE concat(#{bizOrgCode}, '%')
+        </if>
+        ) AS allNum
+        ) a
     </select>
 
     <select id="getUserInfoByYJYA" resultType="java.util.Map">