Merge branch 'hzk' into 'master'

添加字段

See merge request rays/pcloud-book!28

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

@@ -613,6 +613,7 @@
             B.ISBN,
             B.BOOK_NAME,
             B.COVER_IMG,
+			B.SERIAL_NUMBER,
             CONCAT('BK', A.BOOK_ID) uniqueNumber,
 			G.ID book_group_id
         FROM

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

@@ -31,6 +31,7 @@
         <result column="product_id" property="productId" jdbcType="BIGINT"/>
         <result column="product_spec_id" property="productSpecId" jdbcType="BIGINT"/>
         <result column="change_number" property="changeNumber" jdbcType="BIGINT"/>
+        <result column="book_name" property="bookName" jdbcType="VARCHAR"/>
         <result column="book_group_name" property="bookGroupName" jdbcType="VARCHAR"/>
         <result column="book_clock_info_id" property="bookClockInfoId" jdbcType="BIGINT"/>
     </resultMap>
@@ -661,12 +662,13 @@
         bgc.book_id,
         bgc.book_group_id,
         bgc.classify,
-        bg.group_qrcode_name book_group_name
+        b.BOOK_NAME
         FROM
         book_group_classify bgc
-        LEFT JOIN book_group bg ON bgc.book_group_id = bg.id
+        LEFT JOIN book b ON bgc.book_id = b.BOOK_ID
         WHERE
         bgc.create_user = #{adviserId}
+        AND bgc.is_delete= 0
         <if test="classify != null">
             AND bgc.classify LIKE CONCAT('%', #{classify},'%')
         </if>
@@ -678,17 +680,19 @@
         </if>
     </select>
 
-    <!--获取分类名称及对应社群码名称-->
+    <!--获取分类名称及对应社群码名称,书籍名称-->
     <select id="getNameWithBookNameByIds" parameterType="list" resultMap="BaseResultMapDTO">
         SELECT
         bgc.id,
         bgc.book_id,
         bgc.book_group_id,
         bgc.classify,
-        bg.group_qrcode_name book_group_name
+        bg.group_qrcode_name book_group_name,
+        b.book_name
         FROM
         book_group_classify bgc
         LEFT JOIN book_group bg ON bgc.book_group_id = bg.id
+        LEFT JOIN book b ON bgc.book_id = b.book_id
         WHERE bgc.id IN
         <foreach collection="list" open="(" separator="," item="item" close=")">
             ${item}
@@ -702,6 +706,8 @@
         FROM
         book_group_classify
         WHERE
+        is_delete= 0
+        AND
         book_group_id IN
         <foreach collection="list" open="(" close=")" item="item" separator=",">
             ${item}
@@ -715,6 +721,8 @@
         FROM
         book_group_classify
         WHERE
+        is_delete= 0
+        AND
         book_group_id IN
         <foreach collection="list" open="(" close=")" item="item" separator=",">
             ${item}
@@ -737,6 +745,7 @@
         <foreach collection="list" open="(" separator="," item="item" close=")">
             ${item}
         </foreach>
+        AND bgc.IS_DELETE = 0
     </select>
 
 </mapper>
\ No newline at end of file

pcloud-service-book/src/main/resources/mapper/group/BookGroupMapper.xml

@@ -251,6 +251,7 @@
         SELECT
         bg.id,
         bg.book_id,
+        b.book_name,
         bg.group_qrcode_name,
         b.COVER_IMG book_img,
         b.ISBN,