add

src/main/java/com/tanpu/fund/service/impl/ProductServiceImpl.java

@@ -1842,12 +1842,17 @@ public class ProductServiceImpl implements ProductService, Constant {
                 beginTime = DateUtil.offset(endTime, DateField.YEAR, -5);
             } else if (req.getInceptionDate() == 5) {
                 endTime = DateUtil.offset(DateUtil.beginOfYear(beginYear), DateField.YEAR, -2);
-                beginTime = DateUtil.offset(endTime, DateField.YEAR, -5);
+                beginTime = DateUtil.offset(beginYear, DateField.YEAR, -5);
             } else {
                 endTime = DateUtil.endOfDay(new Date());
                 beginTime = beginYear;
             }
-            criteria.andInceptionDateBetween(beginTime, endTime);
+
+            if (req.getInceptionDate() != 5) {
+                criteria.andInceptionDateBetween(beginTime, endTime);
+            } else {
+                criteria.andInceptionDateLessThanOrEqualTo(beginTime);
+            }
         }
     }
 

src/main/resources/application-test.properties

@@ -10,8 +10,8 @@ management.endpoints.web.base-path = /myhealth
 management.endpoint.health.enabled=true
 management.endpoint.health.show-details=always
 
-spring.datasource.url=jdbc:mysql://118.190.63.109:3306/tamp_fund?autoReconnect=true&characterEncoding=utf-8&serverTimezone=GMT%2B8&useSSL=false
-spring.datasource.username=root
+spring.datasource.url=jdbc:mysql://rm-uf6r22t3d798q4kmkao.mysql.rds.aliyuncs.com:3306/tamp_fund?autoReconnect=true&characterEncoding=utf-8&serverTimezone=GMT%2B8&useSSL=false
+spring.datasource.username=tamp_admin
 spring.datasource.password= @imeng123
 spring.datasource.driver-class-name=com.mysql.cj.jdbc.Driver