diff --git a/physical-module-system/physical-system-biz/src/main/java/org/jeecg/modules/database/mapper/xml/ExperimentMapper.xml b/physical-module-system/physical-system-biz/src/main/java/org/jeecg/modules/database/mapper/xml/ExperimentMapper.xml index 7d751b3..e683062 100644 --- a/physical-module-system/physical-system-biz/src/main/java/org/jeecg/modules/database/mapper/xml/ExperimentMapper.xml +++ b/physical-module-system/physical-system-biz/src/main/java/org/jeecg/modules/database/mapper/xml/ExperimentMapper.xml @@ -9,6 +9,7 @@ LEFT JOIN experiment_sample_info s ON s.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_radiation_process rp on rp.experiment_id = e.id @@ -22,6 +23,9 @@ + + and rp.radiation_source like concat('%', #{experiment.radiationSourceType}, '%') + and e.name like concat('%', #{experiment.name}, '%') diff --git a/templates/sybg.docx b/templates/sybg.docx index cb743b9..aae58e6 100644 Binary files a/templates/sybg.docx and b/templates/sybg.docx differ