commit code

archives/src/main/java/com/storeroom/modules/dictionary/controller/ArchivesTypeController.java

@@ -9,6 +9,7 @@ import com.storeroom.exception.constant.ResponseStatus;
 import com.storeroom.modules.common.ArchivesTypeEnum;
 import com.storeroom.modules.dictionary.service.ArchivesDictionaryService;
 import com.storeroom.modules.dictionary.service.ArchivesTypeService;
+import com.storeroom.modules.dictionary.service.DictionaryService;
 import com.storeroom.modules.dictionary.service.dto.ArchivesDictionaryDTO;
 import com.storeroom.modules.dictionary.service.dto.ArchivesTypeDTO;
 import com.storeroom.utils.ApiResponse;
@@ -33,6 +34,7 @@ public class ArchivesTypeController {
 
     private final ArchivesTypeService archivesTypeService;
     private final ArchivesDictionaryService archivesDictionaryService;
+    private final DictionaryService dictionaryService;
 
 
     @ApiOperation("门类类型")
@@ -110,11 +112,16 @@ public class ArchivesTypeController {
         if (!StringUtils.isEmpty(arcdicDto.getFieldCnName()) || StringUtils.isEmpty(arcdicDto.getFieldName())){
             throw new BaseException("字段名字不能为空");
         }
-        if (!StringUtils.isEmpty(arcdicDto.getDictionaryConfigId())){
-            throw new BaseException("系统字典不能为空");
-        }
+
         archivesDictionaryService.create(arcdicDto);
         return ApiResponse.success(ResponseStatus.SUCCESS);
 
     }
+
+    @ApiOperation("获取档案配置下拉列表")
+    @AnonymousGetMapping("arc-config")
+    public ApiResponse<Object> getArcConfig(){
+        return ApiResponse.success(dictionaryService.findDictrionaryMenu());
+
+    }
 }

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

@@ -28,10 +28,10 @@ public class ArchivesDictionary extends BaseEntity implements Serializable {
     @Column(name = "category_id")
     private String categoryId;
 
-    @ManyToOne
+    @ManyToOne(targetEntity = Dictionary.class)
     @ApiModelProperty(value = "系统字典id")
-    @JoinColumn(name = "dictionary_config_id")
-    private Dictionary dictionaryConfig;
+    @JoinColumn(name = "dictionary_config_id",referencedColumnName = "id")
+    private Dictionary dictionaryConfigId;
 
     @ApiModelProperty(value = "字段名称")
     @Column(name = "field_name")
@@ -149,11 +149,11 @@ public class ArchivesDictionary extends BaseEntity implements Serializable {
         if (this == o) return true;
         if (o == null || getClass() != o.getClass()) return false;
         ArchivesDictionary that = (ArchivesDictionary) o;
-        return Objects.equals(id, that.id) && Objects.equals(categoryId, that.categoryId) && Objects.equals(dictionaryConfig, that.dictionaryConfig) && Objects.equals(fieldName, that.fieldName) && Objects.equals(fieldCnName, that.fieldCnName) && Objects.equals(isDefaultValue, that.isDefaultValue) && Objects.equals(isInputClass, that.isInputClass) && Objects.equals(isDataType, that.isDataType) && Objects.equals(isDataTypeDetails, that.isDataTypeDetails) && Objects.equals(isColumnLength, that.isColumnLength) && Objects.equals(isColumnType, that.isColumnType) && Objects.equals(isSequence, that.isSequence) && Objects.equals(isType, that.isType) && Objects.equals(isSystem, that.isSystem) && Objects.equals(isLine, that.isLine) && Objects.equals(isInput, that.isInput) && Objects.equals(isRequired, that.isRequired) && Objects.equals(isAutomatic, that.isAutomatic) && Objects.equals(isAdd, that.isAdd) && Objects.equals(isSearch, that.isSearch) && Objects.equals(isInherit, that.isInherit) && Objects.equals(isFilling, that.isFilling) && Objects.equals(fillingDigit, that.fillingDigit) && Objects.equals(isRepeat, that.isRepeat) && Objects.equals(isDisplay, that.isDisplay) && Objects.equals(displayOrder, that.displayOrder) && Objects.equals(isDisplayformat, that.isDisplayformat) && Objects.equals(displayformatType, that.displayformatType) && Objects.equals(editLength, that.editLength) && Objects.equals(displayLength, that.displayLength);
+        return Objects.equals(id, that.id) && Objects.equals(categoryId, that.categoryId) && Objects.equals(dictionaryConfigId, that.dictionaryConfigId) && Objects.equals(fieldName, that.fieldName) && Objects.equals(fieldCnName, that.fieldCnName) && Objects.equals(isDefaultValue, that.isDefaultValue) && Objects.equals(isInputClass, that.isInputClass) && Objects.equals(isDataType, that.isDataType) && Objects.equals(isDataTypeDetails, that.isDataTypeDetails) && Objects.equals(isColumnLength, that.isColumnLength) && Objects.equals(isColumnType, that.isColumnType) && Objects.equals(isSequence, that.isSequence) && Objects.equals(isType, that.isType) && Objects.equals(isSystem, that.isSystem) && Objects.equals(isLine, that.isLine) && Objects.equals(isInput, that.isInput) && Objects.equals(isRequired, that.isRequired) && Objects.equals(isAutomatic, that.isAutomatic) && Objects.equals(isAdd, that.isAdd) && Objects.equals(isSearch, that.isSearch) && Objects.equals(isInherit, that.isInherit) && Objects.equals(isFilling, that.isFilling) && Objects.equals(fillingDigit, that.fillingDigit) && Objects.equals(isRepeat, that.isRepeat) && Objects.equals(isDisplay, that.isDisplay) && Objects.equals(displayOrder, that.displayOrder) && Objects.equals(isDisplayformat, that.isDisplayformat) && Objects.equals(displayformatType, that.displayformatType) && Objects.equals(editLength, that.editLength) && Objects.equals(displayLength, that.displayLength);
     }
 
     @Override
     public int hashCode() {
-        return Objects.hash(id, categoryId, dictionaryConfig, fieldName, fieldCnName, isDefaultValue, isInputClass, isDataType, isDataTypeDetails, isColumnLength, isColumnType, isSequence, isType, isSystem, isLine, isInput, isRequired, isAutomatic, isAdd, isSearch, isInherit, isFilling, fillingDigit, isRepeat, isDisplay, displayOrder, isDisplayformat, displayformatType, editLength, displayLength);
+        return Objects.hash(id, categoryId, dictionaryConfigId, fieldName, fieldCnName, isDefaultValue, isInputClass, isDataType, isDataTypeDetails, isColumnLength, isColumnType, isSequence, isType, isSystem, isLine, isInput, isRequired, isAutomatic, isAdd, isSearch, isInherit, isFilling, fillingDigit, isRepeat, isDisplay, displayOrder, isDisplayformat, displayformatType, editLength, displayLength);
     }
 }

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

