diff --git a/src/main/java/com/msdw/tms/service/impl/ExperimentalReportServiceImpl.java b/src/main/java/com/msdw/tms/service/impl/ExperimentalReportServiceImpl.java index 1b298b2..970f6ce 100644 --- a/src/main/java/com/msdw/tms/service/impl/ExperimentalReportServiceImpl.java +++ b/src/main/java/com/msdw/tms/service/impl/ExperimentalReportServiceImpl.java @@ -41,12 +41,12 @@ public class ExperimentalReportServiceImpl extends ServiceImpl map = new HashMap<>(); map.put("report", result); - if (systemId == 1 | systemId == 4 | systemId == 5) { + // if (systemId == 1 | systemId == 4 | systemId == 5) { List data = achievementManagementDao.queryPythonTest(recordId); map.put("data", data); return R.ok().put("data", map); - } - return R.ok().put("data", map); + // } + // return R.ok().put("data", map); } //虚拟实验 diff --git a/src/main/resources/application-chaohu.properties b/src/main/resources/application-chaohu.properties index 73311ad..b975ede 100644 --- a/src/main/resources/application-chaohu.properties +++ b/src/main/resources/application-chaohu.properties @@ -2,7 +2,7 @@ server.port=9001 server.servlet.context-path=/evaluation #\u6B63\u5F0F\u6570\u636E\u5E93\u8FDE\u63A5 -spring.datasource.url=jdbc:mysql://rm-wz90d92p0pf083nxzno.mysql.rds.aliyuncs.com:3306/chaohu?useUnicode=true&characterEncoding=UTF-8&useSSL=false&serverTimezone=Asia/Shanghai +spring.datasource.url=jdbc:mysql://192.168.0.245:3306/chaohu?useUnicode=true&characterEncoding=UTF-8&useSSL=false&serverTimezone=Asia/Shanghai spring.datasource.username=root spring.datasource.password=HuoRan@2021 spring.datasource.driver-class-name=com.mysql.cj.jdbc.Driver diff --git a/src/main/resources/application.properties b/src/main/resources/application.properties index bab924b..d4c9479 100644 --- a/src/main/resources/application.properties +++ b/src/main/resources/application.properties @@ -1,2 +1,2 @@ #\u9009\u62E9\u6307\u5B9A\u73AF\u5883,\u76EE\u524D\u53EA\u6709\u6D4B\u8BD5\u548C\u6B63\u5F0F\u73AF\u5883 -spring.profiles.active=prod \ No newline at end of file +spring.profiles.active=chaohu \ No newline at end of file diff --git a/src/main/resources/mapper/tms/ProjectRecordDao.xml b/src/main/resources/mapper/tms/ProjectRecordDao.xml index c31170d..ab7cdff 100644 --- a/src/main/resources/mapper/tms/ProjectRecordDao.xml +++ b/src/main/resources/mapper/tms/ProjectRecordDao.xml @@ -62,7 +62,7 @@ and t.systemId = #{systemId} - GROUP BY c.recordId desc + GROUP BY c.recordId @@ -230,7 +230,7 @@ INNER JOIN tms_experimental_report re ON re.eventId = r.recordId WHERE c.userId = #{userId} AND projectPermissions = 0 - GROUP BY c.recordId DESC; + GROUP BY c.recordId