删除特种也删除安全记录
This commit is contained in:
parent
725e45903b
commit
1f906f5756
@ -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<XzBlindPlatePlugSafeMapper, XzBlindPlatePlugSafe> implements IXzBlindPlatePlugSafeService {
|
||||
@Lazy
|
||||
@Autowired
|
||||
IUserEnterpriseService userEnterpriseService;
|
||||
@Lazy
|
||||
@Autowired
|
||||
private XzBlindPlatePlugSafeMapper xzSpecialOperationFireSafetyMapper;
|
||||
@Lazy
|
||||
@Autowired
|
||||
private XzGasAnalyzeMapper xzGasAnalyzeMapper;
|
||||
@Lazy
|
||||
@Autowired
|
||||
private IXzSecurityQualityInspectionRecordService xzSecurityQualityInspectionRecordService;
|
||||
|
||||
@Override
|
||||
public IPage<XzBlindPlatePlugSafe> queryPageList(HashMap<String, Object> paramMap) {
|
||||
@ -99,6 +109,10 @@ public class XzBlindPlatePlugSafeServiceImpl extends ServiceImpl<XzBlindPlatePlu
|
||||
throw new OpenAlertException("未找到对应实体");
|
||||
}
|
||||
baseMapper.deleteById(id);
|
||||
xzSecurityQualityInspectionRecordService.remove(new LambdaQueryWrapper<XzSecurityQualityInspectionRecord>()
|
||||
.eq(XzSecurityQualityInspectionRecord::getEngineeringId, id)
|
||||
.eq(XzSecurityQualityInspectionRecord::getType, 4)
|
||||
);
|
||||
}
|
||||
|
||||
@Override
|
||||
|
||||
@ -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
|
||||
|
||||
@ -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<XzGroundSafetMapper, X
|
||||
private XzGroundSafetMapper xzSpecialOperationFireSafetyMapper;
|
||||
@Autowired
|
||||
private XzGasAnalyzeMapper xzGasAnalyzeMapper;
|
||||
|
||||
@Lazy
|
||||
@Autowired
|
||||
private IXzSecurityQualityInspectionRecordService xzSecurityQualityInspectionRecordService;
|
||||
@Override
|
||||
public IPage<XzGroundSafet> queryPageList(HashMap<String, Object> paramMap) {
|
||||
QueryWrapper<XzGroundSafet> queryWrapper = getQueryWrapper(paramMap);
|
||||
@ -96,6 +100,11 @@ public class XzGroundSafetServiceImpl extends ServiceImpl<XzGroundSafetMapper, X
|
||||
throw new OpenAlertException("未找到对应实体");
|
||||
}
|
||||
baseMapper.deleteById(id);
|
||||
xzSecurityQualityInspectionRecordService.remove(new LambdaQueryWrapper<XzSecurityQualityInspectionRecord>()
|
||||
.eq(XzSecurityQualityInspectionRecord::getEngineeringId, id)
|
||||
.eq(XzSecurityQualityInspectionRecord::getType, 8)
|
||||
);
|
||||
|
||||
}
|
||||
|
||||
@Override
|
||||
|
||||
@ -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<XzHighJobSafeMapper, X
|
||||
private XzHighJobSafeMapper xzSpecialOperationFireSafetyMapper;
|
||||
@Autowired
|
||||
private XzGasAnalyzeMapper xzGasAnalyzeMapper;
|
||||
|
||||
@Lazy
|
||||
@Autowired
|
||||
private IXzSecurityQualityInspectionRecordService xzSecurityQualityInspectionRecordService;
|
||||
@Override
|
||||
public IPage<XzHighJobSafe> queryPageList(HashMap<String, Object> paramMap) {
|
||||
QueryWrapper<XzHighJobSafe> queryWrapper = getQueryWrapper(paramMap);
|
||||
@ -96,6 +100,11 @@ public class XzHighJobSafeServiceImpl extends ServiceImpl<XzHighJobSafeMapper, X
|
||||
throw new OpenAlertException("未找到对应实体");
|
||||
}
|
||||
baseMapper.deleteById(id);
|
||||
xzSecurityQualityInspectionRecordService.remove(new LambdaQueryWrapper<XzSecurityQualityInspectionRecord>()
|
||||
.eq(XzSecurityQualityInspectionRecord::getEngineeringId, id)
|
||||
.eq(XzSecurityQualityInspectionRecord::getType, 5)
|
||||
);
|
||||
|
||||
}
|
||||
|
||||
@Override
|
||||
|
||||
@ -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<XzHoistSafetyWorkM
|
||||
private XzHoistSafetyWorkMapper xzSpecialOperationFireSafetyMapper;
|
||||
@Autowired
|
||||
private XzGasAnalyzeMapper xzGasAnalyzeMapper;
|
||||
|
||||
@Lazy
|
||||
@Autowired
|
||||
private IXzSecurityQualityInspectionRecordService xzSecurityQualityInspectionRecordService;
|
||||
@Override
|
||||
public IPage<XzHoistSafetyWork> queryPageList(HashMap<String, Object> paramMap) {
|
||||
QueryWrapper<XzHoistSafetyWork> queryWrapper = getQueryWrapper(paramMap);
|
||||
@ -96,6 +100,11 @@ public class XzHoistSafetyWorkServiceImpl extends ServiceImpl<XzHoistSafetyWorkM
|
||||
throw new OpenAlertException("未找到对应实体");
|
||||
}
|
||||
baseMapper.deleteById(id);
|
||||
xzSecurityQualityInspectionRecordService.remove(new LambdaQueryWrapper<XzSecurityQualityInspectionRecord>()
|
||||
.eq(XzSecurityQualityInspectionRecord::getEngineeringId, id)
|
||||
.eq(XzSecurityQualityInspectionRecord::getType, 6)
|
||||
);
|
||||
|
||||
}
|
||||
|
||||
@Override
|
||||
|
||||
@ -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<XzLimitSpaceSafeMap
|
||||
private XzLimitSpaceSafeMapper xzSpecialOperationFireSafetyMapper;
|
||||
@Autowired
|
||||
private XzGasAnalyzeMapper xzGasAnalyzeMapper;
|
||||
|
||||
@Lazy
|
||||
@Autowired
|
||||
private IXzSecurityQualityInspectionRecordService xzSecurityQualityInspectionRecordService;
|
||||
@Override
|
||||
public IPage<XzLimitSpaceSafe> queryPageList(HashMap<String, Object> paramMap) {
|
||||
QueryWrapper<XzLimitSpaceSafe> queryWrapper = getQueryWrapper(paramMap);
|
||||
@ -95,6 +99,11 @@ public class XzLimitSpaceSafeServiceImpl extends ServiceImpl<XzLimitSpaceSafeMap
|
||||
throw new OpenAlertException("未找到对应实体");
|
||||
}
|
||||
baseMapper.deleteById(id);
|
||||
xzSecurityQualityInspectionRecordService.remove(new LambdaQueryWrapper<XzSecurityQualityInspectionRecord>()
|
||||
.eq(XzSecurityQualityInspectionRecord::getEngineeringId, id)
|
||||
.eq(XzSecurityQualityInspectionRecord::getType, 3)
|
||||
);
|
||||
|
||||
}
|
||||
|
||||
@Override
|
||||
|
||||
@ -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<XzOpenCircuitSafeM
|
||||
private XzOpenCircuitSafeMapper xzSpecialOperationFireSafetyMapper;
|
||||
@Autowired
|
||||
private XzGasAnalyzeMapper xzGasAnalyzeMapper;
|
||||
|
||||
@Lazy
|
||||
@Autowired
|
||||
private IXzSecurityQualityInspectionRecordService xzSecurityQualityInspectionRecordService;
|
||||
@Override
|
||||
public IPage<XzOpenCircuitSafe> queryPageList(HashMap<String, Object> paramMap) {
|
||||
QueryWrapper<XzOpenCircuitSafe> queryWrapper = getQueryWrapper(paramMap);
|
||||
@ -96,6 +100,11 @@ public class XzOpenCircuitSafeServiceImpl extends ServiceImpl<XzOpenCircuitSafeM
|
||||
throw new OpenAlertException("未找到对应实体");
|
||||
}
|
||||
baseMapper.deleteById(id);
|
||||
xzSecurityQualityInspectionRecordService.remove(new LambdaQueryWrapper<XzSecurityQualityInspectionRecord>()
|
||||
.eq(XzSecurityQualityInspectionRecord::getEngineeringId, id)
|
||||
.eq(XzSecurityQualityInspectionRecord::getType, 9)
|
||||
);
|
||||
|
||||
}
|
||||
|
||||
@Override
|
||||
|
||||
@ -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<XzSpeci
|
||||
private XzSpecialOperationFireSafetyMapper xzSpecialOperationFireSafetyMapper;
|
||||
@Autowired
|
||||
private IXzGasAnalyzeService xzGasAnalyzeService;
|
||||
|
||||
@Lazy
|
||||
@Autowired
|
||||
private IXzSecurityQualityInspectionRecordService xzSecurityQualityInspectionRecordService;
|
||||
@Override
|
||||
public IPage<XzSpecialOperationFireSafety> queryPageList(HashMap<String, Object> paramMap) {
|
||||
QueryWrapper<XzSpecialOperationFireSafety> queryWrapper = getQueryWrapper(paramMap);
|
||||
@ -105,6 +106,11 @@ public class XzSpecialOperationFireSafetyServiceImpl extends ServiceImpl<XzSpeci
|
||||
throw new OpenAlertException("未找到对应实体");
|
||||
}
|
||||
baseMapper.deleteById(id);
|
||||
xzSecurityQualityInspectionRecordService.remove(new LambdaQueryWrapper<XzSecurityQualityInspectionRecord>()
|
||||
.eq(XzSecurityQualityInspectionRecord::getEngineeringId, id)
|
||||
.eq(XzSecurityQualityInspectionRecord::getType, 2)
|
||||
);
|
||||
|
||||
}
|
||||
|
||||
@Override
|
||||
|
||||
@ -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<XzTempora
|
||||
private XzTemporaryElectricitySafeMapper xzSpecialOperationFireSafetyMapper;
|
||||
@Autowired
|
||||
private XzGasAnalyzeMapper xzGasAnalyzeMapper;
|
||||
|
||||
@Lazy
|
||||
@Autowired
|
||||
private IXzSecurityQualityInspectionRecordService xzSecurityQualityInspectionRecordService;
|
||||
@Override
|
||||
public IPage<XzTemporaryElectricitySafe> queryPageList(HashMap<String, Object> paramMap) {
|
||||
QueryWrapper<XzTemporaryElectricitySafe> queryWrapper = getQueryWrapper(paramMap);
|
||||
@ -96,6 +100,11 @@ public class XzTemporaryElectricitySafeServiceImpl extends ServiceImpl<XzTempora
|
||||
throw new OpenAlertException("未找到对应实体");
|
||||
}
|
||||
baseMapper.deleteById(id);
|
||||
xzSecurityQualityInspectionRecordService.remove(new LambdaQueryWrapper<XzSecurityQualityInspectionRecord>()
|
||||
.eq(XzSecurityQualityInspectionRecord::getEngineeringId, id)
|
||||
.eq(XzSecurityQualityInspectionRecord::getType, 7)
|
||||
);
|
||||
|
||||
}
|
||||
|
||||
@Override
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user