From 172f3bc4d52d24f6bb408d406bac370fded2941e Mon Sep 17 00:00:00 2001
From: xia <taume@126.com>
Date: Tue, 31 May 2022 14:32:00 +0800
Subject: [PATCH] =?UTF-8?q?=E6=9B=B4=E6=96=B0=E6=A1=A3=E6=A1=88=E6=A8=A1?=
 =?UTF-8?q?=E5=9D=97=20=E6=9B=B4=E6=96=B0=E5=AD=97=E6=AE=B5=E7=BB=B4?=
 =?UTF-8?q?=E6=8A=A4=E6=A8=A1=E5=9D=97?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../controller/ArchivesController.java        |  8 ++++
 .../archives/service/ArchivesService.java     |  3 ++
 .../service/impl/ArchivesServiceImpl.java     | 38 +++++++++++++++++--
 .../dictionary/domain/ArchivesDictionary.java | 14 ++++++-
 .../modules/dictionary/domain/Field.java      |  4 ++
 .../modules/dictionary/domain/vo/FieldVO.java |  5 +++
 .../ArchivesDictionaryRepository.java         |  6 ++-
 .../service/impl/FieldServiceImpl.java        |  1 +
 8 files changed, 72 insertions(+), 7 deletions(-)

diff --git a/archives/src/main/java/com/storeroom/modules/archives/controller/ArchivesController.java b/archives/src/main/java/com/storeroom/modules/archives/controller/ArchivesController.java
index a0e5ea8..b95496f 100644
--- a/archives/src/main/java/com/storeroom/modules/archives/controller/ArchivesController.java
+++ b/archives/src/main/java/com/storeroom/modules/archives/controller/ArchivesController.java
@@ -26,6 +26,14 @@ public class ArchivesController {
         return ApiResponse.success(archivesService.initArchivesView(categoryId,query,page));
     }
 
+    @ApiOperation("档案预编辑")
+    @GetMapping("/doedit")
+    public ApiResponse<Object> doedit(
+            String categoryId,String archivesId
+    ){
+        return ApiResponse.success(archivesService.doedit(categoryId,archivesId));
+    }
+
 
 
     @ApiOperation("测试档案")
diff --git a/archives/src/main/java/com/storeroom/modules/archives/service/ArchivesService.java b/archives/src/main/java/com/storeroom/modules/archives/service/ArchivesService.java
index 3966c0d..e807d60 100644
--- a/archives/src/main/java/com/storeroom/modules/archives/service/ArchivesService.java
+++ b/archives/src/main/java/com/storeroom/modules/archives/service/ArchivesService.java
@@ -5,5 +5,8 @@ import org.springframework.data.domain.Pageable;
 public interface ArchivesService {
     //初始化档案列表
     Object initArchivesView(String categoryId, String query, Pageable page);
+    //预编辑档案 初始化信息
+    Object doedit(String categoryId,String archivesId);
+
     String test();
 }
diff --git a/archives/src/main/java/com/storeroom/modules/archives/service/impl/ArchivesServiceImpl.java b/archives/src/main/java/com/storeroom/modules/archives/service/impl/ArchivesServiceImpl.java
index 8985c01..0a5e389 100644
--- a/archives/src/main/java/com/storeroom/modules/archives/service/impl/ArchivesServiceImpl.java
+++ b/archives/src/main/java/com/storeroom/modules/archives/service/impl/ArchivesServiceImpl.java
@@ -1,11 +1,14 @@
 package com.storeroom.modules.archives.service.impl;
 
 import cn.hutool.json.JSONArray;
+import cn.hutool.json.JSONObject;
 import com.storeroom.modules.archives.repository.ArchivesSummaryRepository;
 import com.storeroom.modules.archives.service.ArchivesService;
+import com.storeroom.modules.dictionary.domain.ArchivesDictionary;
 import com.storeroom.modules.dictionary.domain.ArchivesType;
 import com.storeroom.modules.dictionary.repository.ArchivesDictionaryRepository;
 import com.storeroom.modules.dictionary.repository.ArchivesTypeRepository;
+import com.storeroom.utils.StringUtils;
 import lombok.RequiredArgsConstructor;
 import org.springframework.data.domain.Pageable;
 import org.springframework.data.domain.Sort;
