diff --git a/src/main/java/com/ai/da/mapper/primary/entity/Library.java b/src/main/java/com/ai/da/mapper/primary/entity/Library.java index fcc8fb8f..94bbe7ad 100644 --- a/src/main/java/com/ai/da/mapper/primary/entity/Library.java +++ b/src/main/java/com/ai/da/mapper/primary/entity/Library.java @@ -47,6 +47,8 @@ public class Library implements Serializable { private String level3Type; + private String ageGroup; + /** * 元素名 */ diff --git a/src/main/java/com/ai/da/model/vo/LibraryUpdateVo.java b/src/main/java/com/ai/da/model/vo/LibraryUpdateVo.java index ba378a97..d135196d 100644 --- a/src/main/java/com/ai/da/model/vo/LibraryUpdateVo.java +++ b/src/main/java/com/ai/da/model/vo/LibraryUpdateVo.java @@ -35,6 +35,9 @@ public class LibraryUpdateVo implements Serializable { @ApiModelProperty("二级类型") private String level2Type; + @ApiModelProperty("年龄段") + private String ageGroup; + @ApiModelProperty("名字") private String name; diff --git a/src/main/java/com/ai/da/service/impl/LibraryServiceImpl.java b/src/main/java/com/ai/da/service/impl/LibraryServiceImpl.java index 438c47fb..c69c01be 100644 --- a/src/main/java/com/ai/da/service/impl/LibraryServiceImpl.java +++ b/src/main/java/com/ai/da/service/impl/LibraryServiceImpl.java @@ -168,7 +168,8 @@ public class LibraryServiceImpl extends ServiceImpl impl } if (!StringUtils.isEmpty(query.getAgeGroup())) { - queryWrapper.eq("level3_type", query.getAgeGroup()); +// queryWrapper.eq("level3_type", query.getAgeGroup()); + queryWrapper.eq("age_group", query.getAgeGroup()); } if (query.getBrandId() != null) { @@ -747,10 +748,11 @@ public class LibraryServiceImpl extends ServiceImpl impl library.setCreateDate(DateUtil.getByTimeZone(uploadDTO.getTimeZone())); if (uploadDTO.getModelType().equals(ModelType.LIBRARY.getValue())) { library.setLevel2Type(uploadDTO.getModelSex()); - library.setLevel3Type(uploadDTO.getAgeGroup()); +// library.setLevel3Type(uploadDTO.getAgeGroup()); } else { library.setLevel3Type(uploadDTO.getModelSex()); } + library.setAgeGroup(uploadDTO.getAgeGroup()); libraryMapper.insert(library); return library; } else if (uploadDTO.getModelType().equals(ModelType.SYSTEM.getValue())) {