Merge branch 'feature' into 'release'

调整简报竞品格式3

See merge request !207

src/main/java/com/zhiwei/brandkbs2/Brandkbs2Application.java

 package com.zhiwei.brandkbs2;
 
+import org.apache.logging.log4j.LogManager;
+import org.apache.logging.log4j.Logger;
 import org.springframework.boot.SpringApplication;
 import org.springframework.boot.autoconfigure.SpringBootApplication;
 import org.springframework.boot.autoconfigure.jdbc.DataSourceAutoConfiguration;
@@ -20,9 +22,11 @@ import org.springframework.scheduling.annotation.EnableScheduling;
 @SpringBootApplication(exclude = {MongoAutoConfiguration.class, DataSourceAutoConfiguration.class})
 @EnableAspectJAutoProxy
 public class Brandkbs2Application {
+    private static final Logger logger = LogManager.getLogger(Brandkbs2Application.class);
 
     public static void main(String[] args) {
         SpringApplication.run(Brandkbs2Application.class, args);
+        logger.info("Brandkbs启动完成....2023/2/15");
     }
 
 }

src/main/java/com/zhiwei/brandkbs2/service/impl/ReportServiceImpl.java

@@ -358,7 +358,7 @@ public class ReportServiceImpl implements ReportService {
             json.put("id", brandContendId);
             json.put("brand", abstractProject.getBrandName());
             try {
-                json.put("brandCompare", markDataService.getContendSpreadAnalyze(startTime, endTime, projectId, contendId, 5, true));
+                json.put("brandCompare", markDataService.getContendSpreadAnalyze(startTime, endTime, projectId, brandContendId, 5, true));
             } catch (IOException e) {
                 log.error("getPcReportResult-brandCompare-", e);
             }