zm/nuttyreading-java
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/zcc'

Browse Source
This commit is contained in:
wangjinlei
2024-01-15 17:29:48 +08:00
parent dd99620669 ba6e58f954
commit 1682e0390b
2 changed files with 23 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
src/main/java/com/peanut/modules/book/controller/BookController.java
View File

@@ -242,13 +242,15 @@ public class BookController {
public R save(@RequestBody BookEntity book) {
bookService.save(book);
//添加图书类型关系表
String[] types = book.getMedicaldesBookType().split(",");
if (types.length > 0) {
for (int i = 0; i < types.length; i++) {
MedicaldesBook medicaldesBook = new MedicaldesBook();
medicaldesBook.setBookId(book.getId());
medicaldesBook.setTypeId(Integer.parseInt(types[i]));
medicaldesBookService.save(medicaldesBook);
if (StringUtils.isNotEmpty(book.getMedicaldesBookType())){
String[] types = book.getMedicaldesBookType().split(",");
if (types.length > 0) {
for (int i = 0; i < types.length; i++) {
MedicaldesBook medicaldesBook = new MedicaldesBook();
medicaldesBook.setBookId(book.getId());
medicaldesBook.setTypeId(Integer.parseInt(types[i]));
medicaldesBookService.save(medicaldesBook);
}
}
}
return R.ok();
@@ -302,7 +304,7 @@ public class BookController {
}
}
//再添加
if (book.getMedicaldesBookType()!=null){
if (StringUtils.isNotEmpty(book.getMedicaldesBookType())){
String[] types = book.getMedicaldesBookType().split(",");
if (types.length > 0) {
for (int i = 0; i < types.length; i++) {

13
src/main/java/com/peanut/modules/book/controller/MedicaldesController.java
View File

@@ -50,6 +50,17 @@ public class MedicaldesController {
return R.ok().put("result",sysDictDataService.list(wrapper));
}
/**
* 书列表
*/
@RequestMapping(path = "/bookList")
public R bookList() {
LambdaQueryWrapper<BookEntity> wrapper = new LambdaQueryWrapper();
wrapper.eq(BookEntity::getBookType,0);
wrapper.orderByDesc(BookEntity::getCreateTime);
return R.ok().put("result",bookService.list(wrapper));
}
/**
* 专著出版关系列表
*/
@@ -58,6 +69,7 @@ public class MedicaldesController {
MPJLambdaWrapper<MedicaldesBook> wrapper = new MPJLambdaWrapper();
wrapper.selectAll(MedicaldesBook.class);
wrapper.leftJoin(BookEntity.class,BookEntity::getId,MedicaldesBook::getBookId);
wrapper.eq(BookEntity::getBookType,0);
if (map.containsKey("dictType")&&StringUtils.isNotEmpty(map.get("dictType").toString())){
wrapper.eq(MedicaldesBook::getTypeId,map.get("dictType"));
}
@@ -86,6 +98,7 @@ public class MedicaldesController {
wrapper.selectAll(BookEntity.class);
wrapper.leftJoin(MedicaldesBook.class,MedicaldesBook::getBookId,BookEntity::getId);
wrapper.eq(MedicaldesBook::getTypeId,type);
wrapper.eq(BookEntity::getBookType,0);
wrapper.orderByAsc(MedicaldesBook::getSort);
List<BookEntity> list = bookService.list(wrapper);
return R.ok().put("result", list);