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 4c5127916..4c9ecb7e0 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 @@ -1,5 +1,6 @@ package com.zhgd.xmgl.modules.xz.special.service.impl; +import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper; import com.baomidou.mybatisplus.core.metadata.IPage; @@ -8,6 +9,8 @@ import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.zhgd.jeecg.common.execption.OpenAlertException; import com.zhgd.jeecg.common.system.query.QueryGenerator; import com.zhgd.xmgl.modules.worker.service.IUserEnterpriseService; +import com.zhgd.xmgl.modules.xz.security.entity.XzSecurityQualityInspectionRecord; +import com.zhgd.xmgl.modules.xz.security.service.IXzSecurityQualityInspectionRecordService; import com.zhgd.xmgl.modules.xz.special.entity.XzBlindPlatePlugSafe; import com.zhgd.xmgl.modules.xz.special.entity.vo.CountSpecialVo; import com.zhgd.xmgl.modules.xz.special.mapper.XzBlindPlatePlugSafeMapper; @@ -20,6 +23,7 @@ import com.zhgd.xmgl.util.MapBuilder; import com.zhgd.xmgl.util.PageUtil; import com.zhgd.xmgl.util.RefUtil; import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.context.annotation.Lazy; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; @@ -39,12 +43,18 @@ import java.util.stream.Collectors; @Service @Transactional(rollbackFor = Exception.class) public class XzBlindPlatePlugSafeServiceImpl extends ServiceImpl implements IXzBlindPlatePlugSafeService { + @Lazy @Autowired IUserEnterpriseService userEnterpriseService; + @Lazy @Autowired private XzBlindPlatePlugSafeMapper xzSpecialOperationFireSafetyMapper; + @Lazy @Autowired private XzGasAnalyzeMapper xzGasAnalyzeMapper; + @Lazy + @Autowired + private IXzSecurityQualityInspectionRecordService xzSecurityQualityInspectionRecordService; @Override public IPage queryPageList(HashMap paramMap) { @@ -99,6 +109,10 @@ public class XzBlindPlatePlugSafeServiceImpl extends ServiceImpl() + .eq(XzSecurityQualityInspectionRecord::getEngineeringId, id) + .eq(XzSecurityQualityInspectionRecord::getType, 4) + ); } @Override diff --git a/src/main/java/com/zhgd/xmgl/modules/xz/special/service/impl/XzGasAnalyzeServiceImpl.java b/src/main/java/com/zhgd/xmgl/modules/xz/special/service/impl/XzGasAnalyzeServiceImpl.java index 8e7d6b393..4e11a9cb3 100644 --- a/src/main/java/com/zhgd/xmgl/modules/xz/special/service/impl/XzGasAnalyzeServiceImpl.java +++ b/src/main/java/com/zhgd/xmgl/modules/xz/special/service/impl/XzGasAnalyzeServiceImpl.java @@ -1,24 +1,23 @@ package com.zhgd.xmgl.modules.xz.special.service.impl; -import com.zhgd.jeecg.common.execption.OpenAlertException; -import com.zhgd.xmgl.modules.xz.special.entity.XzGasAnalyze; -import com.zhgd.xmgl.modules.xz.special.mapper.XzGasAnalyzeMapper; -import com.zhgd.xmgl.modules.xz.special.service.IXzGasAnalyzeService; -import org.springframework.stereotype.Service; 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.zhgd.jeecg.common.system.query.QueryGenerator; -import com.zhgd.xmgl.util.PageUtil; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import com.zhgd.jeecg.common.execption.OpenAlertException; +import com.zhgd.jeecg.common.system.query.QueryGenerator; +import com.zhgd.xmgl.modules.xz.special.entity.XzGasAnalyze; +import com.zhgd.xmgl.modules.xz.special.mapper.XzGasAnalyzeMapper; +import com.zhgd.xmgl.modules.xz.special.service.IXzGasAnalyzeService; +import com.zhgd.xmgl.util.PageUtil; +import com.zhgd.xmgl.util.RefUtil; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; +import org.springframework.transaction.annotation.Transactional; import java.util.HashMap; import java.util.List; -import com.zhgd.xmgl.util.RefUtil; -import org.springframework.transaction.annotation.Transactional; -import org.springframework.beans.factory.annotation.Autowired; - /** * @Description: 星纵-气体分析 * @author: pds diff --git a/src/main/java/com/zhgd/xmgl/modules/xz/special/service/impl/XzGroundSafetServiceImpl.java b/src/main/java/com/zhgd/xmgl/modules/xz/special/service/impl/XzGroundSafetServiceImpl.java index a1106ec83..fd5c09567 100644 --- a/src/main/java/com/zhgd/xmgl/modules/xz/special/service/impl/XzGroundSafetServiceImpl.java +++ b/src/main/java/com/zhgd/xmgl/modules/xz/special/service/impl/XzGroundSafetServiceImpl.java @@ -1,6 +1,6 @@ package com.zhgd.xmgl.modules.xz.special.service.impl; -import cn.hutool.core.util.StrUtil; +import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper; import com.baomidou.mybatisplus.core.metadata.IPage; @@ -9,17 +9,19 @@ import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.zhgd.jeecg.common.execption.OpenAlertException; import com.zhgd.jeecg.common.system.query.QueryGenerator; import com.zhgd.xmgl.modules.worker.service.IUserEnterpriseService; -import com.zhgd.xmgl.modules.xz.special.mapper.XzGroundSafetMapper; +import com.zhgd.xmgl.modules.xz.security.entity.XzSecurityQualityInspectionRecord; +import com.zhgd.xmgl.modules.xz.security.service.IXzSecurityQualityInspectionRecordService; import com.zhgd.xmgl.modules.xz.special.entity.XzGroundSafet; -import com.zhgd.xmgl.modules.xz.special.service.IXzGroundSafetService; import com.zhgd.xmgl.modules.xz.special.mapper.XzGasAnalyzeMapper; +import com.zhgd.xmgl.modules.xz.special.mapper.XzGroundSafetMapper; +import com.zhgd.xmgl.modules.xz.special.service.IXzGroundSafetService; import com.zhgd.xmgl.security.entity.UserInfo; import com.zhgd.xmgl.security.util.SecurityUtils; import com.zhgd.xmgl.util.MapBuilder; import com.zhgd.xmgl.util.PageUtil; import com.zhgd.xmgl.util.RefUtil; -import org.apache.commons.collections.MapUtils; import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.context.annotation.Lazy; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; @@ -41,7 +43,9 @@ public class XzGroundSafetServiceImpl extends ServiceImpl queryPageList(HashMap paramMap) { QueryWrapper queryWrapper = getQueryWrapper(paramMap); @@ -96,6 +100,11 @@ public class XzGroundSafetServiceImpl extends ServiceImpl() + .eq(XzSecurityQualityInspectionRecord::getEngineeringId, id) + .eq(XzSecurityQualityInspectionRecord::getType, 8) + ); + } @Override diff --git a/src/main/java/com/zhgd/xmgl/modules/xz/special/service/impl/XzHighJobSafeServiceImpl.java b/src/main/java/com/zhgd/xmgl/modules/xz/special/service/impl/XzHighJobSafeServiceImpl.java index 5aa3f7869..30091e545 100644 --- a/src/main/java/com/zhgd/xmgl/modules/xz/special/service/impl/XzHighJobSafeServiceImpl.java +++ b/src/main/java/com/zhgd/xmgl/modules/xz/special/service/impl/XzHighJobSafeServiceImpl.java @@ -1,6 +1,6 @@ package com.zhgd.xmgl.modules.xz.special.service.impl; -import cn.hutool.core.util.StrUtil; +import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper; import com.baomidou.mybatisplus.core.metadata.IPage; @@ -9,17 +9,19 @@ import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.zhgd.jeecg.common.execption.OpenAlertException; import com.zhgd.jeecg.common.system.query.QueryGenerator; import com.zhgd.xmgl.modules.worker.service.IUserEnterpriseService; +import com.zhgd.xmgl.modules.xz.security.entity.XzSecurityQualityInspectionRecord; +import com.zhgd.xmgl.modules.xz.security.service.IXzSecurityQualityInspectionRecordService; import com.zhgd.xmgl.modules.xz.special.entity.XzHighJobSafe; +import com.zhgd.xmgl.modules.xz.special.mapper.XzGasAnalyzeMapper; import com.zhgd.xmgl.modules.xz.special.mapper.XzHighJobSafeMapper; import com.zhgd.xmgl.modules.xz.special.service.IXzHighJobSafeService; -import com.zhgd.xmgl.modules.xz.special.mapper.XzGasAnalyzeMapper; import com.zhgd.xmgl.security.entity.UserInfo; import com.zhgd.xmgl.security.util.SecurityUtils; import com.zhgd.xmgl.util.MapBuilder; import com.zhgd.xmgl.util.PageUtil; import com.zhgd.xmgl.util.RefUtil; -import org.apache.commons.collections.MapUtils; import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.context.annotation.Lazy; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; @@ -41,7 +43,9 @@ public class XzHighJobSafeServiceImpl extends ServiceImpl queryPageList(HashMap paramMap) { QueryWrapper queryWrapper = getQueryWrapper(paramMap); @@ -96,6 +100,11 @@ public class XzHighJobSafeServiceImpl extends ServiceImpl() + .eq(XzSecurityQualityInspectionRecord::getEngineeringId, id) + .eq(XzSecurityQualityInspectionRecord::getType, 5) + ); + } @Override diff --git a/src/main/java/com/zhgd/xmgl/modules/xz/special/service/impl/XzHoistSafetyWorkServiceImpl.java b/src/main/java/com/zhgd/xmgl/modules/xz/special/service/impl/XzHoistSafetyWorkServiceImpl.java index 450546571..bf98cf89b 100644 --- a/src/main/java/com/zhgd/xmgl/modules/xz/special/service/impl/XzHoistSafetyWorkServiceImpl.java +++ b/src/main/java/com/zhgd/xmgl/modules/xz/special/service/impl/XzHoistSafetyWorkServiceImpl.java @@ -1,6 +1,6 @@ package com.zhgd.xmgl.modules.xz.special.service.impl; -import cn.hutool.core.util.StrUtil; +import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper; import com.baomidou.mybatisplus.core.metadata.IPage; @@ -9,17 +9,19 @@ import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.zhgd.jeecg.common.execption.OpenAlertException; import com.zhgd.jeecg.common.system.query.QueryGenerator; import com.zhgd.xmgl.modules.worker.service.IUserEnterpriseService; +import com.zhgd.xmgl.modules.xz.security.entity.XzSecurityQualityInspectionRecord; +import com.zhgd.xmgl.modules.xz.security.service.IXzSecurityQualityInspectionRecordService; import com.zhgd.xmgl.modules.xz.special.entity.XzHoistSafetyWork; +import com.zhgd.xmgl.modules.xz.special.mapper.XzGasAnalyzeMapper; import com.zhgd.xmgl.modules.xz.special.mapper.XzHoistSafetyWorkMapper; import com.zhgd.xmgl.modules.xz.special.service.IXzHoistSafetyWorkService; -import com.zhgd.xmgl.modules.xz.special.mapper.XzGasAnalyzeMapper; import com.zhgd.xmgl.security.entity.UserInfo; import com.zhgd.xmgl.security.util.SecurityUtils; import com.zhgd.xmgl.util.MapBuilder; import com.zhgd.xmgl.util.PageUtil; import com.zhgd.xmgl.util.RefUtil; -import org.apache.commons.collections.MapUtils; import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.context.annotation.Lazy; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; @@ -41,7 +43,9 @@ public class XzHoistSafetyWorkServiceImpl extends ServiceImpl queryPageList(HashMap paramMap) { QueryWrapper queryWrapper = getQueryWrapper(paramMap); @@ -96,6 +100,11 @@ public class XzHoistSafetyWorkServiceImpl extends ServiceImpl() + .eq(XzSecurityQualityInspectionRecord::getEngineeringId, id) + .eq(XzSecurityQualityInspectionRecord::getType, 6) + ); + } @Override diff --git a/src/main/java/com/zhgd/xmgl/modules/xz/special/service/impl/XzLimitSpaceSafeServiceImpl.java b/src/main/java/com/zhgd/xmgl/modules/xz/special/service/impl/XzLimitSpaceSafeServiceImpl.java index cd17d0937..68a3a0701 100644 --- a/src/main/java/com/zhgd/xmgl/modules/xz/special/service/impl/XzLimitSpaceSafeServiceImpl.java +++ b/src/main/java/com/zhgd/xmgl/modules/xz/special/service/impl/XzLimitSpaceSafeServiceImpl.java @@ -1,6 +1,6 @@ package com.zhgd.xmgl.modules.xz.special.service.impl; -import cn.hutool.core.util.StrUtil; +import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper; import com.baomidou.mybatisplus.core.metadata.IPage; @@ -9,17 +9,19 @@ import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.zhgd.jeecg.common.execption.OpenAlertException; import com.zhgd.jeecg.common.system.query.QueryGenerator; import com.zhgd.xmgl.modules.worker.service.IUserEnterpriseService; +import com.zhgd.xmgl.modules.xz.security.entity.XzSecurityQualityInspectionRecord; +import com.zhgd.xmgl.modules.xz.security.service.IXzSecurityQualityInspectionRecordService; import com.zhgd.xmgl.modules.xz.special.entity.XzLimitSpaceSafe; +import com.zhgd.xmgl.modules.xz.special.mapper.XzGasAnalyzeMapper; import com.zhgd.xmgl.modules.xz.special.mapper.XzLimitSpaceSafeMapper; import com.zhgd.xmgl.modules.xz.special.service.IXzLimitSpaceSafeService; -import com.zhgd.xmgl.modules.xz.special.mapper.XzGasAnalyzeMapper; import com.zhgd.xmgl.security.entity.UserInfo; import com.zhgd.xmgl.security.util.SecurityUtils; import com.zhgd.xmgl.util.MapBuilder; import com.zhgd.xmgl.util.PageUtil; import com.zhgd.xmgl.util.RefUtil; -import org.apache.commons.collections.MapUtils; import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.context.annotation.Lazy; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; @@ -41,7 +43,9 @@ public class XzLimitSpaceSafeServiceImpl extends ServiceImpl queryPageList(HashMap paramMap) { QueryWrapper queryWrapper = getQueryWrapper(paramMap); @@ -95,6 +99,11 @@ public class XzLimitSpaceSafeServiceImpl extends ServiceImpl() + .eq(XzSecurityQualityInspectionRecord::getEngineeringId, id) + .eq(XzSecurityQualityInspectionRecord::getType, 3) + ); + } @Override diff --git a/src/main/java/com/zhgd/xmgl/modules/xz/special/service/impl/XzOpenCircuitSafeServiceImpl.java b/src/main/java/com/zhgd/xmgl/modules/xz/special/service/impl/XzOpenCircuitSafeServiceImpl.java index 91357ba33..6ab6cff50 100644 --- a/src/main/java/com/zhgd/xmgl/modules/xz/special/service/impl/XzOpenCircuitSafeServiceImpl.java +++ b/src/main/java/com/zhgd/xmgl/modules/xz/special/service/impl/XzOpenCircuitSafeServiceImpl.java @@ -1,6 +1,6 @@ package com.zhgd.xmgl.modules.xz.special.service.impl; -import cn.hutool.core.util.StrUtil; +import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper; import com.baomidou.mybatisplus.core.metadata.IPage; @@ -9,17 +9,19 @@ import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.zhgd.jeecg.common.execption.OpenAlertException; import com.zhgd.jeecg.common.system.query.QueryGenerator; import com.zhgd.xmgl.modules.worker.service.IUserEnterpriseService; +import com.zhgd.xmgl.modules.xz.security.entity.XzSecurityQualityInspectionRecord; +import com.zhgd.xmgl.modules.xz.security.service.IXzSecurityQualityInspectionRecordService; import com.zhgd.xmgl.modules.xz.special.entity.XzOpenCircuitSafe; +import com.zhgd.xmgl.modules.xz.special.mapper.XzGasAnalyzeMapper; import com.zhgd.xmgl.modules.xz.special.mapper.XzOpenCircuitSafeMapper; import com.zhgd.xmgl.modules.xz.special.service.IXzOpenCircuitSafeService; -import com.zhgd.xmgl.modules.xz.special.mapper.XzGasAnalyzeMapper; import com.zhgd.xmgl.security.entity.UserInfo; import com.zhgd.xmgl.security.util.SecurityUtils; import com.zhgd.xmgl.util.MapBuilder; import com.zhgd.xmgl.util.PageUtil; import com.zhgd.xmgl.util.RefUtil; -import org.apache.commons.collections.MapUtils; import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.context.annotation.Lazy; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; @@ -41,7 +43,9 @@ public class XzOpenCircuitSafeServiceImpl extends ServiceImpl queryPageList(HashMap paramMap) { QueryWrapper queryWrapper = getQueryWrapper(paramMap); @@ -96,6 +100,11 @@ public class XzOpenCircuitSafeServiceImpl extends ServiceImpl() + .eq(XzSecurityQualityInspectionRecord::getEngineeringId, id) + .eq(XzSecurityQualityInspectionRecord::getType, 9) + ); + } @Override diff --git a/src/main/java/com/zhgd/xmgl/modules/xz/special/service/impl/XzSpecialOperationFireSafetyServiceImpl.java b/src/main/java/com/zhgd/xmgl/modules/xz/special/service/impl/XzSpecialOperationFireSafetyServiceImpl.java index b894307e5..b77068fdd 100644 --- a/src/main/java/com/zhgd/xmgl/modules/xz/special/service/impl/XzSpecialOperationFireSafetyServiceImpl.java +++ b/src/main/java/com/zhgd/xmgl/modules/xz/special/service/impl/XzSpecialOperationFireSafetyServiceImpl.java @@ -1,6 +1,5 @@ package com.zhgd.xmgl.modules.xz.special.service.impl; -import cn.hutool.core.util.StrUtil; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper; @@ -9,11 +8,11 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.zhgd.jeecg.common.execption.OpenAlertException; import com.zhgd.jeecg.common.system.query.QueryGenerator; -import com.zhgd.xmgl.modules.dangerous.entity.DangerousEngineeringRecord; import com.zhgd.xmgl.modules.worker.service.IUserEnterpriseService; +import com.zhgd.xmgl.modules.xz.security.entity.XzSecurityQualityInspectionRecord; +import com.zhgd.xmgl.modules.xz.security.service.IXzSecurityQualityInspectionRecordService; import com.zhgd.xmgl.modules.xz.special.entity.XzGasAnalyze; import com.zhgd.xmgl.modules.xz.special.entity.XzSpecialOperationFireSafety; -import com.zhgd.xmgl.modules.xz.special.mapper.XzGasAnalyzeMapper; import com.zhgd.xmgl.modules.xz.special.mapper.XzSpecialOperationFireSafetyMapper; import com.zhgd.xmgl.modules.xz.special.service.IXzGasAnalyzeService; import com.zhgd.xmgl.modules.xz.special.service.IXzSpecialOperationFireSafetyService; @@ -22,8 +21,8 @@ import com.zhgd.xmgl.security.util.SecurityUtils; import com.zhgd.xmgl.util.MapBuilder; import com.zhgd.xmgl.util.PageUtil; import com.zhgd.xmgl.util.RefUtil; -import org.apache.commons.collections.MapUtils; import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.context.annotation.Lazy; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; @@ -45,7 +44,9 @@ public class XzSpecialOperationFireSafetyServiceImpl extends ServiceImpl queryPageList(HashMap paramMap) { QueryWrapper queryWrapper = getQueryWrapper(paramMap); @@ -105,6 +106,11 @@ public class XzSpecialOperationFireSafetyServiceImpl extends ServiceImpl() + .eq(XzSecurityQualityInspectionRecord::getEngineeringId, id) + .eq(XzSecurityQualityInspectionRecord::getType, 2) + ); + } @Override diff --git a/src/main/java/com/zhgd/xmgl/modules/xz/special/service/impl/XzTemporaryElectricitySafeServiceImpl.java b/src/main/java/com/zhgd/xmgl/modules/xz/special/service/impl/XzTemporaryElectricitySafeServiceImpl.java index adb44f94c..5ae14a213 100644 --- a/src/main/java/com/zhgd/xmgl/modules/xz/special/service/impl/XzTemporaryElectricitySafeServiceImpl.java +++ b/src/main/java/com/zhgd/xmgl/modules/xz/special/service/impl/XzTemporaryElectricitySafeServiceImpl.java @@ -1,6 +1,6 @@ package com.zhgd.xmgl.modules.xz.special.service.impl; -import cn.hutool.core.util.StrUtil; +import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper; import com.baomidou.mybatisplus.core.metadata.IPage; @@ -9,17 +9,19 @@ import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.zhgd.jeecg.common.execption.OpenAlertException; import com.zhgd.jeecg.common.system.query.QueryGenerator; import com.zhgd.xmgl.modules.worker.service.IUserEnterpriseService; +import com.zhgd.xmgl.modules.xz.security.entity.XzSecurityQualityInspectionRecord; +import com.zhgd.xmgl.modules.xz.security.service.IXzSecurityQualityInspectionRecordService; import com.zhgd.xmgl.modules.xz.special.entity.XzTemporaryElectricitySafe; +import com.zhgd.xmgl.modules.xz.special.mapper.XzGasAnalyzeMapper; import com.zhgd.xmgl.modules.xz.special.mapper.XzTemporaryElectricitySafeMapper; import com.zhgd.xmgl.modules.xz.special.service.IXzTemporaryElectricitySafeService; -import com.zhgd.xmgl.modules.xz.special.mapper.XzGasAnalyzeMapper; import com.zhgd.xmgl.security.entity.UserInfo; import com.zhgd.xmgl.security.util.SecurityUtils; import com.zhgd.xmgl.util.MapBuilder; import com.zhgd.xmgl.util.PageUtil; import com.zhgd.xmgl.util.RefUtil; -import org.apache.commons.collections.MapUtils; import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.context.annotation.Lazy; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; @@ -41,7 +43,9 @@ public class XzTemporaryElectricitySafeServiceImpl extends ServiceImpl queryPageList(HashMap paramMap) { QueryWrapper queryWrapper = getQueryWrapper(paramMap); @@ -96,6 +100,11 @@ public class XzTemporaryElectricitySafeServiceImpl extends ServiceImpl() + .eq(XzSecurityQualityInspectionRecord::getEngineeringId, id) + .eq(XzSecurityQualityInspectionRecord::getType, 7) + ); + } @Override