From b6082fe75b377ac9c177736d98f36ae46e7cdb70 Mon Sep 17 00:00:00 2001
From: 罗yu 元桥 <2376770955@qq.com>
Date: 星期三, 28 四月 2021 10:20:55 +0800
Subject: [PATCH] Merge branch 'master' into 'test'
---
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComMngRealAssetsServiceImpl.java | 8 ++++++++
1 files changed, 8 insertions(+), 0 deletions(-)
diff --git a/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComMngRealAssetsServiceImpl.java b/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComMngRealAssetsServiceImpl.java
index 8b7652f..43e7866 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComMngRealAssetsServiceImpl.java
+++ b/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComMngRealAssetsServiceImpl.java
@@ -4,6 +4,7 @@
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.panzhihua.common.enums.RealAssetsCategoryType;
import com.panzhihua.common.enums.RealAssetsFloorType;
import com.panzhihua.common.exceptions.ServiceException;
import com.panzhihua.common.model.dtos.community.ExportRealAssetsExcelDTO;
@@ -11,6 +12,7 @@
import com.panzhihua.common.model.vos.R;
import com.panzhihua.common.model.vos.community.ComMngRealAssetsExcelVO;
import com.panzhihua.common.model.vos.community.ComMngRealAssetsVO;
+import com.panzhihua.common.utlis.StringUtils;
import com.panzhihua.service_community.dao.ComMngRealAssetsDAO;
import com.panzhihua.service_community.dao.ComMngStructBuildTypeDAO;
import com.panzhihua.service_community.model.dos.ComMngRealAssetsDO;
@@ -119,6 +121,12 @@
} else if (l.getFloorType().equals(RealAssetsFloorType.LOW.getInfo())) {
comMngRealAssetsDO.setFloorType(RealAssetsFloorType.LOW.getCode());
}
+ if(l.getCategory().equals(RealAssetsCategoryType.PUBLIC.getInfo())){
+ comMngRealAssetsDO.setCategory(RealAssetsCategoryType.PUBLIC.getCode());
+ }
+ if(l.getCategory().equals(RealAssetsCategoryType.BUILD.getInfo())){
+ comMngRealAssetsDO.setCategory(RealAssetsCategoryType.BUILD.getCode());
+ }
comMngRealAssetsDOS.add(comMngRealAssetsDO);
});
boolean batch = this.saveBatch(comMngRealAssetsDOS);
--
Gitblit v1.7.1