From 14c607e2b35ca9876b61e57da3a552f1b70e64eb Mon Sep 17 00:00:00 2001 From: liuyiliang Date: Tue, 9 Jul 2024 11:51:56 +0800 Subject: [PATCH 1/2] =?UTF-8?q?=E5=88=97=E8=A1=A8=E5=AF=BC=E5=87=BA?= =?UTF-8?q?=E4=BB=A3=E7=A0=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/EquipmentLedgerController.java | 38 ++++++------ .../leger/excel/EquipmentLedgerExcel.java | 58 ++++++++++++++++++- .../leger/mapper/EquipmentLedgerMapper.xml | 10 +++- 3 files changed, 83 insertions(+), 23 deletions(-) diff --git a/src/main/java/org/energy/modules/leger/controller/EquipmentLedgerController.java b/src/main/java/org/energy/modules/leger/controller/EquipmentLedgerController.java index 591a68e..cebad51 100644 --- a/src/main/java/org/energy/modules/leger/controller/EquipmentLedgerController.java +++ b/src/main/java/org/energy/modules/leger/controller/EquipmentLedgerController.java @@ -155,25 +155,6 @@ public class EquipmentLedgerController extends DafController { public R auditing(@ApiParam(value = "主键集合", required = true) @RequestParam String ids) { return this.approve(2,ids); } - /** - * 导出 - */ - @SneakyThrows - @GetMapping("export") - @ApiOperationSupport(order = 13) - @ApiOperation(value = "导出", notes = "传入") - @ApiLog - public void exportUser(@ApiIgnore @RequestParam Map entity, HttpServletResponse response) { - QueryWrapper queryWrapper = Condition.getQueryWrapper(entity, EquipmentLedger.class); - queryWrapper.lambda().eq(EquipmentLedger::getIsDeleted, DafConstant.DB_NOT_DELETED); - List list = equipmentLedgerService.export(queryWrapper); - response.setContentType("application/vnd.ms-excel"); - response.setCharacterEncoding(Charsets.UTF_8.name()); - String fileName = URLEncoder.encode("数据导出", Charsets.UTF_8.name()); - response.setHeader("Content-disposition", "attachment;filename=" + fileName + ".xlsx"); - EasyExcel.write(response.getOutputStream(), EquipmentLedgerExcel.class).sheet("数据表").doWrite(list); - } - /** * 驳回 设备台账编码一览 @@ -198,4 +179,23 @@ public class EquipmentLedgerController extends DafController { } return R.status(equipmentLedgerService.updateBatchById(list)); } + + /** + * 导出 + */ + @SneakyThrows + @GetMapping("export") + @ApiOperationSupport(order = 10) + @ApiOperation(value = "导出", notes = "传入") + @ApiLog + public void exportUser(@ApiIgnore @RequestParam Map entity, HttpServletResponse response) { + QueryWrapper queryWrapper = Condition.getQueryWrapper(entity, EquipmentLedger.class); + queryWrapper.lambda().eq(EquipmentLedger::getIsDeleted, DafConstant.DB_NOT_DELETED); + List list = equipmentLedgerService.export(queryWrapper); + response.setContentType("application/vnd.ms-excel"); + response.setCharacterEncoding(Charsets.UTF_8.name()); + String fileName = URLEncoder.encode("静态台账数据导出", Charsets.UTF_8.name()); + response.setHeader("Content-disposition", "attachment;filename=" + fileName + ".xlsx"); + EasyExcel.write(response.getOutputStream(), EquipmentLedgerExcel.class).sheet("静态台账").doWrite(list); + } } diff --git a/src/main/java/org/energy/modules/leger/excel/EquipmentLedgerExcel.java b/src/main/java/org/energy/modules/leger/excel/EquipmentLedgerExcel.java index cb9265c..df652ba 100644 --- a/src/main/java/org/energy/modules/leger/excel/EquipmentLedgerExcel.java +++ b/src/main/java/org/energy/modules/leger/excel/EquipmentLedgerExcel.java @@ -30,12 +30,64 @@ import java.io.Serializable; @Data @ColumnWidth(25) @HeadRowHeight(20) -@ContentRowHeight(18) +@ContentRowHeight(16) public class EquipmentLedgerExcel implements Serializable { private static final long serialVersionUID = 1L; - @ColumnWidth(15) - @ExcelProperty("eqLedgerCode") + @ColumnWidth(20) + @ExcelProperty(value = "设备台账编码") private String eqLedgerCode; + @ColumnWidth(15) + @ExcelProperty(value = "设备描述") + private String deviceDescription; + + @ColumnWidth(15) + @ExcelProperty(value = "KKS编码") + private String kksEncoding; + + @ColumnWidth(15) + @ExcelProperty(value = "设备种类") + private String eqType; + + @ColumnWidth(15) + @ExcelProperty(value = "资产编码") + private String assetCode; + + @ColumnWidth(15) + @ExcelProperty(value = "制造商") + private String manufacturer; + + @ColumnWidth(15) + @ExcelProperty(value = "制造商国家") + private String manufacturerCountry; + + @ColumnWidth(15) + @ExcelProperty(value = "制造商零件号") + private String manufacturerPartNo; + + @ColumnWidth(15) + @ExcelProperty(value = "制造年月") + private String manufactureDate; + + @ColumnWidth(15) + @ExcelProperty(value = "制造序列号") + private String manufacturingSerialNo; + + @ColumnWidth(15) + @ExcelProperty(value = "型号") + private String model; + + @ColumnWidth(15) + @ExcelProperty(value = "大小尺寸") + private String sizeAndSize; + + @ColumnWidth(15) + @ExcelProperty(value = "对象重量") + private String objectWeight; + + @ColumnWidth(15) + @ExcelProperty(value = "审核状态") + private String checkStatusExt; + } diff --git a/src/main/java/org/energy/modules/leger/mapper/EquipmentLedgerMapper.xml b/src/main/java/org/energy/modules/leger/mapper/EquipmentLedgerMapper.xml index bdb2612..645ca6a 100644 --- a/src/main/java/org/energy/modules/leger/mapper/EquipmentLedgerMapper.xml +++ b/src/main/java/org/energy/modules/leger/mapper/EquipmentLedgerMapper.xml @@ -57,7 +57,15 @@ From c4857e49f0568740d386bd9ac1f02d07c1f1ce5b Mon Sep 17 00:00:00 2001 From: yangzhicheng Date: Tue, 9 Jul 2024 14:55:39 +0800 Subject: [PATCH 2/2] =?UTF-8?q?=E5=B7=A5=E5=99=A8=E5=85=B7=E7=BC=96?= =?UTF-8?q?=E7=A0=81=20id=E5=8F=98=E6=9B=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../leger/controller/ToolInventoryRecordController.java | 6 +++--- .../energy/modules/leger/entity/ToolInventoryRecord.java | 2 +- .../modules/leger/mapper/ToolInventoryRecordMapper.xml | 2 +- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/src/main/java/org/energy/modules/leger/controller/ToolInventoryRecordController.java b/src/main/java/org/energy/modules/leger/controller/ToolInventoryRecordController.java index d0f42f8..7be152a 100644 --- a/src/main/java/org/energy/modules/leger/controller/ToolInventoryRecordController.java +++ b/src/main/java/org/energy/modules/leger/controller/ToolInventoryRecordController.java @@ -42,7 +42,7 @@ import com.dayu.daf.core.boot.ctrl.DafController; */ @RestController @AllArgsConstructor -@RequestMapping("/toolinventoryrecord") +@RequestMapping("/leger/toolinventoryrecord") @Api(value = "工器具编码一览", tags = "工器具编码一览接口") public class ToolInventoryRecordController extends DafController { @@ -111,7 +111,7 @@ public class ToolInventoryRecordController extends DafController { return R.status(toolInventoryRecordService.saveOrUpdate(toolInventoryRecord)); } - + /** * 删除 工器具编码一览 */ @@ -122,5 +122,5 @@ public class ToolInventoryRecordController extends DafController { return R.status(toolInventoryRecordService.deleteLogic(Func.toLongList(ids))); } - + } diff --git a/src/main/java/org/energy/modules/leger/entity/ToolInventoryRecord.java b/src/main/java/org/energy/modules/leger/entity/ToolInventoryRecord.java index a0d9a67..7870aea 100644 --- a/src/main/java/org/energy/modules/leger/entity/ToolInventoryRecord.java +++ b/src/main/java/org/energy/modules/leger/entity/ToolInventoryRecord.java @@ -31,7 +31,7 @@ public class ToolInventoryRecord extends BaseEntity { * 工器具编码 */ @ApiModelProperty(value = "工器具编码") - private String toolCode; + private Long toolsCodeId; /** * 工器具名称 */ diff --git a/src/main/java/org/energy/modules/leger/mapper/ToolInventoryRecordMapper.xml b/src/main/java/org/energy/modules/leger/mapper/ToolInventoryRecordMapper.xml index 1150bc1..09eb5ff 100644 --- a/src/main/java/org/energy/modules/leger/mapper/ToolInventoryRecordMapper.xml +++ b/src/main/java/org/energy/modules/leger/mapper/ToolInventoryRecordMapper.xml @@ -11,7 +11,7 @@ - +