@@ -10,7 +10,7 @@ import java.util.Objects; | |||||
* 语种表 | * 语种表 | ||||
*/ | */ | ||||
@Data | @Data | ||||
public class VoiceLanguage implements Comparable { | |||||
public class VoiceLanguage { | |||||
/** | /** | ||||
* 主键ID | * 主键ID | ||||
@@ -40,6 +40,10 @@ public class VoiceLanguage implements Comparable { | |||||
* | * | ||||
*/ | */ | ||||
private String name; | private String name; | ||||
/** | |||||
* | |||||
*/ | |||||
private String Cname; | |||||
/** | /** | ||||
* 图片 | * 图片 | ||||
*/ | */ | ||||
@@ -57,19 +61,4 @@ public class VoiceLanguage implements Comparable { | |||||
*/ | */ | ||||
private Integer isDel; | private Integer isDel; | ||||
@Override | |||||
public int compareTo(Object obj) { | |||||
// 判断是否是学生类型 | |||||
if (obj instanceof VoiceLanguage) { | |||||
VoiceLanguage s = (VoiceLanguage) obj; | |||||
// 如果是学生类型,如果学号相等,则不加入Set | |||||
if (Objects.equals(s.getLanguage(), this.getLanguage()) && Objects.equals(s.getCountry(), this.getCountry())) { | |||||
return 0; | |||||
} else { | |||||
return 1; | |||||
} | |||||
} else { | |||||
return 0; | |||||
} | |||||
} | |||||
} | } |
@@ -20,7 +20,7 @@ public class VoiceLanguageServiceImpl implements VoiceLanguageService { | |||||
@Override | @Override | ||||
public List<VoiceLanguage> voiceTotal() { | public List<VoiceLanguage> voiceTotal() { | ||||
List<VoiceLanguage> languages = voiceLanguageMapper.selectList(new LambdaQueryWrapper<VoiceLanguage>().eq(VoiceLanguage::getIsDel, 0).orderByAsc(VoiceLanguage::getName).select(VoiceLanguage::getId, VoiceLanguage::getName, VoiceLanguage::getImg)); | |||||
List<VoiceLanguage> languages = voiceLanguageMapper.selectList(new LambdaQueryWrapper<VoiceLanguage>().eq(VoiceLanguage::getIsDel, 0).orderByAsc(VoiceLanguage::getName).select(VoiceLanguage::getId, VoiceLanguage::getName, VoiceLanguage::getImg, VoiceLanguage::getCname)); | |||||
return CollectionUtils.isEmpty(languages) ? Lists.newArrayList() : languages; | return CollectionUtils.isEmpty(languages) ? Lists.newArrayList() : languages; | ||||
} | } | ||||
} | } |