国有资产数据接口更新

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

@@ -1285,10 +1285,10 @@ public class DataController {
         /*国有资产-开始*/
         QuantityStatisticsAssemble quantityStatisticsStateOwnedProperty = new QuantityStatisticsAssemble();
         quantityStatisticsStateOwnedProperty.setTitle("国有产权");
-        CqSwBargainResult countCqSwBargainResult = cqSwBargainResultService.getSumMoneyByRegionCode(areaCode);
+        CqSwBargainResult countCqSwBargainResult = cqSwBargainResultService.getSumMoneyByRegionCode(regionCode);
 
         QueryWrapper<CqGqBargainResult> cqGqBargainResultQueryWrapper = new QueryWrapper<CqGqBargainResult>();
-        cqGqBargainResultQueryWrapper.likeRight("REGION_CODE",areaCode);
+        cqGqBargainResultQueryWrapper.likeRight("REGION_CODE",regionCode);
         cqGqBargainResultQueryWrapper.select("sum( case when PRICE_UNIT = 0 then TRADE_VALUE when PRICE_UNIT = 1 then TRADE_VALUE*10000 else TRADE_VALUE end) as sumAll");
         CqGqBargainResult cqGqBargainResult = cqGqBargainResultService.getOne(cqGqBargainResultQueryWrapper);
 
@@ -1593,26 +1593,26 @@ public class DataController {
             Date endTimeOfCurrentMonth = DateUtils.getEndTimeOfCurrentMonth(parse);
             String formatEnd = formatyyyyMMddHHmmss.format(endTimeOfCurrentMonth);
 
-            QueryWrapper<CqSwBargainResult> cqSwBargainResultQueryWrapper = new QueryWrapper<CqSwBargainResult>();
-            cqSwBargainResultQueryWrapper.gt("TRADE_DATE",formatStart.substring(0,8));
-            cqSwBargainResultQueryWrapper.le("TRADE_DATE",formatEnd.substring(0,8));
-            cqSwBargainResultQueryWrapper.eq("PLATFORM_CODE",platformCode);
-            cqSwBargainResultQueryWrapper.select("sum( case when PRICE_UNIT = 0 then TRADE_VALUE when PRICE_UNIT = 1 then TRADE_VALUE*10000 else TRADE_VALUE end) as sumAll");
-            CqSwBargainResult cqSwBargainResult = cqSwBargainResultService.getOne(cqSwBargainResultQueryWrapper);
-
-            QueryWrapper<CqGqBargainResult> cqGqBargainResultQueryWrapper = new QueryWrapper<CqGqBargainResult>();
-            cqGqBargainResultQueryWrapper.gt("TRADE_DATE",formatStart.substring(0,8));
-            cqGqBargainResultQueryWrapper.le("TRADE_DATE",formatEnd.substring(0,8));
-            cqGqBargainResultQueryWrapper.eq("PLATFORM_CODE",platformCode);
-            cqGqBargainResultQueryWrapper.select("sum( case when PRICE_UNIT = 0 then TRADE_VALUE when PRICE_UNIT = 1 then TRADE_VALUE*10000 else TRADE_VALUE end) as sumAll");
-
-
-            CqGqBargainResult cqGqBargainResult = cqGqBargainResultService.getOne(cqGqBargainResultQueryWrapper);
-            if(!ObjectUtils.isEmpty(cqSwBargainResult)){
-                String sumAll = cqSwBargainResult.getSumAll();
+            /*CQ_SW_BARGAIN_RESULT*/
+            CqSwBargainResult cqSwBargainResultSumInIn = null;
+            try {
+                cqSwBargainResultSumInIn = cqSwBargainResultService.getSumMoneyByRegionCodeAndTime(regionCode,formatStart.substring(0,8),formatEnd.substring(0,8));
+            }catch (Exception e){
+                e.printStackTrace();
+            }
+            /*CQ_GQ_BARGAIN_RESULT*/
+            QueryWrapper<CqGqBargainResult> cqGqBargainResultQueryWrapperSumInIn = new QueryWrapper<CqGqBargainResult>();
+            cqGqBargainResultQueryWrapperSumInIn.gt("TRADE_DATE",formatStart.substring(0,8));
+            cqGqBargainResultQueryWrapperSumInIn.le("TRADE_DATE",formatEnd.substring(0,8));
+            cqGqBargainResultQueryWrapperSumInIn.select("sum( case when PRICE_UNIT = 0 then TRADE_VALUE when PRICE_UNIT = 1 then TRADE_VALUE*10000 else TRADE_VALUE end) as sumAll");
+            cqGqBargainResultQueryWrapperSumInIn.likeRight("region_code",regionCode);
+            CqGqBargainResult cqGqBargainResultSumInIn = cqGqBargainResultService.getOne(cqGqBargainResultQueryWrapperSumInIn);
+
+            if(!ObjectUtils.isEmpty(cqGqBargainResultSumInIn)){
+                String sumAll = cqGqBargainResultSumInIn.getSumAll();
                 BigDecimal bigDecimalsumAll = new BigDecimal(sumAll);
-                if(!ObjectUtils.isEmpty(cqGqBargainResult)){
-                    String sumAllValue = cqGqBargainResult.getSumAll();
+                if(!ObjectUtils.isEmpty(cqSwBargainResultSumInIn)){
+                    String sumAllValue = cqSwBargainResultSumInIn.getSumAll();
                     BigDecimal bigDecimalSumAllValue = new BigDecimal(sumAllValue);
                     bigDecimalsumAll = bigDecimalSumAllValue.add(bigDecimalsumAll);
                 }

src/main/java/com/trs/ggzyexchange/mapper/CqSwBargainResultMapper.java

@@ -39,4 +39,9 @@ public interface CqSwBargainResultMapper extends BaseMapper<CqSwBargainResult> {
     CqSwBargainResult getSumMoneyByRegionCode(
             @Param("region_code")    String region_code
     );
+
+    CqSwBargainResult getSumMoneyByRegionCodeAndTime(
+            @Param("regionCode")  String regionCode,
+            @Param("resultStartTime")  String resultStartTime,
+            @Param("resultEndTime") String resultEndTime);
 }

src/main/java/com/trs/ggzyexchange/service/CqSwBargainResultService.java

@@ -27,4 +27,6 @@ public interface CqSwBargainResultService extends IService<CqSwBargainResult> {
     int countByRegionCode(String areaCode);
 
     CqSwBargainResult getSumMoneyByRegionCode(String areaCode);
+
+    CqSwBargainResult getSumMoneyByRegionCodeAndTime(String regionCode, String resultStartTime, String resultEndTime);
 }

src/main/java/com/trs/ggzyexchange/service/impl/CqSwBargainResultServiceImpl.java

@@ -66,5 +66,11 @@ public class CqSwBargainResultServiceImpl extends ServiceImpl<CqSwBargainResultM
         return cqSwBargainResultMapper.getSumMoneyByRegionCode(areaCode);
     }
 
+    // String resultStartTime, String resultEndTime
+    @Override
+    public CqSwBargainResult getSumMoneyByRegionCodeAndTime(String regionCode, String resultStartTime, String resultEndTime) {
+        return cqSwBargainResultMapper.getSumMoneyByRegionCodeAndTime(regionCode,resultStartTime,resultEndTime);
+    }
+
 
 }

src/main/resources/mapper/CqSwBargainResultMapper.xml

@@ -83,4 +83,16 @@
 
 
     </select>
+    <select id="getSumMoneyByRegionCodeAndTime" resultType="com.trs.ggzyexchange.entity.CqSwBargainResult">
+        select
+            sum( case when csb.PRICE_UNIT = 0 then csb.TRADE_VALUE when csb.PRICE_UNIT = 1 then csb.TRADE_VALUE*10000 else csb.TRADE_VALUE end) as sumAll
+        from
+            CQ_SW_BARGAIN_RESULT csb
+                left join CQ_SW_ISSUE_BULLETIN csi
+                          on csb.BID_CODE = csi.BID_CODE
+        where
+            csb.TRADE_DATE &gt;= #{resultStartTime} and csb.TRADE_DATE &lt;= #{resultEndTime}
+            and
+              csi.REGION_CODE like CONCAT(#{region_code}, '%')
+    </select>
 </mapper>