diff --git a/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/device/pojo/excel/FeiBaSetExcel.java b/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/device/pojo/excel/FeiBaSetExcel.java index 21c8851f..eff04a39 100644 --- a/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/device/pojo/excel/FeiBaSetExcel.java +++ b/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/device/pojo/excel/FeiBaSetExcel.java @@ -1,6 +1,7 @@ package org.springblade.desk.device.pojo.excel; +import com.alibaba.excel.annotation.ExcelIgnore; import lombok.Data; import java.math.BigDecimal; @@ -30,24 +31,6 @@ public class FeiBaSetExcel implements Serializable { @Serial private static final long serialVersionUID = 1L; - /** - * - */ - @ColumnWidth(20) - @ExcelProperty("") - private BigDecimal id; - /** - * - */ - @ColumnWidth(20) - @ExcelProperty("") - private String tenantId; - /** - * 删除标记;1:删除,0:正常 - */ - @ColumnWidth(20) - @ExcelProperty("删除标记;1:删除,0:正常") - private Long isDeleted; /** * 编码 */ @@ -61,10 +44,14 @@ public class FeiBaSetExcel implements Serializable { @ExcelProperty("类型") private String fsType; /** - * + * 状态名称 */ @ColumnWidth(20) - @ExcelProperty("") - private Short bindQty; - + @ExcelProperty("飞靶状态") + private String statusName; + /** + * 状态值 + */ + @ExcelIgnore + private String status; } diff --git a/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/device/pojo/excel/RackSetExcel.java b/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/device/pojo/excel/RackSetExcel.java index 79a5f3bf..6a0bacc2 100644 --- a/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/device/pojo/excel/RackSetExcel.java +++ b/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/device/pojo/excel/RackSetExcel.java @@ -1,6 +1,7 @@ package org.springblade.desk.device.pojo.excel; +import com.alibaba.excel.annotation.ExcelIgnore; import lombok.Data; import java.math.BigDecimal; @@ -29,25 +30,6 @@ public class RackSetExcel implements Serializable { @Serial private static final long serialVersionUID = 1L; - - /** - * - */ - @ColumnWidth(20) - @ExcelProperty("") - private BigDecimal id; - /** - * - */ - @ColumnWidth(20) - @ExcelProperty("") - private String tenantId; - /** - * 删除标记;1:删除,0:正常 - */ - @ColumnWidth(20) - @ExcelProperty("删除标记;1:删除,0:正常") - private Long isDeleted; /** * 编码 */ @@ -61,10 +43,15 @@ public class RackSetExcel implements Serializable { @ExcelProperty("类型") private String rsType; /** - * + * 状态名称 */ @ColumnWidth(20) - @ExcelProperty("") - private Short bindQty; + @ExcelProperty("飞靶状态") + private String statusName; + /** + * 状态值 + */ + @ExcelIgnore + private String status; } diff --git a/blade-service-api/blade-dict-api/src/main/java/org/springblade/system/pojo/enums/DictEnum.java b/blade-service-api/blade-dict-api/src/main/java/org/springblade/system/pojo/enums/DictEnum.java index e0bccf0b..d9c86c43 100644 --- a/blade-service-api/blade-dict-api/src/main/java/org/springblade/system/pojo/enums/DictEnum.java +++ b/blade-service-api/blade-dict-api/src/main/java/org/springblade/system/pojo/enums/DictEnum.java @@ -97,6 +97,10 @@ public enum DictEnum { * 用户平台 */ USER_TYPE("user_type"), + /** + * 工装状态 + */ + WORKWEAR_STATUS("workwear_status"), ; final String name; diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/device/service/impl/FeiBaSetServiceImpl.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/device/service/impl/FeiBaSetServiceImpl.java index 281ae9a2..90d50b33 100644 --- a/blade-service/blade-desk/src/main/java/org/springblade/desk/device/service/impl/FeiBaSetServiceImpl.java +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/device/service/impl/FeiBaSetServiceImpl.java @@ -8,6 +8,8 @@ import org.springblade.desk.device.pojo.entity.FeiBaSetEntity; import org.springblade.desk.device.pojo.excel.FeiBaSetExcel; import org.springblade.desk.device.service.IFeiBaSetService; import org.springblade.desk.order.pojo.entity.YieldOrder; +import org.springblade.system.cache.DictCache; +import org.springblade.system.pojo.enums.DictEnum; import org.springframework.stereotype.Service; import com.baomidou.mybatisplus.core.conditions.Wrapper; import com.baomidou.mybatisplus.core.metadata.IPage; @@ -46,9 +48,9 @@ public class FeiBaSetServiceImpl extends BaseServiceImpl exportFeiBaSet(Wrapper queryWrapper) { List feiBaSetList = baseMapper.exportFeiBaSet(queryWrapper); - //feiBaSetList.forEach(feiBaSet -> { - // feiBaSet.setTypeName(DictCache.getValue(DictEnum.YES_NO, FeiBaSet.getType())); - //}); + feiBaSetList.forEach(feiBaSet -> { + feiBaSet.setStatusName(DictCache.getValue(DictEnum.WORKWEAR_STATUS, feiBaSet.getStatus())); + }); return feiBaSetList; } diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/device/service/impl/RackSetServiceImpl.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/device/service/impl/RackSetServiceImpl.java index 083c1bc3..6d197291 100644 --- a/blade-service/blade-desk/src/main/java/org/springblade/desk/device/service/impl/RackSetServiceImpl.java +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/device/service/impl/RackSetServiceImpl.java @@ -32,6 +32,8 @@ import org.springblade.desk.device.pojo.entity.FeiBaSetEntity; import org.springblade.desk.device.pojo.entity.RackSetEntity; import org.springblade.desk.device.pojo.excel.RackSetExcel; import org.springblade.desk.device.service.IRackSetService; +import org.springblade.system.cache.DictCache; +import org.springblade.system.pojo.enums.DictEnum; import org.springframework.stereotype.Service; import com.baomidou.mybatisplus.core.conditions.Wrapper; import com.baomidou.mybatisplus.core.metadata.IPage; @@ -70,9 +72,10 @@ public class RackSetServiceImpl extends BaseServiceImpl exportRackSet(Wrapper queryWrapper) { List rackSetList = baseMapper.exportRackSet(queryWrapper); - //rackSetList.forEach(rackSet -> { - // rackSet.setTypeName(DictCache.getValue(DictEnum.YES_NO, RackSet.getType())); - //}); + rackSetList.forEach(rackSet -> { + rackSet.setStatusName(DictCache.getValue(DictEnum.WORKWEAR_STATUS, rackSet.getStatus())); + + }); return rackSetList; } diff --git a/doc/sql/mes/insert-260106.sql b/doc/sql/mes/insert-260106.sql new file mode 100644 index 00000000..e4c4c079 --- /dev/null +++ b/doc/sql/mes/insert-260106.sql @@ -0,0 +1,9 @@ +--字典 +Insert into BLADE_DICT (ID, PARENT_ID, CODE, DICT_KEY, DICT_VALUE, SORT, REMARK, IS_SEALED, STATUS, IS_DELETED) +values (2008068723414859778, 0, 'workwear_status', '-1', '工装状态', 1020, '工装状态', 0, 1, 0); +Insert into BLADE_DICT (ID, PARENT_ID, CODE, DICT_KEY, DICT_VALUE, SORT, REMARK, IS_SEALED, STATUS, IS_DELETED) +values (2008068810543136769, 2008068723414859778, 'workwear_status', '1', '空闲', 0, '空闲', 0, 1, 0); +Insert into BLADE_DICT (ID, PARENT_ID, CODE, DICT_KEY, DICT_VALUE, SORT, REMARK, IS_SEALED, STATUS, IS_DELETED) +values (2008068905799974913, 2008068723414859778, 'workwear_status', '2', '已绑定', 1, '已绑定', 0, 1, 0); +Insert into BLADE_DICT (ID, PARENT_ID, CODE, DICT_KEY, DICT_VALUE, SORT, REMARK, IS_SEALED, STATUS, IS_DELETED) +values (2008068946371477506, 2008068723414859778, 'workwear_status', '3', '使用中', 2, '使用中', 0, 1, 0);