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-11-30 18:45:50 +08:00
parent f73cad7f65
commit c4ffd9c0fc
2 changed files with 8 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -92,13 +92,14 @@ public class ExperimentSampleInfo implements Serializable {
/**
* 生产厂家
*/
@Schema(description = "生产厂家ID")
private String sampleManufacturer;
@Schema(description = "生产厂家")
@Excel(name = "生产厂家", width = 15)
private String sampleManufacturer;
//
@Schema(description = "生产厂家名称")
@TableField(exist = false)
private String sampleManufacturerName;
// @Schema(description = "生产厂家名称")
// @TableField(exist = false)
// private String sampleManufacturerName;
/**
* 图片
*/

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

@@ -25,7 +25,7 @@ import java.util.Optional;
public class ExperimentSampleInfoServiceImpl extends ServiceImpl<ExperimentSampleInfoMapper, ExperimentSampleInfo>
implements IExperimentSampleInfoService {
@Autowired
private IClientService clientService;
private IClientService clientService;
@Override
public ExperimentSampleInfo getById(Serializable id) {
@@ -35,7 +35,6 @@ public class ExperimentSampleInfoServiceImpl extends ServiceImpl<ExperimentSampl
}
private void assembleDetails(ExperimentSampleInfo sampleInfo) {
if (ObjUtil.isNull(sampleInfo)) {
return;
@@ -43,7 +42,7 @@ public class ExperimentSampleInfoServiceImpl extends ServiceImpl<ExperimentSampl
String sampleManufacturerId = sampleInfo.getSampleManufacturer();
if (StringUtils.isNotBlank(sampleManufacturerId)) {
Client byId = clientService.getById(sampleManufacturerId);
sampleInfo.setSampleManufacturerName(Optional.ofNullable(byId).map(v -> v.getName()).orElse(sampleManufacturerId));
sampleInfo.setSampleManufacturer(Optional.ofNullable(byId).map(v -> v.getName()).orElse(sampleManufacturerId));
}
}