diff --git a/src/main/java/com/peanut/modules/common/controller/TrainingClassController.java b/src/main/java/com/peanut/modules/common/controller/TrainingClassController.java index ac7a31fa..c649fb55 100644 --- a/src/main/java/com/peanut/modules/common/controller/TrainingClassController.java +++ b/src/main/java/com/peanut/modules/common/controller/TrainingClassController.java @@ -63,6 +63,7 @@ public class TrainingClassController { List trainingClassList = trainingClassService.list(new LambdaQueryWrapper() .eq(TrainingClass::getDisplayFlag,0) .eq(StringUtils.isNotEmpty(params.get("year").toString()),TrainingClass::getYear,params.get("year")) + .like(params.containsKey("displayApp"),TrainingClass::getDisplayApp,params.get("displayApp")) .orderByDesc(TrainingClass::getSingupFlag) .orderByAsc(TrainingClass::getSort)); for (TrainingClass trainingClass : trainingClassList) { diff --git a/src/main/java/com/peanut/modules/common/entity/TrainingClass.java b/src/main/java/com/peanut/modules/common/entity/TrainingClass.java index 8ea632d9..b38f137e 100644 --- a/src/main/java/com/peanut/modules/common/entity/TrainingClass.java +++ b/src/main/java/com/peanut/modules/common/entity/TrainingClass.java @@ -42,6 +42,9 @@ public class TrainingClass { //上下架 0上架 1下架 private Integer displayFlag; + //可显示App 0疯子读书1国学众妙之门2医学吴门医述3心灵空间4太湖云医 + private String displayApp; + //费用 private BigDecimal fee; diff --git a/src/main/java/com/peanut/modules/master/controller/TrainingClassController.java b/src/main/java/com/peanut/modules/master/controller/TrainingClassController.java index 4452a9a0..0380f94b 100644 --- a/src/main/java/com/peanut/modules/master/controller/TrainingClassController.java +++ b/src/main/java/com/peanut/modules/master/controller/TrainingClassController.java @@ -83,6 +83,7 @@ public class TrainingClassController { wrapper.eq(StringUtils.isNotEmpty(params.get("type").toString()),TrainingClass::getType,params.get("type")); wrapper.like(StringUtils.isNotEmpty(params.get("year").toString()),TrainingClass::getYear,params.get("year")); wrapper.eq(StringUtils.isNotEmpty(params.get("singupFlag").toString()),TrainingClass::getSingupFlag,params.get("singupFlag")); + wrapper.like(StringUtils.isNotEmpty(params.get("displayApp").toString()),TrainingClass::getDisplayApp,params.get("displayApp")); if (StringUtils.isNotEmpty(params.get("trainingDateSort").toString())){ if ("1".equals(params.get("trainingDateSort").toString())){ wrapper.orderByDesc(TrainingClass::getTrainingDate);