diff --git a/op-modules/op-technology/src/main/java/com/op/technology/controller/ProProcessController.java b/op-modules/op-technology/src/main/java/com/op/technology/controller/ProProcessController.java index c263ecdc5..422d8fbac 100644 --- a/op-modules/op-technology/src/main/java/com/op/technology/controller/ProProcessController.java +++ b/op-modules/op-technology/src/main/java/com/op/technology/controller/ProProcessController.java @@ -171,7 +171,6 @@ public class ProProcessController extends BaseController { */ @GetMapping("/getWorkCenterList") public TableDataInfo getWorkCenterList(SysFactory sysFactory) { - startPage(); List list = proProcessService.getWorkCenterList(sysFactory); return getDataTable(list); } @@ -181,9 +180,8 @@ public class ProProcessController extends BaseController { */ @GetMapping("/getEquipmentTypeList") - public TableDataInfo getEquipmentTypeList(Equipment equipment) { - startPage(); + public AjaxResult getEquipmentTypeList(Equipment equipment) { List list = proProcessService.getEquipmentTypeList(equipment); - return getDataTable(list); + return success(list); } } diff --git a/op-modules/op-technology/src/main/resources/mapper/technology/ProProcessMapper.xml b/op-modules/op-technology/src/main/resources/mapper/technology/ProProcessMapper.xml index dc3a4fa46..613ee60b9 100644 --- a/op-modules/op-technology/src/main/resources/mapper/technology/ProProcessMapper.xml +++ b/op-modules/op-technology/src/main/resources/mapper/technology/ProProcessMapper.xml @@ -324,6 +324,7 @@ from base_equipment where del_flag = '0' group by equipment_type_code,equipment_type_name + order by equipment_type_name desc