From 2cc470a9ade39b60374967868a4e5d43fd9d1c9e Mon Sep 17 00:00:00 2001 From: zhang_li <2235006734@qqq.com> Date: Tue, 14 Nov 2023 19:27:01 +0800 Subject: [PATCH] =?UTF-8?q?=E5=AF=BC=E5=87=BAtrue=E6=94=B9=E6=88=90?= =?UTF-8?q?=E6=98=AF=E5=90=A6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../vo/ConfigurationsettingExcelVO.java | 3 ++- .../paramsetting/vo/ParamsettingExcelVO.java | 3 ++- .../module/wms/controller/shift/vo/ShiftExcelVO.java | 11 ++++++----- .../wms/controller/shift/vo/ShiftExportReqVO.java | 3 --- .../win/module/wms/dal/mysql/shift/ShiftMapper.java | 1 - 5 files changed, 10 insertions(+), 11 deletions(-) diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/configurationsetting/vo/ConfigurationsettingExcelVO.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/configurationsetting/vo/ConfigurationsettingExcelVO.java index 70f14019..f08dea61 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/configurationsetting/vo/ConfigurationsettingExcelVO.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/configurationsetting/vo/ConfigurationsettingExcelVO.java @@ -43,7 +43,8 @@ public class ConfigurationsettingExcelVO { @ExcelProperty("描述") private String description; - @ExcelProperty("必填") + @ExcelProperty(value = "必填", converter = DictConvert.class) + @DictFormat("true_false") private String isRequired; @ExcelProperty("创建时间") diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/paramsetting/vo/ParamsettingExcelVO.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/paramsetting/vo/ParamsettingExcelVO.java index 58334f37..0b0a6c31 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/paramsetting/vo/ParamsettingExcelVO.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/paramsetting/vo/ParamsettingExcelVO.java @@ -47,7 +47,8 @@ public class ParamsettingExcelVO { @ExcelProperty("描述") private String description; - @ExcelProperty("必填") + @ExcelProperty(value = "必填", converter = DictConvert.class) + @DictFormat("true_false") private String isRequired; @ExcelProperty("创建时间") diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/shift/vo/ShiftExcelVO.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/shift/vo/ShiftExcelVO.java index c46a8f05..44b01618 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/shift/vo/ShiftExcelVO.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/shift/vo/ShiftExcelVO.java @@ -1,5 +1,7 @@ package com.win.module.wms.controller.shift.vo; +import com.win.framework.excel.core.annotations.DictFormat; +import com.win.framework.excel.core.convert.DictConvert; import io.swagger.v3.oas.annotations.media.Schema; import lombok.*; import java.util.*; @@ -27,9 +29,6 @@ public class ShiftExcelVO { @ExcelProperty("名称") private String name; - @ExcelProperty("描述") - private String description; - @ExcelProperty("开始时间") private LocalDateTime beginTime; @@ -51,10 +50,12 @@ public class ShiftExcelVO { @ExcelProperty("创建者ID") private String creator; - @ExcelProperty("是否跨天") + @ExcelProperty(value = "是否跨天", converter = DictConvert.class) + @DictFormat("true_false") private String endAtNextDay; - @ExcelProperty("是否可用") + @ExcelProperty(value = "是否可用", converter = DictConvert.class) + @DictFormat("true_false") private String available; } diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/shift/vo/ShiftExportReqVO.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/shift/vo/ShiftExportReqVO.java index 78637881..fc907908 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/shift/vo/ShiftExportReqVO.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/shift/vo/ShiftExportReqVO.java @@ -19,9 +19,6 @@ public class ShiftExportReqVO { @Schema(description = "名称") private String name; - @Schema(description = "描述") - private String description; - @Schema(description = "开始时间") @DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND) private LocalDateTime[] beginTime; diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/shift/ShiftMapper.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/shift/ShiftMapper.java index 89f85f3c..25cd14e1 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/shift/ShiftMapper.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/shift/ShiftMapper.java @@ -46,7 +46,6 @@ public interface ShiftMapper extends BaseMapperX { return selectList(new LambdaQueryWrapperX() .eqIfPresent(ShiftDO::getCode, reqVO.getCode()) .likeIfPresent(ShiftDO::getName, reqVO.getName()) - .eqIfPresent(ShiftDO::getDescription, reqVO.getDescription()) .betweenIfPresent(ShiftDO::getBeginTime, reqVO.getBeginTime()) .betweenIfPresent(ShiftDO::getEntTime, reqVO.getEntTime()) .betweenIfPresent(ShiftDO::getActiveTime, reqVO.getActiveTime())