Browse Source

update: 演练计划导出数据补充

zhongwei
liwen 10 months ago
parent
commit
69600ccce6
  1. 12
      hzims-service-api/safeproduct-api/src/main/java/com/hnac/hzims/safeproduct/dto/RehearsalExportDTO.java
  2. 2
      hzims-service/safeproduct/src/main/java/com/hnac/hzims/safeproduct/mapper/RehearsalPlanMapper.xml

12
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;
}

2
hzims-service/safeproduct/src/main/java/com/hnac/hzims/safeproduct/mapper/RehearsalPlanMapper.xml

@ -73,7 +73,7 @@
<select id="getRehearsalByUnitAndDate" resultType="com.hnac.hzims.safeproduct.dto.RehearsalExportDTO">
SELECT
unit, subject, scheduled_start_time, scheduled_end_time, location, rehearsal_status
unit, subject, scheduled_start_time, scheduled_end_time, location, rehearsal_status, commander
FROM
hzims_rehearsal_plan
WHERE

Loading…
Cancel
Save