From 9039b3c7319ed880d9b030d0aa4e5e4d2088cd77 Mon Sep 17 00:00:00 2001 From: my_ong <429426262@qq.com> Date: Tue, 25 Mar 2025 20:36:51 +0800 Subject: [PATCH] =?UTF-8?q?:bug:=20=E5=AF=BC=E5=87=BAbug=E3=80=81=E5=9E=8B?= =?UTF-8?q?=E5=8F=B7=E7=9A=84=E6=A8=A1=E7=B3=8A=E6=9F=A5=E8=AF=A2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../material/ApplyFormController.java | 2 +- .../ims/converter/BooleanConverter.java | 21 +++++++++++++++++++ .../riemann/ims/dto/response/ApplyDTO.java | 3 ++- .../riemann/ims/entity/material/Material.java | 4 +++- src/main/resources/mapper/ApplyFormMapper.xml | 1 + src/main/resources/mapper/MaterialMapper.xml | 1 + 6 files changed, 29 insertions(+), 3 deletions(-) create mode 100644 src/main/java/tech/riemann/ims/converter/BooleanConverter.java diff --git a/src/main/java/tech/riemann/ims/controller/platform/material/ApplyFormController.java b/src/main/java/tech/riemann/ims/controller/platform/material/ApplyFormController.java index f5c2a63..0db7a33 100644 --- a/src/main/java/tech/riemann/ims/controller/platform/material/ApplyFormController.java +++ b/src/main/java/tech/riemann/ims/controller/platform/material/ApplyFormController.java @@ -69,7 +69,7 @@ public class ApplyFormController { @Operation(summary = "导出申请单列表") public void downloadExcel(@Parameter(description = "申请类型(1入库 3出库 4盘点)") @RequestParam(name = "applyType") Integer applyType, @Parameter(description = "物料类型") @RequestParam(name = "type", required = false) String type, - @Parameter(description = "编码/名称") @RequestParam(name = "code", required = false) String key, + @Parameter(description = "编码/名称") @RequestParam(name = "key", required = false) String key, HttpServletResponse response) { IPage applyDTOIPage = searchPage(1, 10000, applyType, type, key); List applyDTOList = applyDTOIPage.getRecords(); diff --git a/src/main/java/tech/riemann/ims/converter/BooleanConverter.java b/src/main/java/tech/riemann/ims/converter/BooleanConverter.java new file mode 100644 index 0000000..0ac969b --- /dev/null +++ b/src/main/java/tech/riemann/ims/converter/BooleanConverter.java @@ -0,0 +1,21 @@ +package tech.riemann.ims.converter; + +import cn.idev.excel.converters.Converter; +import cn.idev.excel.metadata.GlobalConfiguration; +import cn.idev.excel.metadata.data.WriteCellData; +import cn.idev.excel.metadata.property.ExcelContentProperty; + +/** + * @author mayong + * @since 2025/3/15 18:23 + */ +public class BooleanConverter implements Converter { + + @Override + public WriteCellData convertToExcelData(Boolean value, + ExcelContentProperty contentProperty, + GlobalConfiguration globalConfiguration) { + + return new WriteCellData<>(Boolean.TRUE.equals(value) ? "是" : "否"); + } +} diff --git a/src/main/java/tech/riemann/ims/dto/response/ApplyDTO.java b/src/main/java/tech/riemann/ims/dto/response/ApplyDTO.java index 5ea3936..c2ec85a 100644 --- a/src/main/java/tech/riemann/ims/dto/response/ApplyDTO.java +++ b/src/main/java/tech/riemann/ims/dto/response/ApplyDTO.java @@ -11,6 +11,7 @@ import lombok.Builder; import lombok.Data; import lombok.NoArgsConstructor; import org.nutz.json.JsonField; +import tech.riemann.ims.converter.BooleanConverter; import tech.riemann.ims.converter.ICodeBookConverter; import tech.riemann.ims.enums.ApplyTypeEnum; import tech.riemann.ims.enums.ReviewResultEnum; @@ -90,7 +91,7 @@ public class ApplyDTO { private String remark; @Schema(description = "是否确认") - @ExcelProperty("是否确认") + @ExcelProperty(value = "是否确认",converter = BooleanConverter.class) @ColumnWidth(40) private Boolean confirm; diff --git a/src/main/java/tech/riemann/ims/entity/material/Material.java b/src/main/java/tech/riemann/ims/entity/material/Material.java index d929960..9c3e0e8 100644 --- a/src/main/java/tech/riemann/ims/entity/material/Material.java +++ b/src/main/java/tech/riemann/ims/entity/material/Material.java @@ -14,6 +14,7 @@ import lombok.experimental.Accessors; import lombok.experimental.FieldNameConstants; import lombok.experimental.SuperBuilder; import org.nutz.dao.entity.annotation.*; +import tech.riemann.ims.converter.BooleanConverter; import tech.riemann.ims.entity.IdBaseEntity; import java.io.Serial; @@ -58,7 +59,7 @@ public class Material extends IdBaseEntity { @Column("m_assign_rule") @Comment("赋码规则") @ColDefine(notNull = false, type = ColType.INT) - @ExcelProperty("是否赋码") + @ExcelProperty(value = "是否赋码",converter = BooleanConverter.class) @ColumnWidth(40) private Boolean assignRule; // 0-低值易耗品（不参与赋码） 1-高价值工具类（参与唯一赋码） @@ -108,6 +109,7 @@ public class Material extends IdBaseEntity { @Column("m_description") @Comment("备注") @ColDefine(notNull = false, width = 500, precision = 0) + @ExcelProperty("备注") @ColumnWidth(40) private String description; diff --git a/src/main/resources/mapper/ApplyFormMapper.xml b/src/main/resources/mapper/ApplyFormMapper.xml index 0745b80..e4be6ed 100644 --- a/src/main/resources/mapper/ApplyFormMapper.xml +++ b/src/main/resources/mapper/ApplyFormMapper.xml @@ -66,6 +66,7 @@ and ( m_code like concat('%',#{key},'%') or m_name like concat('%',#{key},'%') + or m_spec like concat('%',#{key},'%') ) ORDER BY f.af_apply_date DESC diff --git a/src/main/resources/mapper/MaterialMapper.xml b/src/main/resources/mapper/MaterialMapper.xml index 2706597..53875c3 100644 --- a/src/main/resources/mapper/MaterialMapper.xml +++ b/src/main/resources/mapper/MaterialMapper.xml @@ -60,6 +60,7 @@ and ( m_code like concat('%',#{key},'%') or m_name like concat('%',#{key},'%') + or m_spec like concat('%',#{key},'%') )