Merge remote-tracking branch 'origin/master'

hehai
zhiyong.ning 4 years ago
commit 1a8abc96f8
  1. 3
      src/main/java/com/msdw/tms/service/impl/ExperimentalReportServiceImpl.java

@ -56,7 +56,8 @@ public class ExperimentalReportServiceImpl extends ServiceImpl<ExperimentalRepor
Integer systemId = reportDao.querySystemId(recordId); Integer systemId = reportDao.querySystemId(recordId);
//python实验 //python实验
if (systemId == 1 | systemId == 4 | systemId == 5) { if (systemId != 2 || systemId != 3) {
/*if (systemId == 1 | systemId == 4 | systemId == 5) {*/
List<AchievementManagementVO> data = achievementManagementDao.queryPythonTest(recordId); List<AchievementManagementVO> data = achievementManagementDao.queryPythonTest(recordId);
HashMap<String, Object> map = new HashMap<>(); HashMap<String, Object> map = new HashMap<>();
map.put("data", data); map.put("data", data);

Loading…
Cancel
Save