From 0ba4e7e415a3b7121ea67ebcb86c9526c96ed93c Mon Sep 17 00:00:00 2001 From: GUO <1923636941@qq.com> Date: Sun, 5 May 2024 19:08:48 +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 --- ...urityInspectTaskItemRecordServiceImpl.java | 22 +++++++++---------- ...zSecurityInspectTaskRecordServiceImpl.java | 14 ++++++------ 2 files changed, 17 insertions(+), 19 deletions(-) diff --git a/src/main/java/com/zhgd/xmgl/modules/xz.security/service/impl/XzSecurityXzSecurityInspectTaskItemRecordServiceImpl.java b/src/main/java/com/zhgd/xmgl/modules/xz.security/service/impl/XzSecurityXzSecurityInspectTaskItemRecordServiceImpl.java index a33468047..2d1b3fbec 100644 --- a/src/main/java/com/zhgd/xmgl/modules/xz.security/service/impl/XzSecurityXzSecurityInspectTaskItemRecordServiceImpl.java +++ b/src/main/java/com/zhgd/xmgl/modules/xz.security/service/impl/XzSecurityXzSecurityInspectTaskItemRecordServiceImpl.java @@ -3,22 +3,21 @@ package com.zhgd.xmgl.modules.xz.security.service.impl; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.zhgd.jeecg.common.mybatis.EntityMap; +import com.zhgd.xmgl.modules.basicdata.mapper.SystemUserMapper; import com.zhgd.xmgl.modules.dangerous.entity.HiddenDangerInspectRecord; +import com.zhgd.xmgl.modules.dangerous.service.IHiddenDangerInspectRecordService; import com.zhgd.xmgl.modules.xz.security.entity.XzSecurityInspectTaskItemRecord; import com.zhgd.xmgl.modules.xz.security.entity.XzSecurityInspectTaskRecord; +import com.zhgd.xmgl.modules.xz.security.entity.XzSecurityQualityInspectionRecord; import com.zhgd.xmgl.modules.xz.security.mapper.XzSecurityInspectTaskItemRecordMapper; -import com.zhgd.xmgl.modules.basicdata.mapper.SystemUserMapper; -import com.zhgd.xmgl.modules.dangerous.service.IHiddenDangerInspectRecordService; import com.zhgd.xmgl.modules.xz.security.mapper.XzSecurityInspectTaskRecordMapper; import com.zhgd.xmgl.modules.xz.security.service.IXzSecurityInspectTaskItemRecordService; -import com.zhgd.xmgl.modules.quality.entity.QualityInspectionRecord; -import com.zhgd.xmgl.modules.quality.service.IQualityInspectionRecordService; +import com.zhgd.xmgl.modules.xz.security.service.IXzSecurityQualityInspectionRecordService; import org.apache.commons.collections.MapUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; - -import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import org.springframework.transaction.annotation.Transactional; import java.util.HashMap; @@ -42,9 +41,8 @@ public class XzSecurityXzSecurityInspectTaskItemRecordServiceImpl extends Servic private IHiddenDangerInspectRecordService hiddenDangerInspectRecordService; @Autowired private SystemUserMapper systemUserMapper; - @Autowired - private IQualityInspectionRecordService qualityInspectionRecordService; + private IXzSecurityQualityInspectionRecordService qualityInspectionRecordService; @Override @@ -85,11 +83,11 @@ public class XzSecurityXzSecurityInspectTaskItemRecordServiceImpl extends Servic } } } else { - QueryWrapper queryWrapper = new QueryWrapper<>(); - queryWrapper.lambda().eq(QualityInspectionRecord::getItemId, id); - List list = qualityInspectionRecordService.list(queryWrapper); + QueryWrapper queryWrapper = new QueryWrapper<>(); + queryWrapper.lambda().eq(XzSecurityQualityInspectionRecord::getItemId, id); + List list = qualityInspectionRecordService.list(queryWrapper); if (list != null && list.size() > 0) { - for (QualityInspectionRecord record : list) { + for (XzSecurityQualityInspectionRecord record : list) { qualityInspectionRecordService.deleteQualityInspectionRecord(record.getId().toString()); } } diff --git a/src/main/java/com/zhgd/xmgl/modules/xz.security/service/impl/XzSecurityXzSecurityInspectTaskRecordServiceImpl.java b/src/main/java/com/zhgd/xmgl/modules/xz.security/service/impl/XzSecurityXzSecurityInspectTaskRecordServiceImpl.java index e5b6b87b3..bdea54c9d 100644 --- a/src/main/java/com/zhgd/xmgl/modules/xz.security/service/impl/XzSecurityXzSecurityInspectTaskRecordServiceImpl.java +++ b/src/main/java/com/zhgd/xmgl/modules/xz.security/service/impl/XzSecurityXzSecurityInspectTaskRecordServiceImpl.java @@ -11,11 +11,11 @@ import com.zhgd.xmgl.modules.dangerous.entity.HiddenDangerInspectRecord; import com.zhgd.xmgl.modules.dangerous.service.IHiddenDangerInspectRecordService; import com.zhgd.xmgl.modules.xz.security.entity.XzSecurityInspectTaskItemRecord; import com.zhgd.xmgl.modules.xz.security.entity.XzSecurityInspectTaskRecord; +import com.zhgd.xmgl.modules.xz.security.entity.XzSecurityQualityInspectionRecord; import com.zhgd.xmgl.modules.xz.security.mapper.XzSecurityInspectTaskItemRecordMapper; import com.zhgd.xmgl.modules.xz.security.mapper.XzSecurityInspectTaskRecordMapper; import com.zhgd.xmgl.modules.xz.security.service.IXzSecurityInspectTaskRecordService; -import com.zhgd.xmgl.modules.quality.entity.QualityInspectionRecord; -import com.zhgd.xmgl.modules.quality.service.IQualityInspectionRecordService; +import com.zhgd.xmgl.modules.xz.security.service.IXzSecurityQualityInspectionRecordService; import com.zhgd.xmgl.util.DateUtils; import org.apache.commons.collections.MapUtils; import org.apache.commons.lang3.StringUtils; @@ -45,7 +45,7 @@ public class XzSecurityXzSecurityInspectTaskRecordServiceImpl extends ServiceImp private IHiddenDangerInspectRecordService hiddenDangerInspectRecordService; @Autowired - private IQualityInspectionRecordService qualityInspectionRecordService; + private IXzSecurityQualityInspectionRecordService qualityInspectionRecordService; @Override public void saveInspectTaskRecord(XzSecurityInspectTaskRecord xzSecurityInspectTaskRecord) { @@ -133,11 +133,11 @@ public class XzSecurityXzSecurityInspectTaskRecordServiceImpl extends ServiceImp } } } else { - QueryWrapper queryWrapper1 = new QueryWrapper<>(); - queryWrapper1.lambda().eq(QualityInspectionRecord::getTaskId, id); - List list = qualityInspectionRecordService.list(queryWrapper1); + QueryWrapper queryWrapper1 = new QueryWrapper<>(); + queryWrapper1.lambda().eq(XzSecurityQualityInspectionRecord::getTaskId, id); + List list = qualityInspectionRecordService.list(queryWrapper1); if (list != null && list.size() > 0) { - for (QualityInspectionRecord inspectRecord : list) { + for (XzSecurityQualityInspectionRecord inspectRecord : list) { qualityInspectionRecordService.deleteQualityInspectionRecord(inspectRecord.getId().toString()); } }