diff --git a/src/main/java/com/zoo/controller/ArchiveController.java b/src/main/java/com/zoo/controller/ArchiveController.java index ed2bcf8..d8d2fd5 100644 --- a/src/main/java/com/zoo/controller/ArchiveController.java +++ b/src/main/java/com/zoo/controller/ArchiveController.java @@ -5,7 +5,9 @@ package com.zoo.controller; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.zoo.common.R; import com.zoo.entity.Archive; +import com.zoo.entity.Breedingplan; import com.zoo.service.IArchiveService; +import com.zoo.service.IBreedingplanService; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.*; @@ -25,6 +27,8 @@ public class ArchiveController { @Autowired IArchiveService iArchiveService; + @Autowired + IBreedingplanService iBreedingplanService; @GetMapping("info") public R info(Integer id,Integer animallId){ QueryWrapper queryWrapper = new QueryWrapper<>(); @@ -70,4 +74,11 @@ public class ArchiveController { } return R.error("删除失败"); } + + @GetMapping("/selectByBreedingId") + public R selectByBreedingId(Integer breedingId){ + QueryWrapper queryWrapper = new QueryWrapper<>(); + queryWrapper.eq("breeding_id",breedingId); + return R.success(iArchiveService.list(queryWrapper)); + } } diff --git a/src/main/java/com/zoo/controller/BreedingplanController.java b/src/main/java/com/zoo/controller/BreedingplanController.java index 3f12e75..aa90e15 100644 --- a/src/main/java/com/zoo/controller/BreedingplanController.java +++ b/src/main/java/com/zoo/controller/BreedingplanController.java @@ -3,6 +3,7 @@ package com.zoo.controller; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.zoo.common.R; import com.zoo.entity.Breedingplan; +import com.zoo.service.IArchiveService; import com.zoo.service.IBreedingplanService; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.*; @@ -14,6 +15,8 @@ import java.util.List; public class BreedingplanController { @Autowired IBreedingplanService iBreedingplanService; + + @GetMapping("/info") public R info(Integer id){ if (id != null){ @@ -54,4 +57,6 @@ public class BreedingplanController { } return R.error("删除失败"); } + + } diff --git a/src/main/java/com/zoo/entity/Archive.java b/src/main/java/com/zoo/entity/Archive.java index 7784007..597cea6 100644 --- a/src/main/java/com/zoo/entity/Archive.java +++ b/src/main/java/com/zoo/entity/Archive.java @@ -68,6 +68,14 @@ public class Archive implements Serializable { */ private String description; + + + /** + * 关联的饲养计划id + * @return + */ + private Integer breedingId; + public Integer getId() { return id; } @@ -79,6 +87,14 @@ public class Archive implements Serializable { return animallId; } + public Integer getBreedingId() { + return breedingId; + } + + public void setBreedingId(Integer breedingId) { + this.breedingId = breedingId; + } + public void setAnimallId(Integer animallId) { this.animallId = animallId; } @@ -152,6 +168,7 @@ public class Archive implements Serializable { ", time=" + time + ", roleId=" + roleId + ", description=" + description + + ",breedingId="+breedingId+ "}"; } } diff --git a/target/classes/com/zoo/controller/ArchiveController.class b/target/classes/com/zoo/controller/ArchiveController.class index 1b71295..1c58688 100644 Binary files a/target/classes/com/zoo/controller/ArchiveController.class and b/target/classes/com/zoo/controller/ArchiveController.class differ