Commit ae0c4252e5ac3674fe6dbbe272388dab885599e7
1 parent
30ada1c3
险情数量错误修改
Showing
2 changed files
with
4 additions
and
4 deletions
urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/controller/admin/emergencytask/vo/EmergencyTaskExcleNewRespVO.java
| @@ -43,11 +43,11 @@ public class EmergencyTaskExcleNewRespVO { | @@ -43,11 +43,11 @@ public class EmergencyTaskExcleNewRespVO { | ||
| 43 | 43 | ||
| 44 | @Schema(description = "险情危害(如:无)", requiredMode = Schema.RequiredMode.REQUIRED, example = "16325") | 44 | @Schema(description = "险情危害(如:无)", requiredMode = Schema.RequiredMode.REQUIRED, example = "16325") |
| 45 | @ExcelProperty("险情危害") | 45 | @ExcelProperty("险情危害") |
| 46 | - private Integer emergencyHarmId; | 46 | + private Integer emergencyHarmNum; |
| 47 | 47 | ||
| 48 | @Schema(description = "数量/株", requiredMode = Schema.RequiredMode.REQUIRED, example = "3371") | 48 | @Schema(description = "数量/株", requiredMode = Schema.RequiredMode.REQUIRED, example = "3371") |
| 49 | @ExcelProperty("数量/株") | 49 | @ExcelProperty("数量/株") |
| 50 | - private Integer emergencyHarmNum; | 50 | + private Integer emergencyTypeNum; |
| 51 | 51 | ||
| 52 | @Schema(description = "抢险开始时间", requiredMode = Schema.RequiredMode.REQUIRED) | 52 | @Schema(description = "抢险开始时间", requiredMode = Schema.RequiredMode.REQUIRED) |
| 53 | @ExcelProperty("抢险开始时间") | 53 | @ExcelProperty("抢险开始时间") |
urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/service/emergencytask/EmergencyExportNewHandler.java
| @@ -63,13 +63,13 @@ public class EmergencyExportNewHandler implements ExcelExportHandler<EmergencyTa | @@ -63,13 +63,13 @@ public class EmergencyExportNewHandler implements ExcelExportHandler<EmergencyTa | ||
| 63 | 63 | ||
| 64 | // 基础字段赋值 | 64 | // 基础字段赋值 |
| 65 | vo.setDiscoveryTime(task.getDiscoveryTime()); | 65 | vo.setDiscoveryTime(task.getDiscoveryTime()); |
| 66 | - vo.setEmergencyHarmId(task.getEmergencyHarmId()); | 66 | + vo.setEmergencyHarmNum(task.getEmergencyHarmNum()); |
| 67 | vo.setEmergencyLocation(task.getEmergencyLocation()); | 67 | vo.setEmergencyLocation(task.getEmergencyLocation()); |
| 68 | vo.setTreeSpecies(task.getTreeSpecies()); | 68 | vo.setTreeSpecies(task.getTreeSpecies()); |
| 69 | vo.setTreeSpec(task.getTreeSpec()); | 69 | vo.setTreeSpec(task.getTreeSpec()); |
| 70 | vo.setRescueStartTime(task.getRescueStartTime()); | 70 | vo.setRescueStartTime(task.getRescueStartTime()); |
| 71 | vo.setRescueCompleteTime(task.getRescueCompleteTime()); | 71 | vo.setRescueCompleteTime(task.getRescueCompleteTime()); |
| 72 | - vo.setEmergencyHarmNum(task.getEmergencyTypeNum()); | 72 | + vo.setEmergencyTypeNum(task.getEmergencyTypeNum()); |
| 73 | vo.setRemarks(task.getRemarks()); | 73 | vo.setRemarks(task.getRemarks()); |
| 74 | vo.setCompanyName(task.getCompanyName()); | 74 | vo.setCompanyName(task.getCompanyName()); |
| 75 | 75 |