|
|
|
@ -24,9 +24,7 @@ import org.springframework.web.servlet.ModelAndView; |
|
|
|
|
|
|
|
|
|
import javax.servlet.http.HttpServletRequest; |
|
|
|
|
import javax.servlet.http.HttpServletResponse; |
|
|
|
|
import java.util.Arrays; |
|
|
|
|
import java.util.List; |
|
|
|
|
import java.util.Map; |
|
|
|
|
import java.util.*; |
|
|
|
|
import java.util.stream.Collectors; |
|
|
|
|
import java.util.stream.Stream; |
|
|
|
|
|
|
|
|
@ -68,6 +66,8 @@ public class StationController extends JeecgController<Station, IStationService> |
|
|
|
|
IPage<Station> pageList = stationService.page(page, queryWrapper); |
|
|
|
|
if (!ObjectUtils.isEmpty(pageList.getRecords())) { |
|
|
|
|
List<Station> records = pageList.getRecords(); |
|
|
|
|
//按工位序号顺序排序
|
|
|
|
|
Collections.sort(records, Comparator.comparingInt(Station::getStationNum)); |
|
|
|
|
List<String> ids = records.stream().map(o -> o.getDepartId()).collect(Collectors.toList()); |
|
|
|
|
List<SysDepart> departList = iSysDepartService.list(new LambdaQueryWrapper<SysDepart>().in(SysDepart::getId, ids)); |
|
|
|
|
records.forEach(e -> { |
|
|
|
|