修改配置

cache/src/main/resources/application.yml

@@ -1,4 +1,4 @@
 spring:
   profiles:
-    active: jn
-#    active: test
+#    active: jn
+    active: hb

cache/target/classes/application.yml

@@ -1,4 +1,4 @@
 spring:
   profiles:
-    active: jn
-#    active: test
+#    active: jn
+    active: hb

web/benchmarking-web-hb/src/main/java/com/gyee/benchmarkingweb/controller/benching/BenchmarkingController.java

@@ -564,6 +564,29 @@ public class BenchmarkingController {
     public R dbmaintop(@RequestParam(value = "timetype",required = true)String timetype,
                           @RequestParam(value = "foreigntype",required = true)String foreigntype) throws Exception {
         List<Benchmark> resultList =  benchmarkingService.dbmaintop(timetype,foreigntype);
+
+                if (timetype.equals("月")){
+                    resultList.stream().forEach(i->{
+
+                        if (i.getComprehensiverate()<0){
+                            i.setComprehensiverate(0.0);
+                        }
+                    });
+                 }
+                if (timetype.equals("年")){
+                    resultList.stream().forEach(i->{
+                        if (i.getComprehensiverate()<0){
+                            i.setComprehensiverate(0.0);
+                        }
+                    });
+                }
+                if (timetype.equals("日")){
+                    resultList.stream().forEach(i->{
+                        if (i.getComprehensiverate()<0){
+                            i.setComprehensiverate(0.0);
+                        }
+                    });
+                }
 //        if (timetype.equals("月")){
 //            resultList.stream().forEach(i->{
 //                if (i.getForeignkeyid().equals("实际")){

web/benchmarking-web-hb/src/main/java/com/gyee/benchmarkingweb/service/benching/BenchmarkingService.java

@@ -2010,8 +2010,8 @@ public class BenchmarkingService {
         }else if(timetype.equals("年")){
             begin = DateUtils.getYearBegin(end);
         }
-        begin = DateUtils.addYears(begin,-1);
-        end = DateUtils.addYears(end,-1);
+        begin = DateUtils.addYears(begin,-3);
+        end = DateUtils.addYears(end,-3);
         qw.ge("recorddate",begin).le("recorddate",end);
         List<Benchmark> jzList = benchmarkService.list(qw);
         if (StringUtils.isNotNull(jzList)  && StringUtils.isNotEmpty(jzList)){