更新档案模块

更新字段模块

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

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 = "字段表管理")

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

@@ -19,6 +19,9 @@ public interface FieldRepository extends JpaRepository<Field, String>{
     @Query("from Field where isType = ?1 order by isSequence asc ")
     List<Field> findAllByIsType(Integer isType);
 
+    @Query("from Field where isType in ?1 order by isType asc,isSequence asc ")
+    List<Field> findAllByIsType(List<Integer> isType);
+
     @Query(nativeQuery = true,
             value = "select max(is_sequence) from archives_field where is_type = ?1 ")
     Integer getMaxSequence(Integer isType);

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<FieldVO> findGroupType(Integer isType);
+    //获取自动生成表字段
+    List<FieldVO> findGroupType(List types);
 
 }

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<FieldVO> findGroupType(List types) {
+        List<Field> fieldList = fieldRepository.findAllByIsType(types);
+        List<FieldVO> fieldVOList = new ArrayList<>();
+        for(Field field:fieldList){
+            fieldVOList.add(BeanUtil.copyProperties(field,FieldVO.class));
+        }
+        return fieldVOList;
+    }
 }