|
@@ -3,7 +3,6 @@ package com.gyee.runeconomy.service.monitor;/*
|
|
|
@date 2023/4/3-14:39
|
|
|
*/
|
|
|
|
|
|
-import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
|
|
|
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
|
|
|
import com.gyee.common.model.PointData;
|
|
|
import com.gyee.common.vo.monitor.CompreVo;
|
|
@@ -32,11 +31,11 @@ public class ComprehensiveService {
|
|
|
public List<ProEconTestingPoint> targets(String type) {
|
|
|
QueryWrapper<ProEconTestingPoint> qw = new QueryWrapper<>();
|
|
|
if (type.equals("-1")){
|
|
|
- qw.select(" DISTINCT uniform_code,name ").lambda().eq(ProEconTestingPoint::getTypeId,"fcc");
|
|
|
+ qw.select(" DISTINCT uniform_code,name ").lambda().eq(ProEconTestingPoint::getTypeId,"fcc").ne(ProEconTestingPoint::getUniformCode,"ZYCGL");
|
|
|
}else if (type.equals("-2")){
|
|
|
- qw.select(" DISTINCT uniform_code,name ").lambda().eq(ProEconTestingPoint::getTypeId,"gcc");
|
|
|
+ qw.select(" DISTINCT uniform_code,name ").lambda().eq(ProEconTestingPoint::getTypeId,"gcc").ne(ProEconTestingPoint::getUniformCode,"ZYCGL");
|
|
|
}else {
|
|
|
- qw.select(" DISTINCT uniform_code,name ").lambda().in(ProEconTestingPoint::getTypeId,"gcc","fcc");
|
|
|
+ qw.select(" DISTINCT uniform_code,name ").lambda().in(ProEconTestingPoint::getTypeId,"gcc","fcc").ne(ProEconTestingPoint::getUniformCode,"ZYCGL");
|
|
|
}
|
|
|
|
|
|
List<ProEconTestingPoint> list = proEconTestingPointService.list(qw);
|