Shanks 7 lat temu
rodzic
commit
804dddb71d

+ 4 - 1
.gitignore

@@ -22,4 +22,7 @@ build/
 nbbuild/
 dist/
 nbdist/
-.nb-gradle/
+.nb-gradle/
+.mvn
+*.log
+mvn*

+ 6 - 0
src/main/java/com/ygj/yuemum/controller/admin/TrainController.java

@@ -7,6 +7,7 @@ import com.ygj.yuemum.service.admin.TrainService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 
+import java.util.List;
 import java.util.Map;
 
 @RestController
@@ -22,6 +23,11 @@ public class TrainController {
         return jso;
     }
 
+    @GetMapping("/getAllTrains")
+    public List<Train> getAllTrains() {
+            return trainService.getAllTrains();
+    }
+
     @PostMapping("/addTrain")
     public int add(@ModelAttribute Train train) {
         return trainService.addTrain(train);

+ 2 - 2
src/main/java/com/ygj/yuemum/controller/maternitymatron/JlServiceUserController.java

@@ -94,6 +94,6 @@ public class JlServiceUserController {
     @PostMapping("/updatejlServiceUser")
     public int update(@ModelAttribute JlServiceUser jlServiceUser) { return jlServiceUserService.updateJlServiceUser(jlServiceUser);}
 
-    @GetMapping("/getjlServiceUser/{id}")
-    public JlServiceUser getOne(@PathVariable("id") Integer id) {return  jlServiceUserService.getJlServiceUser(id);}
+    @GetMapping("/getjlServiceUser")
+    public JlServiceUser getOne(@RequestParam("id") Integer id) {return  jlServiceUserService.getJlServiceUser(id);}
 }

+ 4 - 1
src/main/java/com/ygj/yuemum/service/admin/TrainService.java

@@ -25,7 +25,10 @@ public class TrainService {
         tableData.put("total", count);
         return tableData;
     }
-
+    public List<Train> getAllTrains() {
+        List<Train> trains = trainDao.getAll();
+        return trains;
+    }
     public int addTrain(Train train) {
         return trainDao.insertSelective(train);
     }

+ 0 - 2
src/main/java/com/ygj/yuemum/service/maternitymatron/JlServiceUserService.java

@@ -37,7 +37,6 @@ public class JlServiceUserService {
         tableData.put("total", count);
         return tableData;
     }
-
     public Map<String, Object> queryMMList(QueryServiceUser queryServiceUser) {
         PageHelper.startPage(queryServiceUser.getPage(), queryServiceUser.getLimit());
         List<QueryServiceUser> mmlists = jlServiceUserDao.queryMMList(queryServiceUser);
@@ -47,7 +46,6 @@ public class JlServiceUserService {
         tableData.put("total", count);
         return tableData;
     }
-
     public int getPMId() {
         return jlServiceUserDao.getpmid();
     }