@@ -13,6 +16,7 @@ import org.springframework.stereotype.Service;
 
 import javax.persistence.EntityManager;
 import javax.persistence.PersistenceContext;
+import java.util.ArrayList;
 import java.util.List;
 import java.util.Map;
 import java.util.Optional;
@@ -50,10 +54,36 @@ public class ArchivesServiceImpl implements ArchivesService {
             quertOrder = " order by " + quertOrder.substring(0,quertOrder.length()-1);
 
         List<Object[]> list = entityManager.createNativeQuery("select "+queryField+" from "+queryTable+quertOrder).getResultList();
-        JSONArray jsons = new JSONArray();
-        jsons.put(queryFields);
-        jsons.put(list);
-        return jsons;
+        JSONObject json = new JSONObject();
+        json.put("queryFields",queryFields);
+        json.put("showlist",list);
+        return json;
+    }
+
+    @Override
+    public Object doedit(String categoryId,String archivesId) {
+        JSONObject json = new JSONObject();
+        List<ArchivesDictionary> showFiled = archivesDictionaryRepository.findAllByCategoryIdAndIsInputOrderByIsSequenceAsc(categoryId,true);
+        if(!StringUtils.isEmpty(archivesId)){
+            ArchivesType archivesType = archivesTypeRepository.findById(categoryId).get();
+            List<String> queryFields = new ArrayList<>();
+            for(ArchivesDictionary archivesDictionary:showFiled){
+                queryFields.add(archivesDictionary.getFieldName());
+            }
+            String queryField = queryFields.stream().map(String::valueOf).collect(Collectors.joining(","));
+            String queryTable = archivesType.getEnName();
+            List<Object[]> list = entityManager.createNativeQuery("select "+queryField+" from "+queryTable + " where id = '"+archivesId+"'").getResultList();
+            Object[] doeditEntity = list.size() > 0 ? list.get(0) : null;
+            if(null != doeditEntity){
+                JSONObject echo = new JSONObject();
+                for(int i = 0;i<queryFields.size();i++){
+                    echo.put(queryFields.get(i),doeditEntity[i]);
+                }
+                json.put("echo",echo);
+            }
+        }
+        json.put("showFiled",showFiled);
+        return json;
     }
 
     @Override
