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

irradiation_standards

Browse Source
This commit is contained in:
ls
2025-07-29 23:04:27 +08:00
parent a31c2d6ecf
commit bdc5003fb2
4 changed files with 11 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
Dockerfile
View File

@@ -30,7 +30,4 @@ COPY --from=build /app/physical-launcher/target/physical-launcher-3.7.0.jar phys
COPY --from=build /app/templates ./templates COPY --from=build /app/templates ./templates
ENV PROFILE=dev ENV PROFILE=dev
RUN apt update && apt install -y tesseract-ocr libtesseract-dev
ENV LD_LIBRARY_PATH=/usr/lib/x86_64-linux-gnu
CMD sleep 10;java -Djava.security.egd=file:/dev/./urandom -jar physical-launcher-3.7.0.jar --spring.profiles.active=${PROFILE} CMD sleep 10;java -Djava.security.egd=file:/dev/./urandom -jar physical-launcher-3.7.0.jar --spring.profiles.active=${PROFILE}

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

@@ -256,4 +256,9 @@ public class Experiment implements Serializable {
@TableField(exist = false) @TableField(exist = false)
private ExperimentReview ExperimentReview; private ExperimentReview ExperimentReview;
@Schema(description = "辐照标准")
@TableField(exist = false)
private String radiationStandard;
} }

4
physical-module-system/physical-system-biz/src/main/java/org/jeecg/modules/database/mapper/xml/ExperimentMapper.xml
View File

@@ -10,6 +10,7 @@
left join experiment_deviation_equipment d on d.experiment_id = e.id left join experiment_deviation_equipment d on d.experiment_id = e.id
left join experiment_report r on r.experiment_id = e.id left join experiment_report r on r.experiment_id = e.id
left join experiment_radiation_process rp on rp.experiment_id = e.id left join experiment_radiation_process rp on rp.experiment_id = e.id
left join irradiation_standards ir on rp.radiation_standard = ir.id
<where> <where>
e.status is not null e.status is not null
<choose> <choose>
@@ -24,6 +25,9 @@
</otherwise> </otherwise>
</choose> </choose>
<if test="experiment.radiationStandard != null and experiment.radiationStandard != ''">
and ir.name like concat('%', #{experiment.radiationStandard}, '%')
</if>
<if test="experiment.radiationSourceType != null and experiment.radiationSourceType != ''"> <if test="experiment.radiationSourceType != null and experiment.radiationSourceType != ''">
and rp.radiation_source like concat('%', #{experiment.radiationSourceType}, '%') and rp.radiation_source like concat('%', #{experiment.radiationSourceType}, '%')
</if> </if>

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

@@ -425,9 +425,8 @@ public class ExperimentDocServiceImpl extends ServiceImpl<ExperimentDocMapper, E
List<String> standardCode = new ArrayList<>(); List<String> standardCode = new ArrayList<>();
for (ExperimentRadiationProcess radiationProcess : radiationProcessList) { for (ExperimentRadiationProcess radiationProcess : radiationProcessList) {
String radiationStandard = radiationProcess.getRadiationStandard(); String radiationStandard = radiationProcess.getRadiationStandard();
if (StringUtils.isNotBlank(radiationStandard) && radiationStandard.contains(",")) { if (StringUtils.isNotBlank(radiationStandard)) {
String standardId = radiationStandard.split(",")[1]; IrradiationStandards standards = irradiationStandardsService.getById(radiationStandard);
IrradiationStandards standards = irradiationStandardsService.getById(standardId);
if (Objects.nonNull(standards)) { if (Objects.nonNull(standards)) {
standardName.add(standards.getName()); standardName.add(standards.getName());
standardCode.add(standards.getCode()); standardCode.add(standards.getCode());