diff --git a/hzims-service-api/safeproduct-api/src/main/java/com/hnac/hzims/safeproduct/dto/RehearsalExportDTO.java b/hzims-service-api/safeproduct-api/src/main/java/com/hnac/hzims/safeproduct/dto/RehearsalExportDTO.java index f79db79..d7a3e1d 100644 --- a/hzims-service-api/safeproduct-api/src/main/java/com/hnac/hzims/safeproduct/dto/RehearsalExportDTO.java +++ b/hzims-service-api/safeproduct-api/src/main/java/com/hnac/hzims/safeproduct/dto/RehearsalExportDTO.java @@ -32,18 +32,22 @@ public class RehearsalExportDTO { private Date scheduledEndTime; @ApiModelProperty("演练地点") - @ExcelProperty(value = "演练地点", index = 4) + @ExcelProperty(value = "演练地点", index = 2) private String location; @ApiModelProperty("演练状态") - @ExcelProperty(value = "演练状态", index = 5) + @ExcelProperty(value = "演练状态", index = 6) private String rehearsalStatus; @ApiModelProperty("计划开始时间") - @ExcelProperty(value = "计划开始时间", index = 2) + @ExcelProperty(value = "计划开始时间", index = 3) private String startTime; @ApiModelProperty("计划结束时间") - @ExcelProperty(value = "计划结束时间", index = 3) + @ExcelProperty(value = "计划结束时间", index = 4) private String endTime; + + @ApiModelProperty("总指挥") + @ExcelProperty(value = "总指挥", index = 5) + private String commander; } diff --git a/hzims-service/safeproduct/src/main/java/com/hnac/hzims/safeproduct/mapper/RehearsalPlanMapper.xml b/hzims-service/safeproduct/src/main/java/com/hnac/hzims/safeproduct/mapper/RehearsalPlanMapper.xml index 8ff4810..f855e8d 100644 --- a/hzims-service/safeproduct/src/main/java/com/hnac/hzims/safeproduct/mapper/RehearsalPlanMapper.xml +++ b/hzims-service/safeproduct/src/main/java/com/hnac/hzims/safeproduct/mapper/RehearsalPlanMapper.xml @@ -73,7 +73,7 @@