1002702编辑端首页显示小睿机器人优化

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

@@ -468,8 +468,9 @@
 			B.AUTHOR, B.PUBLISH, B.PUBLISH_DATE, B.COVER_IMG, B.ORIGIN_NAME, B.BOOK_PRICE, B.ISSN, B.BOOK_NUM, B.SERIAL_NUMBER,
 			IF(ISNULL(BF.BOOK_FUND_ID),0,1) IS_FUND_SUPPORT,A.TEMPLET_ID, if(G.ID IS NULL, A.LAST_MODIFIED_DATE, G.UPDATE_TIME) LAST_MODIFIED_DATE,
             A.BOOK_ADVISER_ID,I.BOOK_STATUS, CONCAT('BK',A.BOOK_ID) uniqueNumber, if(G.ID IS NULL, 0, 1) isBookGroup, A.IS_PRINT isPrint,
-			G.id BOOK_GROUP_ID, G.group_qrcode_url groupQrcodeUrl,G.group_qrcode_name groupQrcodeName
-		FROM 
+			G.id BOOK_GROUP_ID, G.group_qrcode_url groupQrcodeUrl,G.group_qrcode_name groupQrcodeName,
+			G.join_group_type
+		FROM
 			BOOK_ADVISER A
 	    INNER JOIN BOOK B ON A.BOOK_ID = B.BOOK_ID AND A.ADVISER_ID = #{adviserId} AND A.IS_DELETE = 0 AND B.IS_DELETE = 0
 		LEFT JOIN BOOK_TYPE T ON B.TYPE_CODE = T.TYPE_CODE
@@ -482,7 +483,7 @@
 		<if test="bookId!=null">
 		AND
 			A.BOOK_ID = #{bookId}
-		</if>	
+		</if>
 		<if test="typeCode!=null">
 		AND
 			B.TYPE_CODE = #{typeCode}
@@ -967,10 +968,10 @@
 
 		<!-- 获取书籍列表(编辑) -->
 	<select id="listBook" resultMap="bookMap" parameterType="map">
-		SELECT 
-			A.BOOK_ID, A.CHANNEL_ID, A.ADVISER_ID, A.IS_MAIN_EDITOR, T.TYPE_CODE, T.TYPE_NAME, B.ISBN, B.BOOK_NAME, B.REMARK, 
+		SELECT
+			A.BOOK_ID, A.CHANNEL_ID, A.ADVISER_ID, A.IS_MAIN_EDITOR, T.TYPE_CODE, T.TYPE_NAME, B.ISBN, B.BOOK_NAME, B.REMARK,
 			B.AUTHOR, B.PUBLISH, B.PUBLISH_DATE, B.COVER_IMG, B.ORIGIN_NAME, B.BOOK_PRICE, B.ISSN, B.BOOK_NUM, B.SERIAL_NUMBER,A.TEMPLET_ID
-		FROM 
+		FROM
 			BOOK_ADVISER A
 		INNER JOIN
 			BOOK B
@@ -979,41 +980,41 @@
 		LEFT JOIN
 			BOOK_TYPE T
 		ON
-			B.TYPE_CODE = T.TYPE_CODE 	
+			B.TYPE_CODE = T.TYPE_CODE
 		ORDER BY
 			A.CREATED_DATE DESC
 		LIMIT #{number}
 	</select>
-	
+
 	<!-- 根据名称获取ID -->
 	<select id="getIdsByName" resultType="long" parameterType="string">
-		SELECT 
+		SELECT
 			BOOK_ID
-		FROM 
+		FROM
 			BOOK
 		WHERE
 			BOOK_NAME LIKE '%${_parameter}%'
 	</select>
-	
+
 	<!-- 根据名称获取ID -->
 	<select id="getIdsByNameMap" resultType="long" parameterType="map">
-		SELECT 
+		SELECT
 			A.BOOK_ID
-		FROM 
+		FROM
 			BOOK_ADVISER A
 		INNER JOIN
 			BOOK B
 		ON
 			A.BOOK_ID = B.BOOK_ID AND A.ADVISER_ID = #{adviserId} AND A.IS_DELETE = 0 AND B.IS_DELETE = 0
