|
@@ -930,17 +930,16 @@ public class PlanNewController {
|
|
|
* @return {@link Mono}<{@link RStatus}<{@link Paged}<{@link PlanNew}>>>
|
|
* @return {@link Mono}<{@link RStatus}<{@link Paged}<{@link PlanNew}>>>
|
|
|
*/
|
|
*/
|
|
|
@PostMapping("planSelectSelf")
|
|
@PostMapping("planSelectSelf")
|
|
|
- public Mono<RStatus<List<PlanNew>>> planSelectSelf(@RequestBody PosterTemSelectSelf request) {
|
|
|
|
|
|
|
+ public Mono<RStatus<List<SelectPlanRes1>>> planSelectSelf(@RequestBody PosterTemSelectSelf request) {
|
|
|
|
|
|
|
|
if (Objects.isNull(request.getUserId())) {
|
|
if (Objects.isNull(request.getUserId())) {
|
|
|
request.setUserId(BaseContextHandler.getUserId());
|
|
request.setUserId(BaseContextHandler.getUserId());
|
|
|
}
|
|
}
|
|
|
Criteria criteria = Criteria.where("create_id").is(request.getUserId()); // poster_template_id
|
|
Criteria criteria = Criteria.where("create_id").is(request.getUserId()); // poster_template_id
|
|
|
- if (Objects.nonNull(request.getName()) && "" != request.getName()) {
|
|
|
|
|
|
|
+ if (Objects.nonNull(request.getName()) && !request.getName().isEmpty()) {
|
|
|
criteria = criteria.and("name").like("%" + request.getName() + "%");
|
|
criteria = criteria.and("name").like("%" + request.getName() + "%");
|
|
|
}
|
|
}
|
|
|
- Mono<List<PlanNew>> listMono = template.select(Query.query(criteria), PlanNew.class).collectList();
|
|
|
|
|
- return RStatus.successList(listMono);
|
|
|
|
|
|
|
+ return getPlanSelect(criteria);
|
|
|
}
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
@@ -956,6 +955,10 @@ public class PlanNewController {
|
|
|
if (Objects.nonNull(request.getName()) && "" != request.getName()) {
|
|
if (Objects.nonNull(request.getName()) && "" != request.getName()) {
|
|
|
criteria = criteria.and("name").is(request.getName());
|
|
criteria = criteria.and("name").is(request.getName());
|
|
|
}
|
|
}
|
|
|
|
|
+ return getPlanSelect(criteria);
|
|
|
|
|
+ }
|
|
|
|
|
+
|
|
|
|
|
+ private Mono<RStatus<List<SelectPlanRes1>>> getPlanSelect( Criteria criteria) {
|
|
|
Mono<List<SelectPlanRes1>> listMono = template.select(Query.query(criteria), PlanNew.class).flatMap(fm -> {
|
|
Mono<List<SelectPlanRes1>> listMono = template.select(Query.query(criteria), PlanNew.class).flatMap(fm -> {
|
|
|
SelectPlanRes1 selectPlanRes1 = new SelectPlanRes1();
|
|
SelectPlanRes1 selectPlanRes1 = new SelectPlanRes1();
|
|
|
selectPlanRes1.setName(fm.name());
|
|
selectPlanRes1.setName(fm.name());
|