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-24 11:25:51 +08:00
parent 2214e66881
commit dc681c5d8d
5 changed files with 13 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -106,6 +106,9 @@ public class ExperimentReportController extends JeecgController<ExperimentReport
if (ObjUtil.isNull(experiment)) {
return Result.error("试验数据不存在！");
}
if (!StringUtils.equals(experiment.getStatus(), ExperimentStatus.COMPLETED)) {
return Result.error("试验状态不正确,请先完成试验！");
}
//ExperimentReport report = experimentReportService.getByExperimentId(experimentId);
//if (ObjUtil.isNotNull(report)) {
// return Result.error("试验报告已存在！");

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

@@ -164,6 +164,7 @@ public class HistoricalDatabaseController extends JeecgController<HistoricalData
return super.importExcel(request, response, HistoricalDatabase.class);
}
@Operation(summary = "历史数据统计")
@GetMapping(value = "/statistics")
public Result<NasaDataRecordPage> queryPageList(NasaDataRecord nasaDataRecord) {
NasaDataRecordPage result = new NasaDataRecordPage();

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

@@ -164,6 +164,7 @@ public class LocalDatabaseController extends JeecgController<LocalDatabase, ILoc
return super.importExcel(request, response, LocalDatabase.class);
}
@Operation(summary = "当期数据统计")
@GetMapping(value = "/statistics")
public Result<NasaDataRecordPage> queryPageList(NasaDataRecord nasaDataRecord) {
NasaDataRecordPage result = new NasaDataRecordPage();

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

@@ -75,6 +75,7 @@ public class NasaDataRecordController extends JeecgController<NasaDataRecord, IN
return Result.OK(pageList);
}
@Operation(summary = "外网数据统计")
@GetMapping(value = "/statistics")
public Result<NasaDataRecordPage> queryPageList(NasaDataRecord nasaDataRecord) {
NasaDataRecordPage result = new NasaDataRecordPage();

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

@@ -69,13 +69,13 @@ public class ExperimentDocServiceImpl extends ServiceImpl<ExperimentDocMapper, E
@Autowired
private ISysUserService sysUserService;
@Autowired
private IClientService clientService;
private IClientService clientService;
@Autowired
private IExperimentTestProcessService experimentTestProcessService;
private IExperimentTestProcessService experimentTestProcessService;
@Autowired
private IExperimentRadiationProcessService experimentRadiationProcessService;
private IExperimentRadiationProcessService experimentRadiationProcessService;
@Autowired
private ITestStandardsService testStandardsService;
private ITestStandardsService testStandardsService;
public static void main(String[] args) throws IOException {
//The core API uses a minimalist design, only one line of code is required
@@ -283,6 +283,9 @@ public class ExperimentDocServiceImpl extends ServiceImpl<ExperimentDocMapper, E
return new HashMap<>();
}
ExperimentReport latestReport = experimentReportService.getLatestReport(experimentId);
if (Objects.isNull(latestReport)) {
return new HashMap<>();
}
Map<String, Object> params = new HashMap<>();
if (Objects.nonNull(latestReport)) {
params.put("审核人员姓名", Optional.ofNullable(sysUserService.getById(latestReport.getAuditor())).map(SysUser::getRealname)