From e2628bb94a7e4fa656d7af0a433d78d0a166a967 Mon Sep 17 00:00:00 2001 From: guoshengxiong <1923636941@qq.com> Date: Wed, 8 May 2024 17:43:19 +0800 Subject: [PATCH] =?UTF-8?q?bug=E4=BF=AE=E5=A4=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/zhgd/xmgl/call/HikvisionCall.java | 9 ++ .../java/com/zhgd/xmgl/enums/ParamEnum.java | 36 +++++++ .../car/service/ICarPassRecordService.java | 3 + .../impl/CarPassRecordServiceImpl.java | 9 +- .../impl/CheckingPointServiceImpl.java | 7 ++ .../vo/ProjectInspectRecordCountVo.java | 2 + .../xml/DangerousEngineeringRecordMapper.xml | 17 ++-- .../xml/HiddenDangerInspectRecordMapper.xml | 3 +- ...rityQualityInspectionRecordController.java | 41 +++++++- .../XzSecurityQualityInspectionRecord.java | 2 + .../entity/vo/StatsByChangeIdVo.java | 16 ++-- .../entity/vo/StatsByEnterpriseVo.java | 17 ++++ .../entity/vo/StatsByInspectManVo.java | 17 ++++ ...ecurityQualityInspectionRecordTotalVo.java | 8 +- ...SecurityQualityInspectionRecordMapper.java | 7 ++ ...zSecurityQualityInspectionRecordMapper.xml | 96 ++++++++++++++++--- ...ecurityQualityInspectionRecordService.java | 7 ++ ...ityQualityInspectionRecordServiceImpl.java | 33 ++++++- 18 files changed, 294 insertions(+), 36 deletions(-) create mode 100644 src/main/java/com/zhgd/xmgl/modules/xz.security/entity/vo/StatsByEnterpriseVo.java create mode 100644 src/main/java/com/zhgd/xmgl/modules/xz.security/entity/vo/StatsByInspectManVo.java diff --git a/src/main/java/com/zhgd/xmgl/call/HikvisionCall.java b/src/main/java/com/zhgd/xmgl/call/HikvisionCall.java index 23c5c4cf0..d65eb9b69 100644 --- a/src/main/java/com/zhgd/xmgl/call/HikvisionCall.java +++ b/src/main/java/com/zhgd/xmgl/call/HikvisionCall.java @@ -22,6 +22,7 @@ import com.zhgd.xmgl.modules.car.mapper.CarCameraMapper; import com.zhgd.xmgl.modules.car.mapper.CarInfoMapper; import com.zhgd.xmgl.modules.car.mapper.CarPassRecordMapper; import com.zhgd.xmgl.modules.car.mapper.CarTypeMapper; +import com.zhgd.xmgl.modules.car.service.impl.CarPassRecordServiceImpl; import com.zhgd.xmgl.modules.project.entity.Project; import com.zhgd.xmgl.modules.project.entity.ProjectVideoConfig; import com.zhgd.xmgl.modules.project.mapper.ProjectMapper; @@ -63,6 +64,9 @@ public class HikvisionCall { private static final String FIXED_CAR_GROUP_NAME = "业主车辆"; @Autowired XzHikvisionSyncServiceImpl xzHikvisionSyncService; + @Lazy + @Autowired + CarPassRecordServiceImpl carPassRecordService; @Value("${upload.image.url.prefix:}") private String imageUrlPrefix; @Value("${basePath:}") @@ -288,6 +292,11 @@ public class HikvisionCall { } else { carPassRecordMapper.insert(entity); } + //车进场后，意味着绑定的司机走过了人脸机，统计为在场人员。车辆出场后，在场人员随之减少 + if (carInfos.size() != 0 && carInfos.get(0) != null && StringUtils.isNotEmpty(carInfos.get(0).getDriverWorkerId())) { + log.info("保存车辆绑定的司机的通行数据，车牌号：{}", carInfos.get(0).getCarNumber()); + carPassRecordService.saveDriverPassData(entity, carInfos.get(0)); + } } } } diff --git a/src/main/java/com/zhgd/xmgl/enums/ParamEnum.java b/src/main/java/com/zhgd/xmgl/enums/ParamEnum.java index f55da6c56..fcba9964c 100644 --- a/src/main/java/com/zhgd/xmgl/enums/ParamEnum.java +++ b/src/main/java/com/zhgd/xmgl/enums/ParamEnum.java @@ -725,4 +725,40 @@ public class ParamEnum { this.desc = desc; } } + + /** + * 1重大隐患2一般隐患 + */ + @JsonFormat(shape = JsonFormat.Shape.OBJECT) + public enum QualityInspectionRecordLevel implements BaseEnum { + ZDYH(1, "重大隐患"), + YBYH(2, "一般隐患"), + ; + + QualityInspectionRecordLevel(Integer value, String desc) { + this.value = value; + this.desc = desc; + } + + private Integer value; + private String desc; + + public Integer getValue() { + return value; + } + + public void setValue(Integer value) { + this.value = value; + } + + public String getDesc() { + return desc; + } + + public void setDesc(String desc) { + this.desc = desc; + } + } + + } diff --git a/src/main/java/com/zhgd/xmgl/modules/car/service/ICarPassRecordService.java b/src/main/java/com/zhgd/xmgl/modules/car/service/ICarPassRecordService.java index 68d122581..9861aeacd 100644 --- a/src/main/java/com/zhgd/xmgl/modules/car/service/ICarPassRecordService.java +++ b/src/main/java/com/zhgd/xmgl/modules/car/service/ICarPassRecordService.java @@ -3,6 +3,7 @@ package com.zhgd.xmgl.modules.car.service; import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.extension.service.IService; import com.zhgd.jeecg.common.mybatis.EntityMap; +import com.zhgd.xmgl.modules.car.entity.CarInfo; import com.zhgd.xmgl.modules.car.entity.CarPassRecord; import com.zhgd.xmgl.modules.car.entity.vo.EntryAndExitRecordsTodayVo; import com.zhgd.xmgl.modules.car.entity.vo.TodayOutInNumber; @@ -22,6 +23,8 @@ public interface ICarPassRecordService extends IService { Map saveCameraCarPassRecord(String plate_num, String car_logo, String car_color, String park_id, String cam_id, String vdc_type, String picture, String closeup_pic); + void saveDriverPassData(CarPassRecord carPassRecord, CarInfo carInfo); + List getCarPassRecordList(Map map); List selectCarPassRecordInOutCount(Map map); diff --git a/src/main/java/com/zhgd/xmgl/modules/car/service/impl/CarPassRecordServiceImpl.java b/src/main/java/com/zhgd/xmgl/modules/car/service/impl/CarPassRecordServiceImpl.java index 424a750d1..45daa5c73 100644 --- a/src/main/java/com/zhgd/xmgl/modules/car/service/impl/CarPassRecordServiceImpl.java +++ b/src/main/java/com/zhgd/xmgl/modules/car/service/impl/CarPassRecordServiceImpl.java @@ -246,7 +246,14 @@ public class CarPassRecordServiceImpl extends ServiceImpl list = workerInfoMapper.selectCarDriverNameList(carInfo.getDriverWorkerId()); if (list != null) { int redNum = 0; diff --git a/src/main/java/com/zhgd/xmgl/modules/checking/service/impl/CheckingPointServiceImpl.java b/src/main/java/com/zhgd/xmgl/modules/checking/service/impl/CheckingPointServiceImpl.java index ae4dde7d1..d8b70bd6f 100644 --- a/src/main/java/com/zhgd/xmgl/modules/checking/service/impl/CheckingPointServiceImpl.java +++ b/src/main/java/com/zhgd/xmgl/modules/checking/service/impl/CheckingPointServiceImpl.java @@ -11,6 +11,7 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.gexin.fastjson.JSON; import com.gexin.fastjson.JSONObject; +import com.zhgd.jeecg.common.execption.OpenAlertException; import com.zhgd.jeecg.common.execption.OpenPromptException; import com.zhgd.xmgl.modules.basicdata.service.INoticeService; import com.zhgd.xmgl.modules.checking.entity.CheckingPoint; @@ -56,11 +57,17 @@ public class CheckingPointServiceImpl extends ServiceImpl 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 0daf3f5d4..06bb65a25 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 @@ -179,7 +179,8 @@ IFNULL(SUM((CASE WHEN a.status != 1 THEN 1 ELSE 0 END)), 0) dangerNum, IFNULL(SUM((CASE WHEN a.status = 3 THEN 1 ELSE 0 END)), 0) reviewNum, IFNULL(SUM((CASE WHEN tr.frequency_type = 3 THEN 1 ELSE 0 END)), 0) weekInspectNum, - IFNULL(SUM((CASE WHEN tr.frequency_type = 4 THEN 1 ELSE 0 END)), 0) monthInspectNum + IFNULL(SUM((CASE WHEN tr.frequency_type = 4 THEN 1 ELSE 0 END)), 0) monthInspectNum, + IFNULL(SUM((CASE WHEN a.fault_level = 2 THEN 1 ELSE 0 END)), 0) greatFaultLevelNum from hidden_danger_inspection_record a left join inspect_task_record tr on tr.id = a.task_id WHERE a.project_sn = #{projectSn} diff --git a/src/main/java/com/zhgd/xmgl/modules/xz.security/controller/XzSecurityQualityInspectionRecordController.java b/src/main/java/com/zhgd/xmgl/modules/xz.security/controller/XzSecurityQualityInspectionRecordController.java index 325052c17..64437a75a 100644 --- a/src/main/java/com/zhgd/xmgl/modules/xz.security/controller/XzSecurityQualityInspectionRecordController.java +++ b/src/main/java/com/zhgd/xmgl/modules/xz.security/controller/XzSecurityQualityInspectionRecordController.java @@ -237,7 +237,6 @@ public class XzSecurityQualityInspectionRecordController { return result; } - @ApiOperation(value = "安全问题统计", notes = "安全问题统计", httpMethod = "POST") @ApiImplicitParams({ @ApiImplicitParam(name = "projectSn", value = "项目SN", paramType = "body", required = true, dataType = "String"), @@ -247,6 +246,17 @@ public class XzSecurityQualityInspectionRecordController { return Result.success(qualityInspectionRecordService.selectQualityStatistics(map)); } + @ApiOperation(value = "安全问题统计数量", notes = "安全问题统计数量", httpMethod = "POST") + @ApiImplicitParams({ + @ApiImplicitParam(name = "projectSn", value = "项目SN", paramType = "body", required = true, dataType = "String"), + @ApiImplicitParam(name = "inspectStartTime", value = "检查开始时间", paramType = "body", required = false, dataType = "String"), + @ApiImplicitParam(name = "inspectEndTime", value = "检查结束时间", paramType = "body", required = false, dataType = "String"), + }) + @PostMapping(value = "/selectQualityStatisticsNum") + public Result selectQualityStatisticsNum(@RequestBody Map map) { + return Result.success(qualityInspectionRecordService.selectQualityStatisticsNum(map)); + } + @ApiOperation(value = "安全问题类型或频发问题统计", notes = "安全问题类型或频发问题统计", httpMethod = "POST") @ApiImplicitParams({ @ApiImplicitParam(name = "projectSn", value = "项目SN", paramType = "body", required = true, dataType = "String"), @@ -312,5 +322,34 @@ public class XzSecurityQualityInspectionRecordController { return Result.success(qualityInspectionRecordService.statsByChangeId(paramMap)); } + @ApiOperation(value = "统计隐患等级", notes = "统计隐患等级", httpMethod = "POST") + @ApiImplicitParams({ + @ApiImplicitParam(name = "projectSn", value = "项目sn", paramType = "body", required = true, dataType = "String"), + @ApiImplicitParam(name = "isNotQualified", value = "是否未销项", paramType = "body", required = false, dataType = "Integer"), + @ApiImplicitParam(name = "isOverdueRectification", value = "是否超期未整改", paramType = "body", required = false, dataType = "Integer"), + }) + @PostMapping(value = "/countDangerLevel") + public Result countDangerLevel(@ApiIgnore @RequestBody Map paramMap) { + return Result.success(qualityInspectionRecordService.countDangerLevel(paramMap)); + } + + @ApiOperation(value = "检查人统计", notes = "检查人统计", httpMethod = "POST") + @ApiImplicitParams({ + @ApiImplicitParam(name = "projectSn", value = "项目sn", paramType = "body", required = true, dataType = "String"), + }) + @PostMapping(value = "/statsByInspectMan") + public Result> statsByInspectMan(@ApiIgnore @RequestBody Map paramMap) { + return Result.success(qualityInspectionRecordService.statsByInspectMan(paramMap)); + } + + @ApiOperation(value = "按分包单位统计", notes = "按分包单位统计", httpMethod = "POST") + @ApiImplicitParams({ + @ApiImplicitParam(name = "projectSn", value = "项目sn", paramType = "body", required = true, dataType = "String"), + }) + @PostMapping(value = "/statsByEnterprise") + public Result> statsByEnterprise(@ApiIgnore @RequestBody Map paramMap) { + return Result.success(qualityInspectionRecordService.statsByEnterprise(paramMap)); + } + } diff --git a/src/main/java/com/zhgd/xmgl/modules/xz.security/entity/XzSecurityQualityInspectionRecord.java b/src/main/java/com/zhgd/xmgl/modules/xz.security/entity/XzSecurityQualityInspectionRecord.java index 96d8f672b..7b108e9df 100644 --- a/src/main/java/com/zhgd/xmgl/modules/xz.security/entity/XzSecurityQualityInspectionRecord.java +++ b/src/main/java/com/zhgd/xmgl/modules/xz.security/entity/XzSecurityQualityInspectionRecord.java @@ -243,6 +243,8 @@ public class XzSecurityQualityInspectionRecord implements Serializable { private String addedDescription; @ApiModelProperty(value = "合作单位id") private Long enterpriseId; + @ApiModelProperty(value = "危大工程记录ID") + private Long engineeringId; /** * 分部工程名称 diff --git a/src/main/java/com/zhgd/xmgl/modules/xz.security/entity/vo/StatsByChangeIdVo.java b/src/main/java/com/zhgd/xmgl/modules/xz.security/entity/vo/StatsByChangeIdVo.java index 46642a3fe..8068e76c1 100644 --- a/src/main/java/com/zhgd/xmgl/modules/xz.security/entity/vo/StatsByChangeIdVo.java +++ b/src/main/java/com/zhgd/xmgl/modules/xz.security/entity/vo/StatsByChangeIdVo.java @@ -7,11 +7,15 @@ import lombok.Data; public class StatsByChangeIdVo { @ApiModelProperty("姓名") private String workerName; - @ApiModelProperty("整改数量") - private Integer changeNum; - @ApiModelProperty("整改率") - private Double changeRate; - @ApiModelProperty("及时整改率") - private Double changeRateTimely; + @ApiModelProperty("已整改数量") + private Integer rectifiedNum; + @ApiModelProperty("超期已整改数量") + private Integer overTimeRectifiedNum; + @ApiModelProperty("超期未整改数量") + private Integer overTimeNotRectifiedNum; + @ApiModelProperty("已整改率") + private Double rectifiedNumRatio; + @ApiModelProperty("已及时整改率") + private Double rectifiedNumRatioTimely; } diff --git a/src/main/java/com/zhgd/xmgl/modules/xz.security/entity/vo/StatsByEnterpriseVo.java b/src/main/java/com/zhgd/xmgl/modules/xz.security/entity/vo/StatsByEnterpriseVo.java new file mode 100644 index 000000000..2f6836ec3 --- /dev/null +++ b/src/main/java/com/zhgd/xmgl/modules/xz.security/entity/vo/StatsByEnterpriseVo.java @@ -0,0 +1,17 @@ +package com.zhgd.xmgl.modules.xz.security.entity.vo; + +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +@Data +public class StatsByEnterpriseVo { + @ApiModelProperty("分班队伍") + private String enterpriseName; + @ApiModelProperty("已整改数量") + private Integer rectifiedNum; + @ApiModelProperty("已整改率") + private Double rectifiedNumRatio; + @ApiModelProperty("已及时整改率") + private Double rectifiedNumRatioTimely; + +} diff --git a/src/main/java/com/zhgd/xmgl/modules/xz.security/entity/vo/StatsByInspectManVo.java b/src/main/java/com/zhgd/xmgl/modules/xz.security/entity/vo/StatsByInspectManVo.java new file mode 100644 index 000000000..bb9e54219 --- /dev/null +++ b/src/main/java/com/zhgd/xmgl/modules/xz.security/entity/vo/StatsByInspectManVo.java @@ -0,0 +1,17 @@ +package com.zhgd.xmgl.modules.xz.security.entity.vo; + +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +@Data +public class StatsByInspectManVo { + @ApiModelProperty("姓名") + private String workerName; + @ApiModelProperty("发起隐患数量") + private Integer createDangerNum; + @ApiModelProperty("已整改率") + private Double rectifiedNumRatio; + @ApiModelProperty("已及时整改率") + private Double rectifiedNumRatioTimely; + +} diff --git a/src/main/java/com/zhgd/xmgl/modules/xz.security/entity/vo/XzSecurityQualityInspectionRecordTotalVo.java b/src/main/java/com/zhgd/xmgl/modules/xz.security/entity/vo/XzSecurityQualityInspectionRecordTotalVo.java index eaa3f00ab..1ff431ac2 100644 --- a/src/main/java/com/zhgd/xmgl/modules/xz.security/entity/vo/XzSecurityQualityInspectionRecordTotalVo.java +++ b/src/main/java/com/zhgd/xmgl/modules/xz.security/entity/vo/XzSecurityQualityInspectionRecordTotalVo.java @@ -24,7 +24,10 @@ public class XzSecurityQualityInspectionRecordTotalVo { @ApiModelProperty("已整改数") private Integer alreadyRectificationNum; private Integer jyUrgentLevelNum; + @ApiModelProperty("超期未整改数量") private Integer overdueRectificationNum; + @ApiModelProperty("超期未整改数量占比") + private Double overdueRectificationNumRatio; @ApiModelProperty("未闭合") private Integer notCloseNum; @ApiModelProperty("今日较昨日总数") @@ -35,6 +38,9 @@ public class XzSecurityQualityInspectionRecordTotalVo { private Integer closeNumDifferYesterday; @ApiModelProperty("今日较昨日未闭合") private Integer notCloseNumDifferYesterday; - + @ApiModelProperty(value = "重大隐患数量") + private Integer greatFaultLevelNum; + @ApiModelProperty(value = "隐患总数") + private Integer dangerNum; } diff --git a/src/main/java/com/zhgd/xmgl/modules/xz.security/mapper/XzSecurityQualityInspectionRecordMapper.java b/src/main/java/com/zhgd/xmgl/modules/xz.security/mapper/XzSecurityQualityInspectionRecordMapper.java index bf15ce32a..b65d3e0b4 100644 --- a/src/main/java/com/zhgd/xmgl/modules/xz.security/mapper/XzSecurityQualityInspectionRecordMapper.java +++ b/src/main/java/com/zhgd/xmgl/modules/xz.security/mapper/XzSecurityQualityInspectionRecordMapper.java @@ -12,6 +12,7 @@ import com.zhgd.xmgl.modules.xz.security.entity.vo.*; import org.apache.ibatis.annotations.Mapper; import org.apache.ibatis.annotations.Param; +import java.util.ArrayList; import java.util.HashMap; import java.util.List; import java.util.Map; @@ -63,4 +64,10 @@ public interface XzSecurityQualityInspectionRecordMapper extends BaseMapper countQualityInspectionRecordRegion(HashMap paramMap); List statsByChangeId(Map paramMap); + + ArrayList countDangerLevel(Map paramMap); + + List StatsByInspectManVo(Map paramMap); + + List statsByEnterprise(Map paramMap); } diff --git a/src/main/java/com/zhgd/xmgl/modules/xz.security/mapper/xml/XzSecurityQualityInspectionRecordMapper.xml b/src/main/java/com/zhgd/xmgl/modules/xz.security/mapper/xml/XzSecurityQualityInspectionRecordMapper.xml index c0eb5305c..249b2ab23 100644 --- a/src/main/java/com/zhgd/xmgl/modules/xz.security/mapper/xml/XzSecurityQualityInspectionRecordMapper.xml +++ b/src/main/java/com/zhgd/xmgl/modules/xz.security/mapper/xml/XzSecurityQualityInspectionRecordMapper.xml @@ -155,7 +155,9 @@ round(IFNULL(TRUNCATE(IFNULL(closeNum, 0) / IFNULL(totalNum, 0), 4), 0) * 100, 2) completeRatio, round(IFNULL(TRUNCATE(IFNULL(totalNum - rectificationNum, 0) / IFNULL(totalNum, 0), 4), 0) * 100, 2) - rectificationRatio + rectificationRatio, + round(IFNULL(TRUNCATE(IFNULL(overdueRectificationNum, 0) / IFNULL(totalNum, 0), 4), 0) * 100, 2) + overdueRectificationNumRatio from ( SELECT count(1) totalNum, IFNULL(SUM((CASE WHEN a.record_type = 2 THEN 1 ELSE 0 END)), 0) investigateNum, @@ -175,9 +177,12 @@ IFNULL(SUM((CASE WHEN a.status = 4 THEN 1 ELSE 0 END)), 0) verificationNum, IFNULL(SUM((CASE WHEN a.urgent_level = 1 THEN 1 ELSE 0 END)), 0) ybUrgentLevelNum, IFNULL(SUM((CASE WHEN a.urgent_level = 2 THEN 1 ELSE 0 END)), 0) yzUrgentLevelNum, - IFNULL(SUM((CASE WHEN a.urgent_level = 3 THEN 1 ELSE 0 END)), 0) jyUrgentLevelNum + IFNULL(SUM((CASE WHEN a.urgent_level = 3 THEN 1 ELSE 0 END)), 0) jyUrgentLevelNum, + IFNULL(SUM((CASE WHEN a.record_type = 1 THEN 1 ELSE 0 END)), 0) dangerNum, + IFNULL(SUM((CASE WHEN a.level = 1 THEN 1 ELSE 0 END)), 0) greatFaultLevelNum from xz_security_quality_inspection_record a WHERE a.project_sn = #{projectSn} + and a.status != 6 and a.region_id = #{regionId} @@ -221,7 +226,8 @@ and a.inspect_time >= #{inspectStartTime} - and a.inspect_time <= #{inspectEndTime} + and a.inspect_time <= if(LENGTH(#{inspectEndTime}) = 10, CONCAT(DATE_FORMAT(#{inspectEndTime}, + '%Y-%m-%d'), ' 23:59:59'), #{inspectEndTime}) and a.region_id = #{regionId} @@ -500,18 +506,78 @@ + + + + + + diff --git a/src/main/java/com/zhgd/xmgl/modules/xz.security/service/IXzSecurityQualityInspectionRecordService.java b/src/main/java/com/zhgd/xmgl/modules/xz.security/service/IXzSecurityQualityInspectionRecordService.java index 6df75a304..6e5642cd1 100644 --- a/src/main/java/com/zhgd/xmgl/modules/xz.security/service/IXzSecurityQualityInspectionRecordService.java +++ b/src/main/java/com/zhgd/xmgl/modules/xz.security/service/IXzSecurityQualityInspectionRecordService.java @@ -68,4 +68,11 @@ public interface IXzSecurityQualityInspectionRecordService extends IService map); + + SectorVo countDangerLevel(Map paramMap); + + List statsByInspectMan(Map paramMap); + + List statsByEnterprise(Map paramMap); } diff --git a/src/main/java/com/zhgd/xmgl/modules/xz.security/service/impl/XzSecurityXzSecurityQualityInspectionRecordServiceImpl.java b/src/main/java/com/zhgd/xmgl/modules/xz.security/service/impl/XzSecurityXzSecurityQualityInspectionRecordServiceImpl.java index 0c82df345..d1bd6ee9c 100644 --- a/src/main/java/com/zhgd/xmgl/modules/xz.security/service/impl/XzSecurityXzSecurityQualityInspectionRecordServiceImpl.java +++ b/src/main/java/com/zhgd/xmgl/modules/xz.security/service/impl/XzSecurityXzSecurityQualityInspectionRecordServiceImpl.java @@ -150,13 +150,18 @@ public class XzSecurityXzSecurityQualityInspectionRecordServiceImpl extends Serv setProblemDescription(vo); } page.setRecords(list); - XzSecurityQualityInspectionRecordTotalVo total = xzSecurityQualityInspectionRecordMapper.selectQualityInspectionRecordPageTotal(map); - setDifferYesterday(map, total); + XzSecurityQualityInspectionRecordTotalVo total = getXzSecurityQualityInspectionRecordTotalVo(map); data.setPage(page); data.setTotal(total); return data; } + private XzSecurityQualityInspectionRecordTotalVo getXzSecurityQualityInspectionRecordTotalVo(Map map) { + XzSecurityQualityInspectionRecordTotalVo total = xzSecurityQualityInspectionRecordMapper.selectQualityInspectionRecordPageTotal(map); + setDifferYesterday(map, total); + return total; + } + private void setProblemDescription(XzSecurityQualityInspectionRecordVo vo) { String problemDescription = StringUtils.substringAfterLast(vo.getDangerItemContent(), "/"); vo.setProblemDescription(StringUtils.isNotBlank(problemDescription) ? problemDescription : vo.getDangerItemContent()); @@ -175,8 +180,7 @@ public class XzSecurityXzSecurityQualityInspectionRecordServiceImpl extends Serv Map data = new HashMap<>(); map.put("recordType", "1"); - XzSecurityQualityInspectionRecordTotalVo total = xzSecurityQualityInspectionRecordMapper.selectQualityInspectionRecordPageTotal(map); - setDifferYesterday(map, total); + XzSecurityQualityInspectionRecordTotalVo total = getXzSecurityQualityInspectionRecordTotalVo(map); List> monthList = xzSecurityQualityInspectionRecordMapper.selectQualityInspectionRecordCountByDay(map); List dayList = getDayList(); List> list = new ArrayList<>(); @@ -483,6 +487,27 @@ public class XzSecurityXzSecurityQualityInspectionRecordServiceImpl extends Serv deductScoreIf(xzSecurityQualityInspectionRecord); } + @Override + public XzSecurityQualityInspectionRecordTotalVo selectQualityStatisticsNum(Map map) { + return getXzSecurityQualityInspectionRecordTotalVo(map); + } + + @Override + public SectorVo countDangerLevel(Map paramMap) { + ArrayList list = baseMapper.countDangerLevel(paramMap); + return SectorVo.getSectorVoByEnum(list, ParamEnum.QualityInspectionRecordLevel.values(), false); + } + + @Override + public List statsByInspectMan(Map paramMap) { + return baseMapper.StatsByInspectManVo(paramMap); + } + + @Override + public List statsByEnterprise(Map paramMap) { + return baseMapper.statsByEnterprise(paramMap); + } + private void recoverScore(XzSecurityQualityInspectionRecord hiddenDangerInspectRecord) { if (hiddenDangerInspectRecord.getRecordType() == null || hiddenDangerInspectRecord.getRecordType() == 2) { return;