更新开评标场地的查询方式

src/main/java/com/trs/ggzyexchange/controller/TRegionController.java

@@ -37,6 +37,7 @@ public class TRegionController extends BaseController {
     public Result<List<TRegion>> getTRegionCityList(){
         QueryWrapper<TRegion> queryWrapper = new QueryWrapper<TRegion>();
         queryWrapper.eq("parent_code","150000");
+        queryWrapper.eq("is_delete","N");
         queryWrapper.orderByAsc("order_num");
         List<TRegion> listReturn = new ArrayList<TRegion>();
         List<TRegion> list = tRegionService.list(queryWrapper);
@@ -67,6 +68,7 @@ public class TRegionController extends BaseController {
     public Result<List<TRegion>> getTRegionDistrictList(@RequestParam(name="parentCode",required=true) String parentCode){
         QueryWrapper<TRegion> queryWrapper = new QueryWrapper<TRegion>();
         queryWrapper.eq("parent_code",parentCode);
+        queryWrapper.eq("is_delete","N");
         queryWrapper.orderByAsc("code");
         List<TRegion> list = tRegionService.list(queryWrapper);
         for (TRegion tRegion : list) {

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

@@ -250,15 +250,16 @@ public class HomePageMSDataController {
         }catch (Exception e){
             e.printStackTrace();
         }
-/*        *//*ZRZY_DK_PROJECT*//*
-        try {
-            QueryWrapper<ZrzyDkProject> zrzyTkqProjectInfoQueryWrapper = new QueryWrapper<ZrzyDkProject>();
-            int countZrzyTdCedeNotice = zrzyDkProjectService.count(zrzyTkqProjectInfoQueryWrapper);
-            totalZRZY =   totalZRZY + countZrzyTdCedeNotice;
-            total = total + countZrzyTdCedeNotice;
-        }catch (Exception e){
-            e.printStackTrace();
-        }*/
+        if(platformCode.equals("121500004600236091")){
+                try {
+                    QueryWrapper<ZrzyDkProject> zrzyTkqProjectInfoQueryWrapper = new QueryWrapper<ZrzyDkProject>();
+                    int countZrzyTdCedeNotice = zrzyDkProjectService.count(zrzyTkqProjectInfoQueryWrapper);
+                    totalZRZY =   totalZRZY + countZrzyTdCedeNotice;
+                    total = total + countZrzyTdCedeNotice;
+                }catch (Exception e){
+                    e.printStackTrace();
+                }
+        }
         /*ZRZY_BG_STOCK_INDEX*/
         try {
             QueryWrapper<ZrzyBgStockIndex> zrzyTkqProjectInfoQueryWrapper = new QueryWrapper<ZrzyBgStockIndex>();
@@ -293,7 +294,7 @@ public class HomePageMSDataController {
         /*CQ_SW_PROJECT*/
         try {
             QueryWrapper<CqSwProject> cqGqProjectQueryWrapper = new QueryWrapper<CqSwProject>();
-            cqGqProjectQueryWrapper.eq("zone",platformCode);
+            cqGqProjectQueryWrapper.eq("zone",regionCode);
             int countZrzyTdCedeNotice = cqSwProjectService.count(cqGqProjectQueryWrapper);
             totalGYCQ = totalGYCQ + countZrzyTdCedeNotice;
             total = total + countZrzyTdCedeNotice;
@@ -413,11 +414,18 @@ public class HomePageMSDataController {
             /*
              *主体数量
              */
-            if(!ObjectUtils.isEmpty(areaCode) && areaCode != ""){
+            if(platformCode.equals("121500004600236091")){
                 QueryWrapper<ZtLegalinfo> ztLegalinfoQueryWrapper = new QueryWrapper<ZtLegalinfo>();
-                ztLegalinfoQueryWrapper.likeRight("REGION_CODE",regionCode);
+                ztLegalinfoQueryWrapper.likeRight("REGION_CODE","15");
                 int countzzq = ztLegalinfoService.count(ztLegalinfoQueryWrapper);
                 totalAmountTransactionData.setTotal(countzzq);
+            }else{
+                if(!ObjectUtils.isEmpty(areaCode) && areaCode != ""){
+                    QueryWrapper<ZtLegalinfo> ztLegalinfoQueryWrapper = new QueryWrapper<ZtLegalinfo>();
+                    ztLegalinfoQueryWrapper.likeRight("REGION_CODE",regionCode);
+                    int countzzq = ztLegalinfoService.count(ztLegalinfoQueryWrapper);
+                    totalAmountTransactionData.setTotal(countzzq);
+                }
             }
         }catch (Exception e){
             e.printStackTrace();
@@ -466,6 +474,13 @@ public class HomePageMSDataController {
             e.printStackTrace();
         }
         try {
+            if(platformCode.equals("121500004600236091")){
+                try {
+                    totalYC = ycNoticeService.count();
+                }catch (Exception e){
+                    e.printStackTrace();
+                }
+            }
             QuantityTransactionCategory quantityTransactionCategory = new QuantityTransactionCategory();
             quantityTransactionCategory.setTotal(totalYC);
             quantityTransactionCategory.setName("药采交易");
@@ -592,18 +607,18 @@ public class HomePageMSDataController {
             e.printStackTrace();
         }
         /*ZRZY_DK_PROJECT*/
-/*
- 盟市没有地勘
- try {
-            QueryWrapper<ZrzyDkProject> zrzyTkqProjectInfoQueryWrapper = new QueryWrapper<ZrzyDkProject>();
-            zrzyTkqProjectInfoQueryWrapper.ge("NOTICE_SEND_TIME",resultStartTime);
-            zrzyTkqProjectInfoQueryWrapper.le("NOTICE_SEND_TIME",resultEndTime);
-            zrzyTkqProjectInfoQueryWrapper.eq("platform_code",platformCode);
-            int countZrzyTdCedeNoticeSelf = zrzyDkProjectService.count(zrzyTkqProjectInfoQueryWrapper);
-            total = total + countZrzyTdCedeNoticeSelf;
-        }catch (Exception e){
-            e.printStackTrace();
-        }*/
+        if(platformCode.equals("121500004600236091")){
+            try {
+                QueryWrapper<ZrzyDkProject> zrzyTkqProjectInfoQueryWrapper = new QueryWrapper<ZrzyDkProject>();
+                zrzyTkqProjectInfoQueryWrapper.ge("NOTICE_SEND_TIME",resultStartTime);
+                zrzyTkqProjectInfoQueryWrapper.le("NOTICE_SEND_TIME",resultEndTime);
+                zrzyTkqProjectInfoQueryWrapper.eq("platform_code",platformCode);
+                int countZrzyTdCedeNoticeSelf = zrzyDkProjectService.count(zrzyTkqProjectInfoQueryWrapper);
+                total = total + countZrzyTdCedeNoticeSelf;
+            }catch (Exception e){
+                e.printStackTrace();
+            }
+        }
         /*ZRZY_BG_STOCK_INDEX*/
         try {
             QueryWrapper<ZrzyBgStockIndex> zrzyTkqProjectInfoQueryWrapper = new QueryWrapper<ZrzyBgStockIndex>();

src/test/java/com/trs/ggzyexchange/GgzyExchangeApplicationTests.java

@@ -1,7 +1,9 @@
 package com.trs.ggzyexchange;
 
+import com.trs.ggzyexchange.entity.JgSiteInformation;
 import com.trs.ggzyexchange.schedul.*;
 import com.trs.ggzyexchange.service.GcNoticeandfileService;
+import com.trs.ggzyexchange.service.JgSiteInformationService;
 import com.trs.ggzyexchange.utils.DateUtils;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.lang3.ObjectUtils;
@@ -17,45 +19,15 @@ import java.nio.charset.CharsetDecoder;
 import java.text.ParseException;
 import java.text.SimpleDateFormat;
 import java.util.Date;
+import java.util.List;
+
 @SpringBootTest
 @Slf4j
 class GgzyExchangeApplicationTests {
 
     @Autowired
-    private GcNoticeandfileSchedul gcNoticeandfileSchedul;
-
-    @Autowired
-    private GcBidcandidatePostSchedul gcBidcandidatePostSchedul;
-
-    @Autowired
-    private GcBidExceptioNoticeSchedul gcBidExceptioNoticeSchedul;
-
-    @Autowired
-    private GcBidopenrecordSchedul gcBidopenrecordSchedul;
-
-    @Autowired
-    private GcBidpublicitySchedul gcBidpublicitySchedul;
-
-    @Autowired
-    private GcPerformanceSchedul gcPerformanceSchedul;
+    private JgSiteInformationService jgSiteInformationService;
 
-    @Autowired
-    private GcPubContractSchedul gcPubContractSchedul;
-
-    @Autowired
-    private GcTenderbidfileSchedul gcTenderbidfileSchedul;
-
-    @Autowired
-    private ZrzyTdBidwinnoticeSchedul zrzyTdBidwinnoticeSchedul;
-
-    @Autowired
-    private ZrzyTdCedeNoticeSchedul ZrzyTdCedeNoticeSchedul;
-
-    @Autowired
-    private CqSwBargainResultSchedul cqSwBargainResultSchedul;
-
-    @Autowired
-    private CqSwIssueBulletinSchedul cqSwIssueBulletinSchedul;
 
     @Test
     void contextLoads() throws Exception {