From c2a6fb1684dec8edbb8c9923a020116e6a9481e2 Mon Sep 17 00:00:00 2001 From: "jhforever.wang@estsh.com" Date: Mon, 22 Jun 2020 09:44:01 +0800 Subject: [PATCH] =?UTF-8?q?[=E4=BB=BB=E5=8A=A12186=20=E6=B6=82=E8=A3=85?= =?UTF-8?q?=E5=AF=BC=E5=85=A5]?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/cn/estsh/i3plus/pojo/mes/bean/MesWorkOrder.java | 15 ++++++++++++++- 1 file changed, 14 insertions(+), 1 deletion(-) diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesWorkOrder.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesWorkOrder.java index d2b83c3..27ad0ee 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesWorkOrder.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesWorkOrder.java @@ -2,12 +2,14 @@ package cn.estsh.i3plus.pojo.mes.bean; import cn.estsh.i3plus.pojo.base.bean.BaseBean; import cn.estsh.i3plus.pojo.mes.model.MesButtonFlagModel; +import com.alibaba.fastjson.JSONObject; import io.swagger.annotations.Api; import io.swagger.annotations.ApiParam; import lombok.Data; import lombok.EqualsAndHashCode; import org.hibernate.annotations.DynamicInsert; import org.hibernate.annotations.DynamicUpdate; +import org.springframework.util.StringUtils; import javax.persistence.*; import java.io.Serializable; @@ -270,7 +272,6 @@ public class MesWorkOrder extends BaseBean implements Serializable { @ApiParam(value = "扩展数据MAP") public Map extendMap; - @Transient @ApiParam("工单源序号") private Double srcSeq; @@ -314,4 +315,16 @@ public class MesWorkOrder extends BaseBean implements Serializable { public int getApprovalStatusVal() { return this.approvalStatus == null ? 0 : this.approvalStatus; } + + public Map getExtendMap() { + try { + if (!StringUtils.isEmpty(this.extend)) { + return JSONObject.parseObject(this.extend, Map.class); + } else { + return null; + } + } catch (Exception e) { + return null; + } + } }