physical3/physical-boot
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

update

Browse Source
This commit is contained in:
ls
2025-04-01 21:54:53 +08:00
parent 0424b3950e
commit 260abb2da8
1 changed files with 6 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
physical-module-system/physical-system-biz/src/main/java/org/jeecg/modules/database/controller/ExperimentReportController.java
View File

@@ -269,9 +269,9 @@ public class ExperimentReportController extends JeecgController<ExperimentReport
} }
if (!StringUtils.equals(requestStatus, ExperimentReportStatus.PROOFREAD_PASS)) { if (!StringUtils.equals(requestStatus, ExperimentReportStatus.PROOFREAD_PASS)) {
report.setStatus(ExperimentReportStatus.REJECT); report.setStatus(ExperimentReportStatus.REJECT);
}
report.setProofreaderMemo(experimentReport.getMemo()); report.setProofreaderMemo(experimentReport.getMemo());
report.setProofreaderTime(DateUtils.formatDate(new Date(), "yyyy-MM-dd HH:mm")); report.setProofreaderTime(DateUtils.formatDate(new Date(), "yyyy-MM-dd HH:mm"));
}
report.setStatus(requestStatus); report.setStatus(requestStatus);
} }
//待审核 //待审核
@@ -281,10 +281,9 @@ public class ExperimentReportController extends JeecgController<ExperimentReport
} }
if (!StringUtils.equals(requestStatus, ExperimentReportStatus.AUDIT_PASS)) { if (!StringUtils.equals(requestStatus, ExperimentReportStatus.AUDIT_PASS)) {
report.setStatus(ExperimentReportStatus.REJECT); report.setStatus(ExperimentReportStatus.REJECT);
}
report.setAuditorMemo(experimentReport.getMemo()); report.setAuditorMemo(experimentReport.getMemo());
report.setAuditorTime(DateUtils.formatDate(new Date(), "yyyy-MM-dd HH:mm")); report.setAuditorTime(DateUtils.formatDate(new Date(), "yyyy-MM-dd HH:mm"));
}
report.setStatus(requestStatus); report.setStatus(requestStatus);
} }
@@ -295,9 +294,9 @@ public class ExperimentReportController extends JeecgController<ExperimentReport
} }
if (!StringUtils.equals(requestStatus, ExperimentReportStatus.PASSED)) { if (!StringUtils.equals(requestStatus, ExperimentReportStatus.PASSED)) {
report.setStatus(ExperimentReportStatus.REJECT); report.setStatus(ExperimentReportStatus.REJECT);
}
report.setConfirmerMemo(experimentReport.getMemo()); report.setConfirmerMemo(experimentReport.getMemo());
report.setConfirmerTime(DateUtils.formatDate(new Date(), "yyyy-MM-dd HH:mm")); report.setConfirmerTime(DateUtils.formatDate(new Date(), "yyyy-MM-dd HH:mm"));
}
report.setStatus(requestStatus); report.setStatus(requestStatus);
} else { } else {
return Result.error("实验报告状态异常!"); return Result.error("实验报告状态异常!");