代码问题修改

web/runeconomy-xk/src/main/java/com/gyee/runeconomy/service/homepage/EconomyPointHomePageService.java

@@ -552,10 +552,10 @@ public class EconomyPointHomePageService {
             BigDecimal currxnsll = compare100(currFiveInfo.getRxnssdl().divide(currFiveInfo.getRllfdl(), 4, BigDecimal.ROUND_HALF_UP).multiply(new BigDecimal("100")));
 
             dto.setCurrGzsll(currgzsll);
-            dto.setCurrGzsll(currjxsll);
-            dto.setCurrGzsll(currxdsll);
-            dto.setCurrGzsll(currslsll);
-            dto.setCurrGzsll(currxnsll);
+            dto.setCurrJxsll(currjxsll);
+            dto.setCurrXdsll(currxdsll);
+            dto.setCurrSlsll(currslsll);
+            dto.setCurrXNsll(currxnsll);
 
 
             if (null != ringFiveInfo) {
@@ -572,10 +572,10 @@ public class EconomyPointHomePageService {
                 BigDecimal ringxnslzzl = currxnsll.subtract(ringxnsll).divide(ringxnsll, 4, BigDecimal.ROUND_HALF_UP).multiply(new BigDecimal("100"));
 
                 dto.setRingGzslzzl(ringGzslzzl);
-                dto.setRingGzslzzl(ringjxslzzl);
-                dto.setRingGzslzzl(ringxdslzzl);
-                dto.setRingGzslzzl(ringslslzzl);
-                dto.setRingGzslzzl(ringxnslzzl);
+                dto.setRingJxslzzl(ringjxslzzl);
+                dto.setRingXdslzzl(ringxdslzzl);
+                dto.setRingSlslzzl(ringslslzzl);
+                dto.setRingXnslzzl(ringxnslzzl);
 
             }
 
@@ -593,10 +593,10 @@ public class EconomyPointHomePageService {
                 BigDecimal withxnslzzl = compare100(currxnsll.subtract(withxnsll).divide(withxnsll, 4, BigDecimal.ROUND_HALF_UP).multiply(new BigDecimal("100")));
 
                 dto.setWithGzslzzl(withGzslzzl);
-                dto.setWithGzslzzl(withjxslzzl);
-                dto.setWithGzslzzl(withxdslzzl);
-                dto.setWithGzslzzl(withslslzzl);
-                dto.setWithGzslzzl(withxnslzzl);
+                dto.setWithJxslzzl(withjxslzzl);
+                dto.setWithXdslzzl(withxdslzzl);
+                dto.setWithSlslzzl(withslslzzl);
+                dto.setWithXnslzzl(withxnslzzl);
             }
         }
 
@@ -616,10 +616,10 @@ public class EconomyPointHomePageService {
             BigDecimal currxnsll = compare100(currFiveInfo.getYxnssdl().divide(currFiveInfo.getYllfdl(), 4, BigDecimal.ROUND_HALF_UP).multiply(new BigDecimal("100")));
 
             dto.setCurrGzsll(currgzsll);
-            dto.setCurrGzsll(currjxsll);
-            dto.setCurrGzsll(currxdsll);
-            dto.setCurrGzsll(currslsll);
-            dto.setCurrGzsll(currxnsll);
+            dto.setCurrJxsll(currjxsll);
+            dto.setCurrXdsll(currxdsll);
+            dto.setCurrSlsll(currslsll);
+            dto.setCurrXNsll(currxnsll);
 
 
             if (null != ringFiveInfo) {
@@ -636,10 +636,10 @@ public class EconomyPointHomePageService {
                 BigDecimal ringxnslzzl = compare100(currxnsll.subtract(ringxnsll).divide(ringxnsll, 4, BigDecimal.ROUND_HALF_UP).multiply(new BigDecimal("100")));
 
                 dto.setRingGzslzzl(ringGzslzzl);
-                dto.setRingGzslzzl(ringjxslzzl);
-                dto.setRingGzslzzl(ringxdslzzl);
-                dto.setRingGzslzzl(ringslslzzl);
-                dto.setRingGzslzzl(ringxnslzzl);
+                dto.setRingJxslzzl(ringjxslzzl);
+                dto.setRingXdslzzl(ringxdslzzl);
+                dto.setRingSlslzzl(ringslslzzl);
+                dto.setRingXnslzzl(ringxnslzzl);
 
             }
 
@@ -657,10 +657,10 @@ public class EconomyPointHomePageService {
                 BigDecimal withxnslzzl = compare100(currxnsll.subtract(withxnsll).divide(withxnsll, 4, BigDecimal.ROUND_HALF_UP).multiply(new BigDecimal("100")));
 
                 dto.setWithGzslzzl(withGzslzzl);
-                dto.setWithGzslzzl(withjxslzzl);
-                dto.setWithGzslzzl(withxdslzzl);
-                dto.setWithGzslzzl(withslslzzl);
-                dto.setWithGzslzzl(withxnslzzl);
+                dto.setWithJxslzzl(withjxslzzl);
+                dto.setWithXdslzzl(withxdslzzl);
+                dto.setWithSlslzzl(withslslzzl);
+                dto.setWithXnslzzl(withxnslzzl);
             }
 
         }
@@ -681,11 +681,10 @@ public class EconomyPointHomePageService {
             BigDecimal currxnsll = compare100(currFiveInfo.getNxnssdl().divide(currFiveInfo.getNllfdl(), 4, BigDecimal.ROUND_HALF_UP).multiply(new BigDecimal("100")));
 
             dto.setCurrGzsll(currgzsll);
-            dto.setCurrGzsll(currjxsll);
-            dto.setCurrGzsll(currxdsll);
-            dto.setCurrGzsll(currslsll);
-            dto.setCurrGzsll(currxnsll);
-
+            dto.setCurrJxsll(currjxsll);
+            dto.setCurrXdsll(currxdsll);
+            dto.setCurrSlsll(currslsll);
+            dto.setCurrXNsll(currxnsll);
 
             if (null != ringFiveInfo) {
                 BigDecimal ringgzsll = compare100(ringFiveInfo.getNgzssdl().divide(ringFiveInfo.getNllfdl(), 4, BigDecimal.ROUND_HALF_UP).multiply(new BigDecimal("100")));
@@ -701,10 +700,10 @@ public class EconomyPointHomePageService {
                 BigDecimal ringxnslzzl = compare100(currxnsll.subtract(ringxnsll).divide(ringxnsll, 4, BigDecimal.ROUND_HALF_UP).multiply(new BigDecimal("100")));
 
                 dto.setRingGzslzzl(ringGzslzzl);
-                dto.setRingGzslzzl(ringjxslzzl);
-                dto.setRingGzslzzl(ringxdslzzl);
-                dto.setRingGzslzzl(ringslslzzl);
-                dto.setRingGzslzzl(ringxnslzzl);
+                dto.setRingJxslzzl(ringjxslzzl);
+                dto.setRingXdslzzl(ringxdslzzl);
+                dto.setRingSlslzzl(ringslslzzl);
+                dto.setRingXnslzzl(ringxnslzzl);
 
             }
 
@@ -722,10 +721,10 @@ public class EconomyPointHomePageService {
                 BigDecimal withxnslzzl = compare100(currxnsll.subtract(withxnsll).divide(withxnsll, 4, BigDecimal.ROUND_HALF_UP).multiply(new BigDecimal("100")));
 
                 dto.setWithGzslzzl(withGzslzzl);
-                dto.setWithGzslzzl(withjxslzzl);
-                dto.setWithGzslzzl(withxdslzzl);
-                dto.setWithGzslzzl(withslslzzl);
-                dto.setWithGzslzzl(withxnslzzl);
+                dto.setWithJxslzzl(withjxslzzl);
+                dto.setWithXdslzzl(withxdslzzl);
+                dto.setWithSlslzzl(withslslzzl);
+                dto.setWithXnslzzl(withxnslzzl);
             }
 
         }
@@ -911,7 +910,7 @@ public class EconomyPointHomePageService {
                 BigDecimal withhours2 = new BigDecimal(0.00).valueOf((int) withhours);
                 BigDecimal withSbklyl = withhours2.subtract((withTimeInfo.getRhjgzxsmx().add(withTimeInfo.getRhjjxtjxs()))).divide(withhours2, 4, BigDecimal.ROUND_HALF_UP).multiply(new BigDecimal("100"));
                 BigDecimal withSbklyzzl = (currSbklyl.subtract(withSbklyl)).divide(withSbklyl, 4, BigDecimal.ROUND_HALF_UP).multiply(new BigDecimal("100"));
-                dto.setRingSbklyzzl(withSbklyzzl);
+                dto.setWithSbklyzzl(withSbklyzzl);
 
             }
         }
@@ -976,7 +975,7 @@ public class EconomyPointHomePageService {
                 BigDecimal withhours2 = new BigDecimal(0.00).valueOf((int) withhours);
                 BigDecimal withSbklyl = withhours2.subtract((withTimeInfo.getYhjgzxsmx().add(withTimeInfo.getYhjjxtjxs()))).divide(withhours2, 4, BigDecimal.ROUND_HALF_UP).multiply(new BigDecimal("100"));
                 BigDecimal withSbklyzzl = (currSbklyl.subtract(withSbklyl)).divide(withSbklyl, 4, BigDecimal.ROUND_HALF_UP).multiply(new BigDecimal("100"));
-                dto.setRingSbklyzzl(withSbklyzzl);
+                dto.setWithSbklyzzl(withSbklyzzl);
 
             }
         }
@@ -1058,7 +1057,7 @@ public class EconomyPointHomePageService {
                 withhours2 = compare0(withhours2) ? withhours2 : new BigDecimal(1);
                 BigDecimal withSbklyl = withhours2.subtract((withTimeInfo.getNhjgzxsmx().add(withTimeInfo.getNhjjxtjxs()))).divide(withhours2, 4, BigDecimal.ROUND_HALF_UP).multiply(new BigDecimal("100"));
                 BigDecimal withSbklyzzl = (currSbklyl.subtract(withSbklyl)).divide(withSbklyl, 4, BigDecimal.ROUND_HALF_UP).multiply(new BigDecimal("100"));
-                dto.setRingSbklyzzl(withSbklyzzl);
+                dto.setWithSbklyzzl(withSbklyzzl);
 
             }
         }