脚本检测大项启用/禁用功能
This commit is contained in:
@@ -205,10 +205,10 @@ public class PqScriptDtlsServiceImpl extends ServiceImpl<PqScriptDtlsMapper, PqS
|
|||||||
checkDataParam.setScriptId(freqDtls.getScriptId());
|
checkDataParam.setScriptId(freqDtls.getScriptId());
|
||||||
checkDataParam.setIndex(freqDtls.getScriptIndex());
|
checkDataParam.setIndex(freqDtls.getScriptIndex());
|
||||||
checkDataParam.setIsValueTypeName(true);
|
checkDataParam.setIsValueTypeName(true);
|
||||||
if(DicDataEnum.F.getCode().equals(issue.getType())||DicDataEnum.VOLTAGE.getCode().equals(issue.getType())){
|
if (DicDataEnum.F.getCode().equals(issue.getType()) || DicDataEnum.VOLTAGE.getCode().equals(issue.getType())) {
|
||||||
checkDataParam.setDataType("avg");
|
checkDataParam.setDataType("avg");
|
||||||
issue.setDataType("avg");
|
issue.setDataType("avg");
|
||||||
}else {
|
} else {
|
||||||
checkDataParam.setDataType(dataType);
|
checkDataParam.setDataType(dataType);
|
||||||
issue.setDataType(dataType);
|
issue.setDataType(dataType);
|
||||||
}
|
}
|
||||||
@@ -641,7 +641,8 @@ public class PqScriptDtlsServiceImpl extends ServiceImpl<PqScriptDtlsMapper, PqS
|
|||||||
return this.update(new LambdaUpdateWrapper<PqScriptDtls>()
|
return this.update(new LambdaUpdateWrapper<PqScriptDtls>()
|
||||||
.set(PqScriptDtls::getEnable, param.getEnable())
|
.set(PqScriptDtls::getEnable, param.getEnable())
|
||||||
.eq(PqScriptDtls::getScriptId, param.getScriptId())
|
.eq(PqScriptDtls::getScriptId, param.getScriptId())
|
||||||
.eq(PqScriptDtls::getScriptIndex, param.getIndex())
|
.eq(ObjectUtil.isNotNull(param.getIndex()), PqScriptDtls::getScriptIndex, param.getIndex())
|
||||||
|
.eq(ObjectUtil.isNotNull(param.getScriptType()), PqScriptDtls::getScriptType, param.getScriptType())
|
||||||
);
|
);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
Reference in New Issue
Block a user