Merge branch 'feature/1003786' into 'master'

feature: [1003786]图书监控

See merge request rays/pcloud-book!1065

pcloud-facade-book/pom.xml

@@ -3,13 +3,13 @@
    <parent>
 		<groupId>com.pcloud.common</groupId>
 		<artifactId>pcloud-book-parent</artifactId>
-		<version>2.1.0-RELEASE</version>
+		<version>2.1.0-SNAPSHOT</version>
 	</parent>
     <modelVersion>4.0.0</modelVersion>
 
 	<groupId>com.pcloud.facade</groupId>
 	<artifactId>pcloud-facade-book</artifactId>
-    <version>2.1.0-RELEASE</version>
+    <version>2.1.0-SNAPSHOT</version>
 	<packaging>jar</packaging>
 
     <name>pcloud-facade-book</name>

pcloud-facade-book/src/main/java/com/pcloud/book/book/dto/BookDto.java

@@ -746,6 +746,7 @@ public class BookDto extends BaseDto {
     @ApiModelProperty("答案订阅状态")
     private Boolean subscribeState;
 
+<<<<<<< HEAD
     @ApiModelProperty("版次")
     private String edition;
 
@@ -757,6 +758,18 @@ public class BookDto extends BaseDto {
         this.edition = edition;
     }
 
+=======
+>>>>>>> d6624c2c31b9ef3ce5d6f2d09aa9106dde275d5f
+    private BookAdviserDto bookAdviserDto;
+
+    public BookAdviserDto getBookAdviserDto() {
+        return bookAdviserDto;
+    }
+
+    public void setBookAdviserDto(BookAdviserDto bookAdviserDto) {
+        this.bookAdviserDto = bookAdviserDto;
+    }
+
     public Boolean getSubscribeState() {
         return subscribeState;
     }

pcloud-service-book/pom.xml

@@ -3,13 +3,13 @@
    <parent>
 		<groupId>com.pcloud.common</groupId>
 		<artifactId>pcloud-book-parent</artifactId>
-		<version>2.1.0-RELEASE</version>
+		<version>2.1.0-SNAPSHOT</version>
 	</parent>
     <modelVersion>4.0.0</modelVersion>
 
 	<groupId>com.pcloud.service</groupId>
 	<artifactId>pcloud-service-book</artifactId>
-	<version>2.1.0-RELEASE</version>
+	<version>2.1.0-SNAPSHOT</version>
 	<packaging>jar</packaging>
 
    <name>pcloud-service-book</name>

pcloud-service-book/src/main/java/com/pcloud/book/book/biz/impl/BookBizImpl.java

@@ -623,9 +623,13 @@ public class BookBizImpl implements BookBiz {
             bookDto = bookDao.getBaseById(bookId);
             BookAdviserDto bookAdviserDto = bookAdviserBiz.getOneMainBook(bookId);
             if (null != bookDto && null != bookAdviserDto) {
+                bookDto.setBookAdviserDto(bookAdviserDto);
                 bookDto.setTempletId(bookAdviserDto.getTempletId());
                 bookSet.setFirstTemplateName(bookDto);
                 adviserId = bookAdviserDto.getAdviserId();
+                if(bookAdviserDto.getGraLabelId()!=null){
+                    bookDto.setGraLabelId(bookAdviserDto.getGraLabelId());
+                }
             }
             if (Objects.nonNull(bookDto)){
                 bookDto.setIsLibraryBook(checkIsLibraryBook(adviserId, bookId) ? 1 : 0);

pom.xml

@@ -5,7 +5,7 @@
 
     <groupId>com.pcloud.common</groupId>
 	<artifactId>pcloud-book-parent</artifactId>
-	<version>2.1.0-RELEASE</version>
+	<version>2.1.0-SNAPSHOT</version>
     <modules>
         <module>pcloud-facade-book</module>
         <module>pcloud-service-book</module>