From 5a278a0965b417e7f39e8c209e2ff401f415066a Mon Sep 17 00:00:00 2001
From: 101captain <237651143@qq.com>
Date: 星期一, 21 二月 2022 14:07:48 +0800
Subject: [PATCH] Merge branch 'hemenkou_dev' into dev
---
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComMngRealAssetsServiceImpl.java | 27 +++++++++++++++------------
1 files changed, 15 insertions(+), 12 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 43e7866..6c1d348 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
@@ -1,5 +1,13 @@
package com.panzhihua.service_community.service.impl;
+import java.util.ArrayList;
+import java.util.List;
+
+import javax.annotation.Resource;
+
+import org.springframework.beans.BeanUtils;
+import org.springframework.stereotype.Service;
+
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
@@ -12,18 +20,11 @@
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;
import com.panzhihua.service_community.model.dos.ComMngStructBuildTypeDO;
import com.panzhihua.service_community.service.ComMngRealAssetsService;
-import org.springframework.beans.BeanUtils;
-import org.springframework.stereotype.Service;
-
-import javax.annotation.Resource;
-import java.util.ArrayList;
-import java.util.List;
/**
* @description: 实有资产
@@ -31,7 +32,8 @@
* @date: 2021/3/19 11:55
*/
@Service
-public class ComMngRealAssetsServiceImpl extends ServiceImpl<ComMngRealAssetsDAO, ComMngRealAssetsDO> implements ComMngRealAssetsService {
+public class ComMngRealAssetsServiceImpl extends ServiceImpl<ComMngRealAssetsDAO, ComMngRealAssetsDO>
+ implements ComMngRealAssetsService {
@Resource
private ComMngRealAssetsDAO comMngRealAssetsDAO;
@@ -58,7 +60,7 @@
@Override
public R saveComMngRealAssets(ComMngRealAssetsVO comMngRealAssetsVO) {
if (null != comMngRealAssetsVO.getId() && comMngRealAssetsVO.getId() != 0) {
- //修改
+ // 修改
ComMngRealAssetsDO comMngRealAssetsDO = comMngRealAssetsDAO.selectById(comMngRealAssetsVO.getId());
BeanUtils.copyProperties(comMngRealAssetsVO, comMngRealAssetsDO);
int update = comMngRealAssetsDAO.updateById(comMngRealAssetsDO);
@@ -106,7 +108,8 @@
List<ComMngRealAssetsDO> comMngRealAssetsDOS = new ArrayList<>();
List<ComMngStructBuildTypeDO> buildTypeDOS = buildTypeDAO.selectList(new LambdaQueryWrapper<>());
list.forEach(l -> {
- ComMngStructBuildTypeDO buildTypeDO = buildTypeDOS.stream().filter(buildType -> buildType.getName().equals(l.getBuildTypeName())).findFirst().orElse(null);
+ ComMngStructBuildTypeDO buildTypeDO = buildTypeDOS.stream()
+ .filter(buildType -> buildType.getName().equals(l.getBuildTypeName())).findFirst().orElse(null);
if (buildTypeDO == null) {
throw new ServiceException("不存在类型建筑类型：" + l.getBuildTypeName());
}
@@ -121,10 +124,10 @@
} else if (l.getFloorType().equals(RealAssetsFloorType.LOW.getInfo())) {
comMngRealAssetsDO.setFloorType(RealAssetsFloorType.LOW.getCode());
}
- if(l.getCategory().equals(RealAssetsCategoryType.PUBLIC.getInfo())){
+ if (l.getCategory().equals(RealAssetsCategoryType.PUBLIC.getInfo())) {
comMngRealAssetsDO.setCategory(RealAssetsCategoryType.PUBLIC.getCode());
}
- if(l.getCategory().equals(RealAssetsCategoryType.BUILD.getInfo())){
+ if (l.getCategory().equals(RealAssetsCategoryType.BUILD.getInfo())) {
comMngRealAssetsDO.setCategory(RealAssetsCategoryType.BUILD.getCode());
}
comMngRealAssetsDOS.add(comMngRealAssetsDO);
--
Gitblit v1.7.1