From 808c70c6a2e3db9330c3c8f7c5b04ee6d0fdbf2a Mon Sep 17 00:00:00 2001 From: xia Date: Wed, 1 Jun 2022 15:50:27 +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=E6=A8=A1?= =?UTF-8?q?=E5=9D=97?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../archives/service/impl/ArchivesServiceImpl.java | 12 +++++++++++- .../dictionary/controller/FieldController.java | 3 +++ .../dictionary/repository/FieldRepository.java | 3 +++ .../modules/dictionary/service/FieldService.java | 2 ++ .../dictionary/service/impl/FieldServiceImpl.java | 10 ++++++++++ 5 files changed, 29 insertions(+), 1 deletion(-) 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 bc080b9..ac96835 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 @@ -105,6 +105,16 @@ public class ArchivesServiceImpl implements ArchivesService { String insertValue = ""; String updateValue = ""; for(ArchivesDictionary archivesDictionary:showFiled){ + if(archivesDictionary.getIsRequired()){ + if(null == json.get(archivesDictionary.getFieldName()) || "".equals(json.get(archivesDictionary.getFieldName()))){ + return archivesDictionary.getFieldName()+"不可为空！"; + } + } + + if(archivesDictionary.getIsRepeat()){ + + } + insertFiled +=archivesDictionary.getFieldName()+","; insertValue += archivesDictionary.getIsDataType() == 1 ? @@ -125,7 +135,7 @@ public class ArchivesServiceImpl implements ArchivesService { String sql = StringUtils.isEmpty(dtoId) ? "insert into " + archivesType.getEnName() + "(" + insertFiled +") values ("+insertValue+")" : "update "+archivesType.getEnName() +" set "+updateValue+" where id = '"+dtoId+"'"; int result = entityManager.createNativeQuery(sql).executeUpdate(); - return result; + return "成功更新"+result+"条数据。"; } @Override diff --git a/archives/src/main/java/com/storeroom/modules/dictionary/controller/FieldController.java b/archives/src/main/java/com/storeroom/modules/dictionary/controller/FieldController.java index 71472d7..18433aa 100644 --- a/archives/src/main/java/com/storeroom/modules/dictionary/controller/FieldController.java +++ b/archives/src/main/java/com/storeroom/modules/dictionary/controller/FieldController.java @@ -17,6 +17,9 @@ import org.springframework.http.HttpStatus; import org.springframework.validation.annotation.Validated; import org.springframework.web.bind.annotation.*; +import java.util.ArrayList; +import java.util.List; + @RestController @RequiredArgsConstructor @Api(tags = "字段表管理") diff --git a/archives/src/main/java/com/storeroom/modules/dictionary/repository/FieldRepository.java b/archives/src/main/java/com/storeroom/modules/dictionary/repository/FieldRepository.java index 5841bb8..7b31578 100644 --- a/archives/src/main/java/com/storeroom/modules/dictionary/repository/FieldRepository.java +++ b/archives/src/main/java/com/storeroom/modules/dictionary/repository/FieldRepository.java @@ -19,6 +19,9 @@ public interface FieldRepository extends JpaRepository{ @Query("from Field where isType = ?1 order by isSequence asc ") List findAllByIsType(Integer isType); + @Query("from Field where isType in ?1 order by isType asc,isSequence asc ") + List findAllByIsType(List isType); + @Query(nativeQuery = true, value = "select max(is_sequence) from archives_field where is_type = ?1 ") Integer getMaxSequence(Integer isType); diff --git a/archives/src/main/java/com/storeroom/modules/dictionary/service/FieldService.java b/archives/src/main/java/com/storeroom/modules/dictionary/service/FieldService.java index 371890f..c4a01e9 100644 --- a/archives/src/main/java/com/storeroom/modules/dictionary/service/FieldService.java +++ b/archives/src/main/java/com/storeroom/modules/dictionary/service/FieldService.java @@ -15,5 +15,7 @@ public interface FieldService { String edit(FieldDTO dto,String userName); //分类获取字段数据 List findGroupType(Integer isType); + //获取自动生成表字段 + List findGroupType(List types); } 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 ffd16f7..0aba84c 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 @@ -63,4 +63,14 @@ public class FieldServiceImpl implements FieldService { } return fieldVOList; } + + @Override + public List findGroupType(List types) { + List fieldList = fieldRepository.findAllByIsType(types); + List fieldVOList = new ArrayList<>(); + for(Field field:fieldList){ + fieldVOList.add(BeanUtil.copyProperties(field,FieldVO.class)); + } + return fieldVOList; + } }