-		WHERE 
+		WHERE
 			B.BOOK_NAME LIKE CONCAT('%',#{bookName},'%')
 	</select>
-		
+
 	<!-- 图书收益，获取书籍列表(编辑) -->
 	<select id="getList4AdviserProfit" resultMap="bookMap" parameterType="map">
-		SELECT 
+		SELECT
 			A.BOOK_ID, A.CHANNEL_ID, A.ADVISER_ID, B.BOOK_NAME, B.REMARK, B.COVER_IMG,B.ORIGIN_NAME,B.BOOK_PRICE,A.TEMPLET_ID
-		FROM 
+		FROM
 			BOOK_ADVISER A
 		INNER JOIN
 			BOOK B
@@ -1028,24 +1029,24 @@
 		ORDER BY
 			A.CREATED_DATE DESC
 	</select>
-	
+
 	<!--  根据刊物序号获取刊物信息-->
 	<select id="getBySerialNum" resultMap="bookMap" parameterType="string">
-		SELECT 
+		SELECT
 			BOOK_ID, ISBN, TYPE_CODE, BOOK_NAME, AUTHOR,
 			PUBLISH, PUBLISH_DATE, COVER_IMG, AD_IMG, REMARK,ORIGIN_NAME,BOOK_PRICE,ISSN,SERIAL_NUMBER
-		FROM 
+		FROM
 			BOOK
 		WHERE
 			SERIAL_NUMBER = #{_parameter}
 	</select>
-	
+
 	<!--微信管理端获取期刊列表  -->
 	<select id="getJournalPage4Adviser" resultMap="bookMap" parameterType="map">
-		SELECT 
-			A.BOOK_ID, A.CHANNEL_ID, A.ADVISER_ID,A.IS_MAIN_EDITOR,B.ISBN, B.BOOK_NAME, B.REMARK, 
+		SELECT
+			A.BOOK_ID, A.CHANNEL_ID, A.ADVISER_ID,A.IS_MAIN_EDITOR,B.ISBN, B.BOOK_NAME, B.REMARK,
 			B.AUTHOR, B.PUBLISH, B.PUBLISH_DATE, B.COVER_IMG,B.ORIGIN_NAME,B.BOOK_PRICE, B.ISSN,B.SERIAL_NUMBER,A.TEMPLET_ID
-		FROM 
+		FROM
 			BOOK_ADVISER A
 		INNER JOIN
 			BOOK B
@@ -1064,43 +1065,43 @@
 		</if>
 		ORDER BY B.SERIAL_NUMBER DESC
 	</select>
-	
+
 	<!--微信客户端获取书刊列表  -->
 	<select id="listPage4Wechat" resultMap="bookMap" parameterType="map">
-		SELECT 
-			A.BOOK_ID, A.CHANNEL_ID, A.ADVISER_ID,B.ISBN, B.BOOK_NAME, B.REMARK, 
+		SELECT
+			A.BOOK_ID, A.CHANNEL_ID, A.ADVISER_ID,B.ISBN, B.BOOK_NAME, B.REMARK,
 			B.AUTHOR, B.PUBLISH, B.PUBLISH_DATE, B.COVER_IMG,B.ORIGIN_NAME,
 			B.BOOK_PRICE, B.ISSN,B.SERIAL_NUMBER,B.TYPE_CODE,A.TEMPLET_ID
-		FROM 
+		FROM
 			BOOK_ADVISER A
 		INNER JOIN
 			BOOK B
 		ON
 			A.BOOK_ID = B.BOOK_ID AND A.IS_DELETE = 0 AND B.IS_DELETE = 0
-		WHERE		
+		WHERE
 			A.CHANNEL_ID = #{channelId}
-		AND 
+		AND
 		    A.IS_MAIN_EDITOR = 1
 		ORDER BY A.CREATED_DATE DESC
 	</select>
-	
+
 		<!-- 根据ISBN获取图书信息 -->
 	<select id="getDetailByIsbn" resultMap="bookMap" parameterType="map">
-		  SELECT B.BOOK_ID, B.ISBN, B.BOOK_NAME, B.AUTHOR, B.PUBLISH, 
+		  SELECT B.BOOK_ID, B.ISBN, B.BOOK_NAME, B.AUTHOR, B.PUBLISH,
 			B.PUBLISH_DATE, B.COVER_IMG,
 			(
-				SELECT COUNT(1) FROM BOOK_APP WHERE BOOK_ID = B.BOOK_ID  AND IS_DELETE = 0		
-			) APP_COUNT, 
+				SELECT COUNT(1) FROM BOOK_APP WHERE BOOK_ID = B.BOOK_ID  AND IS_DELETE = 0
+			) APP_COUNT,
 			(
-				SELECT COUNT(1) FROM BOOK_PRODUCT WHERE BOOK_ID = B.BOOK_ID 
+				SELECT COUNT(1) FROM BOOK_PRODUCT WHERE BOOK_ID = B.BOOK_ID
 			 ) PRODUCT_COUNT
