diff --git a/src/main/java/com/biutag/supervision/controller/subdatav/SubOneVideoSuperviseController.java b/src/main/java/com/biutag/supervision/controller/subdatav/SubOneVideoSuperviseController.java index cd60137..b46f3d5 100644 --- a/src/main/java/com/biutag/supervision/controller/subdatav/SubOneVideoSuperviseController.java +++ b/src/main/java/com/biutag/supervision/controller/subdatav/SubOneVideoSuperviseController.java @@ -1,10 +1,11 @@ package com.biutag.supervision.controller.subdatav; +import cn.hutool.core.date.DateUtil; import com.alibaba.fastjson.JSONObject; +import com.biutag.supervision.mapper.NegativeMapper; import com.biutag.supervision.pojo.Result; import com.biutag.supervision.pojo.request.subdatav.SubDataVRequest; import com.biutag.supervision.pojo.vo.EchartsVo; -import com.biutag.supervision.service.SubOneVideoSuperviseService; import com.biutag.supervision.service.subDatav.SubDatavService; import io.swagger.v3.oas.annotations.Operation; import io.swagger.v3.oas.annotations.tags.Tag; @@ -28,8 +29,8 @@ import static com.biutag.supervision.constants.enums.ProblemSourcesEnum.SPDC; @RequestMapping("datav/sub1/videoSupervise") public class SubOneVideoSuperviseController { - private final SubOneVideoSuperviseService subOneVideoSuperviseService; private final SubDatavService subDatavService; + private final NegativeMapper negativeMapper; @Operation(summary = "问题数排名") @@ -59,7 +60,8 @@ public class SubOneVideoSuperviseController { @Operation(summary = "问题趋势统计") @GetMapping("/getSubOneVideoSuperviseTrend") public Result getSubOneVideoSuperviseTrend(@RequestParam Integer departId, @RequestParam Integer year) { - List videoSuperviseTrendList = subOneVideoSuperviseService.getSubOneVideoSuperviseTrend(String.valueOf(year), SPDC.getValue(), departId.toString()); + List proCode = List.of(SPDC.getValue()); + List videoSuperviseTrendList = negativeMapper.selectMonthStatByYear(year, String.valueOf(departId), proCode); JSONObject jsonObject = new JSONObject().fluentPut("videoSuperviseTrendList", videoSuperviseTrendList); return Result.success(jsonObject); } @@ -73,7 +75,8 @@ public class SubOneVideoSuperviseController { public Result getSubOneVideoSuperviseProblemTypeRate(@RequestParam Integer departId, @RequestParam @DateTimeFormat(pattern = "yyyy-MM-dd") Date beginTime, @RequestParam @DateTimeFormat(pattern = "yyyy-MM-dd") Date endTime) { - List subOneVideoSuperviseProblemTypeRate = subOneVideoSuperviseService.getSubOneVideoSuperviseProblemTypeRate(departId, beginTime, endTime); + endTime =DateUtil.endOfDay(endTime); + List subOneVideoSuperviseProblemTypeRate = negativeMapper.getSubOneVideoSuperviseProblemTypeRate(departId, beginTime, endTime); JSONObject jsonObject = new JSONObject().fluentPut("subOneVideoSuperviseProblemTypeRate", subOneVideoSuperviseProblemTypeRate); return Result.success(jsonObject); } diff --git a/src/main/java/com/biutag/supervision/mapper/NegativeMapper.java b/src/main/java/com/biutag/supervision/mapper/NegativeMapper.java index 14cc66a..1792dce 100644 --- a/src/main/java/com/biutag/supervision/mapper/NegativeMapper.java +++ b/src/main/java/com/biutag/supervision/mapper/NegativeMapper.java @@ -130,12 +130,27 @@ public interface NegativeMapper extends BaseMapper { "INNER JOIN negative_problem_relation npr " + "on ng.id=npr.negativeId " + "WHERE ng.problemSourcesCode=16 " + - "AND checkStatus <> 3 " + + "and ng.check_status_code in (1, 2, 3) " + "AND crtTime BETWEEN #{beginTime} AND #{endTime} " + "GROUP BY npr.threeLevelContent ") List getVideoSuperviseProblemTypeRate(Date beginTime, Date endTime); + @Select("SELECT npr.threeLevelContent AS `name`, " + + "COUNT(*) AS `value` " + + "FROM negative ng " + + "LEFT JOIN negative_problem_relation npr on ng.id=npr.negativeId " + + "LEFT JOIN sup_depart sd on ng.involveDepartId = sd.id " + + "LEFT JOIN sup_depart sdd on sd.pid = sdd.id " + + "LEFT JOIN sup_depart sddd on sdd.pid = sddd.id " + + "WHERE ng.problemSourcesCode=16 " + + "AND ng.check_status_code in (1, 2, 3) " + + "AND ng.crtTime BETWEEN #{beginTime} AND #{endTime} " + + "AND (sd.id =#{departId} OR sdd.id=#{departId} or sddd.id=#{departId}) " + + "GROUP BY npr.threeLevelContent ") + List getSubOneVideoSuperviseProblemTypeRate(Integer departId, Date beginTime, Date endTime); + + @Select("select * from negative ng " + @@ -335,17 +350,6 @@ public interface NegativeMapper extends BaseMapper { "AND ng.crtTime BETWEEN #{beginTime} AND #{endTime} ") VideoSuperviseCountVo getSubOneAllVideoSuperviseCount(Date beginTime, Date endTime, Integer departId); - @Select("SELECT npr.threeLevelContent AS `name`, " + - "COUNT(*) AS `value` " + - "FROM negative ng " + - "INNER JOIN sup_depart sd ON ng.involveDepartId=sd.id AND sd.pid=#{departId} " + - "INNER JOIN negative_problem_relation npr " + - "on ng.id=npr.negativeId " + - "WHERE ng.problemSourcesCode=16 " + - "AND checkStatus <> 3 " + - "AND crtTime BETWEEN #{beginTime} AND #{endTime} " + - "GROUP BY npr.threeLevelContent ") - List getSubOneVideoSuperviseProblemTypeRate(Integer departId, Date beginTime, Date endTime); diff --git a/src/main/java/com/biutag/supervision/service/SubOneVideoSuperviseService.java b/src/main/java/com/biutag/supervision/service/SubOneVideoSuperviseService.java deleted file mode 100644 index e169c35..0000000 --- a/src/main/java/com/biutag/supervision/service/SubOneVideoSuperviseService.java +++ /dev/null @@ -1,52 +0,0 @@ -package com.biutag.supervision.service; - -import com.biutag.supervision.mapper.NegativeMapper; -import com.biutag.supervision.pojo.vo.EchartsVo; -import com.biutag.supervision.pojo.vo.OrganizeProblemRankVo; -import com.biutag.supervision.pojo.vo.VideoSuperviseCountVo; -import lombok.RequiredArgsConstructor; -import org.springframework.stereotype.Service; - -import java.util.Date; -import java.util.List; - -/** - * @Auther: sh - * @Date: 2024/12/16 17:18 - * @Description: - */ - -@RequiredArgsConstructor -@Service -public class SubOneVideoSuperviseService { - private final NegativeMapper negativeMapper; - private final SupDepartService departService; - - - public VideoSuperviseCountVo getSubOneAllVideoSuperviseCount(Date beginTime, Date endTime, Integer departId) { - VideoSuperviseCountVo res = negativeMapper.getSubOneAllVideoSuperviseCount(beginTime, endTime, departId); - return res; - } - - public List getSuboOneVideoSuperviseProblemRank(Date beginTime, Date endTime, Integer groupId, Integer departId) { - List res ; - if (groupId == 10) { - res = negativeMapper.getSuboOneVideoSupervisePoliceProblemRank(beginTime, endTime, groupId, departId); - } else { - res = negativeMapper.getSuboOneVideoSuperviseTeamProblemRank(beginTime, endTime, groupId, departId); - } - return res; - } - - public List getSubOneVideoSuperviseTrend(String year, String problemCode, String departId) { - List departIds = departService.getAllNodeIds(departId); - List res = negativeMapper.getSubOneVideoSuperviseTrend(year, problemCode, departIds); - return res; - } - - public List getSubOneVideoSuperviseProblemTypeRate(Integer departId, Date beginTime, Date endTime) { - List res = negativeMapper.getSubOneVideoSuperviseProblemTypeRate(departId, beginTime, endTime); - return res; - } -} - diff --git a/src/main/java/com/biutag/supervision/service/datav/DatavServiceImpl.java b/src/main/java/com/biutag/supervision/service/datav/DatavServiceImpl.java index 76f2cb7..fb5a897 100644 --- a/src/main/java/com/biutag/supervision/service/datav/DatavServiceImpl.java +++ b/src/main/java/com/biutag/supervision/service/datav/DatavServiceImpl.java @@ -500,6 +500,7 @@ public class DatavServiceImpl implements DatavService { // 4. 领导问责（按 negativeId + 领导姓名 + 领导处理结果 去重） Set seenLead = new HashSet<>(); List leadBlames = negativeBlames.stream() + .filter(one -> BlameType.personal.name().equals(one.getType())) .filter(one -> StrUtil.isNotBlank(one.getLeadHandleResultName())) .filter(one -> !"不予追责".equals(one.getLeadHandleResultName())) .filter(one -> seenLead.add( diff --git a/src/main/java/com/biutag/supervision/service/subDatav/SubDatavServiceImpl.java b/src/main/java/com/biutag/supervision/service/subDatav/SubDatavServiceImpl.java index cd0fb80..111b591 100644 --- a/src/main/java/com/biutag/supervision/service/subDatav/SubDatavServiceImpl.java +++ b/src/main/java/com/biutag/supervision/service/subDatav/SubDatavServiceImpl.java @@ -388,6 +388,7 @@ public class SubDatavServiceImpl implements SubDatavService { // 4. 领导问责（按 negativeId + 领导姓名 + 领导处理结果 去重） Set seenLead = new HashSet<>(); List leadBlames = negativeBlames.stream() + .filter(one -> BlameType.personal.name().equals(one.getType())) .filter(one -> StrUtil.isNotBlank(one.getLeadHandleResultName())) .filter(one -> !"不予追责".equals(one.getLeadHandleResultName())) .filter(one -> seenLead.add(