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
2024-10-24 14:21:37 +08:00
parent 91c6004f46
commit 3d0f75320d
2 changed files with 16 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -185,38 +185,40 @@ public class ExperimentReportController extends JeecgController<ExperimentReport
ExperimentReport report = experimentReportService.getById(experimentReport.getId()); ExperimentReport report = experimentReportService.getById(experimentReport.getId());
//校对员 //校对员
String requestStatus = experimentReport.getStatus(); String requestStatus = experimentReport.getStatus();
if (StringUtils.equals(report.getProofreader(), sysUser.getId())) { //待校对
if (!StringUtils.equals(report.getStatus(), "INIT")) { if (StringUtils.equals(report.getStatus(), "INIT")) {
return Result.error("实验报告状态不匹配!"); if (!StringUtils.equals(report.getProofreader(), sysUser.getId())) {
return Result.error("您无权进行校对!");
} }
if (!StringUtils.equals(requestStatus, "PROOFREAD_PASS")) { if (!StringUtils.equals(requestStatus, "PROOFREAD_PASS")) {
report.setStatus("REJECT"); report.setStatus("REJECT");
} }
report.setStatus(requestStatus); report.setStatus(requestStatus);
} }
//审核员 //待审核
if (StringUtils.equals(report.getAuditor(), sysUser.getId())) { else if (StringUtils.equals(report.getStatus(), "PROOFREAD_PASS")) {
if (!StringUtils.equals(report.getStatus(), "PROOFREAD_PASS")) { if (!StringUtils.equals(report.getAuditor(), sysUser.getId())) {
return Result.error("实验报告状态不匹配!"); return Result.error("您无权进行审核!");
} }
if (!StringUtils.equals(requestStatus, "AUDIT_PASS")) { if (!StringUtils.equals(requestStatus, "AUDIT_PASS")) {
report.setStatus("REJECT"); report.setStatus("REJECT");
} }
report.setStatus(requestStatus); report.setStatus(requestStatus);
} }
//批准员
if (StringUtils.equals(report.getConfirmer(), sysUser.getId())) { //待批准
if (!StringUtils.equals(report.getStatus(), "AUDIT_PASS")) { else if (StringUtils.equals(report.getStatus(), "AUDIT_PASS")) {
return Result.error("实验报告状态不匹配!"); if (!StringUtils.equals(report.getConfirmer(), sysUser.getId())) {
return Result.error("您无权进行批准!");
} }
if (!StringUtils.equals(requestStatus, "PASSED")) { if (!StringUtils.equals(requestStatus, "PASSED")) {
report.setStatus("REJECT"); report.setStatus("REJECT");
} }
report.setStatus(requestStatus); report.setStatus(requestStatus);
} else {
return Result.error("实验报告状态异常!");
} }
experimentReportService.updateById(report); experimentReportService.updateById(report);
return Result.OK("审核成功!"); return Result.OK("审核成功!");

2
physical-module-system/physical-system-biz/src/main/java/org/jeecg/modules/database/entity/ExperimentReport.java
View File

@@ -109,6 +109,6 @@ public class ExperimentReport implements Serializable {
* 状态 * 状态
*/ */
@Excel(name = "状态", width = 15) @Excel(name = "状态", width = 15)
@Schema(description = "状态(申请中(待校对):INIT,不合格RE:REJECT ,校对通过(待审核)：PROOFREAD_PASS,审核通过(待批准)：AUDIT_PASS，批准通过：PASSED)") @Schema(description = "状态(申请中(待校对):INIT,不合格:REJECT ,校对通过(待审核)：PROOFREAD_PASS,审核通过(待批准)：AUDIT_PASS，批准通过：PASSED)")
private String status; private String status;
} }