-		FROM 
+		FROM
 			BOOK B
 		WHERE
 			B.ISBN = #{isbn}
 			<choose>
 			    <when test="serialNumber == null">
-			        AND 
+			        AND
 			        	(B.SERIAL_NUMBER IS NULL OR B.SERIAL_NUMBER = '')
 			    </when>
 			    <otherwise>
@@ -1109,14 +1110,14 @@
 			</choose>
 		LIMIT 1
 	</select>
-	
+
 	<!-- 书刊列表-出版端 -->
 	<select id="listPage4Agent" parameterType="map" resultMap="bookMap">
-		SELECT 
-			A.BOOK_ID, A.CHANNEL_ID, A.ADVISER_ID, A.IS_MAIN_EDITOR, T.TYPE_CODE, T.TYPE_NAME, B.ISBN, B.BOOK_NAME, B.REMARK, 
+		SELECT
+			A.BOOK_ID, A.CHANNEL_ID, A.ADVISER_ID, A.IS_MAIN_EDITOR, T.TYPE_CODE, T.TYPE_NAME, B.ISBN, B.BOOK_NAME, B.REMARK,
 			B.AUTHOR, B.PUBLISH, B.PUBLISH_DATE, B.COVER_IMG, B.ORIGIN_NAME, B.BOOK_PRICE, B.ISSN, B.BOOK_NUM, B.SERIAL_NUMBER,
 			IF(ISNULL(BF.BOOK_FUND_ID),0,1) IS_FUND_SUPPORT, A.TEMPLET_ID, A.IS_PRINT isPrint
-		FROM 
+		FROM
 			BOOK_ADVISER A
 		INNER JOIN
 			BOOK B
@@ -1131,10 +1132,10 @@
 		LEFT JOIN
 			BOOK_TYPE T
 		ON
-			B.TYPE_CODE = T.TYPE_CODE 
-		LEFT JOIN 
+			B.TYPE_CODE = T.TYPE_CODE
+		LEFT JOIN
 			BOOK_FUND BF
-		ON 
+		ON
 			BF.BOOK_ID = A.BOOK_ID AND BF.END_TIME <![CDATA[ > ]]> NOW()  AND BF.START_TIME <![CDATA[ < ]]> NOW()
 		WHERE
 		   1=1
@@ -1174,7 +1175,7 @@
 			</foreach>
 		</if>
 		<if test="isFundSupport != null">
-		  AND 
+		  AND
 		  	BF.BOOK_FUND_ID IS NOT NULL
 		</if>
 		<if test="isPrint != null">
@@ -1185,14 +1186,14 @@
 		ORDER BY
 			A.CREATED_DATE DESC
 	</select>
-	
+
 	<!-- 获取书籍列表(APP) -->
 	<select id="listBook4App" resultMap="bookMap" parameterType="map">
-		SELECT 
-			A.BOOK_ID, A.CHANNEL_ID, A.ADVISER_ID, A.IS_MAIN_EDITOR,A.TEMPLET_ID, T.TYPE_CODE, T.TYPE_NAME, B.ISBN, B.BOOK_NAME, B.REMARK, 
+		SELECT
+			A.BOOK_ID, A.CHANNEL_ID, A.ADVISER_ID, A.IS_MAIN_EDITOR,A.TEMPLET_ID, T.TYPE_CODE, T.TYPE_NAME, B.ISBN, B.BOOK_NAME, B.REMARK,
 			B.COVER_IMG, B.ISSN, B.SERIAL_NUMBER
-		FROM 
-			BOOK_ADVISER A 
+		FROM
+			BOOK_ADVISER A
 		INNER JOIN
 			BOOK B
 		ON
@@ -1200,34 +1201,34 @@
 		LEFT JOIN
 			BOOK_TYPE T
 		ON
