From a49686ae25f3fc71306a1fd9ed117e8ca89da65b Mon Sep 17 00:00:00 2001
From: guoyuji <guoyujie@ng.com>
Date: 星期五, 27 九月 2024 08:42:18 +0800
Subject: [PATCH] Merge branch 'master' of http://10.153.19.25:10101/r/ERP_override
---
north-glass-erp/src/main/java/com/example/erp/controller/sd/BasicGlassTypeController.java | 31 ++++++++++++++++++++++++++-----
1 files changed, 26 insertions(+), 5 deletions(-)
diff --git a/north-glass-erp/src/main/java/com/example/erp/controller/sd/BasicGlassTypeController.java b/north-glass-erp/src/main/java/com/example/erp/controller/sd/BasicGlassTypeController.java
index 36b9848..e05c8fd 100644
--- a/north-glass-erp/src/main/java/com/example/erp/controller/sd/BasicGlassTypeController.java
+++ b/north-glass-erp/src/main/java/com/example/erp/controller/sd/BasicGlassTypeController.java
@@ -1,17 +1,17 @@
package com.example.erp.controller.sd;
import com.example.erp.common.Result;
-import com.example.erp.service.sd.BasicGlassTypeServise;
+import com.example.erp.service.sd.BasicGlassTypeService;
import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
+import org.springframework.web.bind.annotation.*;
+
+import java.util.Map;
@RestController
@RequestMapping("/basicGlassType")
public class BasicGlassTypeController {
@Autowired
- BasicGlassTypeServise basicGlassTypeServise;
+ BasicGlassTypeService basicGlassTypeServise;
@GetMapping("/getOneLevel")
public Result getOneLevel(){
@@ -26,4 +26,25 @@
public Result getAll(){
return Result.seccess(basicGlassTypeServise.getAll());
}
+
+ @GetMapping("/findAll")
+ public Result findAll(){
+ return Result.seccess(basicGlassTypeServise.findAll());
+ }
+
+ @GetMapping("/deleteById/{id}")
+ public Result deleteById(@PathVariable Integer id){
+ return Result.seccess(basicGlassTypeServise.deleteById(id));
+ }
+
+ @GetMapping("/getOneLevelListMap")
+ public Result getOneLevelListMap(){
+ return Result.seccess(basicGlassTypeServise.getOneLevelListMap());
+ }
+
+ @PostMapping("/add")
+ public Result add(@RequestBody Map<String,Object> map){
+ return Result.seccess(basicGlassTypeServise.add(map));
+ }
+
}
--
Gitblit v1.8.0