no message

mall-server-api/src/main/java/com/gree/mall/manager/bean/material/base/WorkerGoodsBean.java

@@ -1,65 +1,20 @@
 package com.gree.mall.manager.bean.material.base;
 
+import com.gree.mall.manager.plus.entity.WorkerGoods;
 import com.gree.mall.manager.plus.entity.WorkerGoodsRela;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
+import lombok.EqualsAndHashCode;
 
-import java.util.Date;
 import java.util.List;
 
+@EqualsAndHashCode(callSuper = true)
 @Data
 @ApiModel
-public class WorkerGoodsBean {
-
-    @ApiModelProperty(value = "商户编号")
-    private String companyWechatId;
-
-    @ApiModelProperty(value = "师傅商品编号")
-    private String goodsId;
-
-    @ApiModelProperty(value = "师傅商品名称")
-    private String goodsName;
-
-    @ApiModelProperty(value = "师傅销售单位")
-    private String salesUnit;
-
-    @ApiModelProperty(value = "商品小类ID")
-    private String goodsCategoryId;
-
-    @ApiModelProperty(value = "父类商品分类ID")
-    private String parentCategoryId;
-
-    @ApiModelProperty(value = "商品小类名称")
-    private String parentCategoryName;
-
-    @ApiModelProperty(value = "父类商品分类名称")
-    private String goodsCategoryName;
-
-    @ApiModelProperty(value = "状态 ON=有效 OFF=无效")
-    private String status;
-
-    @ApiModelProperty(value = "创建人")
-    private String createBy;
-
-    @ApiModelProperty(value = "创建时间")
-    private Date createTime;
-
-    @ApiModelProperty(value = "更新人")
-    private String updateBy;
-
-    @ApiModelProperty(value = "修改时间")
-    private Date updateTime;
-
-    @ApiModelProperty(value = "备注")
-    private String remark;
+public class WorkerGoodsBean extends WorkerGoods {
 
     @ApiModelProperty(value = "明细")
     private List<WorkerGoodsRela> items;
 
-    @ApiModelProperty(value = "商品代码")
-    private String goodsCode;
-
-    @ApiModelProperty(value = "是否小件 true=是 false=否")
-    private Boolean isSmall;
 }

mall-server-api/src/main/java/com/gree/mall/manager/logic/material/base/WorkerGoodsLogic.java

@@ -166,14 +166,14 @@ public class WorkerGoodsLogic {
             row.add(exportBean.getGoodsId());
             row.add(exportBean.getGoodsName());
             row.add(exportBean.getIsSmall() ? "是" : "否");
-            row.add(StringUtils.isNotBlank(exportBean.getStatus()) ? BaseEnum.valueToEnum(StateEnum.class, exportBean.getStatus()).getRemark() : "");
+            row.add(StringUtils.isNotBlank(exportBean.getStatus()) ? BaseEnum.keyToValue(StateEnum.class, exportBean.getStatus()) : "");
             row.add(exportBean.getWebsitCategoryName());
             row.add(exportBean.getWebsitGoodsId());
             row.add(exportBean.getWebsitGoodsName());
             row.add(exportBean.getSpecification());
             row.add(exportBean.getGoodsSalesConvertQty());
-            row.add(StringUtils.isNotBlank(exportBean.getManageWorkerStock()) ?BaseEnum.valueToEnum(IsYesNoEnum.class, exportBean.getManageWorkerStock()).getRemark() : "");
-            row.add(StringUtils.isNotBlank(exportBean.getWebsitGoodsStatus()) ?BaseEnum.valueToEnum(StateEnum.class, exportBean.getWebsitGoodsStatus()).getRemark() : "");
+            row.add(StringUtils.isNotBlank(exportBean.getManageWorkerStock()) ?BaseEnum.keyToValue(IsYesNoEnum.class, exportBean.getManageWorkerStock()) : "");
+            row.add(StringUtils.isNotBlank(exportBean.getWebsitGoodsStatus()) ?BaseEnum.keyToValue(StateEnum.class, exportBean.getWebsitGoodsStatus()) : "");
             rows.add(row);
 
             if (entryValue.size() > 1) {