From 2b0dc519ddc4fefcabc7f60dcda4968964155e11 Mon Sep 17 00:00:00 2001
From: zouyu <2723363702@qq.com>
Date: 星期五, 17 十一月 2023 16:45:43 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
mes-basic/src/main/java/com/chinaztt/mes/basic/controller/FactoryController.java | 11 +++++++++++
1 files changed, 11 insertions(+), 0 deletions(-)
diff --git a/mes-basic/src/main/java/com/chinaztt/mes/basic/controller/FactoryController.java b/mes-basic/src/main/java/com/chinaztt/mes/basic/controller/FactoryController.java
index f3144d2..e81da0c 100644
--- a/mes-basic/src/main/java/com/chinaztt/mes/basic/controller/FactoryController.java
+++ b/mes-basic/src/main/java/com/chinaztt/mes/basic/controller/FactoryController.java
@@ -64,6 +64,15 @@
return R.ok(factoryService.getFactoryPage(page, QueryWrapperUtil.gen(factory)));
}
+ /**
+ * 鏍规嵁鍏徃鏌ヨ宸ュ巶
+ * @param id
+ * @return
+ */
+ @GetMapping("/byCompanyId")
+ public R getFactoryByCompany(@RequestParam("id") Long id){
+ return R.ok(factoryService.getByCompanyId(id));
+ }
/**
* 閫氳繃id鏌ヨ宸ュ巶
@@ -166,4 +175,6 @@
public List<Factory> loadFactory() {
return factoryService.list();
}
+
+
}
--
Gitblit v1.9.3