From 55be346128be9d5734a49f68aa4c42326cc17059 Mon Sep 17 00:00:00 2001 From: guo Date: Thu, 13 Jul 2023 09:25:47 +0800 Subject: [PATCH] =?UTF-8?q?=E5=A4=A7=E5=B1=8F=E5=AE=89=E5=85=A8=E8=B6=8B?= =?UTF-8?q?=E5=8A=BF=E6=8E=A5=E5=8F=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../HiddenDangerInspectRecordController.java | 15 +++- .../DangerInspectionPassMonthStaticsVo.java | 9 ++ .../HiddenDangerInspectRecordMapper.java | 7 +- .../xml/HiddenDangerInspectRecordMapper.xml | 86 +++++++++++-------- .../IHiddenDangerInspectRecordService.java | 6 +- .../HiddenDangerInspectRecordServiceImpl.java | 22 +++++ .../mapper/xml/SecurityManageMapper.xml | 2 +- 7 files changed, 98 insertions(+), 49 deletions(-) create mode 100644 src/main/java/com/zhgd/xmgl/modules/dangerous/entity/vo/DangerInspectionPassMonthStaticsVo.java diff --git a/src/main/java/com/zhgd/xmgl/modules/dangerous/controller/HiddenDangerInspectRecordController.java b/src/main/java/com/zhgd/xmgl/modules/dangerous/controller/HiddenDangerInspectRecordController.java index de622c59d..f06e9f373 100644 --- a/src/main/java/com/zhgd/xmgl/modules/dangerous/controller/HiddenDangerInspectRecordController.java +++ b/src/main/java/com/zhgd/xmgl/modules/dangerous/controller/HiddenDangerInspectRecordController.java @@ -5,10 +5,7 @@ import com.zhgd.jeecg.common.api.vo.Result; import com.zhgd.jeecg.common.mybatis.EntityMap; import com.zhgd.xmgl.modules.dangerous.entity.HiddenDangerInspectRecord; import com.zhgd.xmgl.modules.dangerous.entity.HiddenDangerInspectionStatistics; -import com.zhgd.xmgl.modules.dangerous.entity.vo.AllTodayDataHdirVO; -import com.zhgd.xmgl.modules.dangerous.entity.vo.AllWeekDataHdirVO; -import com.zhgd.xmgl.modules.dangerous.entity.vo.ProjectInspectRecordCountVo; -import com.zhgd.xmgl.modules.dangerous.entity.vo.TotalAndWeekHiddenDanger; +import com.zhgd.xmgl.modules.dangerous.entity.vo.*; import com.zhgd.xmgl.modules.dangerous.service.IHiddenDangerInspectRecordService; import io.swagger.annotations.Api; import io.swagger.annotations.ApiImplicitParam; @@ -272,4 +269,14 @@ public class HiddenDangerInspectRecordController { public Result> selectHiddenDangerStateTrendByWeek(@RequestBody Map map) { return Result.success(hiddenDangerInspectRecordService.selectHiddenDangerStateTrendByWeek(map)); } + + @ApiOperation(value = "查询过去一个月的新增问题趋势", notes = "查询过去一个月的新增问题趋势", httpMethod = "POST") + @ApiImplicitParams({ + @ApiImplicitParam(name = "projectSn", value = "项目SN", paramType = "query", required = true, dataType = "String"), + }) + @PostMapping(value = "/getDangerInspectionPassMonthStatics") + public Result> getDangerInspectionPassMonthStatics(@RequestBody Map map) { + return Result.success(hiddenDangerInspectRecordService.getDangerInspectionPassMonthStatics(map)); + } + } diff --git a/src/main/java/com/zhgd/xmgl/modules/dangerous/entity/vo/DangerInspectionPassMonthStaticsVo.java b/src/main/java/com/zhgd/xmgl/modules/dangerous/entity/vo/DangerInspectionPassMonthStaticsVo.java new file mode 100644 index 000000000..ed38c0765 --- /dev/null +++ b/src/main/java/com/zhgd/xmgl/modules/dangerous/entity/vo/DangerInspectionPassMonthStaticsVo.java @@ -0,0 +1,9 @@ +package com.zhgd.xmgl.modules.dangerous.entity.vo; + +import lombok.Data; + +@Data +public class DangerInspectionPassMonthStaticsVo { + private Integer num; + private String day; +} diff --git a/src/main/java/com/zhgd/xmgl/modules/dangerous/mapper/HiddenDangerInspectRecordMapper.java b/src/main/java/com/zhgd/xmgl/modules/dangerous/mapper/HiddenDangerInspectRecordMapper.java index 1a0e2f8fd..e0114097e 100644 --- a/src/main/java/com/zhgd/xmgl/modules/dangerous/mapper/HiddenDangerInspectRecordMapper.java +++ b/src/main/java/com/zhgd/xmgl/modules/dangerous/mapper/HiddenDangerInspectRecordMapper.java @@ -6,10 +6,7 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.zhgd.jeecg.common.mybatis.EntityMap; import com.zhgd.xmgl.modules.dangerous.entity.HiddenDangerInspectRecord; import com.zhgd.xmgl.modules.dangerous.entity.HiddenDangerInspectionStatistics; -import com.zhgd.xmgl.modules.dangerous.entity.vo.AllTodayDataHdirVO; -import com.zhgd.xmgl.modules.dangerous.entity.vo.AllWeekDataHdirVO; -import com.zhgd.xmgl.modules.dangerous.entity.vo.ProjectInspectRecordCountVo; -import com.zhgd.xmgl.modules.dangerous.entity.vo.TotalAndWeekHiddenDanger; +import com.zhgd.xmgl.modules.dangerous.entity.vo.*; import org.apache.ibatis.annotations.Mapper; import org.apache.ibatis.annotations.Param; @@ -68,4 +65,6 @@ public interface HiddenDangerInspectRecordMapper extends BaseMapper getGroupByProjectSn(); HiddenDangerInspectionStatistics statisticsByStatue(DateTime startTime, DateTime endTime, String projectSn); + + List getDangerInspectionPassMonthStatics(Map map); } diff --git a/src/main/java/com/zhgd/xmgl/modules/dangerous/mapper/xml/HiddenDangerInspectRecordMapper.xml b/src/main/java/com/zhgd/xmgl/modules/dangerous/mapper/xml/HiddenDangerInspectRecordMapper.xml index 3e332c85d..d4f297d8a 100644 --- a/src/main/java/com/zhgd/xmgl/modules/dangerous/mapper/xml/HiddenDangerInspectRecordMapper.xml +++ b/src/main/java/com/zhgd/xmgl/modules/dangerous/mapper/xml/HiddenDangerInspectRecordMapper.xml @@ -3,10 +3,10 @@ @@ -391,34 +391,48 @@ - + SELECT IFNULL(sum(if(project_sn = #{projectSn} AND create_time BETWEEN #{startTime} AND #{endTime}, 1, 0)), + 0) increaseNum, + IFNULL(sum(if(`status` = 4 AND project_sn = #{projectSn} AND + update_time BETWEEN #{startTime} AND #{endTime}, 1, 0)), 0) solveNum, + IFNULL(sum(if(`status` != 1 AND `status` != 4 AND project_sn = #{projectSn}, 1, 0)), 0) unResolveNum FROM hidden_danger_inspection_record + + diff --git a/src/main/java/com/zhgd/xmgl/modules/dangerous/service/IHiddenDangerInspectRecordService.java b/src/main/java/com/zhgd/xmgl/modules/dangerous/service/IHiddenDangerInspectRecordService.java index f6c3abda1..646416fe2 100644 --- a/src/main/java/com/zhgd/xmgl/modules/dangerous/service/IHiddenDangerInspectRecordService.java +++ b/src/main/java/com/zhgd/xmgl/modules/dangerous/service/IHiddenDangerInspectRecordService.java @@ -6,10 +6,7 @@ import com.zhgd.jeecg.common.api.vo.Result; import com.zhgd.jeecg.common.mybatis.EntityMap; import com.zhgd.xmgl.modules.dangerous.entity.HiddenDangerInspectRecord; import com.zhgd.xmgl.modules.dangerous.entity.HiddenDangerInspectionStatistics; -import com.zhgd.xmgl.modules.dangerous.entity.vo.AllTodayDataHdirVO; -import com.zhgd.xmgl.modules.dangerous.entity.vo.AllWeekDataHdirVO; -import com.zhgd.xmgl.modules.dangerous.entity.vo.ProjectInspectRecordCountVo; -import com.zhgd.xmgl.modules.dangerous.entity.vo.TotalAndWeekHiddenDanger; +import com.zhgd.xmgl.modules.dangerous.entity.vo.*; import javax.servlet.http.HttpServletResponse; import java.util.List; @@ -77,4 +74,5 @@ public interface IHiddenDangerInspectRecordService extends IService edit(HiddenDangerInspectRecord hiddenDangerInspectRecord); + List getDangerInspectionPassMonthStatics(Map map); } diff --git a/src/main/java/com/zhgd/xmgl/modules/dangerous/service/impl/HiddenDangerInspectRecordServiceImpl.java b/src/main/java/com/zhgd/xmgl/modules/dangerous/service/impl/HiddenDangerInspectRecordServiceImpl.java index 67883681f..4c8037410 100644 --- a/src/main/java/com/zhgd/xmgl/modules/dangerous/service/impl/HiddenDangerInspectRecordServiceImpl.java +++ b/src/main/java/com/zhgd/xmgl/modules/dangerous/service/impl/HiddenDangerInspectRecordServiceImpl.java @@ -40,6 +40,7 @@ import org.springframework.transaction.annotation.Transactional; import javax.servlet.http.HttpServletResponse; import java.text.SimpleDateFormat; import java.util.*; +import java.util.stream.Collectors; /** * @Description: 隐患检查记录 @@ -494,6 +495,27 @@ public class HiddenDangerInspectRecordServiceImpl extends ServiceImpl getDangerInspectionPassMonthStatics(Map map) { + List monthStatics = hiddenDangerInspectRecordMapper.getDangerInspectionPassMonthStatics(map); + return fillData(monthStatics); + } + + private List fillData(List monthStatics) { + List rtVos = new ArrayList<>(); + Map map = monthStatics.stream().collect(Collectors.toMap(e -> e.getDay(), e -> e, (o, o2) -> o)); + for (String orderDay : com.zhgd.xmgl.util.DateUtil.getDaysBetweenLastMonth()) { + DangerInspectionPassMonthStaticsVo vo = map.get(orderDay); + if (vo == null) { + vo = new DangerInspectionPassMonthStaticsVo(); + vo.setDay(orderDay); + vo.setNum(0); + } + rtVos.add(vo); + } + return rtVos; + } + /** * 设置全部占比 * diff --git a/src/main/java/com/zhgd/xmgl/modules/security/mapper/xml/SecurityManageMapper.xml b/src/main/java/com/zhgd/xmgl/modules/security/mapper/xml/SecurityManageMapper.xml index f57159852..74dba52ee 100644 --- a/src/main/java/com/zhgd/xmgl/modules/security/mapper/xml/SecurityManageMapper.xml +++ b/src/main/java/com/zhgd/xmgl/modules/security/mapper/xml/SecurityManageMapper.xml @@ -76,4 +76,4 @@ order by a.create_time desc - \ No newline at end of file +