@@ -9,6 +9,7 @@ import org.hibernate.annotations.GenericGenerator;
 import javax.persistence.*;
 import javax.validation.constraints.NotNull;
 import java.io.Serializable;
+import java.util.List;
 
 @Entity
 @Getter
@@ -24,6 +25,9 @@ public class Dictionary extends BaseEntity implements Serializable {
     @ApiModelProperty(value = "名称")
     private String dicName;
 
+    @OneToMany(mappedBy = "dictionaryConfigId")
+    private List<ArchivesDictionary> archivesDictionaryList;
+
 
     @Column(name = "dic_code")
     @ApiModelProperty(value = "代码")

archives/src/main/java/com/storeroom/modules/dictionary/repository/ArchivesDictionaryRepository.java

@@ -27,7 +27,6 @@ public interface ArchivesDictionaryRepository extends JpaRepository<ArchivesDict
      * @param categoryId
      * @return
      */
-    @Query(value = "",nativeQuery = true)
     List<ArchivesDictionary> findByCategoryId(String categoryId);
 
 

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

@@ -1,6 +1,7 @@
 package com.storeroom.modules.dictionary.service;
 
 
+import com.storeroom.modules.dictionary.domain.ArchivesDictionary;
 import com.storeroom.modules.dictionary.service.dto.ArchivesDictionaryDTO;
 
 import java.util.List;

archives/src/main/java/com/storeroom/modules/dictionary/service/dto/ArchivesDictionaryDTO.java

@@ -6,6 +6,7 @@ import lombok.Getter;
 import lombok.Setter;
 
 import java.io.Serializable;
+import java.util.List;
 import java.util.Objects;
 
 @Getter
@@ -16,7 +17,7 @@ public class ArchivesDictionaryDTO extends BaseDTO implements Serializable {
 
     private String categoryId;
 
-    private String dictionaryConfigId;
+    private DictionaryDTO dictionaryConfigId;
 
     private String fieldName;