From 6f576c48c854ee2ab969494d4ce3203354b32024 Mon Sep 17 00:00:00 2001 From: guoshengxiong <1923636941@qq.com> Date: Mon, 13 May 2024 15:49:24 +0800 Subject: [PATCH] =?UTF-8?q?=E5=AE=89=E5=85=A8=E9=A6=96=E9=A1=B5=E6=8E=A5?= =?UTF-8?q?=E5=8F=A3bug=E4=BF=AE=E5=A4=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../worker/controller/WorkerInfoController.java | 9 ++++----- .../modules/worker/mapper/WorkerInfoMapper.java | 7 +++---- .../worker/mapper/xml/WorkerInfoMapper.xml | 16 ++++++++-------- .../worker/service/IWorkerInfoService.java | 7 +++---- .../service/impl/WorkerInfoServiceImpl.java | 11 +++++------ 5 files changed, 23 insertions(+), 27 deletions(-) diff --git a/src/main/java/com/zhgd/xmgl/modules/worker/controller/WorkerInfoController.java b/src/main/java/com/zhgd/xmgl/modules/worker/controller/WorkerInfoController.java index 6925cf0df..bbadb2066 100644 --- a/src/main/java/com/zhgd/xmgl/modules/worker/controller/WorkerInfoController.java +++ b/src/main/java/com/zhgd/xmgl/modules/worker/controller/WorkerInfoController.java @@ -7,8 +7,7 @@ import com.zhgd.jeecg.common.api.vo.Result; import com.zhgd.jeecg.common.mybatis.EntityMap; import com.zhgd.redis.annotation.ApiIdempotent; import com.zhgd.redis.lock.RedisRepository; -import com.zhgd.xmgl.base.entity.vo.SectorVo; -import com.zhgd.xmgl.base.entity.vo.TrendVo; +import com.zhgd.xmgl.base.entity.vo.TrendOneVo; import com.zhgd.xmgl.modules.worker.entity.WorkerInfo; import com.zhgd.xmgl.modules.worker.entity.vo.*; import com.zhgd.xmgl.modules.worker.service.IWorkerInfoService; @@ -678,8 +677,8 @@ public class WorkerInfoController { @ApiImplicitParam(name = "projectSn", value = "项目sn", paramType = "body", required = true, dataType = "String"), }) @PostMapping(value = "/statsSafeScore") - public Result statsSafeScore(@RequestBody Map map) { - return Result.success(workerInfoService.statsSector(map)); + public Result statsSafeScore(@RequestBody Map map) { + return Result.success(workerInfoService.statsSafeScore(map)); } @ApiOperation(value = "企业安全评分汇总", notes = "企业安全评分汇总", httpMethod = "POST") @@ -687,7 +686,7 @@ public class WorkerInfoController { @ApiImplicitParam(name = "projectSn", value = "项目sn", paramType = "body", required = true, dataType = "String"), }) @PostMapping(value = "/statsEnterprise") - public Result statsEnterprise(@RequestBody Map map) { + public Result> statsEnterprise(@RequestBody Map map) { return Result.success(workerInfoService.statsEnterprise(map)); } diff --git a/src/main/java/com/zhgd/xmgl/modules/worker/mapper/WorkerInfoMapper.java b/src/main/java/com/zhgd/xmgl/modules/worker/mapper/WorkerInfoMapper.java index 120af7f18..4b53a4840 100644 --- a/src/main/java/com/zhgd/xmgl/modules/worker/mapper/WorkerInfoMapper.java +++ b/src/main/java/com/zhgd/xmgl/modules/worker/mapper/WorkerInfoMapper.java @@ -5,8 +5,7 @@ import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.zhgd.annotation.DataScope; import com.zhgd.jeecg.common.mybatis.EntityMap; -import com.zhgd.xmgl.base.entity.vo.SectorOneVo; -import com.zhgd.xmgl.base.entity.vo.SectorVo; +import com.zhgd.xmgl.base.entity.vo.TrendOneVo; import com.zhgd.xmgl.modules.worker.entity.WorkerInfo; import com.zhgd.xmgl.modules.worker.entity.vo.*; import org.apache.ibatis.annotations.Mapper; @@ -242,9 +241,9 @@ public interface WorkerInfoMapper extends BaseMapper { List stats(@Param("param") Map map); - List statsSector(@Param("param") Map map); + StatsTrendVo statsSafeScore(@Param("param") Map map); - List statsEnterprise(@Param("param") Map map); + List statsEnterprise(@Param("param") Map map); List statsEnterpriseRisk(@Param("param") Map map); } diff --git a/src/main/java/com/zhgd/xmgl/modules/worker/mapper/xml/WorkerInfoMapper.xml b/src/main/java/com/zhgd/xmgl/modules/worker/mapper/xml/WorkerInfoMapper.xml index 793886509..0c891b582 100644 --- a/src/main/java/com/zhgd/xmgl/modules/worker/mapper/xml/WorkerInfoMapper.xml +++ b/src/main/java/com/zhgd/xmgl/modules/worker/mapper/xml/WorkerInfoMapper.xml @@ -2485,20 +2485,20 @@ - select - CASE WHEN t.safe_score < 80 THEN '高风险' When t.safe_score >= 80 and t.safe_score < 90 then '中风险' ELSE '低风险' - END as name, - count(*) as count + ifnull(round(sum(if(t.safe_score < 80,1,0)),2),0) as highRiskNum, + ifnull(round(sum(if(t.safe_score >= 80 and t.safe_score < 90,1,0)),2),0) as mediumRiskNum, + ifnull(round(sum(if(t.safe_score >= 90,1,0)),2),0) as lowRiskNum, + count(*) as workerNum from worker_info t where t.project_sn=#{param.projectSn} - group by name - select - ei.enterprise_name as name, - avg(t.safe_score) as count + ei.enterprise_name as x, + ifnull(round(avg(t.safe_score),2),0) as y from worker_info t join enterprise_info ei on ei.id=t.enterprise_id where t.project_sn=#{param.projectSn} diff --git a/src/main/java/com/zhgd/xmgl/modules/worker/service/IWorkerInfoService.java b/src/main/java/com/zhgd/xmgl/modules/worker/service/IWorkerInfoService.java index ab7c92c82..fed8ad723 100644 --- a/src/main/java/com/zhgd/xmgl/modules/worker/service/IWorkerInfoService.java +++ b/src/main/java/com/zhgd/xmgl/modules/worker/service/IWorkerInfoService.java @@ -4,8 +4,7 @@ import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.extension.service.IService; import com.zhgd.jeecg.common.api.vo.Result; import com.zhgd.jeecg.common.mybatis.EntityMap; -import com.zhgd.xmgl.base.entity.vo.SectorVo; -import com.zhgd.xmgl.base.entity.vo.TrendVo; +import com.zhgd.xmgl.base.entity.vo.TrendOneVo; import com.zhgd.xmgl.modules.worker.entity.WorkerInfo; import com.zhgd.xmgl.modules.worker.entity.dto.GetWorkerInfoByDevDto; import com.zhgd.xmgl.modules.worker.entity.vo.*; @@ -135,9 +134,9 @@ public interface IWorkerInfoService extends IService { WorkerInfo selectWorkerInfoByIdCard(Map map); - SectorVo statsSector(Map map); + StatsTrendVo statsSafeScore(Map map); - SectorVo statsEnterprise(Map map); + List statsEnterprise(Map map); List statsEnterpriseRisk(Map map); } diff --git a/src/main/java/com/zhgd/xmgl/modules/worker/service/impl/WorkerInfoServiceImpl.java b/src/main/java/com/zhgd/xmgl/modules/worker/service/impl/WorkerInfoServiceImpl.java index 4c4981dbf..78518254a 100644 --- a/src/main/java/com/zhgd/xmgl/modules/worker/service/impl/WorkerInfoServiceImpl.java +++ b/src/main/java/com/zhgd/xmgl/modules/worker/service/impl/WorkerInfoServiceImpl.java @@ -24,9 +24,8 @@ import com.zhgd.jeecg.common.mybatis.EntityMap; import com.zhgd.xmgl.async.AsyncHikvision; import com.zhgd.xmgl.async.AsyncJiLianDa; import com.zhgd.xmgl.async.AsyncWorker; -import com.zhgd.xmgl.base.entity.vo.SectorOneVo; import com.zhgd.xmgl.base.entity.vo.SectorVo; -import com.zhgd.xmgl.base.entity.vo.TrendVo; +import com.zhgd.xmgl.base.entity.vo.TrendOneVo; import com.zhgd.xmgl.call.HikvisionCall; import com.zhgd.xmgl.modules.basicdata.entity.Company; import com.zhgd.xmgl.modules.basicdata.entity.SystemUser; @@ -2128,13 +2127,13 @@ public class WorkerInfoServiceImpl extends ServiceImpl map) { - return SectorVo.getSectorVo(baseMapper.statsSector(map)); + public StatsTrendVo statsSafeScore(Map map) { + return baseMapper.statsSafeScore(map); } @Override - public SectorVo statsEnterprise(Map map) { - return SectorVo.getSectorVo(baseMapper.statsEnterprise(map)); + public List statsEnterprise(Map map) { + return baseMapper.statsEnterprise(map); } @Override