国有产权接更新

README.md

@@ -6,6 +6,5 @@
 
 数据中心接口
 
-
-
+接口文档：https://apifox.com/apidoc/shared-89fcf996-fb6c-4f59-921e-703f0cb69fff
 

src/main/java/com/trs/ggzyexchange/datacentercontroller/DataController.java

@@ -1293,7 +1293,7 @@ public class DataController {
         CqGqBargainResult cqGqBargainResult = cqGqBargainResultService.getOne(cqGqBargainResultQueryWrapper);
 
         BigDecimal bigDecimal = new BigDecimal("0");
-        if(!ObjectUtils.isEmpty(cqGqBargainResult)){
+        if(!ObjectUtils.isEmpty(countCqSwBargainResult)){
             bigDecimal = bigDecimal.add(new BigDecimal(countCqSwBargainResult.getSumAll()));
         }
         if(!ObjectUtils.isEmpty(cqGqBargainResult)){
@@ -1349,6 +1349,7 @@ public class DataController {
         /*其他交易-结束*/
 
         redisUtil.set(CommonConstant.PUBLISHING_CATEGORY_MONEY_LIST, JSONArray.toJSONString(statisticsAssembles),CommonConstant.REDIS_SAVE_TIME);
+
         return Result.OK(statisticsAssembles);
 
     }
@@ -1608,18 +1609,18 @@ public class DataController {
             cqGqBargainResultQueryWrapperSumInIn.likeRight("region_code",regionCode);
             CqGqBargainResult cqGqBargainResultSumInIn = cqGqBargainResultService.getOne(cqGqBargainResultQueryWrapperSumInIn);
 
+            BigDecimal cqSwBargainTotal = new BigDecimal(0);
+            if(!ObjectUtils.isEmpty(cqSwBargainResultSumInIn)){
+                String sumAll = cqSwBargainResultSumInIn.getSumAll();
+                BigDecimal bigDecimalSumAllValue = new BigDecimal(sumAll);
+                cqSwBargainTotal = cqSwBargainTotal.add(bigDecimalSumAllValue);
+            }
             if(!ObjectUtils.isEmpty(cqGqBargainResultSumInIn)){
-                String sumAll = cqGqBargainResultSumInIn.getSumAll();
-                BigDecimal bigDecimalsumAll = new BigDecimal(sumAll);
-                if(!ObjectUtils.isEmpty(cqSwBargainResultSumInIn)){
-                    String sumAllValue = cqSwBargainResultSumInIn.getSumAll();
-                    BigDecimal bigDecimalSumAllValue = new BigDecimal(sumAllValue);
-                    bigDecimalsumAll = bigDecimalSumAllValue.add(bigDecimalsumAll);
-                }
-                lineChartDataGyValue[ilineChartDataGyValue] = bigDecimalsumAll.toString();
-            }else{
-                lineChartDataGyValue[ilineChartDataGyValue] = "0";
+                String sumAllValue = cqGqBargainResultSumInIn.getSumAll();
+                BigDecimal bigDecimalSumAllValue = new BigDecimal(sumAllValue);
+                cqSwBargainTotal =  cqSwBargainTotal.add(bigDecimalSumAllValue);
             }
+            lineChartDataGyValue[ilineChartDataGyValue] = cqSwBargainTotal.toString();
             ilineChartDataGyValue++;
         }
         lineChartDataGy.setValue(lineChartDataGyValue);
@@ -1687,6 +1688,7 @@ public class DataController {
         lineChartDataQt.setName("其他交易");
         dataDataDataList.add(lineChartDataQt);
 
+        redisUtil.set(CommonConstant.PUBLISHING_CATEGORY_MONEY_YUE_LIST, JSONArray.toJSONString(dataDataDataList),CommonConstant.REDIS_SAVE_TIME);
 
         return Result.OK(dataDataDataList);
     }

src/main/resources/mapper/CqSwBargainResultMapper.xml

@@ -93,6 +93,6 @@
         where
             csb.TRADE_DATE >= #{resultStartTime} and csb.TRADE_DATE <= #{resultEndTime}
             and
-              csi.REGION_CODE like CONCAT(#{region_code}, '%')
+              csi.REGION_CODE like CONCAT(#{regionCode}, '%')
     </select>
 </mapper>