复检时脚本查询结果错误bug
This commit is contained in:
@@ -892,7 +892,8 @@ public class PqScriptDtlsServiceImpl extends ServiceImpl<PqScriptDtlsMapper, PqS
|
|||||||
pqScriptDtls = this.list(queryWrapper);
|
pqScriptDtls = this.list(queryWrapper);
|
||||||
} else {
|
} else {
|
||||||
//先获取检测脚本类型是否相对值 true相对值 false绝对值(相对值要乘额定值,绝对值不需要处理)
|
//先获取检测脚本类型是否相对值 true相对值 false绝对值(相对值要乘额定值,绝对值不需要处理)
|
||||||
queryWrapper.eq(PqScriptDtls::getScriptId, param.getScriptId());
|
queryWrapper.eq(PqScriptDtls::getScriptId, param.getScriptId())
|
||||||
|
.in(CollUtil.isNotEmpty(param.getIndexList()), PqScriptDtls::getScriptIndex, param.getIndexList());
|
||||||
pqScriptDtls = this.getBaseMapper().selectJoinList(PqScriptDtls.class, queryWrapper);
|
pqScriptDtls = this.getBaseMapper().selectJoinList(PqScriptDtls.class, queryWrapper);
|
||||||
if (CollUtil.isNotEmpty(param.getDevIds()) || (ObjectUtil.isNotNull(param.getType()) && param.getType() == 1)) {
|
if (CollUtil.isNotEmpty(param.getDevIds()) || (ObjectUtil.isNotNull(param.getType()) && param.getType() == 1)) {
|
||||||
Boolean isValueType = pqScriptMapper.selectScriptIsValueType(param.getScriptId());
|
Boolean isValueType = pqScriptMapper.selectScriptIsValueType(param.getScriptId());
|
||||||
|
|||||||
Reference in New Issue
Block a user