Merge branch 'feature/many' into 'release'

feat:[none] 书刊收益新增时间筛选参数

See merge request rays/pcloud-book!1569

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

@@ -671,6 +671,8 @@ public interface BookFacade {
                                          @RequestParam(value = "templetId", required = false) Long templetId,
                                          @RequestParam(value = "secondTempletId", required = false) Long secondTempletId,
                                          @RequestParam(value = "thirdTempletId", required = false) Long thirdTempletId,
+                                                  @RequestParam(value = "startTime", required = false) String startTime,
+                                                  @RequestParam(value = "endTime", required = false) String endTime,
                                                   @RequestParam(value = "minimumSupport", required = false) Integer minimumSupport)
             throws BizException, PermissionException, JsonParseException;
 
@@ -691,6 +693,8 @@ public interface BookFacade {
             @RequestParam(value = "isFundSupport", required = false) Integer isFundSupport,
             @RequestParam(value = "templetId", required = false) Long templetId,
             @RequestParam(value = "secondTempletId", required = false) Long secondTempletId,
+            @RequestParam(value = "startTime", required = false) String startTime,
+            @RequestParam(value = "endTime", required = false) String endTime,
             @RequestParam(value = "thirdTempletId", required = false) Long thirdTempletId)
             throws PermissionException, BizException;
 

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

@@ -1051,6 +1051,8 @@ public class BookFacadeImpl implements BookFacade {
                                                           @RequestParam(value = "templetId", required = false) Long templetId,
                                                           @RequestParam(value = "secondTempletId", required = false) Long secondTempletId,
                                                           @RequestParam(value = "thirdTempletId", required = false) Long thirdTempletId,
+                                                          @RequestParam(value = "startTime", required = false) String startTime,
+                                                          @RequestParam(value = "endTime", required = false) String endTime,
                                                           @RequestParam(value = "minimumSupport", required = false) Integer minimumSupport)
             throws BizException, PermissionException {
         Long agentId = (Long) SessionUtil.getVlaue(token, SessionUtil.PARTY_ID);
@@ -1068,6 +1070,8 @@ public class BookFacadeImpl implements BookFacade {
         paramMap.put("thirdTempletId", thirdTempletId);
         paramMap.put("thirdTempletIds", Optional.ofNullable(paramMap.get("thirdTempletId")).map(Lists::newArrayList).orElse(Lists.newArrayList()));
         paramMap.put("minimumSupport", minimumSupport);
+        paramMap.put("startTime",StringUtil.trimToNull(startTime));
+        paramMap.put("endTime",StringUtil.trimToNull(endTime));
         return new ResponseDto<>(bookBiz.listPageIncomeDetail(new PageParam(currentPage, numPerPage), paramMap, agentId));
     }
 
@@ -1082,6 +1086,8 @@ public class BookFacadeImpl implements BookFacade {
             @RequestParam(value = "isFundSupport", required = false) Integer isFundSupport,
             @RequestParam(value = "templetId", required = false) Long templetId,
             @RequestParam(value = "secondTempletId", required = false) Long secondTempletId,
+            @RequestParam(value = "startTime", required = false) String startTime,
+            @RequestParam(value = "endTime", required = false) String endTime,
             @RequestParam(value = "thirdTempletId", required = false) Long thirdTempletId) throws PermissionException {
         Long agentId = (Long) SessionUtil.getVlaue(token, SessionUtil.PARTY_ID);
         String systemCode = (String) SessionUtil.getVlaue(token, SessionUtil.SYSTEM_CODE);
@@ -1104,6 +1110,8 @@ public class BookFacadeImpl implements BookFacade {
         paramMap.put("secondTempletIds", Optional.ofNullable(paramMap.get("secondTempletId")).map(Lists::newArrayList).orElse(Lists.newArrayList()));
         paramMap.put("thirdTempletId", thirdTempletId);
         paramMap.put("thirdTempletIds", Optional.ofNullable(paramMap.get("thirdTempletId")).map(Lists::newArrayList).orElse(Lists.newArrayList()));
+        paramMap.put("startTime",StringUtil.trimToNull(startTime));
+        paramMap.put("endTime",StringUtil.trimToNull(endTime));
         bookBiz.exportBookIncomeDetail(paramMap, agentId, partyId, systemCode);
         return new ResponseDto<>();
     }

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

@@ -2498,6 +2498,12 @@
 		book_minimum_support s ON B.BOOK_ID=s.book_id AND s.end_time <![CDATA[ > ]]> NOW()  AND s.start_time <![CDATA[ < ]]> NOW()
 		WHERE
 		1=1
+		<if test="startTime !=null">
+			AND A.CREATED_DATE <![CDATA[ >= ]]> #{startTime}
+		</if>
+		<if test="endTime !=null">
+			AND A.CREATED_DATE <![CDATA[ <= ]]> #{endTime}
+		</if>
 		<if test="typeCode!=null">
 			AND
 			B.TYPE_CODE = #{typeCode}
@@ -2574,6 +2580,12 @@
 		BF.BOOK_ID = A.BOOK_ID AND BF.END_TIME <![CDATA[ > ]]> NOW()  AND BF.START_TIME <![CDATA[ < ]]> NOW()
 		WHERE
 		1=1
+		<if test="startTime !=null">
+			AND A.CREATED_DATE <![CDATA[ >= ]]> #{startTime}
+		</if>
+		<if test="endTime !=null">
+			AND A.CREATED_DATE <![CDATA[ <= ]]> #{endTime}
+		</if>
 		<if test="typeCode!=null">
 			AND
 			B.TYPE_CODE = #{typeCode}