Browse Source

导出true改成是否

master
张立 2 years ago
parent
commit
2cc470a9ad
  1. 3
      win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/configurationsetting/vo/ConfigurationsettingExcelVO.java
  2. 3
      win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/paramsetting/vo/ParamsettingExcelVO.java
  3. 11
      win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/shift/vo/ShiftExcelVO.java
  4. 3
      win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/shift/vo/ShiftExportReqVO.java
  5. 1
      win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/shift/ShiftMapper.java

3
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("创建时间")

3
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("创建时间")

11
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;
}

3
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;

1
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<ShiftDO> {
return selectList(new LambdaQueryWrapperX<ShiftDO>()
.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())

Loading…
Cancel
Save