-			B.TYPE_CODE = T.TYPE_CODE 	
+			B.TYPE_CODE = T.TYPE_CODE
 		<if test="bookName!=null">
 			WHERE BOOK_NAME LIKE CONCAT('%',#{bookName},'%')
 		</if>
 		ORDER BY
-			A.CREATED_DATE DESC 
+			A.CREATED_DATE DESC
 	</select>
-	
+
 	<!--获取应用关联图书  -->
 	<select id="listBookByAppId" resultMap="bookMap" parameterType="map">
-		SELECT 
+		SELECT
 			A.BOOK_ID, A.CHANNEL_ID, A.ADVISER_ID,B.ISBN, B.BOOK_NAME,
 			B.COVER_IMG,B.ISSN,B.SERIAL_NUMBER,B.TYPE_CODE
-		FROM 
+		FROM
 			(SELECT BOOK_ID, CHANNEL_ID, CREATED_USER AS ADVISER_ID  FROM BOOK_APP WHERE APP_ID = #{appId} AND CHANNEL_ID = #{channelId} AND IS_DELETE = 0) A
 		INNER JOIN
 			BOOK B
 		ON
 			A.BOOK_ID = B.BOOK_ID  AND B.IS_DELETE = 0
 	</select>
-	
+
 	<!-- 书刊回收站列表（30天内删除的书刊列表） -->
 	<select id="listPageDelete4Adviser" resultMap="bookMap" parameterType="map">
-		SELECT 
-			A.BOOK_ID, A.CHANNEL_ID, A.ADVISER_ID, A.IS_MAIN_EDITOR, T.TYPE_CODE, T.TYPE_NAME, B.ISBN, B.BOOK_NAME, B.REMARK, 
+		SELECT
+			A.BOOK_ID, A.CHANNEL_ID, A.ADVISER_ID, A.IS_MAIN_EDITOR, T.TYPE_CODE, T.TYPE_NAME, B.ISBN, B.BOOK_NAME, B.REMARK,
 			B.AUTHOR, B.PUBLISH, B.PUBLISH_DATE, B.COVER_IMG, B.ORIGIN_NAME, B.BOOK_PRICE, B.ISSN, B.BOOK_NUM, B.SERIAL_NUMBER,
 			IF(ISNULL(BF.BOOK_FUND_ID),0,1) IS_FUND_SUPPORT,A.TEMPLET_ID,A.LAST_MODIFIED_DATE
-		FROM 
+		FROM
 			BOOK_ADVISER A
 		INNER JOIN
 			BOOK B
@@ -1236,27 +1237,27 @@
 		LEFT JOIN
 			BOOK_TYPE T
 		ON
-			B.TYPE_CODE = T.TYPE_CODE 
-		LEFT JOIN 
+			B.TYPE_CODE = T.TYPE_CODE
+		LEFT JOIN
 			BOOK_FUND BF
-		ON 
+		ON
 			BF.BOOK_ID = A.BOOK_ID AND BF.END_TIME <![CDATA[ > ]]> NOW()  AND BF.START_TIME <![CDATA[ < ]]> NOW()
 		GROUP BY A.BOOK_ID, A.CHANNEL_ID
 		ORDER BY
 			A.LAST_MODIFIED_DATE DESC
 	</select>
-	
-	
+
+
 	<!--  获取出版下除默认生成图书的所有图书总数-->
 	<select id="getAllBookCount4Agent" parameterType="map" resultType="Integer">
-		SELECT 
+		SELECT
 			COUNT(1)
-		FROM 
+		FROM
 			(SELECT BOOK_ID, ADVISER_ID, CHANNEL_ID FROM BOOK_ADVISER WHERE ADVISER_ID IN
 			<foreach collection="adviserIds" index="i" item="item" open="(" separator="," close=")">
 				${item}
 			</foreach>
-			 AND IS_DELETE = 0 
+			 AND IS_DELETE = 0
 			<if test="bookId!=null">
 			 AND BOOK_ID != #{bookId}
 	     	</if>
@@ -1266,17 +1267,17 @@
 		ON
 			A.BOOK_ID = B.BOOK_ID  AND B.IS_DELETE = 0
 	</select>
-	
+
 	<!--  获取出版下除默认生成图书的所有图书-->
 	<select id="getAllBook4Agent" parameterType="map" resultMap="bookMap">
-		SELECT 
+		SELECT
 			A.BOOK_ID,A.ADVISER_ID,A.CHANNEL_ID,B.BOOK_NAME,B.ISBN,B.SERIAL_NUMBER
-		FROM 
+		FROM
 			(SELECT BOOK_ID, ADVISER_ID, CHANNEL_ID, CREATED_DATE FROM BOOK_ADVISER WHERE ADVISER_ID IN
 			<foreach collection="adviserIds" index="i" item="item" open="(" separator="," close=")">
 				${item}
 			</foreach>
-			 AND IS_DELETE = 0 
+			 AND IS_DELETE = 0
 			<if test="bookId!=null">
 			 AND BOOK_ID != #{bookId}
 	     	</if>
@@ -1290,17 +1291,17 @@
 		   limit #{currentPage},#{numPerPage}
 		</if>
 	</select>
-	
+
 	<select id="listByIsbn" resultMap="bookMap" parameterType="map">
-		SELECT 
+		SELECT
 			BOOK_ID, ISBN, BOOK_NAME,TYPE_CODE,AUTHOR,PUBLISH,PUBLISH_DATE,SERIAL_NUMBER,
 			COVER_IMG
-		FROM 
+		FROM
 			BOOK
 		WHERE
 			ISBN = #{isbn}
 	</select>
-	
+
 	<!-- 图书列表（平台端） -->
 	<select id="listBookClassify" resultMap="bookMap" parameterType="map">
 		SELECT
@@ -1408,11 +1409,11 @@
         </if>
 	</select>
 
-	
+
 	<!-- 获取平台下除默认生成图书的所有图书 -->
 	<select id="getAllBook4Platform" resultMap="bookMap" parameterType="map">
 		SELECT
-			b.BOOK_ID, b.BOOK_NAME, b.COVER_IMG, b.ISBN, b.PUBLISH, 
+			b.BOOK_ID, b.BOOK_NAME, b.COVER_IMG, b.ISBN, b.PUBLISH,
 			ba.ADVISER_ID, ba.TEMPLET_ID,ba.SECOND_TEMPLET_ID, ba.CHANNEL_ID, ba.CREATED_DATE,
 			bt.TYPE_NAME
 		FROM
@@ -1436,14 +1437,14 @@
 		   limit #{currentPage},#{numPerPage}
 		</if>
 	</select>
-	
+
 	<!-- 获取图书总数除RAYS现代纸书(平台端) -->
 	<select id="getAllBookCount4Platform" resultType="Integer" parameterType="map">
-		SELECT 
+		SELECT
 			COUNT(1)
-		FROM 
-			(SELECT BOOK_ID, ADVISER_ID, CHANNEL_ID FROM BOOK_ADVISER 
-			 WHERE IS_DELETE = 0 
+		FROM
+			(SELECT BOOK_ID, ADVISER_ID, CHANNEL_ID FROM BOOK_ADVISER
+			 WHERE IS_DELETE = 0
 			<if test="bookId!=null">
 			 AND BOOK_ID != #{bookId}
 	     	</if>
@@ -1451,44 +1452,44 @@
 		INNER JOIN
 			BOOK B
 		ON
-			A.BOOK_ID = B.BOOK_ID 
+			A.BOOK_ID = B.BOOK_ID
 		WHERE
 			B.IS_DELETE = 0
 	</select>
-	
-	
+
+
 	<!-- 获取编辑模板 -->
 	<select id="getTempletId" resultType="long" parameterType="map">
-		SELECT 
+		SELECT
 			TEMPLET_ID
-		FROM 
+		FROM
 			BOOK_ADVISER
 		WHERE
 			BOOK_ID = #{bookId, jdbcType=BIGINT} AND CHANNEL_ID = #{channelId} AND CREATED_USER = #{adviserId}
 	</select>
-	
-	
+
+
 	<!-- 修改书籍信息-->
 	<update id="updateByAdviser" parameterType="book" flushCache="true">
 		UPDATE BOOK
 		SET
 		    <if test="bookName != null">
-			BOOK_NAME = #{bookName, jdbcType=VARCHAR}, 
+			BOOK_NAME = #{bookName, jdbcType=VARCHAR},
 			</if>
 			<if test="bookPrice != null">
 			BOOK_PRICE = #{bookPrice, jdbcType=VARCHAR},
 			</if>
 			<if test="author != null">
-			AUTHOR = #{author, jdbcType=VARCHAR}, 
+			AUTHOR = #{author, jdbcType=VARCHAR},
 			</if>
 			<if test="publish != null">
-			PUBLISH = #{publish, jdbcType=VARCHAR}, 
+			PUBLISH = #{publish, jdbcType=VARCHAR},
 			</if>
 			<if test="coverImg != null">
-			COVER_IMG = #{coverImg, jdbcType=VARCHAR}, 
+			COVER_IMG = #{coverImg, jdbcType=VARCHAR},
 			</if>
 			<if test="lastModifiedUser != null">
-			LAST_MODIFIED_USER = #{lastModifiedUser, jdbcType=BIGINT}, 
+			LAST_MODIFIED_USER = #{lastModifiedUser, jdbcType=BIGINT},
 			</if>
 			<if test="serialNumber != null">
 		    SERIAL_NUMBER = #{serialNumber, jdbcType=VARCHAR},