|
@@ -226,6 +226,7 @@ public class RuleTemplateServiceImpl extends ServiceImpl<RuleTemplateMapper, Rul
|
|
|
QueryWrapper<RuleIndicator> indicatorQueryWrapper = new QueryWrapper<>();
|
|
|
indicatorQueryWrapper.eq("code", ruleBase.getIndicatorCode());
|
|
|
indicatorQueryWrapper.eq("dimension", ruleBase.getRuleDimension());
|
|
|
+ indicatorQueryWrapper.eq("media_type", template.getMediaType());
|
|
|
indicatorQueryWrapper.last("limit 1");
|
|
|
RuleIndicator ruleIndicator = ruleIndicatorService.getOne(indicatorQueryWrapper);
|
|
|
if (!Check.isNull(ruleIndicator)) {
|
|
@@ -334,6 +335,7 @@ public class RuleTemplateServiceImpl extends ServiceImpl<RuleTemplateMapper, Rul
|
|
|
QueryWrapper<RuleIndicator> indicatorQueryWrapper = new QueryWrapper<>();
|
|
|
indicatorQueryWrapper.eq("code", ruleBase.getIndicatorCode());
|
|
|
indicatorQueryWrapper.eq("dimension", ruleBase.getRuleDimension());
|
|
|
+ indicatorQueryWrapper.eq("media_type", template.getMediaType());
|
|
|
indicatorQueryWrapper.last("limit 1");
|
|
|
RuleIndicator ruleIndicator = ruleIndicatorService.getOne(indicatorQueryWrapper); // 查询指标的详情信息
|
|
|
if (!Check.isNull(ruleIndicator)) {
|
|
@@ -396,6 +398,7 @@ public class RuleTemplateServiceImpl extends ServiceImpl<RuleTemplateMapper, Rul
|
|
|
*/
|
|
|
QueryWrapper<RuleIndicator> indicatorQueryWrapper = new QueryWrapper<>();
|
|
|
indicatorQueryWrapper.eq("code", ruleBase.getIndicatorCode());
|
|
|
+ indicatorQueryWrapper.eq("media_type", template.getMediaType());
|
|
|
indicatorQueryWrapper.eq("dimension", ruleBase.getRuleDimension());
|
|
|
indicatorQueryWrapper.last("limit 1");
|
|
|
RuleIndicator ruleIndicator = ruleIndicatorService.getOne(indicatorQueryWrapper); // 查询基础规则的指标信息
|
|
@@ -478,6 +481,7 @@ public class RuleTemplateServiceImpl extends ServiceImpl<RuleTemplateMapper, Rul
|
|
|
QueryWrapper<RuleIndicator> indicatorQueryWrapper = new QueryWrapper<>();
|
|
|
indicatorQueryWrapper.eq("code", ruleBase.getIndicatorCode());
|
|
|
indicatorQueryWrapper.eq("dimension", ruleBase.getRuleDimension());
|
|
|
+ indicatorQueryWrapper.eq("media_type", template.getMediaType());
|
|
|
indicatorQueryWrapper.last("limit 1");
|
|
|
RuleIndicator ruleIndicator = ruleIndicatorService.getOne(indicatorQueryWrapper);
|
|
|
if (!Check.isNull(ruleIndicator)) {
|
|
@@ -515,6 +519,7 @@ public class RuleTemplateServiceImpl extends ServiceImpl<RuleTemplateMapper, Rul
|
|
|
QueryWrapper<RuleIndicator> indicatorQueryWrapper = new QueryWrapper<>();
|
|
|
indicatorQueryWrapper.eq("code", ruleBase.getIndicatorCode());
|
|
|
indicatorQueryWrapper.eq("dimension", ruleBase.getRuleDimension());
|
|
|
+ indicatorQueryWrapper.eq("media_type", template.getMediaType());
|
|
|
indicatorQueryWrapper.last("limit 1");
|
|
|
RuleIndicator ruleIndicator = ruleIndicatorService.getOne(indicatorQueryWrapper);
|
|
|
if (!Check.isNull(ruleIndicator)) {
|