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-02-23 11:52:24 +08:00
parent 33e6c66e1d
commit 651b30952b
7 changed files with 27 additions and 30 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
physical-module-system/physical-system-biz/src/main/java/org/jeecg/modules/database/constant/ExperimentStatus.java
View File

@@ -2,10 +2,10 @@ package org.jeecg.modules.database.constant;
public interface ExperimentStatus {
String STAGING = "暂存";
String PRE_TEST = "试验前";
String PROGRESSING = "试验进行中";
String REPORT_AUDITING = "报告审批中";
String COMPLETED = "试验完成";
String REVIEWED = "已审核";
String STAGING = "暂存";
String PRE_TEST = "试验前";
String PROGRESSING = "试验进行中";
//String REPORT_AUDITING = "报告审批中";
String COMPLETED = "试验完成";
String REVIEWED = "已审核";
}

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

@@ -100,7 +100,7 @@ public class ExperimentAnnealProcessController extends JeecgController<Experimen
if (Objects.isNull(dbExperiment)) {
return Result.error("试验数据不存在！");
}
if (StringUtils.containsAny(dbExperiment.getStatus(), ExperimentStatus.COMPLETED, ExperimentStatus.REPORT_AUDITING)) {
if (StringUtils.containsAny(dbExperiment.getStatus(), ExperimentStatus.COMPLETED)) {
return Result.error("试验状态:[" + dbExperiment.getStatus() + "]不能进行修改！");
}
experimentService.changeStatus(experimentId, ExperimentStatus.PROGRESSING);
@@ -138,7 +138,7 @@ public class ExperimentAnnealProcessController extends JeecgController<Experimen
if (Objects.isNull(dbExperiment)) {
return Result.error("试验数据不存在！");
}
if (StringUtils.containsAny(dbExperiment.getStatus(), ExperimentStatus.COMPLETED, ExperimentStatus.REPORT_AUDITING)) {
if (StringUtils.containsAny(dbExperiment.getStatus(), ExperimentStatus.COMPLETED)) {
return Result.error("试验状态:[" + dbExperiment.getStatus() + "]不能进行修改！");
}
experimentService.changeStatus(experimentId, ExperimentStatus.PROGRESSING);
@@ -176,7 +176,7 @@ public class ExperimentAnnealProcessController extends JeecgController<Experimen
if (Objects.isNull(dbExperiment)) {
return Result.error("试验数据不存在！");
}
if (StringUtils.containsAny(dbExperiment.getStatus(), ExperimentStatus.COMPLETED, ExperimentStatus.REPORT_AUDITING)) {
if (StringUtils.containsAny(dbExperiment.getStatus(), ExperimentStatus.COMPLETED)) {
return Result.error("试验状态:[" + dbExperiment.getStatus() + "]不能进行修改！");
}
ExperimentLog experimentLog = new ExperimentLog();

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

@@ -96,13 +96,12 @@ public class ExperimentRadiationProcessController extends JeecgController<Experi
if (Objects.isNull(dbExperiment)) {
return Result.error("试验数据不存在！");
}
if (StringUtils.containsAny(dbExperiment.getStatus(), ExperimentStatus.COMPLETED, ExperimentStatus.REPORT_AUDITING)) {
if (StringUtils.containsAny(dbExperiment.getStatus(), ExperimentStatus.COMPLETED)) {
return Result.error("试验状态:[" + dbExperiment.getStatus() + "]不能进行修改！");
}
experimentRadiationProcess.setId(null);
experimentService.changeStatus(experimentId ,ExperimentStatus.PROGRESSING);
experimentService.changeStatus(experimentId, ExperimentStatus.PROGRESSING);
experimentRadiationProcessService.saveWithDetails(experimentRadiationProcess);
@@ -137,10 +136,10 @@ public class ExperimentRadiationProcessController extends JeecgController<Experi
if (Objects.isNull(dbExperiment)) {
return Result.error("试验数据不存在！");
}
if (StringUtils.containsAny(dbExperiment.getStatus(), ExperimentStatus.COMPLETED, ExperimentStatus.REPORT_AUDITING)) {
if (StringUtils.containsAny(dbExperiment.getStatus(), ExperimentStatus.COMPLETED)) {
return Result.error("试验状态:[" + dbExperiment.getStatus() + "]不能进行修改！");
}
experimentService.changeStatus(experimentId,ExperimentStatus.PROGRESSING);
experimentService.changeStatus(experimentId, ExperimentStatus.PROGRESSING);
experimentRadiationProcessService.saveWithDetails(experimentRadiationProcess);
@@ -175,7 +174,7 @@ public class ExperimentRadiationProcessController extends JeecgController<Experi
if (Objects.isNull(dbExperiment)) {
return Result.error("试验数据不存在！");
}
if (StringUtils.containsAny(dbExperiment.getStatus(), ExperimentStatus.COMPLETED, ExperimentStatus.REPORT_AUDITING)) {
if (StringUtils.containsAny(dbExperiment.getStatus(), ExperimentStatus.COMPLETED)) {
return Result.error("试验状态:[" + dbExperiment.getStatus() + "]不能进行修改！");
}
ExperimentLog experimentLog = new ExperimentLog();
@@ -248,7 +247,7 @@ public class ExperimentRadiationProcessController extends JeecgController<Experi
* @param request
* @param experimentRadiationProcess
*/
@RequestMapping(value = "/exportXls")
public ModelAndView exportXls(HttpServletRequest request, ExperimentRadiationProcess experimentRadiationProcess) {
return super.exportXls(request, experimentRadiationProcess, ExperimentRadiationProcess.class, "辐照过程");

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

@@ -304,7 +304,7 @@ public class ExperimentReportController extends JeecgController<ExperimentReport
} else if (StringUtils.equals(report.getStatus(), ExperimentReportStatus.REJECT)) {
experiment.setStatus(ExperimentStatus.PROGRESSING);
} else {
experiment.setStatus(ExperimentStatus.REPORT_AUDITING);
//experiment.setStatus(ExperimentStatus.REPORT_AUDITING);
}
experimentService.updateById(experiment);

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

@@ -95,7 +95,7 @@ public class ExperimentTestProcessController extends JeecgController<ExperimentT
if (Objects.isNull(dbExperiment)) {
return Result.error("试验数据不存在！");
}
if (StringUtils.containsAny(dbExperiment.getStatus(), ExperimentStatus.COMPLETED, ExperimentStatus.REPORT_AUDITING)) {
if (StringUtils.containsAny(dbExperiment.getStatus(), ExperimentStatus.COMPLETED)) {
return Result.error("试验状态:[" + dbExperiment.getStatus() + "]不能进行修改！");
}
experimentTestProcess.setId(null);
@@ -135,7 +135,7 @@ public class ExperimentTestProcessController extends JeecgController<ExperimentT
if (Objects.isNull(dbExperiment)) {
return Result.error("试验数据不存在！");
}
if (StringUtils.containsAny(dbExperiment.getStatus(), ExperimentStatus.COMPLETED, ExperimentStatus.REPORT_AUDITING)) {
if (StringUtils.containsAny(dbExperiment.getStatus(), ExperimentStatus.COMPLETED)) {
return Result.error("试验状态:[" + dbExperiment.getStatus() + "]不能进行修改！");
}
@@ -175,7 +175,7 @@ public class ExperimentTestProcessController extends JeecgController<ExperimentT
if (Objects.isNull(dbExperiment)) {
return Result.error("试验数据不存在！");
}
if (StringUtils.containsAny(dbExperiment.getStatus(), ExperimentStatus.COMPLETED, ExperimentStatus.REPORT_AUDITING)) {
if (StringUtils.containsAny(dbExperiment.getStatus(), ExperimentStatus.COMPLETED)) {
return Result.error("试验状态:[" + dbExperiment.getStatus() + "]不能进行修改！");
}
ExperimentLog experimentLog = new ExperimentLog();
@@ -249,7 +249,7 @@ public class ExperimentTestProcessController extends JeecgController<ExperimentT
* @param request
* @param experimentTestProcess
*/
@RequestMapping(value = "/exportXls")
public ModelAndView exportXls(HttpServletRequest request, ExperimentTestProcess experimentTestProcess) {
return super.exportXls(request, experimentTestProcess, ExperimentTestProcess.class, "测试过程");

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

@@ -91,7 +91,7 @@ public class ExperimentUserController extends JeecgController<ExperimentUser, IE
if (Objects.isNull(dbExperiment)) {
return Result.error("试验数据不存在！");
}
if (StringUtils.containsAny(dbExperiment.getStatus(), ExperimentStatus.COMPLETED, ExperimentStatus.REPORT_AUDITING)) {
if (StringUtils.containsAny(dbExperiment.getStatus(), ExperimentStatus.COMPLETED)) {
return Result.error("试验状态:[" + dbExperiment.getStatus() + "]不能进行修改！");
}
experimentUserService.save(experimentUser);
@@ -120,7 +120,7 @@ public class ExperimentUserController extends JeecgController<ExperimentUser, IE
if (Objects.isNull(dbExperiment)) {
return Result.error("试验数据不存在！");
}
if (StringUtils.containsAny(dbExperiment.getStatus(), ExperimentStatus.COMPLETED, ExperimentStatus.REPORT_AUDITING)) {
if (StringUtils.containsAny(dbExperiment.getStatus(), ExperimentStatus.COMPLETED)) {
return Result.error("试验状态:[" + dbExperiment.getStatus() + "]不能进行修改！");
}
experimentUserService.save(v);
@@ -157,7 +157,7 @@ public class ExperimentUserController extends JeecgController<ExperimentUser, IE
if (Objects.isNull(dbExperiment)) {
return Result.error("试验数据不存在！");
}
if (StringUtils.containsAny(dbExperiment.getStatus(), ExperimentStatus.COMPLETED, ExperimentStatus.REPORT_AUDITING)) {
if (StringUtils.containsAny(dbExperiment.getStatus(), ExperimentStatus.COMPLETED)) {
return Result.error("试验状态:[" + dbExperiment.getStatus() + "]不能进行修改！");
}
ExperimentLog experimentLog = new ExperimentLog();
@@ -191,7 +191,7 @@ public class ExperimentUserController extends JeecgController<ExperimentUser, IE
if (Objects.isNull(dbExperiment)) {
return Result.error("试验数据不存在！");
}
if (StringUtils.containsAny(dbExperiment.getStatus(), ExperimentStatus.COMPLETED, ExperimentStatus.REPORT_AUDITING)) {
if (StringUtils.containsAny(dbExperiment.getStatus(), ExperimentStatus.COMPLETED)) {
return Result.error("试验状态:[" + dbExperiment.getStatus() + "]不能进行修改！");
}
ExperimentLog experimentLog = new ExperimentLog();
@@ -266,7 +266,7 @@ public class ExperimentUserController extends JeecgController<ExperimentUser, IE
* @param request
* @param experimentUser
*/
@RequestMapping(value = "/exportXls")
public ModelAndView exportXls(HttpServletRequest request, ExperimentUser experimentUser) {
return super.exportXls(request, experimentUser, ExperimentUser.class, "试验人员");

6
physical-module-system/physical-system-biz/src/main/java/org/jeecg/modules/database/service/impl/ExperimentServiceImpl.java
View File

@@ -189,8 +189,7 @@ public class ExperimentServiceImpl extends ServiceImpl<ExperimentMapper, Experim
Experiment dbData = getById(experimentId);
switch (status) {
case ExperimentStatus.COMPLETED:
if (!StringUtils.equals(dbData.getStatus(), ExperimentStatus.PROGRESSING)
|| !StringUtils.equals(dbData.getStatus(), ExperimentStatus.REPORT_AUDITING)) {
if (!StringUtils.equals(dbData.getStatus(), ExperimentStatus.PROGRESSING)) {
throw new IllegalArgumentException("试验状态不正确!");
}
break;
@@ -274,10 +273,9 @@ public class ExperimentServiceImpl extends ServiceImpl<ExperimentMapper, Experim
@Override
public IPage<Experiment> join(Page<Experiment> page, Experiment experiment, SysUser loginUser) {
return baseMapper.join(page, experiment,loginUser);
return baseMapper.join(page, experiment, loginUser);
}
@Override
public Long sumLhs() {
return Optional.ofNullable(baseMapper.sumLhs()).orElse(0L);