From c7870e34282239d41919795e97d1f0ae475e6636 Mon Sep 17 00:00:00 2001
From: weitingdong <2480899115@qq.com>
Date: Thu, 11 Jul 2024 09:17:02 +0800
Subject: [PATCH] =?UTF-8?q?=E5=B7=A5=E5=99=A8=E5=85=B7=E5=8F=B0=E8=B4=A6?=
 =?UTF-8?q?=20=E5=AF=BC=E5=87=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../leger/entity/InventoryDocument.java       |  2 +
 .../leger/excel/ToolInventoryRecordExcel.java | 56 ++++++++++---------
 .../mapper/ToolInventoryRecordMapper.xml      | 27 ++++++++-
 .../modules/system/util/EnumFileInfoType.java |  2 +-
 4 files changed, 57 insertions(+), 30 deletions(-)

diff --git a/src/main/java/org/energy/modules/leger/entity/InventoryDocument.java b/src/main/java/org/energy/modules/leger/entity/InventoryDocument.java
index f1c21cb..5ca0419 100644
--- a/src/main/java/org/energy/modules/leger/entity/InventoryDocument.java
+++ b/src/main/java/org/energy/modules/leger/entity/InventoryDocument.java
@@ -34,11 +34,13 @@ public class InventoryDocument extends BaseEntity {
     /**
      * 设备台账主键
      */
+	@JsonSerialize(using = ToStringSerializer.class)
     @ApiModelProperty(value = "设备台账主键")
     private Long eqLedgerId;
     /**
      * 工器具编码主键
      */
+	@JsonSerialize(using = ToStringSerializer.class)
     @ApiModelProperty(value = "工器具编码主键")
     private Long toolsCodeId;
     /**
diff --git a/src/main/java/org/energy/modules/leger/excel/ToolInventoryRecordExcel.java b/src/main/java/org/energy/modules/leger/excel/ToolInventoryRecordExcel.java
index ae70efa..58c9ddb 100644
--- a/src/main/java/org/energy/modules/leger/excel/ToolInventoryRecordExcel.java
+++ b/src/main/java/org/energy/modules/leger/excel/ToolInventoryRecordExcel.java
@@ -35,56 +35,60 @@ public class ToolInventoryRecordExcel implements Serializable {
 	private static final long serialVersionUID = 1L;
 
 	@ColumnWidth(20)
-	@ExcelProperty(value = "设备台账编码")
-	private String eqLedgerCode;
+	@ExcelProperty(value = "工器具编码")
+	private String toolsCodeId;
 
 	@ColumnWidth(15)
-	@ExcelProperty(value = "设备描述")
-	private String deviceDescription;
+	@ExcelProperty(value = "工器具名称")
+	private String toolName;
 
 	@ColumnWidth(15)
-	@ExcelProperty(value = "KKS编码")
-	private String kksEncoding;
+	@ExcelProperty(value = "规格型号")
+	private String modelSpecification;
 
 	@ColumnWidth(15)
-	@ExcelProperty(value = "设备种类")
-	private String eqType;
+	@ExcelProperty(value = "配置日期")
+	private String configurationDate;
 
 	@ColumnWidth(15)
-	@ExcelProperty(value = "资产编码")
-	private String assetCode;
+	@ExcelProperty(value = "责任班组")
+	private String responsibleTeam;
 
 	@ColumnWidth(15)
-	@ExcelProperty(value = "制造商")
-	private String manufacturer;
+	@ExcelProperty(value = "场站")
+	private String stationsExt;
 
 	@ColumnWidth(15)
-	@ExcelProperty(value = "制造商国家")
-	private String manufacturerCountry;
+	@ExcelProperty(value = "工器具类别")
+	private String toolCategory;
 
 	@ColumnWidth(15)
-	@ExcelProperty(value = "制造商零件号")
-	private String manufacturerPartNo;
+	@ExcelProperty(value = "工器具状态")
+	private String toolStatus;
 
 	@ColumnWidth(15)
-	@ExcelProperty(value = "制造年月")
-	private String manufactureDate;
+	@ExcelProperty(value = "已用年限")
+	private String yearsInUsed;
 
 	@ColumnWidth(15)
-	@ExcelProperty(value = "制造序列号")
-	private String manufacturingSerialNo;
+	@ExcelProperty(value = "责任人")
+	private String responsiblPerson;
 
 	@ColumnWidth(15)
-	@ExcelProperty(value = "型号")
-	private String model;
+	@ExcelProperty(value = "工器具类别描述")
+	private String toolTypeDescription;
 
 	@ColumnWidth(15)
-	@ExcelProperty(value = "大小尺寸")
-	private String sizeAndSize;
+	@ExcelProperty(value = "工器具状态描述")
+	private String toolStatusDescription;
 
 	@ColumnWidth(15)
-	@ExcelProperty(value = "对象重量")
-	private String objectWeight;
+	@ExcelProperty(value = "出厂编号")
+	private String factoryNo;
+
+	@ColumnWidth(15)
+	@ExcelProperty(value = "是否检验周期内")
+	private String isInspectionPeriodExt;
 
 	@ColumnWidth(15)
 	@ExcelProperty(value = "审核状态")
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 1828a97..cb0447f 100644
--- a/src/main/java/org/energy/modules/leger/mapper/ToolInventoryRecordMapper.xml
+++ b/src/main/java/org/energy/modules/leger/mapper/ToolInventoryRecordMapper.xml
@@ -34,9 +34,30 @@
     </select>
 
     <select id="exportData" resultType="org.energy.modules.leger.excel.ToolInventoryRecordExcel">
-        SELECT eq_ledger_code,device_description,kks_encoding,eq_type,asset_code,manufacturer,
-               manufacturer_country,manufacturer_part_no,manufacture_date,manufacturing_serial_no,
-               model,size_and_size,object_weight,
+        SELECT tools_code_id,
+               tool_name,
+               model_specification,
+               configuration_date,
+               responsible_team,
+               CASE
+                   WHEN stations = '1' THEN '景和光伏'
+                   WHEN stations = '2' THEN '北沙一光伏'
+                   WHEN stations = '3' THEN '北沙二光伏'
+                   WHEN stations = '4' THEN '达坂城风电一场'
+                   ELSE ''
+                   END AS stations_ext,
+               tool_category,
+               tool_status,
+               years_in_used,
+               responsibl_person,
+               tool_type_description,
+               tool_status_description,
+               factory_no,
+               CASE
+                   WHEN is_inspection_period = '1' THEN '否'
+                   WHEN is_inspection_period = '2' THEN '是'
+                   ELSE ''
+                   END AS is_inspection_period_ext,
                CASE
                    WHEN check_status = '1' THEN '审核中'
                    WHEN check_status = '2' THEN '已审核'
diff --git a/src/main/java/org/energy/modules/system/util/EnumFileInfoType.java b/src/main/java/org/energy/modules/system/util/EnumFileInfoType.java
index be8c23d..a84ab3a 100644
--- a/src/main/java/org/energy/modules/system/util/EnumFileInfoType.java
+++ b/src/main/java/org/energy/modules/system/util/EnumFileInfoType.java
@@ -6,7 +6,7 @@ package org.energy.modules.system.util;
 public enum EnumFileInfoType {
 
 	STATIC_LEDGER_DOCUMENT_INVENTORY("1", "ST_LD_DOC_INV", "静态台账文档清册"),
-    ;
+	STATIC_TOOLS_DOCUMENT_INVENTORY("2", "ST_TO_DOC_INV", "工器具台账文档清册"),;
 
     private String key;
     private String keyDesc;