Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev

modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/bean/BaseBean.java

@@ -82,8 +82,8 @@ public abstract class BaseBean implements Serializable {
     @Column(name="CREATE_USER",updatable = false)
     @ApiParam(value = "创建用户")
     @AnnoOutputColumn(hidden = true)
-    @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.SELECT, selectRule = WmsEnumUtil.DYNAMIC_FIELD_SELECT_RULE.SINGLE_URL,
+    @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.LIST, isRequire = 2, entityName = "/wms/inner-order/query/user-list",
-            isRequire = 2, entityName = "/wms/inner-order/query/user-list", listColumnName = "name", explicitColumnName = "name")
+            listColumnName = "name", explicitColumnName = "name")
     public String createUser;
 
     @Indexed(direction = IndexDirection.DESCENDING)
@@ -95,8 +95,8 @@ public abstract class BaseBean implements Serializable {
     @Column(name="MODIFY_USER")
     @ApiParam(value = "修改人")
     @AnnoOutputColumn(hidden = true)
-    @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.SELECT, selectRule = WmsEnumUtil.DYNAMIC_FIELD_SELECT_RULE.SINGLE_URL,
+    @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.LIST, isRequire = 2, entityName = "/wms/inner-order/query/user-list",
-            isRequire = 2, entityName = "/wms/inner-order/query/user-list", listColumnName = "name", explicitColumnName = "name")
+            listColumnName = "name", explicitColumnName = "name")
     public String modifyUser;
 
     @Column(name="MODIFY_DATE_TIME")

modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesShiftClassDetail.java

@@ -11,6 +11,7 @@ import org.hibernate.annotations.DynamicUpdate;
 import javax.persistence.Column;
 import javax.persistence.Entity;
 import javax.persistence.Table;
+import javax.persistence.Transient;
 import java.io.Serializable;
 
 /**
@@ -50,4 +51,7 @@ public class MesShiftClassDetail extends BaseBean implements Serializable {
     @ApiParam("工作中心代码")
     private String workCenterCode;
 
+    @Transient
+    @ApiParam("开始-结束日期")
+    private String startEndTime;
 }

modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/common/ImppMessage.java

@@ -0,0 +1,38 @@
+package cn.estsh.i3plus.pojo.model.common;
+
+import cn.estsh.i3plus.pojo.base.enumutil.CommonEnumUtil;
+import io.swagger.annotations.ApiParam;
+import lombok.Data;
+
+import java.io.Serializable;
+
+/**
+ * @Description :
+ * @Reference :
+ * @Author : wei.peng
+ * @CreateDate : 20-4-22 下午7:46
+ * @Modify:
+ **/
+@Data
+public class ImppMessage implements Serializable {
+
+    private static final long serialVersionUID = 6840525365653629445L;
+    @ApiParam(value ="产品")
+    private Integer softType;
+
+    @ApiParam(value ="消息组")
+    private Integer messageGroup;
+
+    @ApiParam(value ="消息内容")
+    private String messageParam;
+
+    public String getSoftTypeTxt() {
+        return softType == null ? null : CommonEnumUtil.SOFT_TYPE.valueOfDescription(softType);
+    }
+
+    public CommonEnumUtil.SOFT_TYPE getSoftTypeEnum() {
+        return softType == null ? null : CommonEnumUtil.SOFT_TYPE.valueOf(softType);
+    }
+
+
+}