bonus
/
SafetyAlertSystem
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

大屏调试

This commit is contained in:
mashuai 2024-09-30 10:15:49 +08:00
parent 21a98dbbd4
commit 5fe413c07d
4 changed files with 17 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
bonus-modules/bonus-base/src/main/java/com/bonus/screen/controller/ProjectViewTwoController.java
View File

@ -83,8 +83,8 @@ public class ProjectViewTwoController extends BaseController {
* @return
*/
@GetMapping("/getTeamDataAmount")
public AjaxResult getTeamDataAmount() {
return success(projectViewService.getTeamDataAmount());
public AjaxResult getTeamDataAmount(TeamRecord record) {
return success(projectViewService.getTeamDataAmount(record));
}
/**

2
bonus-modules/bonus-base/src/main/java/com/bonus/screen/mapper/TeamRecordMapper.java
View File

@ -15,7 +15,7 @@ public interface TeamRecordMapper {
* 施工记录数量
* @return
*/
TeamRecordNum getTeamDataAmount();
TeamRecordNum getTeamDataAmount(TeamRecord record);
/**
* 施工班组详情页

4
bonus-modules/bonus-base/src/main/java/com/bonus/screen/service/impl/ProjectViewServiceImpl.java
View File

@ -207,8 +207,8 @@ public class ProjectViewServiceImpl {
* 施工记录数量
* @return
*/
public TeamRecordNum getTeamDataAmount() {
return teamRecord.getTeamDataAmount();
public TeamRecordNum getTeamDataAmount(TeamRecord record) {
return teamRecord.getTeamDataAmount(record);
}
/**

15
bonus-modules/bonus-base/src/main/resources/mapper/screen/TeamRecordMapper.xml
View File

@ -5,15 +5,20 @@
<!-- 施工记录数量 -->
<select id="getTeamDataAmount" resultType="com.bonus.screen.vo.TeamRecordNum">
SELECT
( SELECT COUNT( tt.id ) FROM tb_team tt WHERE tt.del_flag = 0 AND tt.js_time IS NULL ) AS teamNum,
COUNT( tp.id ) AS peopleNum,
COUNT( CASE WHEN ( tp.post_code IN ( '0900101', '0900102', '0900103' )) THEN 1 END ) AS teamMaster,
COUNT(DISTINCT tt.id) AS teamNum,
COUNT(DISTINCT tp.id) AS peopleNum,
COUNT(CASE WHEN tp.post_code IN ('0900101', '0900102', '0900103') THEN 1 END) AS teamMaster,
COUNT(CASE WHEN tp.post_code = '0900104' THEN 1 END) AS teamSame,
COUNT(CASE WHEN tp.post_code = '0900106' THEN 1 END) AS teamSpecial
FROM
tb_people tp
tb_team tt
LEFT JOIN
tb_people tp ON tt.id = tp.team_id AND tp.del_flag = 0
WHERE
tp.del_flag = 0
tt.del_flag = 0 AND tt.js_time IS NULL
<if test="proId != null">
AND tt.pro_id = #{proId}
</if>
</select>
<!-- 施工班组详情页 -->