|
@@ -8,11 +8,13 @@ import com.huimv.management.dao.YearPigBaseDao;
|
|
import com.huimv.management.entity.*;
|
|
import com.huimv.management.entity.*;
|
|
import com.huimv.management.entity.PastureEntity;
|
|
import com.huimv.management.entity.PastureEntity;
|
|
import com.huimv.management.entity.PastureEntity;
|
|
import com.huimv.management.entity.PastureEntity;
|
|
|
|
+import org.apache.commons.lang3.StringUtils;
|
|
import org.springframework.beans.factory.annotation.Autowired;
|
|
import org.springframework.beans.factory.annotation.Autowired;
|
|
import org.springframework.stereotype.Service;
|
|
import org.springframework.stereotype.Service;
|
|
|
|
|
|
import java.util.List;
|
|
import java.util.List;
|
|
import java.util.Map;
|
|
import java.util.Map;
|
|
|
|
+
|
|
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
|
|
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
|
|
import com.baomidou.mybatisplus.core.metadata.IPage;
|
|
import com.baomidou.mybatisplus.core.metadata.IPage;
|
|
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
|
|
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
|
|
@@ -38,16 +40,11 @@ public class PastureServiceImpl extends ServiceImpl<PastureDao, PastureEntity> i
|
|
|
|
|
|
LambdaQueryWrapper<PastureEntity> lambdaQuery = Wrappers.lambdaQuery();
|
|
LambdaQueryWrapper<PastureEntity> lambdaQuery = Wrappers.lambdaQuery();
|
|
String keywords = (String) params.get("keywords");
|
|
String keywords = (String) params.get("keywords");
|
|
- //没有参数
|
|
|
|
- if (keywords == null || keywords.equals("")){
|
|
|
|
- IPage<PastureEntity> page = this.page(
|
|
|
|
- new Query<PastureEntity>().getPage(params),
|
|
|
|
- new QueryWrapper<PastureEntity>()
|
|
|
|
- );
|
|
|
|
- return new PageUtils(page);
|
|
|
|
|
|
+ //有参数
|
|
|
|
+ if (StringUtils.isNotEmpty(keywords)) {
|
|
|
|
+ lambdaQuery.apply("CONCAT(name,front_location ,manager,build_time) like CONCAT('%',{0},'%')",keywords);
|
|
}
|
|
}
|
|
|
|
|
|
- lambdaQuery.like(PastureEntity::getName,keywords);
|
|
|
|
IPage<PastureEntity> page = page(this.page(
|
|
IPage<PastureEntity> page = page(this.page(
|
|
new Query<PastureEntity>().getPage(params)
|
|
new Query<PastureEntity>().getPage(params)
|
|
), lambdaQuery);
|
|
), lambdaQuery);
|
|
@@ -67,9 +64,9 @@ public class PastureServiceImpl extends ServiceImpl<PastureDao, PastureEntity> i
|
|
public Integer delete(Integer[] ids) {
|
|
public Integer delete(Integer[] ids) {
|
|
LambdaQueryWrapper<PigstyEntity> lambdaQuery = Wrappers.lambdaQuery();
|
|
LambdaQueryWrapper<PigstyEntity> lambdaQuery = Wrappers.lambdaQuery();
|
|
for (Integer id : ids) {
|
|
for (Integer id : ids) {
|
|
- lambdaQuery.eq(PigstyEntity::getPastureId,id);
|
|
|
|
|
|
+ lambdaQuery.eq(PigstyEntity::getPastureId, id);
|
|
List<PigstyEntity> yearPigBaseEntities = pigstyDao.selectList(lambdaQuery);
|
|
List<PigstyEntity> yearPigBaseEntities = pigstyDao.selectList(lambdaQuery);
|
|
- if (yearPigBaseEntities != null && yearPigBaseEntities.size() >0){
|
|
|
|
|
|
+ if (yearPigBaseEntities != null && yearPigBaseEntities.size() > 0) {
|
|
return 2;
|
|
return 2;
|
|
}
|
|
}
|
|
}
|
|
}
|
|
@@ -80,9 +77,9 @@ public class PastureServiceImpl extends ServiceImpl<PastureDao, PastureEntity> i
|
|
@Override
|
|
@Override
|
|
public Boolean findByName(PastureEntity pasture) {
|
|
public Boolean findByName(PastureEntity pasture) {
|
|
LambdaQueryWrapper<PastureEntity> lambdaQuery = Wrappers.lambdaQuery();
|
|
LambdaQueryWrapper<PastureEntity> lambdaQuery = Wrappers.lambdaQuery();
|
|
- lambdaQuery.eq(PastureEntity::getName,pasture.getName());
|
|
|
|
|
|
+ lambdaQuery.eq(PastureEntity::getName, pasture.getName());
|
|
PastureEntity pastureEntity = pastureDao.selectOne(lambdaQuery);
|
|
PastureEntity pastureEntity = pastureDao.selectOne(lambdaQuery);
|
|
- if (pastureEntity == null){
|
|
|
|
|
|
+ if (pastureEntity == null) {
|
|
return true;
|
|
return true;
|
|
}
|
|
}
|
|
return false;
|
|
return false;
|