diff --git a/shgx-moldmanagement/src/main/java/com/shgx/moldmanagement/domain/dto/MachineQueryDTO.java b/shgx-moldmanagement/src/main/java/com/shgx/moldmanagement/domain/dto/MachineQueryDTO.java index 2661f0a..f54385b 100644 --- a/shgx-moldmanagement/src/main/java/com/shgx/moldmanagement/domain/dto/MachineQueryDTO.java +++ b/shgx-moldmanagement/src/main/java/com/shgx/moldmanagement/domain/dto/MachineQueryDTO.java @@ -6,5 +6,5 @@ import lombok.Data; @Data public class MachineQueryDTO { private String machineName; - private String machineLocation; + private String machineCode; } diff --git a/shgx-moldmanagement/src/main/java/com/shgx/moldmanagement/service/impl/MoldInjectionMachineServiceImpl.java b/shgx-moldmanagement/src/main/java/com/shgx/moldmanagement/service/impl/MoldInjectionMachineServiceImpl.java index 547ce2c..be2efa2 100644 --- a/shgx-moldmanagement/src/main/java/com/shgx/moldmanagement/service/impl/MoldInjectionMachineServiceImpl.java +++ b/shgx-moldmanagement/src/main/java/com/shgx/moldmanagement/service/impl/MoldInjectionMachineServiceImpl.java @@ -111,12 +111,12 @@ public class MoldInjectionMachineServiceImpl implements IMoldInjectionMachineSer */ @Override public List selectMoldInjectionMachineLocationList() { - List list = moldInjectionMachineMapper.selectList(new LambdaQueryWrapper().select(MoldInjectionMachine::getMachineLocation)); + List list = moldInjectionMachineMapper.selectList(new LambdaQueryWrapper().select(MoldInjectionMachine::getInjectionMachineName)); List queryList = new ArrayList<>(); for (MoldInjectionMachine item : list) { MachineQueryDTO machineQueryDTO = new MachineQueryDTO(); - machineQueryDTO.setMachineName(item.getMachineLocation()); - machineQueryDTO.setMachineLocation(item.getMachineLocation()); + machineQueryDTO.setMachineName(item.getInjectionMachineName()); + machineQueryDTO.setMachineCode(item.getInjectionMachineCode()); queryList.add(machineQueryDTO); } return queryList;