diff --git a/physical-module-system/physical-system-biz/src/main/java/org/jeecg/modules/database/controller/ExperimentController.java b/physical-module-system/physical-system-biz/src/main/java/org/jeecg/modules/database/controller/ExperimentController.java index 823d5db..6537284 100644 --- a/physical-module-system/physical-system-biz/src/main/java/org/jeecg/modules/database/controller/ExperimentController.java +++ b/physical-module-system/physical-system-biz/src/main/java/org/jeecg/modules/database/controller/ExperimentController.java @@ -156,24 +156,6 @@ public class ExperimentController extends JeecgController sampleInfoList = experiment.getSampleInfoList(); - List irradiationBoardList = experiment.getIrradiationBoardList(); - List deviationConditionList = experiment.getDeviationConditionList(); - List deviationEquipmentList = experiment.getDeviationEquipmentList(); - Set sampleList = sampleInfoList.stream().map(v -> v.getSampleModel()).collect(Collectors.toUnmodifiableSet()); - Set boardList = irradiationBoardList.stream().map(v -> v.getSampleModel()).collect(Collectors.toUnmodifiableSet()); - Set conditionList = deviationConditionList.stream().map(v -> v.getSampleModel()).collect(Collectors.toUnmodifiableSet()); - Set equipmentList = deviationEquipmentList.stream().map(v -> v.getSampleModel()).collect(Collectors.toUnmodifiableSet()); - if (!sampleList.equals(boardList)) { - return Result.error("辐照板信息不匹配!"); - } - if (!sampleList.equals(conditionList)) { - return Result.error("偏置条件信息不匹配!"); - } - if (!sampleList.equals(equipmentList)) { - return Result.error("加偏设备信息不匹配!"); - }*/ experiment.setStatus(ExperimentStatus.PRE_TEST); experimentService.saveWithDetail(experiment); diff --git a/physical-module-system/physical-system-biz/src/main/java/org/jeecg/modules/database/entity/Experiment.java b/physical-module-system/physical-system-biz/src/main/java/org/jeecg/modules/database/entity/Experiment.java index fb82f8c..148151f 100644 --- a/physical-module-system/physical-system-biz/src/main/java/org/jeecg/modules/database/entity/Experiment.java +++ b/physical-module-system/physical-system-biz/src/main/java/org/jeecg/modules/database/entity/Experiment.java @@ -241,4 +241,11 @@ public class Experiment implements Serializable { @TableField(exist = false) private String reportStatus; + /** + * 数据是给哪个页面用的,用来区分试验管理和报告审核 + */ + @Schema(description = "试验页面") + @TableField(exist = false) + private String pageName; + } 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 d32515d..0f5db5c 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 @@ -10,9 +10,18 @@ left join experiment_deviation_equipment d on d.experiment_id = e.id left join experiment_report r on r.experiment_id = e.id - ( e.supervisor=#{loginUser.id} or e.create_by=#{loginUser.username} or 'admin'=#{loginUser.username} - or (r.auditor=#{loginUser.id} and r.status='PROOFREAD_PASS') or (r.proofreader=#{loginUser.id} and r.status='INIT') - or (r.confirmer=#{loginUser.id} and r.status='AUDIT_PASS' )) + + + AND (r.auditor=#{loginUser.id} and r.status='PROOFREAD_PASS') or (r.proofreader=#{loginUser.id} and r.status='INIT') + or (r.confirmer=#{loginUser.id} and r.status='AUDIT_PASS' )) + + + AND ( e.supervisor=#{loginUser.id} or e.create_by=#{loginUser.username} or 'admin'=#{loginUser.username} + or (r.auditor=#{loginUser.id} and r.status='PROOFREAD_PASS') or (r.proofreader=#{loginUser.id} and r.status='INIT') + or (r.confirmer=#{loginUser.id} and r.status='AUDIT_PASS' )) + + + and e.name like concat('%', #{experiment.name}, '%')