浏览代码

获取机构列表

zsf 1 年之前
父节点
当前提交
81af6c1b0f

+ 16 - 0
src/main/java/com/rf/psychological/institution/rest/InstitutionController.java

@@ -376,6 +376,22 @@ public class InstitutionController extends BaseController {
         }
     }
 
+    @SafetyProcess
+    @GetMapping("/getAll")
+    @ApiOperation("获取到所有番号")
+    public Result getAll()  {
+        try {
+            List<InstitutionEntity> list =  institutionService.findAll();
+            return success(list);
+        }catch (Exception e){
+            e.printStackTrace();
+            return fail("操作失败");
+        }
+    }
+
+
+
+
 
 
 

+ 2 - 0
src/main/java/com/rf/psychological/institution/service/InstitutionService.java

@@ -53,4 +53,6 @@ public interface InstitutionService {
     Page<InstitutionEntity> findAllInstitution(int pageNum, int pageSize, String searchKey);
 
     String newNumber();
+
+    List<InstitutionEntity> findAll();
 }

+ 10 - 1
src/main/java/com/rf/psychological/institution/service/impl/InstitutionServiceImpl.java

@@ -103,7 +103,7 @@ public class InstitutionServiceImpl implements InstitutionService {
             saveInstitutionVO.getAdminList().forEach(item->{
                         UserEntity institutionUserEntity = new UserEntity(institutionNo,institutionName, item.get("loginName").toString(),
                         item.get("loginName").toString(), DigestUtils.md5DigestAsHex(item.get("password").toString().getBytes()),
-                        LocalDate.now().toString(),Constant.DEFAULT_VALUE_ZERO, UserStatus.PASS.getType(), UserRole.SUPERADMIN.getType());
+                        LocalDate.now().toString(),Constant.DEFAULT_VALUE_ZERO, UserStatus.PASS.getType(), UserRole.ADMIN.getType());
                         institutionUserEntity.setCreateTime(DateUtil.now());
                         institutionUserEntity.setStructureNo(institutionNo);
                         userService.save(institutionUserEntity);
@@ -131,6 +131,11 @@ public class InstitutionServiceImpl implements InstitutionService {
         return String.valueOf(checkNumber(number));
     }
 
+    @Override
+    public List<InstitutionEntity> findAll() {
+        return institutionRepository.findAll();
+    }
+
     private int checkNumber(int number){
         //根据编号获取到机构
         InstitutionEntity entity = institutionRepository.findByInstitutionNo(String.valueOf(number));
@@ -140,4 +145,8 @@ public class InstitutionServiceImpl implements InstitutionService {
             return checkNumber(number+1);
         }
     }
+
+
+
+
 }