From 5b2b3d46d941c24dfa0b7a23605a0955053b987e Mon Sep 17 00:00:00 2001 From: liuyiliang Date: Tue, 16 Jul 2024 09:32:47 +0800 Subject: [PATCH] =?UTF-8?q?=E7=89=A9=E8=B5=84=E5=88=86=E7=B1=BB=E7=A0=81?= =?UTF-8?q?=E5=AF=BC=E5=87=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../org/energy/modules/spares/excel/MaterialClassExcel.java | 4 ---- .../modules/spares/mapper/MaterialClassificationMapper.xml | 1 - .../service/impl/MaterialClassificationServiceImpl.java | 4 ++-- 3 files changed, 2 insertions(+), 7 deletions(-) diff --git a/src/main/java/org/energy/modules/spares/excel/MaterialClassExcel.java b/src/main/java/org/energy/modules/spares/excel/MaterialClassExcel.java index c0c71c7..1cacd10 100644 --- a/src/main/java/org/energy/modules/spares/excel/MaterialClassExcel.java +++ b/src/main/java/org/energy/modules/spares/excel/MaterialClassExcel.java @@ -50,8 +50,4 @@ public class MaterialClassExcel implements Serializable { @ExcelProperty(value = "创建人") private String createUserName; - @ColumnWidth(20) - @ExcelProperty(value = "审批状态") - private String approvalStatus; - } diff --git a/src/main/java/org/energy/modules/spares/mapper/MaterialClassificationMapper.xml b/src/main/java/org/energy/modules/spares/mapper/MaterialClassificationMapper.xml index c6e99d9..8921849 100644 --- a/src/main/java/org/energy/modules/spares/mapper/MaterialClassificationMapper.xml +++ b/src/main/java/org/energy/modules/spares/mapper/MaterialClassificationMapper.xml @@ -25,7 +25,6 @@ select a.code, a.type, - a.approval_status, a.create_time, c.name as create_user_name from spt_material_classification a diff --git a/src/main/java/org/energy/modules/spares/service/impl/MaterialClassificationServiceImpl.java b/src/main/java/org/energy/modules/spares/service/impl/MaterialClassificationServiceImpl.java index 241416f..b166298 100644 --- a/src/main/java/org/energy/modules/spares/service/impl/MaterialClassificationServiceImpl.java +++ b/src/main/java/org/energy/modules/spares/service/impl/MaterialClassificationServiceImpl.java @@ -35,8 +35,8 @@ public class MaterialClassificationServiceImpl extends BaseServiceImpl export(MaterialClassificationVO materialClassificationVO) { List list = baseMapper.exportData(materialClassificationVO); list.forEach(item -> { - if (StringUtils.isNotEmpty(item.getApprovalStatus())) - item.setApprovalStatus(dictService.getValue("check_status", Integer.parseInt(item.getApprovalStatus()))); + if (StringUtils.isNotEmpty(item.getType())) + item.setType(dictService.getValue("supplies_type", Integer.parseInt(item.getType()))); }); return list; }