|
|
@@ -594,6 +594,12 @@ public class GmyDataExchangApiServiceImpl implements IGmyDataExchangApiService {
|
|
|
lambdaQueryWrapper.ge(GmyDeclHead::getDeclDate, decl.getDeclDateList().get(0));
|
|
|
lambdaQueryWrapper.le(GmyDeclHead::getDeclDate, decl.getDeclDateList().get(1));
|
|
|
}
|
|
|
+ if(ObjectUtils.isNotNull(decl.getStatus())) {
|
|
|
+ lambdaQueryWrapper.eq(GmyDeclHead::getStatus, decl.getStatus());
|
|
|
+ }else{
|
|
|
+ lambdaQueryWrapper.eq(GmyDeclHead::getStatus, 0);
|
|
|
+ }
|
|
|
+
|
|
|
IPage<GmyDeclHead> pages = gmyDeclHeadService.page(Condition.getPage(query), lambdaQueryWrapper);
|
|
|
|
|
|
return R.data(pages);
|