From 4a1f52465c29c94815529f18be9d0fa841d8cbb9 Mon Sep 17 00:00:00 2001 From: guoshengxiong <1923636941@qq.com> Date: Wed, 28 May 2025 09:57:12 +0800 Subject: [PATCH] =?UTF-8?q?=E6=A8=A1=E6=8B=9F=E6=95=B0=E6=8D=AE=E7=94=9F?= =?UTF-8?q?=E6=88=90?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../QualityInspectionRecordController.java | 16 +++--- .../entity/QualityInspectionRecord.java | 32 +++++++++++ .../IQualityInspectionRecordService.java | 1 + .../QualityInspectionRecordServiceImpl.java | 55 +++++++++++++++++++ ...rityQualityInspectionRecordController.java | 10 +++- .../XzSecurityQualityInspectionRecord.java | 30 ++++++++++ ...ecurityQualityInspectionRecordService.java | 2 + ...ityQualityInspectionRecordServiceImpl.java | 55 +++++++++++++++++++ 8 files changed, 193 insertions(+), 8 deletions(-) diff --git a/src/main/java/com/zhgd/xmgl/modules/quality/controller/QualityInspectionRecordController.java b/src/main/java/com/zhgd/xmgl/modules/quality/controller/QualityInspectionRecordController.java index 5b535557a..a1e638b71 100644 --- a/src/main/java/com/zhgd/xmgl/modules/quality/controller/QualityInspectionRecordController.java +++ b/src/main/java/com/zhgd/xmgl/modules/quality/controller/QualityInspectionRecordController.java @@ -1,18 +1,15 @@ package com.zhgd.xmgl.modules.quality.controller; -import cn.hutool.core.date.DateUtil; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.zhgd.annotation.OperLog; 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.TrendOneVo; -import com.zhgd.xmgl.modules.dangerous.service.IDangerousEngineeringRecordService; import com.zhgd.xmgl.modules.quality.entity.QualityInspectionRecord; -import com.zhgd.xmgl.modules.quality.entity.dto.DepartmentRectifiedRankDto; -import com.zhgd.xmgl.modules.quality.entity.vo.*; +import com.zhgd.xmgl.modules.quality.entity.vo.QualityInspectionRecordVo; +import com.zhgd.xmgl.modules.quality.entity.vo.RecordVo; import com.zhgd.xmgl.modules.quality.service.IQualityInspectionRecordService; -import com.zhgd.xmgl.modules.video.service.IAiAnalyseHardWareAlarmRecordService; import com.zhgd.xmgl.modules.xz.security.entity.dto.XzSecurityDepartmentRectifiedRankDto; import com.zhgd.xmgl.modules.xz.security.entity.vo.*; import com.zhgd.xmgl.util.MessageUtil; @@ -27,8 +24,6 @@ import org.springframework.validation.annotation.Validated; import org.springframework.web.bind.annotation.*; import springfox.documentation.annotations.ApiIgnore; -import java.math.BigDecimal; -import java.util.Date; import java.util.HashMap; import java.util.List; import java.util.Map; @@ -431,6 +426,13 @@ public class QualityInspectionRecordController { return Result.success(qualityInspectionRecordService.riskChart(map)); } + @ApiOperation(value = "补录质量检查记录信息", notes = "补录质量检查记录信息", httpMethod = "POST") + @PostMapping(value = "/backAdd") + public Result backAdd(@RequestBody QualityInspectionRecord qualityInspectionRecord) { + qualityInspectionRecordService.backAdd(qualityInspectionRecord); + return Result.ok(); + } + } diff --git a/src/main/java/com/zhgd/xmgl/modules/quality/entity/QualityInspectionRecord.java b/src/main/java/com/zhgd/xmgl/modules/quality/entity/QualityInspectionRecord.java index 80f97ad15..182d0211d 100644 --- a/src/main/java/com/zhgd/xmgl/modules/quality/entity/QualityInspectionRecord.java +++ b/src/main/java/com/zhgd/xmgl/modules/quality/entity/QualityInspectionRecord.java @@ -255,4 +255,36 @@ public class QualityInspectionRecord implements Serializable { private String subentryName; + @TableField(exist = false) + @ApiModelProperty(value = "整改人整改时间") + private String zgRectifyTime; + @TableField(exist = false) + @ApiModelProperty(value = "整改人附件") + private String zgFileUrl; + @TableField(exist = false) + @ApiModelProperty(value = "整改人补充说明") + private String zgAdditionalRemarks; + + @TableField(exist = false) + @ApiModelProperty(value = "复查人整改时间") + private String fcRectifyTime; + @TableField(exist = false) + @ApiModelProperty(value = "复查人附件") + private String fcFileUrl; + @TableField(exist = false) + @ApiModelProperty(value = "复查人补充说明") + private String fcAdditionalRemarks; + @TableField(exist = false) + @ApiModelProperty(value = "核验人整改时间") + private String hyRectifyTime; + @TableField(exist = false) + @ApiModelProperty(value = "核验人附件") + private String hyFileUrl; + @TableField(exist = false) + @ApiModelProperty(value = "核验人补充说明") + private String hyAdditionalRemarks; + @TableField(exist = false) + @ApiModelProperty(value = "违章人员") + private Long violatorId; + } diff --git a/src/main/java/com/zhgd/xmgl/modules/quality/service/IQualityInspectionRecordService.java b/src/main/java/com/zhgd/xmgl/modules/quality/service/IQualityInspectionRecordService.java index af0369c05..a76d56c34 100644 --- a/src/main/java/com/zhgd/xmgl/modules/quality/service/IQualityInspectionRecordService.java +++ b/src/main/java/com/zhgd/xmgl/modules/quality/service/IQualityInspectionRecordService.java @@ -271,4 +271,5 @@ public interface IQualityInspectionRecordService extends IService riskChart(Map map); + void backAdd(QualityInspectionRecord qualityInspectionRecord); } diff --git a/src/main/java/com/zhgd/xmgl/modules/quality/service/impl/QualityInspectionRecordServiceImpl.java b/src/main/java/com/zhgd/xmgl/modules/quality/service/impl/QualityInspectionRecordServiceImpl.java index 7cf33d23e..99e7ca20e 100644 --- a/src/main/java/com/zhgd/xmgl/modules/quality/service/impl/QualityInspectionRecordServiceImpl.java +++ b/src/main/java/com/zhgd/xmgl/modules/quality/service/impl/QualityInspectionRecordServiceImpl.java @@ -45,10 +45,12 @@ import com.zhgd.xmgl.modules.worker.mapper.WorkerInfoMapper; import com.zhgd.xmgl.modules.worker.service.impl.WorkerInfoServiceImpl; import com.zhgd.xmgl.modules.xz.entity.XzDeductScoreRecord; import com.zhgd.xmgl.modules.xz.mapper.XzDeductScoreRecordMapper; +import com.zhgd.xmgl.modules.xz.security.entity.XzSecurityQualityRectifyRecord; import com.zhgd.xmgl.modules.xz.security.entity.dto.XzSecurityDepartmentRectifiedRankDto; import com.zhgd.xmgl.modules.xz.security.entity.vo.*; import com.zhgd.xmgl.modules.xz.security.mapper.XzSecurityQualityInspectionRecordMapper; import com.zhgd.xmgl.push.config.PushPayloads; +import com.zhgd.xmgl.security.util.SecurityUtils; import com.zhgd.xmgl.util.*; import org.apache.commons.collections.CollectionUtils; import org.apache.commons.collections.MapUtils; @@ -662,6 +664,59 @@ public class QualityInspectionRecordServiceImpl extends ServiceImpl() + .eq(EnterpriseInfo::getEnterpriseSn, enterpriseSn)); + record.setEnterpriseId(enterpriseInfo.getId()); + } + qualityInspectionRecordMapper.insert(record); + Long userId = SecurityUtils.getUser().getUserId(); + QualityRectifyRecord zg = new QualityRectifyRecord(); + zg.setQualityId(record.getId()); + zg.setType(1); + zg.setStatus(2); + zg.setRectifyTime(record.getZgRectifyTime()); + zg.setFileUrl(record.getZgFileUrl()); + zg.setAdditionalRemarks(record.getZgAdditionalRemarks()); + zg.setCreateTime(record.getZgRectifyTime()); + zg.setCreateUser(userId); + zg.setViolatorId(record.getViolatorId()); + qualityRectifyRecordMapper.insert(zg); + + QualityRectifyRecord fc = new QualityRectifyRecord(); + fc.setQualityId(record.getId()); + fc.setType(2); + fc.setStatus(2); + fc.setRectifyTime(record.getFcRectifyTime()); + fc.setFileUrl(record.getFcFileUrl()); + fc.setAdditionalRemarks(record.getFcAdditionalRemarks()); + fc.setCreateTime(record.getFcRectifyTime()); + fc.setCreateUser(userId); + fc.setViolatorId(record.getViolatorId()); + qualityRectifyRecordMapper.insert(fc); + + QualityRectifyRecord hy = new QualityRectifyRecord(); + hy.setQualityId(record.getId()); + hy.setType(3); + hy.setStatus(2); + hy.setRectifyTime(record.getHyRectifyTime()); + hy.setFileUrl(record.getHyFileUrl()); + hy.setAdditionalRemarks(record.getHyAdditionalRemarks()); + hy.setCreateTime(record.getHyRectifyTime()); + hy.setCreateUser(userId); + hy.setViolatorId(record.getViolatorId()); + qualityRectifyRecordMapper.insert(hy); + + } + @Override public Page statsByChangeId(Map paramMap) { Page page = PageUtil.getPage(paramMap); 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 de380c702..6b16b4c3c 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 @@ -513,9 +513,17 @@ public class XzSecurityQualityInspectionRecordController { @ApiImplicitParam(name = "pageSize", value = "每页显示条数", paramType = "query", required = true, dataType = "Integer"), @ApiImplicitParam(name = "projectSn", value = "项目SN", paramType = "body", required = true, dataType = "String"), }) - @PostMapping( "/specialPage") + @PostMapping("/specialPage") public Result> querySpecialPage(@RequestBody Map map) { return Result.success(qualityInspectionRecordService.querySpecialPage(map)); } + @OperLog(operModul = "安全管理", operType = "补录安全检查记录信息", operDesc = "补录安全检查记录信息") + @ApiOperation(value = "补录安全检查记录信息", notes = "补录安全检查记录信息", httpMethod = "POST") + @PostMapping(value = "/backAdd") + public Result backAdd(@RequestBody XzSecurityQualityInspectionRecord xzSecurityQualityInspectionRecord) { + qualityInspectionRecordService.backAdd(xzSecurityQualityInspectionRecord); + return Result.ok(); + } + } 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 2be566093..dd32258a0 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 @@ -265,5 +265,35 @@ public class XzSecurityQualityInspectionRecord implements Serializable { @ApiModelProperty(value = "安全履职预警超时时间（分钟）") private Integer safeWatchAlarmExceedMinute; + @TableField(exist = false) + @ApiModelProperty(value = "整改人整改时间") + private String zgRectifyTime; + @TableField(exist = false) + @ApiModelProperty(value = "整改人附件") + private String zgFileUrl; + @TableField(exist = false) + @ApiModelProperty(value = "整改人补充说明") + private String zgAdditionalRemarks; + @TableField(exist = false) + @ApiModelProperty(value = "复查人整改时间") + private String fcRectifyTime; + @TableField(exist = false) + @ApiModelProperty(value = "复查人附件") + private String fcFileUrl; + @TableField(exist = false) + @ApiModelProperty(value = "复查人补充说明") + private String fcAdditionalRemarks; + @TableField(exist = false) + @ApiModelProperty(value = "核验人整改时间") + private String hyRectifyTime; + @TableField(exist = false) + @ApiModelProperty(value = "核验人附件") + private String hyFileUrl; + @TableField(exist = false) + @ApiModelProperty(value = "核验人补充说明") + private String hyAdditionalRemarks; + @TableField(exist = false) + @ApiModelProperty(value = "违章人员") + private Long violatorId; } 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 f92f66f0e..2dd5860dc 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 @@ -312,4 +312,6 @@ public interface IXzSecurityQualityInspectionRecordService extends IService querySpecialPage(Map map); + + void backAdd(XzSecurityQualityInspectionRecord xzSecurityQualityInspectionRecord); } 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 b4c303905..ecace9b8e 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 @@ -64,6 +64,7 @@ import com.zhgd.xmgl.modules.xz.security.service.IXzSecurityQualityInspectionRec 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.security.util.SecurityUtils; import com.zhgd.xmgl.util.*; import lombok.extern.slf4j.Slf4j; import org.apache.commons.collections.CollectionUtils; @@ -950,6 +951,60 @@ public class XzSecurityQualityInspectionRecordServiceImpl extends ServiceImpl() + .eq(EnterpriseInfo::getEnterpriseSn, enterpriseSn)); + record.setEnterpriseId(enterpriseInfo.getId()); + } + xzSecurityQualityInspectionRecordMapper.insert(record); + Long userId = SecurityUtils.getUser().getUserId(); + XzSecurityQualityRectifyRecord zg = new XzSecurityQualityRectifyRecord(); + zg.setQualityId(record.getId()); + zg.setType(1); + zg.setStatus(2); + zg.setRectifyTime(record.getZgRectifyTime()); + zg.setFileUrl(record.getZgFileUrl()); + zg.setAdditionalRemarks(record.getZgAdditionalRemarks()); + zg.setCreateTime(record.getZgRectifyTime()); + zg.setCreateUser(userId); + zg.setViolatorId(record.getViolatorId()); + xzSecurityQualityRectifyRecordMapper.insert(zg); + + XzSecurityQualityRectifyRecord fc = new XzSecurityQualityRectifyRecord(); + fc.setQualityId(record.getId()); + fc.setType(2); + fc.setStatus(2); + fc.setRectifyTime(record.getFcRectifyTime()); + fc.setFileUrl(record.getFcFileUrl()); + fc.setAdditionalRemarks(record.getFcAdditionalRemarks()); + fc.setCreateTime(record.getFcRectifyTime()); + fc.setCreateUser(userId); + fc.setViolatorId(record.getViolatorId()); + xzSecurityQualityRectifyRecordMapper.insert(fc); + + XzSecurityQualityRectifyRecord hy = new XzSecurityQualityRectifyRecord(); + hy.setQualityId(record.getId()); + hy.setType(3); + hy.setStatus(2); + hy.setRectifyTime(record.getHyRectifyTime()); + hy.setFileUrl(record.getHyFileUrl()); + hy.setAdditionalRemarks(record.getHyAdditionalRemarks()); + hy.setCreateTime(record.getHyRectifyTime()); + hy.setCreateUser(userId); + hy.setViolatorId(record.getViolatorId()); + xzSecurityQualityRectifyRecordMapper.insert(hy); + + + } + private void recoverScore(XzSecurityQualityInspectionRecord hiddenDangerInspectRecord) { if (hiddenDangerInspectRecord.getRecordType() == null || Objects.equals(hiddenDangerInspectRecord.getRecordType(), XzSecurityQualityInspectionRecordRecordTypeEnum.RECORD.getValue())) { return;