Merge branch 'feature/listBookClassify' into 'master'

feat: [none] listBookClassify添加字段

See merge request rays/pcloud-book!912

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

@@ -692,6 +692,73 @@ public class BookDto extends BaseDto {
 
     private String adviserPwd;
 
+    /**
+     * 是否开启小睿流程
+     */
+    private Boolean openWeapp;
+    /**
+     * 年级标签
+     */
+    private String graLabelName;
+
+    /**
+     * 科目标签
+     */
+    private String subLabelName;
+
+    /**
+     * 版本标签
+     */
+    private String verLabelName;
+
+    /**
+     * 地域标签
+     */
+    private String areaLabelName;
+    /**
+     * 上下册标签
+     */
+    private String volLabelName;
+
+    public String getGraLabelName() {
+        return graLabelName;
+    }
+
+    public void setGraLabelName(String graLabelName) {
+        this.graLabelName = graLabelName;
+    }
+
+    public String getSubLabelName() {
+        return subLabelName;
+    }
+
+    public void setSubLabelName(String subLabelName) {
+        this.subLabelName = subLabelName;
+    }
+
+    public String getVerLabelName() {
+        return verLabelName;
+    }
+
+    public void setVerLabelName(String verLabelName) {
+        this.verLabelName = verLabelName;
+    }
+
+    public String getAreaLabelName() {
+        return areaLabelName;
+    }
+
+    public void setAreaLabelName(String areaLabelName) {
+        this.areaLabelName = areaLabelName;
+    }
+
+    public String getVolLabelName() {
+        return volLabelName;
+    }
+
+    public void setVolLabelName(String volLabelName) {
+        this.volLabelName = volLabelName;
+    }
 
     public String getBookUniqueNumber() {
         return bookUniqueNumber;
@@ -725,11 +792,6 @@ public class BookDto extends BaseDto {
         this.singleGroup = singleGroup;
     }
 
-    /**
-     * 是否开启小睿流程
-     */
-    private Boolean openWeapp;
-
     public Boolean getOpenWeapp() {
         return openWeapp;
     }
@@ -2015,7 +2077,18 @@ public class BookDto extends BaseDto {
                 ", isOpenRobotProcess=" + isOpenRobotProcess +
                 ", classifyId=" + classifyId +
                 ", volLabelId=" + volLabelId +
+                ", singleGroup=" + singleGroup +
+                ", relatedBookGroupId=" + relatedBookGroupId +
+                ", relatedBookGroup=" + relatedBookGroup +
+                ", bookUniqueNumber='" + bookUniqueNumber + '\'' +
+                ", adviserAccount='" + adviserAccount + '\'' +
+                ", adviserPwd='" + adviserPwd + '\'' +
                 ", openWeapp=" + openWeapp +
+                ", graLabelName=" + graLabelName +
+                ", subLabelName=" + subLabelName +
+                ", verLabelName=" + verLabelName +
+                ", areaLabelName=" + areaLabelName +
+                ", volLabelName=" + volLabelName +
                 '}';
     }
 }

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

@@ -1351,7 +1351,7 @@ public class BookBizImpl implements BookBiz {
             // 设置图书读者量、扫码量、浏览量
             bookSet.setBookSvUvPv4Object(pageBean.getRecordList());
             // 设置书刊分类
-            bookSet.setTemplateName(pageBean.getRecordList());
+            bookSet.setTemplateNameNew(pageBean.getRecordList());
             // 设置运营平台名称
             bookSet.setChannelInfoList(pageBean.getRecordList());
             // 设置出版社名称

pcloud-service-book/src/main/java/com/pcloud/book/book/set/BookSet.java

@@ -1792,4 +1792,33 @@ public class BookSet {
         }
         LOGGER.info("设置编辑登陆信息【END】");
     }
+
+    public void setTemplateNameNew(List<Object> objects) {
+        if (ListUtils.isEmpty(objects)){
+            return;
+        }
+        List<Long> classifyIds = new ArrayList<>();
+        for (Object object : objects){
+            BookDto bookDto = (BookDto) object;
+            if (null!=bookDto.getTempletId() && !classifyIds.contains(bookDto.getTempletId())) {
+                classifyIds.add(bookDto.getTempletId());
+            }
+            if (null!=bookDto.getSecondTempletId() && !classifyIds.contains(bookDto.getSecondTempletId())) {
+                classifyIds.add(bookDto.getSecondTempletId());
+            }
+        }
+        Map<Long, AssistTempletDTO> classifyMap = new HashMap<>();
+        if (!ListUtils.isEmpty(classifyIds)){
+            classifyMap = assistTempletConsr.mapByIds4Classify(classifyIds);
+        }
+        for (Object object : objects){
+            BookDto bookDto = (BookDto) object;
+            if (!MapUtils.isEmpty(classifyMap) && classifyMap.containsKey(bookDto.getTempletId())){
+                bookDto.setTempletName(classifyMap.get(bookDto.getTempletId()).getTempletName());
+            }
+            if (!MapUtils.isEmpty(classifyMap) && classifyMap.containsKey(bookDto.getSecondTempletId())){
+                bookDto.setSecondTempletName(classifyMap.get(bookDto.getSecondTempletId()).getTempletName());
+            }
+        }
+    }
 }

pcloud-service-book/src/main/resources/mapper/book/Book.Mapper.xml

@@ -1317,7 +1317,9 @@
 		SELECT
 			b.BOOK_ID, b.BOOK_NAME, b.COVER_IMG, b.ISBN,b.SERIAL_NUMBER, b.PUBLISH,
 			ba.ADVISER_ID, ba.TEMPLET_ID, ba.CHANNEL_ID, ba.CREATED_DATE,
-			bt.TYPE_NAME, ba.IS_PRINT isPrint
+			bt.TYPE_NAME, ba.IS_PRINT isPrint,
+		    ba.SECOND_TEMPLET_ID, ba.GRA_LABEL_ID,ba.SUB_LABEL_ID,ba.VER_LABEL_ID,ba.AREA_LABEL_ID,ba.vol_label_id,
+		    la1.`name` graLabelName,la2.`name` subLabelName,la3.`name` verLabelName,la4.`name` areaLabelName,la5.`name` volLabelName
 		FROM
 			BOOK_ADVISER ba
 		JOIN
@@ -1328,6 +1330,11 @@
 			BOOK_TYPE bt
 		ON
 			b.TYPE_CODE = bt.TYPE_CODE
+		LEFT JOIN book_label la1 ON ba.GRA_LABEL_ID=la1.id AND la1.type=1
+		LEFT JOIN book_label la2 ON ba.SUB_LABEL_ID=la2.id AND la2.type=2
+		LEFT JOIN book_label la3 ON ba.VER_LABEL_ID=la3.id AND la3.type=3
+		LEFT JOIN book_label la4 ON ba.AREA_LABEL_ID=la4.id AND la4.type=4
+		LEFT JOIN book_label la5 ON ba.vol_label_id=la5.id AND la5.type=5
 		WHERE
 			ba.IS_DELETE = 0
 		AND