feat:[1007593]冻结书刊筛选

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

@@ -888,7 +888,18 @@ public class BookDto extends BaseDto {
      * 书下应用数量
      */
     private Integer bookAppCount;
+    /**
+     * 书刊冻结状态
+     */
+    private Integer isFreeze;
 
+    public Integer getIsFreeze() {
+        return isFreeze;
+    }
+
+    public void setIsFreeze(Integer isFreeze) {
+        this.isFreeze = isFreeze;
+    }
 
     public Integer getBookAppCount() {
         return bookAppCount;

pcloud-facade-book/src/main/java/com/pcloud/book/book/entity/BookAdviser.java

@@ -120,4 +120,6 @@ public class BookAdviser extends BaseEntity {
 	private Long volLabelId;
 
 	private Integer openRaysCode;
+
+	private Integer isJumpBook;
 }

pcloud-service-book/src/main/java/com/pcloud/book/book/facade/BookFacade.java

@@ -409,7 +409,8 @@ public interface BookFacade {
                                         @RequestParam(value = "isPrint", required = false) Boolean isPrint,
                                          @RequestParam(value = "minimumSupport", required = false) Integer minimumSupport,
                                          @RequestParam(value = "startTime", required = false) String startTime,
-                                         @RequestParam(value = "endTime", required = false) String endTime)
+                                         @RequestParam(value = "endTime", required = false) String endTime,
+                                         @RequestParam(value = "isFreeze",required = false) Integer isFreeze)
             throws BizException, PermissionException, JsonParseException;
 
     /**

pcloud-service-book/src/main/java/com/pcloud/book/book/facade/impl/BookFacadeImpl.java

@@ -566,7 +566,8 @@ public class BookFacadeImpl implements BookFacade {
                                                  @RequestParam(value = "isPrint", required = false) Boolean isPrint,
                                                  @RequestParam(value = "minimumSupport", required = false) Integer minimumSupport,
                                                  @RequestParam(value = "startTime", required = false) String startTime,
-                                                 @RequestParam(value = "endTime", required = false) String endTime)
+                                                 @RequestParam(value = "endTime", required = false) String endTime,
+                                                 @RequestParam(value = "isFreeze",required = false) Integer isFreeze)
             throws BizException, PermissionException {
         Long agentId = (Long) SessionUtil.getVlaue(token, SessionUtil.PARTY_ID);
         if (currentPage < 0 || numPerPage < 0) {
@@ -593,6 +594,7 @@ public class BookFacadeImpl implements BookFacade {
         paramMap.put("minimumSupport", minimumSupport);
         paramMap.put("startTime", StringUtil.isBlank(startTime) ? null : startTime);
         paramMap.put("endTime", StringUtil.isBlank(endTime) ? null : endTime);
+        paramMap.put("isFreeze", isFreeze);
         return new ResponseDto<>(
                 bookBiz.listPage4Agent(new PageParam(currentPage, numPerPage), paramMap, agentId));
     }
@@ -614,7 +616,8 @@ public class BookFacadeImpl implements BookFacade {
                                                  @RequestParam(value = "isPrint", required = false) Boolean isPrint,
                                                  @RequestParam(value = "minimumSupport", required = false) Integer minimumSupport,
                                                  @RequestParam(value = "startTime", required = false) String startTime,
-                                                 @RequestParam(value = "endTime", required = false) String endTime)
+                                                 @RequestParam(value = "endTime", required = false) String endTime,
+                                                 @RequestParam(value = "isFreeze",required = false) Integer isFreeze)
             throws BizException, PermissionException {
         Long agentId = (Long) SessionUtil.getVlaue(token, SessionUtil.PARTY_ID);
         Map<String, Object> map = SessionUtil.getToken4Redis(token);
@@ -646,6 +649,7 @@ public class BookFacadeImpl implements BookFacade {
         paramMap.put("minimumSupport", minimumSupport);
         paramMap.put("startTime", StringUtil.isBlank(startTime) ? null : startTime);
         paramMap.put("endTime", StringUtil.isBlank(endTime) ? null : endTime);
+        paramMap.put("isFreeze", isFreeze);
         bookBiz.exportListPage4Agent(paramMap, agentId,partyId,systemCode);
         return new ResponseDto<>();
     }

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

@@ -1552,7 +1552,7 @@
 			A.BOOK_ADVISER_ID, 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, IF(ISNULL(s.id),0,1) minimumSupport,B.CREATED_DATE
-			,A.open_rays_code
+			,A.open_rays_code, IFNULL(f.IS_FREEZE,0) isFreeze
 		FROM
 			BOOK_ADVISER A
 		INNER JOIN
@@ -1574,6 +1574,7 @@
 		ON
 			BF.BOOK_ID = A.BOOK_ID AND BF.END_TIME <![CDATA[ > ]]> NOW()  AND BF.START_TIME <![CDATA[ < ]]> NOW()
 		LEFT JOIN book_minimum_support s ON B.BOOK_ID=s.book_id AND s.end_time <![CDATA[ > ]]> NOW()  AND s.start_time <![CDATA[ < ]]> NOW()
+		LEFT JOIN book_freeze f ON B.BOOK_ID = f.BOOK_ID
 		WHERE
 		   1=1
 		<if test="typeCode!=null">
@@ -1629,6 +1630,9 @@
 		  AND
 		  	BF.BOOK_FUND_ID IS NOT NULL
 		</if>
+		<if test="isFreeze != null">
+			AND f.IS_FREEZE = 1
+		</if>
 		<if test="isPrint != null">
 		  AND
 		  	A.IS_PRINT = #{isPrint}
@@ -1672,6 +1676,9 @@
 		LEFT JOIN book_minimum_support s
 		ON B.BOOK_ID = s.book_id AND s.end_time <![CDATA[ > ]]> NOW()  AND s.start_time <![CDATA[ < ]]> NOW()
 		</if>
+		<if test="isFreeze != null">
+		LEFT JOIN book_freeze f ON B.BOOK_ID = f.BOOK_ID
+		</if>
 		WHERE
 		1=1
 		<if test="typeCode!=null">
@@ -1720,6 +1727,9 @@
 		<if test="isFundSupport != null">
 			AND BF.BOOK_FUND_ID IS NOT NULL
 		</if>
+		<if test="isFreeze != null">
+			AND f.IS_FREEZE = 1
+		</if>
 		<if test="isPrint != null">
 			AND A.IS_PRINT = #{isPrint}
 		</if>

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

@@ -48,7 +48,7 @@
 		INSERT INTO BOOK_ADVISER (
 			BOOK_ID, ADVISER_ID, CHANNEL_ID, CREATED_USER, CREATED_DATE,IS_MAIN_EDITOR, TEMPLET_ID, SECOND_TEMPLET_ID,third_templet_id,
 			GRA_LABEL_ID,SUB_LABEL_ID,VER_LABEL_ID,AREA_LABEL_ID,pro_label_id, dep_label_id,pur_label_id,is_open_robot_process,
-		vol_label_id,LAST_MODIFIED_DATE,ip_address,open_rays_code
+		vol_label_id,LAST_MODIFIED_DATE,ip_address,open_rays_code, is_jump_book
 		)
 		VALUES (
 			#{bookId, jdbcType=VARCHAR}, #{adviserId, jdbcType=VARCHAR}, #{channelId, jdbcType=VARCHAR}, 
@@ -56,7 +56,7 @@
 			#{secondTempletId, jdbcType=BIGINT},#{thirdTempletId},#{graLabelId, jdbcType=BIGINT},#{subLabelId, jdbcType=BIGINT},
 			#{verLabelId, jdbcType=BIGINT},#{areaLabelId, jdbcType=BIGINT},#{proLabelId,jdbcType=BIGINT},
 			#{depLabelId,jdbcType=BIGINT},#{purLabelId,jdbcType=BIGINT},#{isOpenRobotProcess,jdbcType=BIT},
-		#{volLabelId},now(),#{ipAddress},IFNULL(#{openRaysCode},1)
+		#{volLabelId},now(),#{ipAddress},IFNULL(#{openRaysCode},1), IFNULL(#{isJumpBook},0)
 		)
 		ON
 			DUPLICATE KEY UPDATE IS_DELETE = 0,LAST_MODIFIED_DATE=now(), IS_MAIN_EDITOR = #{isMainEditor, jdbcType=BIT}