Merge remote-tracking branch 'origin/v2.0.0' into dev

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

@@ -4,7 +4,6 @@ import cn.hutool.core.date.DateField;
 import cn.hutool.core.date.DatePattern;
 import cn.hutool.core.date.DateTime;
 import cn.hutool.core.date.DateUtil;
-import cn.hutool.core.util.NumberUtil;
 import cn.hutool.poi.excel.ExcelReader;
 import cn.hutool.poi.excel.ExcelUtil;
 import com.github.pagehelper.page.PageMethod;
@@ -2055,49 +2054,49 @@ public class ProductServiceImpl implements ProductService, Constant {
         if (req.getStddev1y() != null) {
             switch (req.getStddev1y().getYear()) {
                 case "1y":
-                    if ("+".equals(req.getRet1y().getEnd())) {
+                    if ("+".equals(req.getStddev1y().getEnd())) {
                         criteria.andStddev1yGreaterThanOrEqualTo(new BigDecimal(req.getStddev1y().getBegin()));
                     } else {
                         criteria.andStddev1yBetween(new BigDecimal(req.getStddev1y().getBegin()), new BigDecimal(req.getStddev1y().getEnd()));
                     }
                     break;
                 case "2y":
-                    if ("+".equals(req.getRet1y().getEnd())) {
+                    if ("+".equals(req.getStddev1y().getEnd())) {
                         criteria.andStddev2yGreaterThanOrEqualTo(new BigDecimal(req.getStddev1y().getBegin()));
                     } else {
                         criteria.andStddev2yBetween(new BigDecimal(req.getStddev1y().getBegin()), new BigDecimal(req.getStddev1y().getEnd()));
                     }
                     break;
                 case "3y":
-                    if ("+".equals(req.getRet1y().getEnd())) {
+                    if ("+".equals(req.getStddev1y().getEnd())) {
                         criteria.andStddev3yGreaterThanOrEqualTo(new BigDecimal(req.getStddev1y().getBegin()));
                     } else {
                         criteria.andStddev3yBetween(new BigDecimal(req.getStddev1y().getBegin()), new BigDecimal(req.getStddev1y().getEnd()));
                     }
                     break;
                 case "4y":
-                    if ("+".equals(req.getRet1y().getEnd())) {
+                    if ("+".equals(req.getStddev1y().getEnd())) {
                         criteria.andStddev4yGreaterThanOrEqualTo(new BigDecimal(req.getStddev1y().getBegin()));
                     } else {
                         criteria.andStddev4yBetween(new BigDecimal(req.getStddev1y().getBegin()), new BigDecimal(req.getStddev1y().getEnd()));
                     }
                     break;
                 case "5y":
-                    if ("+".equals(req.getRet1y().getEnd())) {
+                    if ("+".equals(req.getStddev1y().getEnd())) {
                         criteria.andStddev5yGreaterThanOrEqualTo(new BigDecimal(req.getStddev1y().getBegin()));
                     } else {
                         criteria.andStddev5yBetween(new BigDecimal(req.getStddev1y().getBegin()), new BigDecimal(req.getStddev1y().getEnd()));
                     }
                     break;
                 case "10y":
-                    if ("+".equals(req.getRet1y().getEnd())) {
+                    if ("+".equals(req.getStddev1y().getEnd())) {
                         criteria.andStddev10yGreaterThanOrEqualTo(new BigDecimal(req.getStddev1y().getBegin()));
                     } else {
                         criteria.andStddev10yBetween(new BigDecimal(req.getStddev1y().getBegin()), new BigDecimal(req.getStddev1y().getEnd()));
                     }
                     break;
                 case "incepY":
-                    if ("+".equals(req.getRet1y().getEnd())) {
+                    if ("+".equals(req.getStddev1y().getEnd())) {
                         criteria.andStddevIncepGreaterThanOrEqualTo(new BigDecimal(req.getStddev1y().getBegin()));
                     } else {
                         criteria.andStddevIncepBetween(new BigDecimal(req.getStddev1y().getBegin()), new BigDecimal(req.getStddev1y().getEnd()));