Merge remote-tracking branch 'origin/master'
This commit is contained in:
commit
b2882d58e1
@ -39,14 +39,20 @@ public class EngineReviewListServiceImpl implements EngineReviewListService {
|
||||
Integer page = engineReviewListRequest.getPage();
|
||||
Integer size = engineReviewListRequest.getSize();
|
||||
PageQueryResult<EngineReviewListPojo> engineReviewListPojoPageQueryResult = sw.buildFromDatasource("xdap_app_223770822127386625")
|
||||
// .like("model_name", engineReviewListRequest.getModelName())
|
||||
// .like("process_topic", engineReviewListRequest.getProcessTopic())
|
||||
// .like("subsystem_name", engineReviewListRequest.getSubsystemName())
|
||||
// .like("status_description", engineReviewListRequest.getStatusDescription())
|
||||
// .eq("yc_or_oth", engineReviewListRequest.getYcOrOth())
|
||||
// .eq("applicant", engineReviewListRequest.getUserID())
|
||||
// .conjuctionOr()
|
||||
// .like("approver_persons",engineReviewListRequest.getUserID() )
|
||||
.like("model_name", engineReviewListRequest.getModelName())
|
||||
.like("process_topic", engineReviewListRequest.getProcessTopic())
|
||||
.like("subsystem_name", engineReviewListRequest.getSubsystemName())
|
||||
.like("status_description", engineReviewListRequest.getStatusDescription())
|
||||
.eq("yc_or_oth", engineReviewListRequest.getYcOrOth())
|
||||
.eq("applicant", engineReviewListRequest.getUserID())
|
||||
.conjuctionOr()
|
||||
.like("approver_persons",engineReviewListRequest.getUserID() )
|
||||
.eq("yc_or_oth", engineReviewListRequest.getYcOrOth())
|
||||
.doPageQuery(page, size, EngineReviewListPojo.class);
|
||||
|
||||
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user