车间工位管理-删除逻辑修改 12.8

zhc4dev
zhc077 2 years ago
parent bcae9c7b05
commit 684bbd42e2
  1. 6
      jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/team/controller/StationController.java

@ -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 -> {

Loading…
Cancel
Save