diff --git a/physical-base-core/src/main/java/org/jeecg/common/system/base/controller/JeecgController.java b/physical-base-core/src/main/java/org/jeecg/common/system/base/controller/JeecgController.java index b8c43cd..1c7063d 100644 --- a/physical-base-core/src/main/java/org/jeecg/common/system/base/controller/JeecgController.java +++ b/physical-base-core/src/main/java/org/jeecg/common/system/base/controller/JeecgController.java @@ -13,6 +13,7 @@ import org.apache.shiro.SecurityUtils; import org.jeecg.common.api.vo.Result; import org.jeecg.common.system.query.QueryGenerator; import org.jeecg.common.system.vo.LoginUser; +import org.jeecg.common.util.DateUtils; import org.jeecg.common.util.oConvertUtils; import org.jeecg.config.JeecgBaseConfig; import org.jeecgframework.poi.excel.ExcelImportUtil; @@ -71,7 +72,7 @@ public class JeecgController> { mv.addObject(NormalExcelConstants.CLASS, clazz); //update-begin--Author:liusq Date:20210126 for:图片导出报错,ImageBasePath未设置-------------------- ExportParams exportParams = new ExportParams(title + "报表", "导出人:" + Optional.ofNullable(sysUser).map(v -> v.getRealname()) - .orElse(""), title); + .orElse("") + ",导出日期:" + DateUtils.formatDate(new Date()), title); exportParams.setImageBasePath(jeecgBaseConfig.getPath().getUpload()); //update-end--Author:liusq Date:20210126 for:图片导出报错,ImageBasePath未设置---------------------- mv.addObject(NormalExcelConstants.PARAMS, exportParams); 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 1dedea4..099bfdf 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 @@ -7,6 +7,7 @@ import lombok.Data; import lombok.EqualsAndHashCode; import lombok.experimental.Accessors; import org.jeecgframework.poi.excel.annotation.Excel; +import org.jeecgframework.poi.excel.annotation.ExcelCollection; import org.springframework.format.annotation.DateTimeFormat; import java.io.Serializable; @@ -62,18 +63,28 @@ public class Experiment implements Serializable { */ @Schema(description = "所属部门") private String sysOrgCode; + + @Schema(description = "序号") + private Integer indexNo; /** * 试验编号 */ @Excel(name = "试验编号", width = 15) @Schema(description = "试验编号") - private String experimentNo; + private String experimentNo; /** * 名称 */ @Excel(name = "名称", width = 15) @Schema(description = "名称") - private String name; + private String name; + + /** + * 委托方名称 + */ + @Excel(name = "委托方名称", width = 15) + @Schema(description = "委托方名称") + private String clientName; /** * 试验类型 */ @@ -99,15 +110,9 @@ public class Experiment implements Serializable { /** * 辐射源类型 */ - @Excel(name = "辐射源类型", width = 15) + //@Excel(name = "辐射源类型", width = 15) @Schema(description = "辐射源类型") private String radiationSourceType; - /** - * 委托方名称 - */ - @Excel(name = "委托方名称", width = 15) - @Schema(description = "委托方名称") - private String clientName; /** * 样品型号 */ @@ -191,15 +196,14 @@ public class Experiment implements Serializable { */ @TableField(exist = false) private List experimentUserList; - @Schema(description = "排序号") - private Integer indexNo; - // - //public void addCopyCount() { - // if (Objects.isNull(copyCount)) { - // setCopyCount(1); - // } - // setCopyCount(copyCount + 1); - //} + + //@TableField(exist = false) + //@ExcelCollection(name = "辐照") + //private List experimentAnnealProcessList; + //@TableField(exist = false) + //private List experimentRadiationProcessList; + //@TableField(exist = false) + //private List experimentTestProcessList; } diff --git a/physical-module-system/physical-system-biz/src/main/java/org/jeecg/modules/database/entity/ExperimentAnnealProcess.java b/physical-module-system/physical-system-biz/src/main/java/org/jeecg/modules/database/entity/ExperimentAnnealProcess.java index b1b5690..873cc03 100644 --- a/physical-module-system/physical-system-biz/src/main/java/org/jeecg/modules/database/entity/ExperimentAnnealProcess.java +++ b/physical-module-system/physical-system-biz/src/main/java/org/jeecg/modules/database/entity/ExperimentAnnealProcess.java @@ -78,43 +78,36 @@ public class ExperimentAnnealProcess implements Serializable { /** * 辐照标准 */ - @Excel(name = "辐照标准", width = 15) @Schema(description = "辐照标准") private String radiationStandard; /** * 退火温度 */ - @Excel(name = "退火温度", width = 15) @Schema(description = "退火温度") private String annealTemperature; /** * 备注 */ - @Excel(name = "备注", width = 15) @Schema(description = "备注") private String comment; /** * 异常记录 */ - @Excel(name = "异常记录", width = 15) @Schema(description = "异常记录") private String exceptionRecord; /** * 辐照详情(json存储) */ - @Excel(name = "辐照详情(json存储)", width = 15) @Schema(description = "辐照详情(json存储)") private String radiationDetail; /** * 试验ID */ - @Excel(name = "试验ID", width = 15) @Schema(description = "试验ID") private String experimentId; /** * 退火开始时间 */ - @Excel(name = "退火开始时间", width = 20, format = "yyyy-MM-dd HH:mm:ss") @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss") @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss") @Schema(description = "退火开始时间") @@ -122,7 +115,6 @@ public class ExperimentAnnealProcess implements Serializable { /** * 退火结束时间 */ - @Excel(name = "退火结束时间", width = 20, format = "yyyy-MM-dd HH:mm:ss") @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss") @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss") @Schema(description = "退火结束时间") @@ -130,17 +122,14 @@ public class ExperimentAnnealProcess implements Serializable { /** * 偏置条件 */ - @Excel(name = "偏置条件", width = 15) @Schema(description = "偏置条件") private String deviationCondition; /** * 加偏设备 */ - @Excel(name = "加偏设备", width = 15) @Schema(description = "加偏设备") private String deviationEquipment; - @Excel(name = "样品信息", width = 15) @Schema(description = "样品信息") private String sampleInfo; diff --git a/physical-module-system/physical-system-biz/src/main/java/org/jeecg/modules/database/service/impl/ExperimentServiceImpl.java b/physical-module-system/physical-system-biz/src/main/java/org/jeecg/modules/database/service/impl/ExperimentServiceImpl.java index f01ae85..95c2423 100644 --- a/physical-module-system/physical-system-biz/src/main/java/org/jeecg/modules/database/service/impl/ExperimentServiceImpl.java +++ b/physical-module-system/physical-system-biz/src/main/java/org/jeecg/modules/database/service/impl/ExperimentServiceImpl.java @@ -44,7 +44,13 @@ public class ExperimentServiceImpl extends ServiceImpl list(Wrapper queryWrapper) { @@ -99,7 +105,18 @@ public class ExperimentServiceImpl extends ServiceImpl experimentAnnealProcessList = experimentAnnealProcessService.getByExperimentId(experiment.getId()); + //List radiationProcessList = experimentRadiationProcessService.getByExperimentId(experiment.getId()); + //List experimentTestProcesses = experimentTestProcessService.getByExperimentId(experiment.getId()); + //if (CollUtil.isNotEmpty(experimentAnnealProcessList)) { + // experiment.setExperimentAnnealProcessList(experimentAnnealProcessList); + //} + //if (CollUtil.isNotEmpty(radiationProcessList)) { + // experiment.setExperimentRadiationProcessList(radiationProcessList); + //} + //if (CollUtil.isNotEmpty(experimentTestProcesses)) { + // experiment.setExperimentTestProcessList(experimentTestProcesses); + //} } @Override