|
@@ -148,7 +148,7 @@ public class ProjectplanService implements BaseService<Projectplan, ProjectplanE
|
|
|
|
|
|
if(name.equals("0"))
|
|
|
{
|
|
|
- example.createCriteria().andYearEqualTo(String.valueOf(year)).andMonthEqualTo(String.valueOf(month));
|
|
|
+ example.createCriteria().andWindpowerNotLike("%_GDC").andYearEqualTo(String.valueOf(year)).andMonthEqualTo(String.valueOf(month));
|
|
|
|
|
|
}else
|
|
|
{
|
|
@@ -177,7 +177,7 @@ public class ProjectplanService implements BaseService<Projectplan, ProjectplanE
|
|
|
|
|
|
if(name.equals("0"))
|
|
|
{
|
|
|
- example.createCriteria().andYearEqualTo(String.valueOf(year)).andMonthIsNull();
|
|
|
+ example.createCriteria().andWindpowerNotLike("%_GDC").andYearEqualTo(String.valueOf(year)).andMonthIsNull();
|
|
|
|
|
|
}else
|
|
|
{
|