|
@@ -241,9 +241,9 @@ public class IndexServiceImpl implements IndexService {
|
|
|
BigDecimal lastMothTqTotal = lastMothTqTotalFuture.join();
|
|
|
BigDecimal lastYearMonthTqTotal = lastYearMonthTqTotalFuture.join();
|
|
|
|
|
|
- incomeDataInfoVO.setYearTotal(currentYearTotal);
|
|
|
- incomeDataInfoVO.setYearTq(lastYearTqTotal);
|
|
|
- incomeDataInfoVO.setMonthTotal(currentMonthTotal);
|
|
|
+ incomeDataInfoVO.setYearTotal(currentYearTotal.setScale(2,RoundingMode.HALF_UP));
|
|
|
+ incomeDataInfoVO.setYearTq(lastYearTqTotal.setScale(2,RoundingMode.HALF_UP));
|
|
|
+ incomeDataInfoVO.setMonthTotal(currentMonthTotal.setScale(2,RoundingMode.HALF_UP));
|
|
|
|
|
|
|
|
|
CompletableFuture<BigDecimal> incomeYearTbFuture = CompletableFuture.supplyAsync(() -> {
|
|
@@ -276,9 +276,9 @@ public class IndexServiceImpl implements IndexService {
|
|
|
BigDecimal incomeYearTb = incomeYearTbFuture.join();
|
|
|
BigDecimal incomeMothHb = incomeMothHbFuture.join();
|
|
|
BigDecimal incomeYearMothTb = incomeYearMothTbFuture.join();
|
|
|
- incomeDataInfoVO.setYearTb(incomeYearTb);
|
|
|
- incomeDataInfoVO.setMonthTb(incomeYearMothTb);
|
|
|
- incomeDataInfoVO.setMonthHb(incomeMothHb);
|
|
|
+ incomeDataInfoVO.setYearTb(incomeYearTb.setScale(2,RoundingMode.HALF_UP));
|
|
|
+ incomeDataInfoVO.setMonthTb(incomeYearMothTb.setScale(2,RoundingMode.HALF_UP));
|
|
|
+ incomeDataInfoVO.setMonthHb(incomeMothHb.setScale(2,RoundingMode.HALF_UP));
|
|
|
|
|
|
redisUtil.set(CacheKey.INCOME_DATA_REDIS_KEY + depart + ":" + role, incomeDataInfoVO, 1000L * 60 * 60 * 2);
|
|
|
|
|
@@ -436,9 +436,9 @@ public class IndexServiceImpl implements IndexService {
|
|
|
BigDecimal lastMothTqTotal = lastMothTqTotalFuture.join();
|
|
|
BigDecimal lastYearMonthTqTotal = lastYearMonthTqTotalFuture.join();
|
|
|
|
|
|
- totalContractNumInfoVO.setYearTotal(currentYearTotal);
|
|
|
- totalContractNumInfoVO.setYearTq(lastYearTqTotal);
|
|
|
- totalContractNumInfoVO.setMonthTotal(currentMonthTotal);
|
|
|
+ totalContractNumInfoVO.setYearTotal(currentYearTotal.setScale(2,RoundingMode.HALF_UP));
|
|
|
+ totalContractNumInfoVO.setYearTq(lastYearTqTotal.setScale(2,RoundingMode.HALF_UP));
|
|
|
+ totalContractNumInfoVO.setMonthTotal(currentMonthTotal.setScale(2,RoundingMode.HALF_UP));
|
|
|
|
|
|
|
|
|
CompletableFuture<BigDecimal> yearTbFuture = CompletableFuture.supplyAsync(() -> {
|
|
@@ -471,9 +471,9 @@ public class IndexServiceImpl implements IndexService {
|
|
|
BigDecimal yearTb = yearTbFuture.join();
|
|
|
BigDecimal mothHb = mothHbFuture.join();
|
|
|
BigDecimal yearMothTb = yearMothTbFuture.join();
|
|
|
- totalContractNumInfoVO.setYearTb(yearTb);
|
|
|
- totalContractNumInfoVO.setMonthTb(yearMothTb);
|
|
|
- totalContractNumInfoVO.setMonthHb(mothHb);
|
|
|
+ totalContractNumInfoVO.setYearTb(yearTb.setScale(2,RoundingMode.HALF_UP));
|
|
|
+ totalContractNumInfoVO.setMonthTb(yearMothTb.setScale(2,RoundingMode.HALF_UP));
|
|
|
+ totalContractNumInfoVO.setMonthHb(mothHb.setScale(2,RoundingMode.HALF_UP));
|
|
|
|
|
|
redisUtil.set(CacheKey.CONTRACT_DATA_REDIS_KEY + depart + ":" + role, totalContractNumInfoVO, 1000L * 60 * 60 * 2);
|
|
|
|
|
@@ -629,9 +629,9 @@ public class IndexServiceImpl implements IndexService {
|
|
|
BigDecimal lastMothTqTotal = lastMothTqTotalFuture.join();
|
|
|
BigDecimal lastYearMonthTqTotal = lastYearMonthTqTotalFuture.join();
|
|
|
|
|
|
- indexTotalVo.setYearTotal(currentYearTotal);
|
|
|
- indexTotalVo.setYearTq(lastYearTqTotal);
|
|
|
- indexTotalVo.setMonthTotal(currentMonthTotal);
|
|
|
+ indexTotalVo.setYearTotal(currentYearTotal.setScale(2,RoundingMode.HALF_UP));
|
|
|
+ indexTotalVo.setYearTq(lastYearTqTotal.setScale(2,RoundingMode.HALF_UP));
|
|
|
+ indexTotalVo.setMonthTotal(currentMonthTotal.setScale(2,RoundingMode.HALF_UP));
|
|
|
|
|
|
|
|
|
CompletableFuture<BigDecimal> yearTbFuture = CompletableFuture.supplyAsync(() -> {
|
|
@@ -664,9 +664,9 @@ public class IndexServiceImpl implements IndexService {
|
|
|
BigDecimal yearTb = yearTbFuture.join();
|
|
|
BigDecimal mothHb = mothHbFuture.join();
|
|
|
BigDecimal yearMothTb = yearMothTbFuture.join();
|
|
|
- indexTotalVo.setYearTb(yearTb);
|
|
|
- indexTotalVo.setMonthTb(yearMothTb);
|
|
|
- indexTotalVo.setMonthHb(mothHb);
|
|
|
+ indexTotalVo.setYearTb(yearTb.setScale(2,RoundingMode.HALF_UP));
|
|
|
+ indexTotalVo.setMonthTb(yearMothTb.setScale(2,RoundingMode.HALF_UP));
|
|
|
+ indexTotalVo.setMonthHb(mothHb.setScale(2,RoundingMode.HALF_UP));
|
|
|
|
|
|
redisUtil.set(CacheKey.RECEIVED_DATA_REDIS_KEY + depart + ":" + role, indexTotalVo, 1000L * 60 * 60 * 2);
|
|
|
|
|
@@ -799,7 +799,7 @@ public class IndexServiceImpl implements IndexService {
|
|
|
ContractChartInfoVo newResVo = new ContractChartInfoVo();
|
|
|
for (ContractAmount amount : contractAmountList) {
|
|
|
String dateResult = amount.getDate();
|
|
|
- BigDecimal contractAmountResult = amount.getContractAmount();
|
|
|
+ BigDecimal contractAmountResult = amount.getContractAmount().setScale(2,RoundingMode.HALF_UP);
|
|
|
Long contractTotalResult = amount.getContractTotal();
|
|
|
|
|
|
for (int i = 0; i < xAxisData.size(); i++) {
|