新建实体类

archives/src/main/java/com/storeroom/modules/dictionary/domain/ArchivesNoSetting.java

@@ -0,0 +1,65 @@
+package com.storeroom.modules.dictionary.domain;
+
+
+import com.storeroom.base.BaseEntity;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Getter;
+import lombok.Setter;
+
+import javax.persistence.Column;
+import javax.persistence.Entity;
+import javax.persistence.Id;
+import javax.persistence.Table;
+import javax.validation.constraints.NotNull;
+import java.io.Serializable;
+import java.util.Objects;
+
+@Entity
+@Getter
+@Setter
+@Table(name = "archives_no_setting")
+public class ArchivesNoSetting extends BaseEntity implements Serializable {
+
+    @Id
+    @Column(name = "id")
+    @NotNull(groups = Update.class)
+    @ApiModelProperty(value = "ID", hidden = true)
+    private String id;
+
+    @ApiModelProperty(value = "列名")
+    @Column(name = "filed_cn_name")
+    private String filedCnName;
+
+    @ApiModelProperty(value = "字段名")
+    @Column(name = "filed_name")
+    private String filedName;
+
+    @ApiModelProperty(value = "连接符")
+    @Column(name = "connector")
+    private String connector;
+
+    @ApiModelProperty(value = "")
+    @Column(name = "sequence")
+    private Integer sequence;
+
+    @ApiModelProperty(value = "门类id")
+    @Column(name = "category_id")
+    private String categoryId;
+
+    @ApiModelProperty(value = "字段字典表id")
+    @Column(name = "dictionary_id")
+    private String dictionaryId;
+
+    @Override
+    public boolean equals(Object o) {
+        if (this == o) return true;
+        if (o == null || getClass() != o.getClass()) return false;
+        ArchivesNoSetting that = (ArchivesNoSetting) o;
+        return Objects.equals(id, that.id) && Objects.equals(filedCnName, that.filedCnName) && Objects.equals(filedName, that.filedName) && Objects.equals(connector, that.connector) && Objects.equals(sequence, that.sequence) && Objects.equals(categoryId, that.categoryId) && Objects.equals(dictionaryId, that.dictionaryId);
+    }
+
+    @Override
+    public int hashCode() {
+        return Objects.hash(id, filedCnName, filedName, connector, sequence, categoryId, dictionaryId);
+    }
+}

archives/src/main/java/com/storeroom/modules/dictionary/service/ArchivesDictionaryService.java

@@ -70,7 +70,7 @@ public interface ArchivesDictionaryService {
     void ChangeDisplayState(Set<ArchivesDisplaySmallDTO> archivesDictionarySmallDTOS);
 
 
-    void ChangeDisplaySort(Set<ArchivesDisplaySmallDTO> archivesDisplaySmallDTOS);
+
 
 
 }

archives/src/main/java/com/storeroom/modules/dictionary/service/impl/ArchivesDictionaryImpl.java

@@ -133,15 +133,13 @@ public class ArchivesDictionaryImpl implements ArchivesDictionaryService {
             ad.setDisplayformatType(ar.getDisplayformatType());
             ad.setDisplayLength(ar.getDisplayLength());
             ad.setIsSequence(ar.getSort());
+            ad.setDisplayOrderBy(ar.getDisplayOrderBy());
             list.add(ad);
         }
         archivesDictionaryRepository.saveAll(list);
     }
 
-    @Override
-    public void ChangeDisplaySort(Set<ArchivesDisplaySmallDTO> archivesDisplaySmallDTOS) {
 
-    }
 
 
 }

archives/src/main/java/com/storeroom/modules/dictionary/service/impl/DynamicTableImpl.java

@@ -97,7 +97,7 @@ public class DynamicTableImpl implements DynamicTableService {
             archivesDictionaryDTO.setIsSequence(j.getIsSequence());
             archivesDictionaryDTO.setIsType(j.getIsType());
             archivesDictionaryDTO.setIsSystem(j.getIsSystem());
-            archivesDictionaryDTO.setIsColumnType(j.getIsType() == 3 ? 2 : 1);
+            archivesDictionaryDTO.setIsColumnType(j.getIsType());
             newList.add(archivesDictionaryDTO);
         }
 

system/src/main/resources/application.yml

@@ -20,7 +20,8 @@ spring:
   jpa:
     properties:
       hibernate:
-        ddl-auto: none
+        hbm2ddl:
+          auto: none
       open-in-view: true
     show-sql: true