From b144036dda9056f208d3e88118c48351ab9c934d Mon Sep 17 00:00:00 2001 From: guoshengxiong <1923636941@qq.com> Date: Fri, 5 Jul 2024 16:17:25 +0800 Subject: [PATCH] =?UTF-8?q?=E5=8D=B1=E9=99=A9=E7=89=B9=E6=AE=8A=E4=BD=9C?= =?UTF-8?q?=E4=B8=9A=E7=BB=9F=E8=AE=A1=E5=8D=B1=E5=A4=A7=E5=B7=A5=E7=A8=8B?= =?UTF-8?q?=E6=95=B0=E9=87=8F+=E7=89=B9=E6=AE=8A=E4=BD=9C=E4=B8=9A?= =?UTF-8?q?=E6=95=B0=E9=87=8F=20=E5=AE=89=E5=85=A8=E6=95=99=E8=82=B2?= =?UTF-8?q?=E7=BB=9F=E8=AE=A1=E5=85=A5=E5=9C=BA=E5=AE=89=E5=85=A8=E6=95=99?= =?UTF-8?q?=E8=82=B2+=E5=9F=B9=E8=AE=AD=E8=AE=A1=E5=88=92=E6=95=B0?= =?UTF-8?q?=E9=87=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../modules/exam/mapper/ExamTrainMapper.java | 7 +- .../exam/mapper/xml/ExamTrainMapper.xml | 15 +- .../exam/service/IExamTrainService.java | 22 +++ .../service/impl/ExamTrainServiceImpl.java | 16 ++- .../vo/StatsDirectorateBigscreenVo.java | 4 +- ...ityQualityInspectionRecordServiceImpl.java | 12 ++ .../controller/CountApiController.java | 15 +- .../xz/special/mapper/CountApiMapper.java | 28 ++++ .../mapper/XzBlindPlatePlugSafeMapper.java | 7 - .../xz/special/mapper/xml/CountApiMapper.xml | 110 ++++++++++++++ .../mapper/xml/XzBlindPlatePlugSafeMapper.xml | 106 -------------- .../xz/special/service/CountApiService.java | 134 ++++++++++++++++++ .../service/IXzBlindPlatePlugSafeService.java | 7 - .../impl/XzBlindPlatePlugSafeServiceImpl.java | 49 ------- 14 files changed, 347 insertions(+), 185 deletions(-) create mode 100644 src/main/java/com/zhgd/xmgl/modules/xz/special/mapper/CountApiMapper.java create mode 100644 src/main/java/com/zhgd/xmgl/modules/xz/special/mapper/xml/CountApiMapper.xml create mode 100644 src/main/java/com/zhgd/xmgl/modules/xz/special/service/CountApiService.java diff --git a/src/main/java/com/zhgd/xmgl/modules/exam/mapper/ExamTrainMapper.java b/src/main/java/com/zhgd/xmgl/modules/exam/mapper/ExamTrainMapper.java index db8427925..6ce20c173 100644 --- a/src/main/java/com/zhgd/xmgl/modules/exam/mapper/ExamTrainMapper.java +++ b/src/main/java/com/zhgd/xmgl/modules/exam/mapper/ExamTrainMapper.java @@ -1,13 +1,10 @@ package com.zhgd.xmgl.modules.exam.mapper; -import java.util.List; +import java.util.Set; import com.baomidou.mybatisplus.core.conditions.Wrapper; import com.baomidou.mybatisplus.core.toolkit.Constants; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; -import com.fasterxml.jackson.annotation.JsonInclude; -import com.zhgd.annotation.DataScope; -import com.zhgd.xmgl.modules.exam.entity.ExamCourse; import org.apache.ibatis.annotations.Mapper; import org.apache.ibatis.annotations.Param; import com.zhgd.xmgl.modules.exam.entity.ExamTrain; @@ -23,4 +20,6 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper; public interface ExamTrainMapper extends BaseMapper { Page pageList(Page page, @Param(Constants.WRAPPER) Wrapper wrapper); + + Integer count(@Param("projectSn") String projectSn, @Param("list") Set trainIds); } diff --git a/src/main/java/com/zhgd/xmgl/modules/exam/mapper/xml/ExamTrainMapper.xml b/src/main/java/com/zhgd/xmgl/modules/exam/mapper/xml/ExamTrainMapper.xml index c3771a04e..691c41508 100644 --- a/src/main/java/com/zhgd/xmgl/modules/exam/mapper/xml/ExamTrainMapper.xml +++ b/src/main/java/com/zhgd/xmgl/modules/exam/mapper/xml/ExamTrainMapper.xml @@ -11,4 +11,17 @@ left join system_user u on et.create_by = u.user_id) a ${ew.customSqlSegment} - \ No newline at end of file + + + diff --git a/src/main/java/com/zhgd/xmgl/modules/exam/service/IExamTrainService.java b/src/main/java/com/zhgd/xmgl/modules/exam/service/IExamTrainService.java index 84b58e162..0d870f936 100644 --- a/src/main/java/com/zhgd/xmgl/modules/exam/service/IExamTrainService.java +++ b/src/main/java/com/zhgd/xmgl/modules/exam/service/IExamTrainService.java @@ -14,10 +14,32 @@ import com.baomidou.mybatisplus.extension.service.IService; * @version： V1.0 */ public interface IExamTrainService extends IService { + /** + * 统计培训计划数量 + * @param projectSn + * @return + */ + int count(String projectSn); + /** + * + * @param page + * @param wrapper + * @return + */ Page pageList(Page page, QueryWrapper wrapper); + /** + * + * @param examTrain + * @return + */ boolean saveInfo(ExamTrain examTrain); + /** + * + * @param examTrain + * @return + */ boolean delInfo(ExamTrain examTrain); } diff --git a/src/main/java/com/zhgd/xmgl/modules/exam/service/impl/ExamTrainServiceImpl.java b/src/main/java/com/zhgd/xmgl/modules/exam/service/impl/ExamTrainServiceImpl.java index 9c5d1c555..d980a83bd 100644 --- a/src/main/java/com/zhgd/xmgl/modules/exam/service/impl/ExamTrainServiceImpl.java +++ b/src/main/java/com/zhgd/xmgl/modules/exam/service/impl/ExamTrainServiceImpl.java @@ -2,21 +2,15 @@ package com.zhgd.xmgl.modules.exam.service.impl; import cn.hutool.core.date.DateUtil; import cn.hutool.core.util.StrUtil; -import com.baomidou.mybatisplus.core.conditions.Wrapper; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.toolkit.Wrappers; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; -import com.zhgd.xmgl.modules.basicdata.entity.SystemUser; -import com.zhgd.xmgl.modules.basicdata.service.ISystemUserService; import com.zhgd.xmgl.modules.exam.entity.*; import com.zhgd.xmgl.modules.exam.mapper.ExamTrainMapper; import com.zhgd.xmgl.modules.exam.service.*; -import com.zhgd.xmgl.modules.exam.vo.ExamTrainRecordVo; -import com.zhgd.xmgl.modules.worker.entity.WorkerInfo; import com.zhgd.xmgl.modules.worker.service.IWorkerInfoService; import com.zhgd.xmgl.security.entity.UserInfo; import com.zhgd.xmgl.security.util.SecurityUtils; -import com.zhgd.xmgl.util.DateUtils; import com.zhgd.xmgl.util.EmailUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; @@ -29,7 +23,6 @@ import java.util.Date; import java.util.List; import java.util.Set; import java.util.stream.Collectors; -import java.util.stream.Stream; /** * @Description: 教育培训信息 @@ -58,6 +51,15 @@ public class ExamTrainServiceImpl extends ServiceImpl trainIds = examTrainRecordService.list().stream().map(e -> e.getTrainId()).collect(Collectors.toSet()); + if (trainIds.size() == 0) { + return 0; + } + return baseMapper.count(projectSn,trainIds); + } + @Override public Page pageList(Page page, QueryWrapper wrapper) { Set trainIds = examTrainRecordService.list().stream().map(e -> e.getTrainId()).collect(Collectors.toSet()); diff --git a/src/main/java/com/zhgd/xmgl/modules/xz.security/entity/vo/StatsDirectorateBigscreenVo.java b/src/main/java/com/zhgd/xmgl/modules/xz.security/entity/vo/StatsDirectorateBigscreenVo.java index 195e1ee14..55647e9be 100644 --- a/src/main/java/com/zhgd/xmgl/modules/xz.security/entity/vo/StatsDirectorateBigscreenVo.java +++ b/src/main/java/com/zhgd/xmgl/modules/xz.security/entity/vo/StatsDirectorateBigscreenVo.java @@ -5,10 +5,10 @@ import lombok.Data; @Data public class StatsDirectorateBigscreenVo { - @ApiModelProperty("危大工程数量") + @ApiModelProperty("危大工程数量+特殊作业数量") private Integer dangerousEngineeringRecordNum; - @ApiModelProperty("人员登记培训数量") + @ApiModelProperty("入场安全教育+培训计划数量") private Integer workerInfoAuditRecordNum; @ApiModelProperty("影响进度数量") diff --git a/src/main/java/com/zhgd/xmgl/modules/xz.security/service/impl/XzSecurityQualityInspectionRecordServiceImpl.java b/src/main/java/com/zhgd/xmgl/modules/xz.security/service/impl/XzSecurityQualityInspectionRecordServiceImpl.java index 4af427881..687610c35 100644 --- a/src/main/java/com/zhgd/xmgl/modules/xz.security/service/impl/XzSecurityQualityInspectionRecordServiceImpl.java +++ b/src/main/java/com/zhgd/xmgl/modules/xz.security/service/impl/XzSecurityQualityInspectionRecordServiceImpl.java @@ -28,6 +28,7 @@ import com.zhgd.xmgl.modules.basicdata.service.INoticeService; import com.zhgd.xmgl.modules.basicdata.service.impl.SystemUserServiceImpl; import com.zhgd.xmgl.modules.dangerous.entity.DangerousEngineeringRecord; import com.zhgd.xmgl.modules.dangerous.mapper.DangerousEngineeringRecordMapper; +import com.zhgd.xmgl.modules.exam.service.IExamTrainService; import com.zhgd.xmgl.modules.quality.entity.QualityInspectionRecord; import com.zhgd.xmgl.modules.quality.entity.QualityRegion; import com.zhgd.xmgl.modules.quality.mapper.QualityInspectionRecordMapper; @@ -58,6 +59,7 @@ import com.zhgd.xmgl.modules.xz.security.service.IXzSecurityInspectTaskItemRecor import com.zhgd.xmgl.modules.xz.security.service.IXzSecurityInspectTaskRecordService; import com.zhgd.xmgl.modules.xz.security.service.IXzSecurityQualityInspectionRecordService; import com.zhgd.xmgl.modules.xz.service.IXzWorkerSafeWatchConfigService; +import com.zhgd.xmgl.modules.xz.special.service.CountApiService; import com.zhgd.xmgl.push.config.PushPayloads; import com.zhgd.xmgl.util.*; import lombok.extern.slf4j.Slf4j; @@ -65,6 +67,7 @@ import org.apache.commons.collections.CollectionUtils; import org.apache.commons.collections.MapUtils; import org.apache.commons.lang3.StringUtils; import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.context.annotation.Lazy; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; @@ -110,8 +113,15 @@ public class XzSecurityQualityInspectionRecordServiceImpl extends ServiceImpl() .eq(DangerousEngineeringRecord::getProjectSn, projectSn)); + dc += countApiService.countSpecial(projectSn); vo.setDangerousEngineeringRecordNum(dc); Integer arc = workerInfoAuditRecordMapper.selectCount(new LambdaQueryWrapper() .eq(WorkerInfoAuditRecord::getProjectSn, projectSn)); + arc += examTrainService.count(projectSn); vo.setWorkerInfoAuditRecordNum(arc); Integer cc = xzTaskProgressContentMapper.selectCount(new LambdaQueryWrapper() .eq(XzTaskProgressContent::getProjectSn, projectSn) diff --git a/src/main/java/com/zhgd/xmgl/modules/xz/special/controller/CountApiController.java b/src/main/java/com/zhgd/xmgl/modules/xz/special/controller/CountApiController.java index a3be05417..a833f592c 100644 --- a/src/main/java/com/zhgd/xmgl/modules/xz/special/controller/CountApiController.java +++ b/src/main/java/com/zhgd/xmgl/modules/xz/special/controller/CountApiController.java @@ -32,33 +32,44 @@ import java.util.*; @Slf4j @Api(tags = "星纵-特种作业统计Api") public class CountApiController { + @Lazy @Autowired IXzBlindPlatePlugSafeService xzBlindPlatePlugSafeService; + @Lazy @Resource IXzGroundSafetService iXzGroundSafetService; + @Lazy @Resource IXzHighJobSafeService iXzHighJobSafeService; + @Lazy @Resource IXzHoistSafetyWorkService iXzHoistSafetyWorkService; + @Lazy @Resource IXzLimitSpaceSafeService iXzLimitSpaceSafeService; + @Lazy @Resource IXzOpenCircuitSafeService iXzOpenCircuitSafeService; + @Lazy @Resource IXzSpecialOperationFireSafetyService iXzSpecialOperationFireSafetyService; + @Lazy @Resource IXzTemporaryElectricitySafeService xzTemporaryElectricitySafeService; @Lazy @Autowired private UserEnterpriseServiceImpl userEnterpriseService; + @Lazy + @Autowired + private CountApiService countApiService; - @ApiOperation(value = "统计特殊作业数量", notes = "统计特殊作业数量", httpMethod = "POST") + @ApiOperation(value = "统计过去一周每天的特殊作业数量", notes = "统计过去一周每天的特殊作业数量", httpMethod = "POST") @ApiImplicitParams({ @ApiImplicitParam(name = "projectSn", value = "项目sn", paramType = "body", required = true, dataType = "String"), }) @PostMapping(value = "/countAllSpecial") public Result> countAllSpecial(@ApiIgnore @RequestBody Map param) { - return Result.success(xzBlindPlatePlugSafeService.countAllSpecial(param)); + return Result.success(countApiService.countAllSpecial(param)); } @ApiOperation(value = "统计特殊作业情况", notes = "统计特殊作业情况", httpMethod = "POST") diff --git a/src/main/java/com/zhgd/xmgl/modules/xz/special/mapper/CountApiMapper.java b/src/main/java/com/zhgd/xmgl/modules/xz/special/mapper/CountApiMapper.java new file mode 100644 index 000000000..4727d7e57 --- /dev/null +++ b/src/main/java/com/zhgd/xmgl/modules/xz/special/mapper/CountApiMapper.java @@ -0,0 +1,28 @@ +package com.zhgd.xmgl.modules.xz.special.mapper; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.zhgd.xmgl.modules.xz.special.entity.XzGasAnalyze; +import com.zhgd.xmgl.modules.xz.special.entity.vo.CountSpecialVo; +import org.apache.ibatis.annotations.Mapper; +import org.apache.ibatis.annotations.Param; + +import java.util.List; +import java.util.Map; + +/** + * @Description: 星纵-气体分析 + * @author： pds + * @date： 2024-05-14 + * @version： V1.0 + */ +@Mapper +public interface CountApiMapper { + + /** + * 统计过去一周每天的特殊作业数量 + * + * @param param + * @return + */ + List countAllSpecial(@Param("param") Map param); +} diff --git a/src/main/java/com/zhgd/xmgl/modules/xz/special/mapper/XzBlindPlatePlugSafeMapper.java b/src/main/java/com/zhgd/xmgl/modules/xz/special/mapper/XzBlindPlatePlugSafeMapper.java index 7b8acfa62..cb9f30e0b 100644 --- a/src/main/java/com/zhgd/xmgl/modules/xz/special/mapper/XzBlindPlatePlugSafeMapper.java +++ b/src/main/java/com/zhgd/xmgl/modules/xz/special/mapper/XzBlindPlatePlugSafeMapper.java @@ -49,11 +49,4 @@ public interface XzBlindPlatePlugSafeMapper extends BaseMapper param); - /** - * 统计特殊作业数量 - * - * @param param - * @return - */ - List countAllSpecial(@Param("param") Map param); } diff --git a/src/main/java/com/zhgd/xmgl/modules/xz/special/mapper/xml/CountApiMapper.xml b/src/main/java/com/zhgd/xmgl/modules/xz/special/mapper/xml/CountApiMapper.xml new file mode 100644 index 000000000..e01b023d2 --- /dev/null +++ b/src/main/java/com/zhgd/xmgl/modules/xz/special/mapper/xml/CountApiMapper.xml @@ -0,0 +1,110 @@ + + + + + + SELECT + DATE_FORMAT( DATE_ADD( CONCAT( date_sub(current_date,interval 7 day) ), INTERVAL ( help_topic_id ) DAY ), '%Y-%m-%d' ) DT + FROM + mysql.help_topic + WHERE + help_topic_id <= TIMESTAMPDIFF( + DAY, + CONCAT( date_sub(current_date,interval 7 day) ), + CONCAT( current_date )) + + diff --git a/src/main/java/com/zhgd/xmgl/modules/xz/special/mapper/xml/XzBlindPlatePlugSafeMapper.xml b/src/main/java/com/zhgd/xmgl/modules/xz/special/mapper/xml/XzBlindPlatePlugSafeMapper.xml index b6e33be62..afdf77d31 100644 --- a/src/main/java/com/zhgd/xmgl/modules/xz/special/mapper/xml/XzBlindPlatePlugSafeMapper.xml +++ b/src/main/java/com/zhgd/xmgl/modules/xz/special/mapper/xml/XzBlindPlatePlugSafeMapper.xml @@ -51,110 +51,4 @@ where t.id = #{param.id} - - SELECT - DATE_FORMAT( DATE_ADD( CONCAT( date_sub(current_date,interval 7 day) ), INTERVAL ( help_topic_id ) DAY ), '%Y-%m-%d' ) DT - FROM - mysql.help_topic - WHERE - help_topic_id <= TIMESTAMPDIFF( - DAY, - CONCAT( date_sub(current_date,interval 7 day) ), - CONCAT( current_date )) - - diff --git a/src/main/java/com/zhgd/xmgl/modules/xz/special/service/CountApiService.java b/src/main/java/com/zhgd/xmgl/modules/xz/special/service/CountApiService.java new file mode 100644 index 000000000..59503a106 --- /dev/null +++ b/src/main/java/com/zhgd/xmgl/modules/xz/special/service/CountApiService.java @@ -0,0 +1,134 @@ +package com.zhgd.xmgl.modules.xz.special.service; + +import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; +import com.zhgd.xmgl.modules.xz.special.entity.*; +import com.zhgd.xmgl.modules.xz.special.entity.vo.CountSpecialVo; +import com.zhgd.xmgl.modules.xz.special.mapper.CountApiMapper; +import com.zhgd.xmgl.util.DateUtils; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.context.annotation.Lazy; +import org.springframework.stereotype.Service; + +import javax.annotation.Resource; +import java.util.ArrayList; +import java.util.List; +import java.util.Map; +import java.util.function.Function; +import java.util.stream.Collectors; + +@Service +public class CountApiService { + @Autowired + CountApiMapper countApiMapper; + @Lazy + @Autowired + IXzBlindPlatePlugSafeService xzBlindPlatePlugSafeService; + @Lazy + @Resource + IXzGroundSafetService iXzGroundSafetService; + @Lazy + @Resource + IXzHighJobSafeService iXzHighJobSafeService; + @Lazy + @Resource + IXzHoistSafetyWorkService iXzHoistSafetyWorkService; + @Lazy + @Resource + IXzLimitSpaceSafeService iXzLimitSpaceSafeService; + @Lazy + @Resource + IXzOpenCircuitSafeService iXzOpenCircuitSafeService; + @Lazy + @Resource + IXzSpecialOperationFireSafetyService iXzSpecialOperationFireSafetyService; + @Lazy + @Resource + IXzTemporaryElectricitySafeService xzTemporaryElectricitySafeService; + + /** + * 统计过去一周每天的特殊作业数量 + * + * @param param + * @return + */ + public List countAllSpecial(Map param) { + List rtList = new ArrayList<>(); + List list = countApiMapper.countAllSpecial(param); + Map dateMap = list.stream().collect(Collectors.toMap(CountSpecialVo::getDate, Function.identity(), (countSpecialVo, countSpecialVo2) -> countSpecialVo2)); + List dateList = DateUtils.getDateTimeStrList(60, "yyyy-MM-dd"); + for (String date : dateList) { + CountSpecialVo vo = dateMap.get(date); + if (vo == null) { + vo = new CountSpecialVo(); + } + fillEmtpy(vo); + vo.setDate(date); + rtList.add(vo); + } + return rtList; + } + + private void fillEmtpy(CountSpecialVo vo) { + if (vo.getTotalNum() == null) { + vo.setTotalNum(0); + } + if (vo.getXzBlindPlatePlugSafeNum() == null) { + vo.setXzBlindPlatePlugSafeNum(0); + } + if (vo.getXzGroundSafetNum() == null) { + vo.setXzGroundSafetNum(0); + } + if (vo.getXzHighJobSafeNum() == null) { + vo.setXzHighJobSafeNum(0); + } + if (vo.getXzHoistSafetyWorkNum() == null) { + vo.setXzHoistSafetyWorkNum(0); + } + if (vo.getXzLimitSpaceSafeNum() == null) { + vo.setXzLimitSpaceSafeNum(0); + } + if (vo.getXzOpenCircuitSafeNum() == null) { + vo.setXzOpenCircuitSafeNum(0); + } + if (vo.getXzSpecialOperationFireSafetyNum() == null) { + vo.setXzSpecialOperationFireSafetyNum(0); + } + if (vo.getXzTemporaryElectricitySafeNum() == null) { + vo.setXzTemporaryElectricitySafeNum(0); + } + } + + /** + * 统计特殊作业数量 + * + * @param projectSn + * @return + */ + public Integer countSpecial(String projectSn) { + int n1 = xzBlindPlatePlugSafeService.count(new LambdaQueryWrapper() + .eq(XzBlindPlatePlugSafe::getProjectSn, projectSn) + ); + int n2 = iXzGroundSafetService.count(new LambdaQueryWrapper() + .eq(XzGroundSafet::getProjectSn, projectSn) + ); + int n3 = iXzHighJobSafeService.count(new LambdaQueryWrapper() + .eq(XzHighJobSafe::getProjectSn, projectSn) + ); + int n4 = iXzHoistSafetyWorkService.count(new LambdaQueryWrapper() + .eq(XzHoistSafetyWork::getProjectSn, projectSn) + ); + int n5 = iXzLimitSpaceSafeService.count(new LambdaQueryWrapper() + .eq(XzLimitSpaceSafe::getProjectSn, projectSn) + ); + int n6 = iXzOpenCircuitSafeService.count(new LambdaQueryWrapper() + .eq(XzOpenCircuitSafe::getProjectSn, projectSn) + ); + int n7 = iXzSpecialOperationFireSafetyService.count(new LambdaQueryWrapper() + .eq(XzSpecialOperationFireSafety::getProjectSn, projectSn) + ); + int n8 = xzTemporaryElectricitySafeService.count(new LambdaQueryWrapper() + .eq(XzTemporaryElectricitySafe::getProjectSn, projectSn) + ); + return n1 + n2 + n3 + n4 + n5 + n6 + n7 + n8; + } +} diff --git a/src/main/java/com/zhgd/xmgl/modules/xz/special/service/IXzBlindPlatePlugSafeService.java b/src/main/java/com/zhgd/xmgl/modules/xz/special/service/IXzBlindPlatePlugSafeService.java index 189aec549..2a23f5aa3 100644 --- a/src/main/java/com/zhgd/xmgl/modules/xz/special/service/IXzBlindPlatePlugSafeService.java +++ b/src/main/java/com/zhgd/xmgl/modules/xz/special/service/IXzBlindPlatePlugSafeService.java @@ -68,12 +68,5 @@ public interface IXzBlindPlatePlugSafeService extends IService countAllSpecial(Map param); } diff --git a/src/main/java/com/zhgd/xmgl/modules/xz/special/service/impl/XzBlindPlatePlugSafeServiceImpl.java b/src/main/java/com/zhgd/xmgl/modules/xz/special/service/impl/XzBlindPlatePlugSafeServiceImpl.java index 815a024ff..b63a6a1ac 100644 --- a/src/main/java/com/zhgd/xmgl/modules/xz/special/service/impl/XzBlindPlatePlugSafeServiceImpl.java +++ b/src/main/java/com/zhgd/xmgl/modules/xz/special/service/impl/XzBlindPlatePlugSafeServiceImpl.java @@ -161,53 +161,4 @@ public class XzBlindPlatePlugSafeServiceImpl extends ServiceImpl countAllSpecial(Map param) { - List rtList = new ArrayList<>(); - List list = baseMapper.countAllSpecial(param); - Map dateMap = list.stream().collect(Collectors.toMap(CountSpecialVo::getDate, Function.identity(), (countSpecialVo, countSpecialVo2) -> countSpecialVo2)); - List dateList = DateUtils.getDateTimeStrList(60, "yyyy-MM-dd"); - for (String date : dateList) { - CountSpecialVo vo = dateMap.get(date); - if (vo == null) { - vo = new CountSpecialVo(); - } - fillEmtpy(vo); - vo.setDate(date); - rtList.add(vo); - } - return rtList; - } - - - private void fillEmtpy(CountSpecialVo vo) { - if (vo.getTotalNum() == null) { - vo.setTotalNum(0); - } - if (vo.getXzBlindPlatePlugSafeNum() == null) { - vo.setXzBlindPlatePlugSafeNum(0); - } - if (vo.getXzGroundSafetNum() == null) { - vo.setXzGroundSafetNum(0); - } - if (vo.getXzHighJobSafeNum() == null) { - vo.setXzHighJobSafeNum(0); - } - if (vo.getXzHoistSafetyWorkNum() == null) { - vo.setXzHoistSafetyWorkNum(0); - } - if (vo.getXzLimitSpaceSafeNum() == null) { - vo.setXzLimitSpaceSafeNum(0); - } - if (vo.getXzOpenCircuitSafeNum() == null) { - vo.setXzOpenCircuitSafeNum(0); - } - if (vo.getXzSpecialOperationFireSafetyNum() == null) { - vo.setXzSpecialOperationFireSafetyNum(0); - } - if (vo.getXzTemporaryElectricitySafeNum() == null) { - vo.setXzTemporaryElectricitySafeNum(0); - } - } - }