diff --git a/src/main/java/com/biutag/supervision/controller/mobileSupervision/TestingAlcoholController.java b/src/main/java/com/biutag/supervision/controller/mobileSupervision/TestingAlcoholController.java index 06be34f..2b8fbfd 100644 --- a/src/main/java/com/biutag/supervision/controller/mobileSupervision/TestingAlcoholController.java +++ b/src/main/java/com/biutag/supervision/controller/mobileSupervision/TestingAlcoholController.java @@ -2,6 +2,7 @@ package com.biutag.supervision.controller.mobileSupervision; import cn.hutool.core.collection.CollectionUtil; import cn.hutool.core.io.FileUtil; +import cn.hutool.core.util.ObjectUtil; import cn.hutool.core.util.StrUtil; import com.alibaba.excel.EasyExcel; import com.alibaba.excel.ExcelReader; @@ -173,7 +174,7 @@ public class TestingAlcoholController { if (StrUtil.isNotBlank(distribute.getProblemVo().getFiles())) { vo.setFileData(JSON.parseArray(distribute.getProblemVo().getFiles(), FileVo.class)); } - if(StrUtil.isNotBlank(distribute.getProblemVo().getPeoples())){ + if( StrUtil.isNotBlank(distribute.getProblemVo().getPeoples())){ vo.setPeopleData(JSON.parseArray(distribute.getProblemVo().getPeoples(), People.class)); } break; @@ -181,6 +182,9 @@ public class TestingAlcoholController { //违反六项规定 List list = supTaskProblemService.list(new LambdaQueryWrapper().eq(SupTaskProblem::getTaskId,distribute.getTaskId())); //判断 + if(ObjectUtil.isNotEmpty(distribute.getProblemVo())){ + vo.setDepartId(distribute.getProblemVo().getDepartId()); + } if(CollectionUtil.isNotEmpty(list)){ list = list.stream().filter(s->StrUtil.isNotEmpty(s.getEmpNo())).toList(); if(CollectionUtil.isNotEmpty(list)){ diff --git a/src/main/java/com/biutag/supervision/mapper/NegativeMapper.java b/src/main/java/com/biutag/supervision/mapper/NegativeMapper.java index b6e3358..1d38503 100644 --- a/src/main/java/com/biutag/supervision/mapper/NegativeMapper.java +++ b/src/main/java/com/biutag/supervision/mapper/NegativeMapper.java @@ -639,11 +639,12 @@ public interface NegativeMapper extends BaseMapper { @Select("SELECT sd.short_name AS label, " + "count(*) as `value` " + " FROM negative ng " + - "INNER JOIN sup_depart sd ON ng.involveDepartId=sd.id " + - "AND sd.pid=#{departId} AND sd.statistics_group_id=10 " + + "INNER JOIN sup_depart sd ON ng.three_involve_depart_id=sd.id " + + "AND ng.second_involve_depart_id=#{departId} AND sd.statistics_group_id=10 " + "WHERE checkStatus <> 3 " + "AND problemSourcesCode=16 " + "AND crtTime BETWEEN #{beginTime} AND #{endTime} " + + "and ng.three_involve_depart_id is not null " + "GROUP BY sd.short_name " + "ORDER BY `value` DESC ") List getSuboOneVideoSupervisePoliceProblemRank(Date beginTime, Date endTime, Integer groupId, Integer departId); @@ -651,11 +652,12 @@ public interface NegativeMapper extends BaseMapper { @Select("SELECT sd.short_name AS label, " + "count(*) as `value` " + " FROM negative ng " + - "INNER JOIN sup_depart sd ON ng.involveDepartId=sd.id " + - "AND sd.pid=#{departId} AND sd.statistics_group_id!=10 " + + "INNER JOIN sup_depart sd ON ng.three_involve_depart_id=sd.id " + + "AND ng.second_involve_depart_id=#{departId} AND sd.statistics_group_id!=10 " + "WHERE checkStatus <> 3 " + "AND problemSourcesCode=16 " + "AND crtTime BETWEEN #{beginTime} AND #{endTime} " + + "and ng.three_involve_depart_id is not null " + "GROUP BY sd.short_name " + "ORDER BY `value` DESC ") List getSuboOneVideoSuperviseTeamProblemRank(Date beginTime, Date endTime, Integer groupId, Integer departId);