Merge remote-tracking branch 'origin/dev' into dev

server-service/src/main/java/com/makeit/service/platform/elder/impl/PlatElderServiceImpl.java

@@ -359,6 +359,7 @@ public class PlatElderServiceImpl extends ServiceImpl<PlatElderMapper, PlatElder
     }
 
     @Override
+    @Transactional
     public ExcelImportVo importExcel(MultipartFile excelFile) throws Exception {
 
         List<PlatElderImportDTO> list = ExcelUtil.importExcel(null, 3, excelFile, PlatElderImportDTO.class);
@@ -427,12 +428,20 @@ public class PlatElderServiceImpl extends ServiceImpl<PlatElderMapper, PlatElder
             for (int i = 0; i < list.size(); i++) {
                 PlatElderImportDTO platElderImportDTO = list.get(i);
 
-                boolean check = check(platElderImportDTO, sysConfigVOS1);
+                String type = platElderImportDTO.getCertificateType();
+                if (StringUtils.isBlank(type)) {
+                    errorVoList.add(new ExcelErrorVo(i + start, "证件类型*","证件类型不存在"));
+                }
+                long count = count(new QueryWrapper<PlatElder>().lambda()
+                        .eq(StringUtils.isNotEmpty(type), PlatElder::getCertificateType, type)
+                        .eq(PlatElder::getCertificateNumber, platElderImportDTO.getCertificateNumber())
+                );
+                if (count > 0) {
+                    errorVoList.add(new ExcelErrorVo(i + start, "证件号*","证件号不能重复"));
+                }
                 boolean success = true;
 
-                if (check) {
-                    errorVoList.add(new ExcelErrorVo(i + start, "证件类型和证件号","证件号不能重复"));
-                }
+
 
                 List<String> excelField = Arrays.asList(
                         "小区",
@@ -554,9 +563,9 @@ public class PlatElderServiceImpl extends ServiceImpl<PlatElderMapper, PlatElder
                         for (int j = 0; j <= 1; j++) {
                             String id = null;
 
-                            Map<String, TreeDTOVO> nameAreaMap = parentIdName.get(spaceIdList.get(j));
+                            Map<String, TreeDTOVO> nameAreaMap = parentIdName.get(spaceIdList.get(0));
                             if (nameAreaMap != null) {
-                                TreeDTOVO area = nameAreaMap.get(spaceName.get(j));
+                                TreeDTOVO area = nameAreaMap.get(roomAndBed.get(j));
                                 if (area != null) {
                                     id = area.getId();
                                 }
@@ -628,19 +637,6 @@ public class PlatElderServiceImpl extends ServiceImpl<PlatElderMapper, PlatElder
         return excelImportVo;
     }
 
-    private boolean check(PlatElderImportDTO dto,List<SysConfigVO> sysConfigVOS1) {
-
-        Optional<SysConfigVO> configVO = sysConfigVOS1.stream().filter(sysConfigVO -> sysConfigVO.getName().equals(dto.getCertificateType())).findFirst();
-        String type = "";
-        if (configVO.isPresent()) {
-            type = configVO.get().getValue();
-        }
-        long count = count(new QueryWrapper<PlatElder>().lambda()
-                .eq(StringUtils.isNotEmpty(type), PlatElder::getCertificateType, type)
-                .eq(PlatElder::getCertificateNumber, dto.getCertificateNumber())
-        );
-        return count > 0;
-    }
 
     private void check(PlatElderAddDTO dto) {
         PlatElder old = getOne(new QueryWrapper<PlatElder>().lambda()