Merge remote-tracking branch 'remotes/origin/dev' into test

modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/ImppEnumUtil.java

@@ -1081,4 +1081,72 @@ public class ImppEnumUtil {
             return tmp;
         }
     }
+
+    /**
+     * 附件来源
+     * 1.NOTICE：通知
+     * 2.STATION_LETTER：站内信
+     * 3.SWEB_NOTICE：SWEB通知
+     */
+    @JsonFormat(shape = JsonFormat.Shape.OBJECT)
+    public enum FILE_ATTACH_SOURCE {
+        MAIL(1,"邮件","邮件"),
+        LETTER(2,"站内信","站内信"),
+        SWEB_NOTICE(3,"SWEB通知","SWEB通知");
+
+        private int value;
+        private String name;
+        private String description;
+
+        FILE_ATTACH_SOURCE() {
+        }
+
+        FILE_ATTACH_SOURCE(int value, String name, String description) {
+            this.value = value;
+            this.name = name;
+            this.description = description;
+        }
+
+        public int getValue() {
+            return value;
+        }
+
+        public String getName() {
+            return name;
+        }
+
+        public String getDescription() {
+            return description;
+        }
+
+        public static String valueOfCode(int val) {
+            String tmp = null;
+            for (int i = 0; i < values().length; i++) {
+                if (values()[i].value == val) {
+                    tmp = values()[i].name;
+                }
+            }
+            return tmp;
+        }
+
+        public static String valueOfDescription(int val) {
+            String tmp = null;
+            for (int i = 0; i < values().length; i++) {
+                if (values()[i].value == val) {
+                    tmp = values()[i].description;
+                }
+            }
+            return tmp;
+        }
+
+        public static String codeOfDescription(String code) {
+            String tmp = null;
+            for (int i = 0; i < values().length; i++) {
+                if (values()[i].name.equals(code)) {
+                    tmp = values()[i].description;
+                }
+            }
+            return tmp;
+        }
+    }
 }

modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysFileAttach.java

@@ -28,7 +28,7 @@ import javax.persistence.Table;
 @EqualsAndHashCode(callSuper = true)
 @Table(name="SYS_FILE_ATTACH")
 @Api(value="文件附件",description = "文件附件")
-public class SysFileAttachment extends BaseBean {
+public class SysFileAttach extends BaseBean {
 
     @Column(name="ATTACH_SOFT_TYPE")
     @ApiParam(value ="附件所属模块")

modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysMessage.java

@@ -134,6 +134,6 @@ public class SysMessage extends BaseBean {
 
     @Transient
     @ApiParam(value = "附件集合")
-    private List<SysFileAttachment> sysFileAttachmentList;
+    private List<SysFileAttach> sysFileAttachList;
 
 }

modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/repository/SysFileAttachRepository.java

@@ -0,0 +1,14 @@
+package cn.estsh.i3plus.pojo.platform.repository;
+
+import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository;
+import cn.estsh.i3plus.pojo.platform.bean.SysFileAttach;
+
+/**
+ * @Description :
+ * @Reference :
+ * @Author : yunhao
+ * @CreateDate : 2019-04-12 19:15
+ * @Modify:
+ **/
+public interface SysFileAttachRepository extends BaseRepository<SysFileAttach, Long> {
+}