|
|
@@ -22,6 +22,7 @@ import org.springframework.stereotype.Service;
|
|
|
import org.springframework.transaction.annotation.Transactional;
|
|
|
|
|
|
import java.util.ArrayList;
|
|
|
+import java.util.Comparator;
|
|
|
import java.util.List;
|
|
|
import java.util.Map;
|
|
|
import java.util.stream.Collectors;
|
|
|
@@ -114,6 +115,7 @@ public class BasePigpenServiceImpl extends ServiceImpl<BasePigpenMapper, BasePig
|
|
|
queryWrapper.like(StringUtils.isNotBlank(buildName),"build_name", buildName);
|
|
|
queryWrapper.like(StringUtils.isNotBlank(stageCode),"stage_code", stageCode);
|
|
|
queryWrapper.eq(StringUtils.isNotBlank(farmCode),"farm_id", farmCode);
|
|
|
+ queryWrapper.orderByAsc("sort");
|
|
|
//创建排序
|
|
|
List<BasePigpen> basePigpens = basePigpenMapper.selectList(queryWrapper);
|
|
|
//将结果List改为树
|
