|
@@ -28,6 +28,8 @@ import org.apache.poi.poifs.filesystem.POIFSFileSystem;
|
|
|
import org.apache.poi.ss.usermodel.Workbook;
|
|
|
import org.springframework.beans.factory.annotation.Autowired;
|
|
|
import org.springframework.data.domain.Page;
|
|
|
+import org.springframework.data.domain.Sort;
|
|
|
+import org.springframework.data.domain.Sort.Direction;
|
|
|
import org.springframework.data.jpa.domain.Specification;
|
|
|
import org.springframework.flex.remoting.RemotingDestination;
|
|
|
import org.springframework.flex.remoting.RemotingExclude;
|
|
@@ -550,7 +552,8 @@ public class JyrController extends BaseController {
|
|
|
} else {
|
|
|
Specification<JyrEntity> spec = SpecificationCreater
|
|
|
.searchByPredicateModels(filterList);
|
|
|
- list = service.findAll(spec);
|
|
|
+ Sort sort2 = new Sort(Direction.ASC, "gkjyr");
|
|
|
+ list.addAll(service.findAll(spec,sort2)) ;
|
|
|
}
|
|
|
bc.setResult(list);
|
|
|
return bc;
|
|
@@ -575,7 +578,8 @@ public class JyrController extends BaseController {
|
|
|
List<JyrEntity> list = new ArrayList<JyrEntity>();
|
|
|
Specification<JyrEntity> spec = SpecificationCreater
|
|
|
.searchByPredicateModels(filterList);
|
|
|
- list = service.findAll(spec);
|
|
|
+ Sort sort2 = new Sort(Direction.ASC, "gkjyr");
|
|
|
+ list.addAll(service.findAll(spec,sort2)) ;
|
|
|
bc.setResult(list);
|
|
|
return bc;
|
|
|
}
|
|
@@ -600,7 +604,8 @@ public class JyrController extends BaseController {
|
|
|
BaseEntity.RECORD_STATE_DRAFT, Operator.NEQ);
|
|
|
Specification<JyrEntity> spec = SpecificationCreater
|
|
|
.searchByPredicateModels(filterList);
|
|
|
- list = service.findAll(spec);
|
|
|
+ Sort sort2 = new Sort(Direction.ASC, "gkjyr");
|
|
|
+ list.addAll(service.findAll(spec,sort2)) ;
|
|
|
}
|
|
|
bc.setResult(list);
|
|
|
return bc;
|
|
@@ -629,7 +634,8 @@ public class JyrController extends BaseController {
|
|
|
BaseEntity.RECORD_STATE_DRAFT, Operator.NEQ);
|
|
|
Specification<JyrEntity> spec = SpecificationCreater
|
|
|
.searchByPredicateModels(filterList);
|
|
|
- list = service.findAll(spec);
|
|
|
+ Sort sort2 = new Sort(Direction.ASC, "gkjyr");
|
|
|
+ list.addAll(service.findAll(spec,sort2)) ;
|
|
|
}
|
|
|
bc.setResult(list);
|
|
|
return bc;
|
|
@@ -663,7 +669,9 @@ public class JyrController extends BaseController {
|
|
|
addNotEmptyModel(filterList, "sfwhqy", Constants.YES, Operator.EQ);
|
|
|
Specification<JyrEntity> spec = SpecificationCreater
|
|
|
.searchByPredicateModels(filterList);
|
|
|
- List<JyrEntity> list = service.findAll(spec);
|
|
|
+ List<JyrEntity> list = new ArrayList<JyrEntity>();
|
|
|
+ Sort sort2 = new Sort(Direction.ASC, "gkjyr");
|
|
|
+ list.addAll(service.findAll(spec,sort2)) ;
|
|
|
bc.setResult(list);
|
|
|
return bc;
|
|
|
}
|
|
@@ -685,7 +693,9 @@ public class JyrController extends BaseController {
|
|
|
addNotEmptyModel(filterList, "sfwhqy", Constants.YES, Operator.EQ);
|
|
|
Specification<JyrEntity> spec = SpecificationCreater
|
|
|
.searchByPredicateModels(filterList);
|
|
|
- List<JyrEntity> list = service.findAll(spec);
|
|
|
+ List<JyrEntity> list = new ArrayList<JyrEntity>();
|
|
|
+ Sort sort2 = new Sort(Direction.ASC, "gkjyr");
|
|
|
+ list.addAll(service.findAll(spec,sort2)) ;
|
|
|
bc.setResult(list);
|
|
|
return bc;
|
|
|
}
|