添加饲养计划与档案关联
This commit is contained in:
parent
8d3c862719
commit
3bbeea672d
@ -5,7 +5,9 @@ package com.zoo.controller;
|
|||||||
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
|
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
|
||||||
import com.zoo.common.R;
|
import com.zoo.common.R;
|
||||||
import com.zoo.entity.Archive;
|
import com.zoo.entity.Archive;
|
||||||
|
import com.zoo.entity.Breedingplan;
|
||||||
import com.zoo.service.IArchiveService;
|
import com.zoo.service.IArchiveService;
|
||||||
|
import com.zoo.service.IBreedingplanService;
|
||||||
import org.springframework.beans.factory.annotation.Autowired;
|
import org.springframework.beans.factory.annotation.Autowired;
|
||||||
import org.springframework.web.bind.annotation.*;
|
import org.springframework.web.bind.annotation.*;
|
||||||
|
|
||||||
@ -25,6 +27,8 @@ public class ArchiveController {
|
|||||||
@Autowired
|
@Autowired
|
||||||
IArchiveService iArchiveService;
|
IArchiveService iArchiveService;
|
||||||
|
|
||||||
|
@Autowired
|
||||||
|
IBreedingplanService iBreedingplanService;
|
||||||
@GetMapping("info")
|
@GetMapping("info")
|
||||||
public R info(Integer id,Integer animallId){
|
public R info(Integer id,Integer animallId){
|
||||||
QueryWrapper<Archive> queryWrapper = new QueryWrapper<>();
|
QueryWrapper<Archive> queryWrapper = new QueryWrapper<>();
|
||||||
@ -70,4 +74,11 @@ public class ArchiveController {
|
|||||||
}
|
}
|
||||||
return R.error("删除失败");
|
return R.error("删除失败");
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@GetMapping("/selectByBreedingId")
|
||||||
|
public R selectByBreedingId(Integer breedingId){
|
||||||
|
QueryWrapper<Archive> queryWrapper = new QueryWrapper<>();
|
||||||
|
queryWrapper.eq("breeding_id",breedingId);
|
||||||
|
return R.success(iArchiveService.list(queryWrapper));
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
@ -3,6 +3,7 @@ package com.zoo.controller;
|
|||||||
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
|
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
|
||||||
import com.zoo.common.R;
|
import com.zoo.common.R;
|
||||||
import com.zoo.entity.Breedingplan;
|
import com.zoo.entity.Breedingplan;
|
||||||
|
import com.zoo.service.IArchiveService;
|
||||||
import com.zoo.service.IBreedingplanService;
|
import com.zoo.service.IBreedingplanService;
|
||||||
import org.springframework.beans.factory.annotation.Autowired;
|
import org.springframework.beans.factory.annotation.Autowired;
|
||||||
import org.springframework.web.bind.annotation.*;
|
import org.springframework.web.bind.annotation.*;
|
||||||
@ -14,6 +15,8 @@ import java.util.List;
|
|||||||
public class BreedingplanController {
|
public class BreedingplanController {
|
||||||
@Autowired
|
@Autowired
|
||||||
IBreedingplanService iBreedingplanService;
|
IBreedingplanService iBreedingplanService;
|
||||||
|
|
||||||
|
|
||||||
@GetMapping("/info")
|
@GetMapping("/info")
|
||||||
public R info(Integer id){
|
public R info(Integer id){
|
||||||
if (id != null){
|
if (id != null){
|
||||||
@ -54,4 +57,6 @@ public class BreedingplanController {
|
|||||||
}
|
}
|
||||||
return R.error("删除失败");
|
return R.error("删除失败");
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
}
|
}
|
||||||
|
@ -68,6 +68,14 @@ public class Archive implements Serializable {
|
|||||||
*/
|
*/
|
||||||
private String description;
|
private String description;
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
/**
|
||||||
|
* 关联的饲养计划id
|
||||||
|
* @return
|
||||||
|
*/
|
||||||
|
private Integer breedingId;
|
||||||
|
|
||||||
public Integer getId() {
|
public Integer getId() {
|
||||||
return id;
|
return id;
|
||||||
}
|
}
|
||||||
@ -79,6 +87,14 @@ public class Archive implements Serializable {
|
|||||||
return animallId;
|
return animallId;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
public Integer getBreedingId() {
|
||||||
|
return breedingId;
|
||||||
|
}
|
||||||
|
|
||||||
|
public void setBreedingId(Integer breedingId) {
|
||||||
|
this.breedingId = breedingId;
|
||||||
|
}
|
||||||
|
|
||||||
public void setAnimallId(Integer animallId) {
|
public void setAnimallId(Integer animallId) {
|
||||||
this.animallId = animallId;
|
this.animallId = animallId;
|
||||||
}
|
}
|
||||||
@ -152,6 +168,7 @@ public class Archive implements Serializable {
|
|||||||
", time=" + time +
|
", time=" + time +
|
||||||
", roleId=" + roleId +
|
", roleId=" + roleId +
|
||||||
", description=" + description +
|
", description=" + description +
|
||||||
|
",breedingId="+breedingId+
|
||||||
"}";
|
"}";
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
Binary file not shown.
Loading…
Reference in New Issue
Block a user