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

server-common/src/main/java/com/makeit/common/vo/ExcelImportVo.java

@@ -29,6 +29,9 @@ public class ExcelImportVo implements Serializable{
 	@ApiModelProperty("成功条数")
 	@ApiModelProperty("成功条数")
 	private Integer successCount;
 	private Integer successCount;
 
 
+	@ApiModelProperty("符合导入的条数")
+	private Integer matchesCount;
+	
 	@ApiModelProperty("错误信息")
 	@ApiModelProperty("错误信息")
 	private List<?> list;
 	private List<?> list;
 
 

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

@@ -821,6 +821,10 @@ public class PlatElderServiceImpl extends ServiceImpl<PlatElderMapper, PlatElder
         PlatElder db = getById(dto.getId());
         PlatElder db = getById(dto.getId());
         BeanUtils.copyProperties(dto, db);
         BeanUtils.copyProperties(dto, db);
 
 
+        PlatElderAddDTO platElderAddDTO = new PlatElderAddDTO();
+        platElderAddDTO.setBedId(dto.getBedId());
+        checkBed(platElderAddDTO);
+
         fillSpace(db);
         fillSpace(db);
 
 
         db.setCheckInTime(LocalDateTime.now());
         db.setCheckInTime(LocalDateTime.now());

server-service/src/main/java/com/makeit/service/platform/space/impl/PlatSpaceServiceImpl.java

@@ -470,8 +470,6 @@ public class PlatSpaceServiceImpl extends ServiceImpl<PlatSpaceMapper, PlatSpace
                     }
                     }
                 }
                 }
 
 
-
-
                 if (errorFlag) {
                 if (errorFlag) {
                     errorCount++;
                     errorCount++;
                 } else {
                 } else {
@@ -649,6 +647,10 @@ public class PlatSpaceServiceImpl extends ServiceImpl<PlatSpaceMapper, PlatSpace
             excelImportVo.setErrorCount(errorCount);
             excelImportVo.setErrorCount(errorCount);
             excelImportVo.setSuccessCount(successCount);
             excelImportVo.setSuccessCount(successCount);
             excelImportVo.setList(errorVoList);
             excelImportVo.setList(errorVoList);
+            if(errorCount  > 0){
+                excelImportVo.setSuccessCount(0);
+                excelImportVo.setMatchesCount(successCount);
+            }
             return excelImportVo;
             return excelImportVo;
         } catch (Exception e) {
         } catch (Exception e) {
             TransactionAspectSupport.currentTransactionStatus().setRollbackOnly();
             TransactionAspectSupport.currentTransactionStatus().setRollbackOnly();