Skip to content

A
amos-boot-biz
Commit 37d1a3c7 authored by zhangsen's avatar zhangsen
Browse files
Options

大屏需求补充

parent 879b1c90
Hide whitespace changes
Inline Side-by-side
Showing with 25 additions and 97 deletions
amos-boot-module/amos-boot-module-api/amos-boot-module-common-api/src/main/java/com/yeejoin/amos/boot/module/common/api/dto/BigScreen1VO.java
View file @ 37d1a3c7
......@@ -15,5 +15,6 @@ public class BigScreen1VO {
private List<Map<String, Object>> usrSignInfo;
private List<Map<String, Object>> usrSignInfoByCode;
// private Integer teamNum;
}
amos-boot-module/amos-boot-module-api/amos-boot-module-common-api/src/main/java/com/yeejoin/amos/boot/module/common/api/mapper/FirefightersMapper.java
View file @ 37d1a3c7
......@@ -48,4 +48,6 @@ public interface FirefightersMapper extends BaseMapper<Firefighters> {
Map<String, Object> getFireForceInfoByCode(@Param("bizOrgCode") String bizOrgCode);
List<Map<String, Object>> getStationSignInfo(@Param("bizOrgCode") String bizOrgCode);
List<Map<String, Object>> getUsrSignInfoByBizOrgCode(@Param("bizOrgCode") String bizOrgCode);
}
amos-boot-module/amos-boot-module-api/amos-boot-module-common-api/src/main/resources/mapper/FirefightersMapper.xml
View file @ 37d1a3c7
......@@ -505,100 +505,6 @@ LEFT JOIN cb_fire_team cft ON cff.fire_team_id = cft.sequence_nbr
</select>
<select id="getStationSignInfo" resultType="java.util.Map">
<!-- SELECT b.qualifiedNum, b.unQualifiedNum, (TRUNCATE ( abs(( b.qualifiedNum ) / IF (( b.totalNum = 0 ),-->
<!-- 1,-->
<!-- b.totalNum-->
<!-- )) * 100 ,2)) as qualifiedAbs-->
<!-- FROM-->
<!-- (-->
<!-- SELECT-->
<!-- count( a.signCount &gt;= 8 OR NULL ) AS qualifiedNum,-->
<!-- count( 1 ) AS totalNum,-->
<!-- count( a.signCount &lt; 8 OR NULL ) AS unQualifiedNum-->
<!-- FROM-->
<!-- (-->
<!-- SELECT-->
<!-- si.`code`,-->
<!-- count( DISTINCT cs.user_id ) AS signCount-->
<!-- FROM-->
<!-- idx_biz_station_info si-->
<!-- LEFT JOIN cb_org_usr ou ON ou.`code` = si.`code`-->
<!-- AND ou.is_delete = 0-->
<!-- LEFT JOIN cb_sign cs ON cs.biz_org_code = ou.biz_org_code-->
<!-- AND cs.date LIKE CONCAT( DATE_FORMAT( now(), '%Y-%m' ), '%' )-->
<!-- <where>-->
<!-- <if test="companyCode != null and companyCode != ''">-->
<!-- si.`code` = #{companyCode}-->
<!-- </if>-->
<!-- </where>-->
<!-- GROUP BY-->
<!-- si.`code`-->
<!-- ) a-->
<!-- ) b-->
<!-- SELECT-->
<!-- sum( c.isNormal ) AS qualifiedNum,-->
<!-- (-->
<!-- count( 1 ) - sum( c.isNormal )) AS unQualifiedNum,-->
<!-- (-->
<!-- TRUNCATE (-->
<!-- abs(-->
<!-- sum( c.isNormal ) /-->
<!-- IF-->
<!-- (( count( 1 ) = 0 ), 1, count( 1 ) )) * 100,-->
<!-- 2-->
<!-- )) AS qualifiedAbs-->
<!-- FROM-->
<!-- (-->
<!-- SELECT-->
<!-- si.`code`,-->
<!-- CASE-->
<!-- WHEN count( b.`date` IS NOT NULL OR NULL ) = DATEDIFF(-->
<!-- DATE_ADD( CURDATE(), INTERVAL 1 DAY ),-->
<!-- DATE_ADD( curdate(), INTERVAL - DAY ( curdate()) + 1 DAY )) THEN-->
<!-- 1 ELSE 0-->
<!-- END AS isNormal-->
<!-- FROM-->
<!-- idx_biz_station_info si-->
<!-- LEFT JOIN (-->
<!-- SELECT-->
<!-- *-->
<!-- FROM-->
<!-- (-->
<!-- SELECT-->
<!-- t.date,-->
<!-- count( DISTINCT cs.user_id ) AS num,-->
<!-- si.`code`-->
<!-- FROM-->
<!-- (-->
<!-- SELECT-->
<!-- DATE_ADD( DATE_ADD( CURDATE(), INTERVAL - 1 DAY ), INTERVAL @s DAY ) AS date,-->
<!-- @s := @s - 1 AS `index`-->
<!-- FROM-->
<!-- mysql.help_topic,-->
<!-- ( SELECT @s := 1 ) temp-->
<!-- 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.`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-->
<!-- t.date,-->
<!-- si.`code`-->
<!-- ) a-->
<!-- WHERE-->
<!-- num &gt;= 8-->
<!-- ) b ON b.`code` = si.`code`-->
<!-- <where>-->
<!-- <if test="bizOrgCode != null and bizOrgCode != ''">-->
<!-- si.`code` = #{bizOrgCode}-->
<!-- </if>-->
<!-- </where>-->
<!-- GROUP BY-->
<!-- si.`code`-->
<!-- ) c-->
SELECT
sum( c.isNormal ) AS qualifiedNum,
(
......@@ -644,7 +550,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.`biz_org_code` = cs.`biz_org_code`
LEFT JOIN cb_org_usr ou ON ou.`amos_org_id` = cs.`user_id`
AND ou.is_delete = 0
LEFT JOIN idx_biz_station_info si ON si.`code` = ou.`code`
GROUP BY
......@@ -658,11 +564,28 @@ LEFT JOIN cb_fire_team cft ON cff.fire_team_id = cft.sequence_nbr
AND is_delete = 0
<where>
<if test="bizOrgCode != null and bizOrgCode != ''">
ou1.`biz_org_code` = #{bizOrgCode}
ou1.`biz_org_code` like concat(#{bizOrgCode}, '%')
</if>
</where>
GROUP BY
si.`code`
) c
</select>
<select id="getUsrSignInfoByBizOrgCode" resultType="java.util.Map">
SELECT
count( 1 ) AS total,
count( DISTINCT cs.user_id ) AS signNum,
(
count( 1 ) - count( DISTINCT cs.user_id )) AS notSignNum
FROM
cb_org_usr u
LEFT JOIN cb_sign cs ON cs.user_id = u.amos_org_id
WHERE
u.is_delete = 0
AND u.biz_org_type = 'PERSON'
<if test="bizOrgCode != null and bizOrgCode != ''">
AND u.`biz_org_code` LIKE concat(#{bizOrgCode}, '%')
</if>
</select>
</mapper>
amos-boot-module/amos-boot-module-biz/amos-boot-module-common-biz/src/main/java/com/yeejoin/amos/boot/module/common/biz/service/impl/FirefightersServiceImpl.java
View file @ 37d1a3c7
......@@ -317,6 +317,8 @@ public class FirefightersServiceImpl extends BaseService<FirefightersDto, Firefi
// bigScreen1VO.setFirefightersInfo(fireForceInfoByCode);
List<Map<String, Object>> stationSignInfo = firefightersMapper.getStationSignInfo(bizOrgCode);
bigScreen1VO.setUsrSignInfo(stationSignInfo);
List<Map<String, Object>> usrSignInfoByBizOrgCode = firefightersMapper.getUsrSignInfoByBizOrgCode(bizOrgCode);
bigScreen1VO.setUsrSignInfoByCode(usrSignInfoByBizOrgCode);
return bigScreen1VO;
}
}
amos-boot-system-equip/src/main/resources/mapper/FireFightingSystemMapper.xml
View file @ 37d1a3c7
......@@ -2143,7 +2143,7 @@
DISTINCT `eqlog`.`equipment_specific_id`
)
FROM
`wl_equipment_specific_alarm_log` `eqlog`
`wl_equipment_specific_alarm` `eqlog`
WHERE
(
(
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment