|
@@ -140,19 +140,16 @@ public class CalculateMethodServiceImpl extends ServiceImpl<CalculateMethodMappe
|
|
|
|
|
|
if (queryCalculateMethodDTO != null) {
|
|
if (queryCalculateMethodDTO != null) {
|
|
|
|
|
|
- // todo 需判断使用like还是eq
|
|
|
|
if (StringUtils.isNotEmpty(queryCalculateMethodDTO.getName())) {
|
|
if (StringUtils.isNotEmpty(queryCalculateMethodDTO.getName())) {
|
|
queryWrapper.like(CalculateMethod.PROP_NAME, queryCalculateMethodDTO.getName());
|
|
queryWrapper.like(CalculateMethod.PROP_NAME, queryCalculateMethodDTO.getName());
|
|
}
|
|
}
|
|
|
|
|
|
- // todo 需判断使用like还是eq
|
|
|
|
if (StringUtils.isNotEmpty(queryCalculateMethodDTO.getFormula())) {
|
|
if (StringUtils.isNotEmpty(queryCalculateMethodDTO.getFormula())) {
|
|
queryWrapper.like(CalculateMethod.PROP_FORMULA, queryCalculateMethodDTO.getFormula());
|
|
queryWrapper.like(CalculateMethod.PROP_FORMULA, queryCalculateMethodDTO.getFormula());
|
|
}
|
|
}
|
|
|
|
|
|
- // todo 需判断使用like还是eq
|
|
|
|
if (StringUtils.isNotEmpty(queryCalculateMethodDTO.getMonitorIndicatorId())) {
|
|
if (StringUtils.isNotEmpty(queryCalculateMethodDTO.getMonitorIndicatorId())) {
|
|
- queryWrapper.like(CalculateMethod.PROP_MONITOR_INDICATOR_ID, queryCalculateMethodDTO.getMonitorIndicatorId());
|
|
|
|
|
|
+ queryWrapper.eq(CalculateMethod.PROP_MONITOR_INDICATOR_ID, queryCalculateMethodDTO.getMonitorIndicatorId());
|
|
}
|
|
}
|
|
|
|
|
|
if (queryCalculateMethodDTO.getIsDefault() != null) {
|
|
if (queryCalculateMethodDTO.getIsDefault() != null) {
|