diff --git a/archives/src/main/java/com/storeroom/modules/dictionary/domain/ArchivesDictionary.java b/archives/src/main/java/com/storeroom/modules/dictionary/domain/ArchivesDictionary.java
index 561e5c1..588de69 100644
--- a/archives/src/main/java/com/storeroom/modules/dictionary/domain/ArchivesDictionary.java
+++ b/archives/src/main/java/com/storeroom/modules/dictionary/domain/ArchivesDictionary.java
@@ -25,6 +25,14 @@ public class ArchivesDictionary extends BaseEntity implements Serializable {
     @ApiModelProperty(value = "ID", hidden = true)
     private String id;
 
+    @ApiModelProperty(value = "门类id")
+    @Column(name = "category_id")
+    private String categoryId;
+
+    @ApiModelProperty(value = "系统字典id")
+    @Column(name = "sys_dictionary_id")
+    private String sysDictionaryId;
+
 //    @OneToMany(mappedBy = "",cascade = {CascadeType.PERSIST,CascadeType.REMOVE})
 //    private List<Category> category_id;
 
@@ -45,7 +53,11 @@ public class ArchivesDictionary extends BaseEntity implements Serializable {
 
     @Column(name = "is_data_type")
     @ApiModelProperty(value = "数据类型")
-    private String isDataType;
+    private Integer isDataType;
+
+    @Column(name = "is_data_type_details")
+    @ApiModelProperty(value = "数据类型详情")
+    private String isDataTypeDetails;
 
     @Column(name = "is_column_length")
     @ApiModelProperty(value = "字段长度")
diff --git a/archives/src/main/java/com/storeroom/modules/dictionary/domain/Field.java b/archives/src/main/java/com/storeroom/modules/dictionary/domain/Field.java
index 3908eca..96b3f6e 100644
--- a/archives/src/main/java/com/storeroom/modules/dictionary/domain/Field.java
+++ b/archives/src/main/java/com/storeroom/modules/dictionary/domain/Field.java
@@ -39,6 +39,10 @@ public class Field extends BaseEntity implements Serializable {
     @ApiModelProperty(value = "数据类型")
     private Integer isDataType;
 
+    @Column(name = "is_data_type_details")
+    @ApiModelProperty(value = "数据类型详情")
+    private String isDataTypeDetails;
+
     @Column(name = "is_column_length")
     @ApiModelProperty(value = "字段长度")
     private Integer isColumnLength;
diff --git a/archives/src/main/java/com/storeroom/modules/dictionary/domain/vo/FieldVO.java b/archives/src/main/java/com/storeroom/modules/dictionary/domain/vo/FieldVO.java
index 810ad45..7780028 100644
--- a/archives/src/main/java/com/storeroom/modules/dictionary/domain/vo/FieldVO.java
+++ b/archives/src/main/java/com/storeroom/modules/dictionary/domain/vo/FieldVO.java
@@ -42,6 +42,11 @@ public class FieldVO {
     @JsonProperty("isDataType")
     private Integer isDataType;
 
+    @ApiModelProperty(value = "数据类型详情")
+    @JSONField(name="isDataTypeDetails")
+    @JsonProperty("isDataTypeDetails")
+    private String isDataTypeDetails;
+
     @ApiModelProperty(value = "字段长度")
     @JSONField(name="isColumnLength")
     @JsonProperty("isColumnLength")
diff --git a/archives/src/main/java/com/storeroom/modules/dictionary/repository/ArchivesDictionaryRepository.java b/archives/src/main/java/com/storeroom/modules/dictionary/repository/ArchivesDictionaryRepository.java
index b7bbf29..e863f64 100644
--- a/archives/src/main/java/com/storeroom/modules/dictionary/repository/ArchivesDictionaryRepository.java
+++ b/archives/src/main/java/com/storeroom/modules/dictionary/repository/ArchivesDictionaryRepository.java
@@ -1,16 +1,18 @@
 package com.storeroom.modules.dictionary.repository;
 
-import com.storeroom.modules.dictionary.domain.ArchivesType;
+import com.storeroom.modules.dictionary.domain.ArchivesDictionary;
 import org.springframework.data.jpa.repository.JpaRepository;
 import org.springframework.data.jpa.repository.JpaSpecificationExecutor;
 import org.springframework.data.jpa.repository.Query;
 
 import java.util.List;
 
-public interface ArchivesDictionaryRepository extends JpaRepository<ArchivesType,String>, JpaSpecificationExecutor<ArchivesType> {
+public interface ArchivesDictionaryRepository extends JpaRepository<ArchivesDictionary,String>, JpaSpecificationExecutor<ArchivesDictionary> {
 
     @Query(nativeQuery = true,
             value = "select field_name from archives_dictionary where category_id = ?1 and is_display is true order by is_displayorder asc")
     List<String> findDisPlayField(String categoryId);
 
+    List<ArchivesDictionary> findAllByCategoryIdAndIsInputOrderByIsSequenceAsc(String categoryId,boolean isInput);
+
 }
diff --git a/archives/src/main/java/com/storeroom/modules/dictionary/service/impl/FieldServiceImpl.java b/archives/src/main/java/com/storeroom/modules/dictionary/service/impl/FieldServiceImpl.java
index b806980..ffd16f7 100644
--- a/archives/src/main/java/com/storeroom/modules/dictionary/service/impl/FieldServiceImpl.java
+++ b/archives/src/main/java/com/storeroom/modules/dictionary/service/impl/FieldServiceImpl.java
@@ -39,6 +39,7 @@ public class FieldServiceImpl implements FieldService {
         field.setIsDefaultValue(dto.getIsDefaultValue());
         field.setDictionaryId(dto.getDictionaryId());
         field.setIsDataType(dto.getIsDataType());
+        field.setIsDataTypeDetails(dto.getIsDataType() == 1 ? "varchar":"int");
         field.setIsColumnLength(dto.getIsColumnLength());
         if(null == dto.getIsSequence()) {
             Integer maxSequence = fieldRepository.getMaxSequence(dto.getIsType());