|
@@ -28,6 +28,8 @@ import java.util.Date;
|
|
|
import java.util.List;
|
|
|
import java.util.Set;
|
|
|
|
|
|
+import static com.alibaba.druid.sql.visitor.SQLEvalVisitorUtils.like;
|
|
|
+
|
|
|
@Service
|
|
|
public class HappyEntryServiceImpl extends SysServiceImpl<HappyEntryMapper, HappyEntry> implements HappyEntryService{
|
|
|
|
|
@@ -38,6 +40,8 @@ public class HappyEntryServiceImpl extends SysServiceImpl<HappyEntryMapper, Hap
|
|
|
@Transactional
|
|
|
public HappyEntryVo addHappyEntry(AddHappyEntryDto happyEntryDto) {
|
|
|
|
|
|
+
|
|
|
+
|
|
|
Assert.isTrue(ObjectUtil.isNotEmpty(happyEntryDto),"参数不能为空");
|
|
|
HappyEntry entity = BeanUtil.copyProperties(happyEntryDto, HappyEntry.class);
|
|
|
boolean save = this.save(entity);
|
|
@@ -68,7 +72,8 @@ public class HappyEntryServiceImpl extends SysServiceImpl<HappyEntryMapper, Hap
|
|
|
entry.setAreaCode(happyEntryDto.getAreaCode());
|
|
|
entry.setEmail(happyEntryDto.getEmail());
|
|
|
entry.setCourseType(happyEntryDto.getCourseType());
|
|
|
- entry.setAge(happyEntryDto.getAge());
|
|
|
+ entry.setMinAge(happyEntryDto.getMinAge());
|
|
|
+ entry.setMaxAge(happyEntryDto.getMaxAge());
|
|
|
entry.setUpdateTime(new Date());
|
|
|
EduTenantPO principal = (EduTenantPO) SecurityContextHolder.getContext().getAuthentication().getPrincipal();
|
|
|
entry.setUpdateUserId(principal.getId().toString());
|
|
@@ -101,6 +106,11 @@ public class HappyEntryServiceImpl extends SysServiceImpl<HappyEntryMapper, Hap
|
|
|
LambdaQueryWrapper<HappyEntry> queryWrapper = new LambdaQueryWrapper<HappyEntry>()
|
|
|
.eq(HappyEntry::getDeleteFlag, 0)
|
|
|
.eq(happyEntryDto.getCourseType() != null,HappyEntry::getCourseType, happyEntryDto.getCourseType())
|
|
|
+ .and(happyEntryDto.getMinAge() != null && happyEntryDto.getMaxAge() != null, wrapper ->
|
|
|
+ wrapper
|
|
|
+ .le(HappyEntry::getMinAge, happyEntryDto.getMaxAge())
|
|
|
+ .ge(HappyEntry::getMaxAge, happyEntryDto.getMinAge())
|
|
|
+ )
|
|
|
.like(happyEntryDto.getSurname() != null, HappyEntry::getSurname, happyEntryDto.getSurname())
|
|
|
.like(happyEntryDto.getName() != null && !happyEntryDto.getName().isEmpty(), HappyEntry::getName, happyEntryDto.getName())
|
|
|
.like(happyEntryDto.getEmail() != null && !happyEntryDto.getEmail().isEmpty(), HappyEntry::getEmail, happyEntryDto.getEmail())
|