Skip to content

T
tamp_fund
Commit 945d2f79 authored by zp's avatar zp
Browse files
Options

无穷概念

parent 7e7eeb2d
Hide whitespace changes
Inline Side-by-side
Showing with 140 additions and 28 deletions
src/main/java/com/tanpu/fund/service/impl/ProductServiceImpl.java
View file @ 945d2f79
...@@ -1906,28 +1906,60 @@ public class ProductServiceImpl implements ProductService, Constant { ...@@ -1906,28 +1906,60 @@ public class ProductServiceImpl implements ProductService, Constant {
if (req.getRet1y() != null) { if (req.getRet1y() != null) {
switch (req.getRet1y().getYear()) { switch (req.getRet1y().getYear()) {
case "1m": case "1m":
criteria.andRet1mBetween(new BigDecimal(req.getRet1y().getBegin()), new BigDecimal(req.getRet1y().getEnd())); if ("+".equals(req.getRet1y().getEnd())) {
criteria.andRet1mGreaterThanOrEqualTo(new BigDecimal(req.getRet1y().getBegin()));
} else {
criteria.andRet1mBetween(new BigDecimal(req.getRet1y().getBegin()), new BigDecimal(req.getRet1y().getEnd()));
}
break; break;
case "3m": case "3m":
criteria.andRet3mBetween(new BigDecimal(req.getRet1y().getBegin()), new BigDecimal(req.getRet1y().getEnd())); if ("+".equals(req.getRet1y().getEnd())) {
criteria.andRet3mGreaterThanOrEqualTo(new BigDecimal(req.getRet1y().getBegin()));
} else {
criteria.andRet3mBetween(new BigDecimal(req.getRet1y().getBegin()), new BigDecimal(req.getRet1y().getEnd()));
}
break; break;
case "6m": case "6m":
criteria.andRet6mBetween(new BigDecimal(req.getRet1y().getBegin()), new BigDecimal(req.getRet1y().getEnd())); if ("+".equals(req.getRet1y().getEnd())) {
criteria.andRet6mGreaterThanOrEqualTo(new BigDecimal(req.getRet1y().getBegin()));
} else {
criteria.andRet6mBetween(new BigDecimal(req.getRet1y().getBegin()), new BigDecimal(req.getRet1y().getEnd()));
}
break; break;
case "1y": case "1y":
criteria.andRet1yBetween(new BigDecimal(req.getRet1y().getBegin()), new BigDecimal(req.getRet1y().getEnd())); if ("+".equals(req.getRet1y().getEnd())) {
criteria.andRet1yGreaterThanOrEqualTo(new BigDecimal(req.getRet1y().getBegin()));
} else {
criteria.andRet1yBetween(new BigDecimal(req.getRet1y().getBegin()), new BigDecimal(req.getRet1y().getEnd()));
}
break; break;
case "thisY": case "thisY":
criteria.andRetYtdBetween(new BigDecimal(req.getRet1y().getBegin()), new BigDecimal(req.getRet1y().getEnd())); if ("+".equals(req.getRet1y().getEnd())) {
criteria.andRetYtdGreaterThanOrEqualTo(new BigDecimal(req.getRet1y().getBegin()));
} else {
criteria.andRetYtdBetween(new BigDecimal(req.getRet1y().getBegin()), new BigDecimal(req.getRet1y().getEnd()));
}
break; break;
case "2y": case "2y":
criteria.andRet2yBetween(new BigDecimal(req.getRet1y().getBegin()), new BigDecimal(req.getRet1y().getEnd())); if (req.getRet1y().getEnd().equals("+")) {
criteria.andRet2yGreaterThanOrEqualTo(new BigDecimal(req.getRet1y().getBegin()));
} else {
criteria.andRet2yBetween(new BigDecimal(req.getRet1y().getBegin()), new BigDecimal(req.getRet1y().getEnd()));
}
break; break;
case "3y": case "3y":
criteria.andRet3yBetween(new BigDecimal(req.getRet1y().getBegin()), new BigDecimal(req.getRet1y().getEnd())); if (req.getRet1y().getEnd().equals("+")) {
criteria.andRet3yGreaterThanOrEqualTo(new BigDecimal(req.getRet1y().getBegin()));
} else {
criteria.andRet3yBetween(new BigDecimal(req.getRet1y().getBegin()), new BigDecimal(req.getRet1y().getEnd()));
}
break; break;
case "5y": case "5y":
criteria.andRet5yBetween(new BigDecimal(req.getRet1y().getBegin()), new BigDecimal(req.getRet1y().getEnd())); if (req.getRet1y().getEnd().equals("+")) {
criteria.andRet5yGreaterThanOrEqualTo(new BigDecimal(req.getRet1y().getBegin()));
} else {
criteria.andRet5yBetween(new BigDecimal(req.getRet1y().getBegin()), new BigDecimal(req.getRet1y().getEnd()));
}
break; break;
} }
} }
...@@ -1937,25 +1969,53 @@ public class ProductServiceImpl implements ProductService, Constant { ...@@ -1937,25 +1969,53 @@ public class ProductServiceImpl implements ProductService, Constant {
if (req.getMaxdrawdown1y() != null) { if (req.getMaxdrawdown1y() != null) {
switch (req.getMaxdrawdown1y().getYear()) { switch (req.getMaxdrawdown1y().getYear()) {
case "1y": case "1y":
criteria.andMaxdrawdown1yBetween(new BigDecimal(req.getMaxdrawdown1y().getBegin()), new BigDecimal(req.getMaxdrawdown1y().getEnd())); if (("-").equals(req.getMaxdrawdown1y().getBegin())) {
criteria.andMaxdrawdown1yLessThanOrEqualTo(new BigDecimal(req.getMaxdrawdown1y().getEnd()));
} else {
criteria.andMaxdrawdown1yBetween(new BigDecimal(req.getMaxdrawdown1y().getBegin()), new BigDecimal(req.getMaxdrawdown1y().getEnd()));
}
break; break;
case "2y": case "2y":
criteria.andMaxdrawdown2yBetween(new BigDecimal(req.getMaxdrawdown1y().getBegin()), new BigDecimal(req.getMaxdrawdown1y().getEnd())); if (("-").equals(req.getMaxdrawdown1y().getBegin())) {
criteria.andMaxdrawdown2yLessThanOrEqualTo(new BigDecimal(req.getMaxdrawdown1y().getEnd()));
} else {
criteria.andMaxdrawdown2yBetween(new BigDecimal(req.getMaxdrawdown1y().getBegin()), new BigDecimal(req.getMaxdrawdown1y().getEnd()));
}
break; break;
case "3y": case "3y":
criteria.andMaxdrawdown3yBetween(new BigDecimal(req.getMaxdrawdown1y().getBegin()), new BigDecimal(req.getMaxdrawdown1y().getEnd())); if (("-").equals(req.getMaxdrawdown1y().getBegin())) {
criteria.andMaxdrawdown3yLessThanOrEqualTo(new BigDecimal(req.getMaxdrawdown1y().getEnd()));
} else {
criteria.andMaxdrawdown3yBetween(new BigDecimal(req.getMaxdrawdown1y().getBegin()), new BigDecimal(req.getMaxdrawdown1y().getEnd()));
}
break; break;
case "4y": case "4y":
criteria.andMaxdrawdown4yBetween(new BigDecimal(req.getMaxdrawdown1y().getBegin()), new BigDecimal(req.getMaxdrawdown1y().getEnd())); if (("-").equals(req.getMaxdrawdown1y().getBegin())) {
criteria.andMaxdrawdown4yLessThanOrEqualTo(new BigDecimal(req.getMaxdrawdown1y().getEnd()));
} else {
criteria.andMaxdrawdown4yBetween(new BigDecimal(req.getMaxdrawdown1y().getBegin()), new BigDecimal(req.getMaxdrawdown1y().getEnd()));
}
break; break;
case "5y": case "5y":
criteria.andMaxdrawdown5yBetween(new BigDecimal(req.getMaxdrawdown1y().getBegin()), new BigDecimal(req.getMaxdrawdown1y().getEnd())); if (("-").equals(req.getMaxdrawdown1y().getBegin())) {
criteria.andMaxdrawdown5yLessThanOrEqualTo(new BigDecimal(req.getMaxdrawdown1y().getEnd()));
} else {
criteria.andMaxdrawdown5yBetween(new BigDecimal(req.getMaxdrawdown1y().getBegin()), new BigDecimal(req.getMaxdrawdown1y().getEnd()));
}
break; break;
case "10y": case "10y":
criteria.andMaxdrawdown10yBetween(new BigDecimal(req.getMaxdrawdown1y().getBegin()), new BigDecimal(req.getMaxdrawdown1y().getEnd())); if (("-").equals(req.getMaxdrawdown1y().getBegin())) {
criteria.andMaxdrawdown10yLessThanOrEqualTo(new BigDecimal(req.getMaxdrawdown1y().getEnd()));
} else {
criteria.andMaxdrawdown10yBetween(new BigDecimal(req.getMaxdrawdown1y().getBegin()), new BigDecimal(req.getMaxdrawdown1y().getEnd()));
}
break; break;
case "incepY": case "incepY":
criteria.andMaxdrawdownIncepBetween(new BigDecimal(req.getMaxdrawdown1y().getBegin()), new BigDecimal(req.getMaxdrawdown1y().getEnd())); if (("-").equals(req.getMaxdrawdown1y().getBegin())) {
criteria.andMaxdrawdownIncepLessThanOrEqualTo(new BigDecimal(req.getMaxdrawdown1y().getEnd()));
} else {
criteria.andMaxdrawdownIncepBetween(new BigDecimal(req.getMaxdrawdown1y().getBegin()), new BigDecimal(req.getMaxdrawdown1y().getEnd()));
}
break; break;
} }
} }
...@@ -1965,25 +2025,53 @@ public class ProductServiceImpl implements ProductService, Constant { ...@@ -1965,25 +2025,53 @@ public class ProductServiceImpl implements ProductService, Constant {
if (req.getStddev1y() != null) { if (req.getStddev1y() != null) {
switch (req.getStddev1y().getYear()) { switch (req.getStddev1y().getYear()) {
case "1y": case "1y":
criteria.andStddev1yBetween(new BigDecimal(req.getStddev1y().getBegin()), new BigDecimal(req.getStddev1y().getEnd())); if ("+".equals(req.getRet1y().getEnd())) {
criteria.andStddev1yGreaterThanOrEqualTo(new BigDecimal(req.getStddev1y().getBegin()));
} else {
criteria.andStddev1yBetween(new BigDecimal(req.getStddev1y().getBegin()), new BigDecimal(req.getStddev1y().getEnd()));
}
break; break;
case "2y": case "2y":
criteria.andStddev2yBetween(new BigDecimal(req.getStddev1y().getBegin()), new BigDecimal(req.getStddev1y().getEnd())); if ("+".equals(req.getRet1y().getEnd())) {
criteria.andStddev2yGreaterThanOrEqualTo(new BigDecimal(req.getStddev1y().getBegin()));
} else {
criteria.andStddev2yBetween(new BigDecimal(req.getStddev1y().getBegin()), new BigDecimal(req.getStddev1y().getEnd()));
}
break; break;
case "3y": case "3y":
criteria.andStddev3yBetween(new BigDecimal(req.getStddev1y().getBegin()), new BigDecimal(req.getStddev1y().getEnd())); if ("+".equals(req.getRet1y().getEnd())) {
criteria.andStddev3yGreaterThanOrEqualTo(new BigDecimal(req.getStddev1y().getBegin()));
} else {
criteria.andStddev3yBetween(new BigDecimal(req.getStddev1y().getBegin()), new BigDecimal(req.getStddev1y().getEnd()));
}
break; break;
case "4y": case "4y":
criteria.andStddev4yBetween(new BigDecimal(req.getStddev1y().getBegin()), new BigDecimal(req.getStddev1y().getEnd())); if ("+".equals(req.getRet1y().getEnd())) {
criteria.andStddev4yGreaterThanOrEqualTo(new BigDecimal(req.getStddev1y().getBegin()));
} else {
criteria.andStddev4yBetween(new BigDecimal(req.getStddev1y().getBegin()), new BigDecimal(req.getStddev1y().getEnd()));
}
break; break;
case "5y": case "5y":
criteria.andStddev5yBetween(new BigDecimal(req.getStddev1y().getBegin()), new BigDecimal(req.getStddev1y().getEnd())); if ("+".equals(req.getRet1y().getEnd())) {
criteria.andStddev5yGreaterThanOrEqualTo(new BigDecimal(req.getStddev1y().getBegin()));
} else {
criteria.andStddev5yBetween(new BigDecimal(req.getStddev1y().getBegin()), new BigDecimal(req.getStddev1y().getEnd()));
}
break; break;
case "10y": case "10y":
criteria.andStddev10yBetween(new BigDecimal(req.getStddev1y().getBegin()), new BigDecimal(req.getStddev1y().getEnd())); if ("+".equals(req.getRet1y().getEnd())) {
criteria.andStddev10yGreaterThanOrEqualTo(new BigDecimal(req.getStddev1y().getBegin()));
} else {
criteria.andStddev10yBetween(new BigDecimal(req.getStddev1y().getBegin()), new BigDecimal(req.getStddev1y().getEnd()));
}
break; break;
case "incepY": case "incepY":
criteria.andStddevIncepBetween(new BigDecimal(req.getStddev1y().getBegin()), new BigDecimal(req.getStddev1y().getEnd())); if ("+".equals(req.getRet1y().getEnd())) {
criteria.andStddevIncepGreaterThanOrEqualTo(new BigDecimal(req.getStddev1y().getBegin()));
} else {
criteria.andStddevIncepBetween(new BigDecimal(req.getStddev1y().getBegin()), new BigDecimal(req.getStddev1y().getEnd()));
}
break; break;
} }
} }
...@@ -1993,22 +2081,46 @@ public class ProductServiceImpl implements ProductService, Constant { ...@@ -1993,22 +2081,46 @@ public class ProductServiceImpl implements ProductService, Constant {
if (req.getSharperatio1y() != null) { if (req.getSharperatio1y() != null) {
switch (req.getSharperatio1y().getYear()) { switch (req.getSharperatio1y().getYear()) {
case "1y": case "1y":
criteria.andSharperatio1yBetween(new BigDecimal(req.getSharperatio1y().getBegin()), new BigDecimal(req.getSharperatio1y().getEnd())); if ("+".equals(req.getSharperatio1y().getEnd())) {
criteria.andSharperatio1yGreaterThanOrEqualTo(new BigDecimal(req.getSharperatio1y().getBegin()));
} else {
criteria.andSharperatio1yBetween(new BigDecimal(req.getSharperatio1y().getBegin()), new BigDecimal(req.getSharperatio1y().getEnd()));
}
break; break;
case "2y": case "2y":
criteria.andSharperatio2yBetween(new BigDecimal(req.getSharperatio1y().getBegin()), new BigDecimal(req.getSharperatio1y().getEnd())); if ("+".equals(req.getSharperatio1y().getEnd())) {
criteria.andSharperatio2yGreaterThanOrEqualTo(new BigDecimal(req.getSharperatio1y().getBegin()));
} else {
criteria.andSharperatio2yBetween(new BigDecimal(req.getSharperatio1y().getBegin()), new BigDecimal(req.getSharperatio1y().getEnd()));
}
break; break;
case "3y": case "3y":
criteria.andSharperatio3yBetween(new BigDecimal(req.getSharperatio1y().getBegin()), new BigDecimal(req.getSharperatio1y().getEnd())); if ("+".equals(req.getSharperatio1y().getEnd())) {
criteria.andSharperatio3yGreaterThanOrEqualTo(new BigDecimal(req.getSharperatio1y().getBegin()));
} else {
criteria.andSharperatio3yBetween(new BigDecimal(req.getSharperatio1y().getBegin()), new BigDecimal(req.getSharperatio1y().getEnd()));
}
break; break;
case "4y": case "4y":
criteria.andSharperatio4yBetween(new BigDecimal(req.getSharperatio1y().getBegin()), new BigDecimal(req.getSharperatio1y().getEnd())); if ("+".equals(req.getSharperatio1y().getEnd())) {
criteria.andSharperatio4yGreaterThanOrEqualTo(new BigDecimal(req.getSharperatio1y().getBegin()));
} else {
criteria.andSharperatio4yBetween(new BigDecimal(req.getSharperatio1y().getBegin()), new BigDecimal(req.getSharperatio1y().getEnd()));
}
break; break;
case "5y": case "5y":
criteria.andSharperatio5yBetween(new BigDecimal(req.getSharperatio1y().getBegin()), new BigDecimal(req.getSharperatio1y().getEnd())); if ("+".equals(req.getSharperatio1y().getEnd())) {
criteria.andSharperatio5yGreaterThanOrEqualTo(new BigDecimal(req.getSharperatio1y().getBegin()));
} else {
criteria.andSharperatio5yBetween(new BigDecimal(req.getSharperatio1y().getBegin()), new BigDecimal(req.getSharperatio1y().getEnd()));
}
break; break;
case "incepY": case "incepY":
criteria.andSharperatioIncepBetween(new BigDecimal(req.getSharperatio1y().getBegin()), new BigDecimal(req.getSharperatio1y().getEnd())); if ("+".equals(req.getSharperatio1y().getEnd())) {
criteria.andSharperatioIncepGreaterThanOrEqualTo(new BigDecimal(req.getSharperatio1y().getBegin()));
} else {
criteria.andSharperatioIncepBetween(new BigDecimal(req.getSharperatio1y().getBegin()), new BigDecimal(req.getSharperatio1y().getEnd()));
}
break; break;
} }
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment