From bb2da5de17a6d959f91738c17868b312ee14e86b Mon Sep 17 00:00:00 2001
From: huanghongfa <huanghongfa123456>
Date: 星期四, 20 五月 2021 19:51:53 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/test' into test
---
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComMngRealCompanyServiceImpl.java | 63 +++++++++++++++++++------------
1 files changed, 38 insertions(+), 25 deletions(-)
diff --git a/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComMngRealCompanyServiceImpl.java b/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComMngRealCompanyServiceImpl.java
index f85bae3..736004d 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComMngRealCompanyServiceImpl.java
+++ b/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComMngRealCompanyServiceImpl.java
@@ -1,13 +1,15 @@
package com.panzhihua.service_community.service.impl;
+import java.util.Date;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
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.model.dtos.community.ComMngRealCompanyBelongsDTO;
import com.panzhihua.common.model.dtos.community.ExportRealCompanyExcelDTO;
import com.panzhihua.common.model.dtos.community.PageComMngRealCompanyDTO;
import com.panzhihua.common.model.vos.R;
-import com.panzhihua.common.model.vos.community.ComMngCarVO;
+import com.panzhihua.common.model.vos.community.ComMngRealCompanyBelongsVO;
import com.panzhihua.common.model.vos.community.ComMngRealCompanyExcelVO;
import com.panzhihua.common.model.vos.community.ComMngRealCompanyVO;
import com.panzhihua.service_community.dao.ComMngRealCompanyDAO;
@@ -26,7 +28,7 @@
* @date: 2021/3/19 11:55
*/
@Service
-public class ComMngRealCompanyServiceImpl extends ServiceImpl<ComMngRealCompanyDAO, ComMngRealCompanyDO> implements ComMngRealCompanyService {
+public class ComMngRealCompanyServiceImpl extends ServiceImpl<ComMngRealCompanyDAO, ComMngRealCompanyDO> implements ComMngRealCompanyService {
@Resource
private ComMngRealCompanyDAO comMngRealCompanyDAO;
@@ -50,32 +52,32 @@
@Override
public R saveComMngRealCompany(ComMngRealCompanyVO comMngRealCompanyVO) {
- if(null!=comMngRealCompanyVO.getId() && comMngRealCompanyVO.getId()!=0){
+ if (null != comMngRealCompanyVO.getId() && comMngRealCompanyVO.getId() != 0) {
//修改
ComMngRealCompanyDO comMngRealCompanyDO = comMngRealCompanyDAO.selectById(comMngRealCompanyVO.getId());
- if(null==comMngRealCompanyDO){
+ if (null == comMngRealCompanyDO) {
return R.fail("该单位不存在");
}
- ComMngRealCompanyDO checkCreditCode = comMngRealCompanyDAO.selectOne(new QueryWrapper<ComMngRealCompanyDO>().lambda().eq(ComMngRealCompanyDO::getCreditCode,comMngRealCompanyVO.getCreditCode()));
- if(null!=checkCreditCode && comMngRealCompanyDO.getId()!=checkCreditCode.getId()){
+ ComMngRealCompanyDO checkCreditCode = comMngRealCompanyDAO.selectOne(new QueryWrapper<ComMngRealCompanyDO>().lambda().eq(ComMngRealCompanyDO::getCreditCode, comMngRealCompanyVO.getCreditCode()));
+ if (null != checkCreditCode && comMngRealCompanyDO.getId() != checkCreditCode.getId()) {
return R.fail("该单位已存在，信用代码重复");
}
- BeanUtils.copyProperties(comMngRealCompanyVO,comMngRealCompanyDO);
+ BeanUtils.copyProperties(comMngRealCompanyVO, comMngRealCompanyDO);
int update = comMngRealCompanyDAO.updateById(comMngRealCompanyDO);
- if(update>0){
+ if (update > 0) {
return R.ok();
}
- }else{
+ } else {
//新增
- Integer count = comMngRealCompanyDAO.selectCount(new QueryWrapper<ComMngRealCompanyDO>().lambda().eq(ComMngRealCompanyDO::getCreditCode,comMngRealCompanyVO.getCreditCode()));
- if(count>0){
+ Integer count = comMngRealCompanyDAO.selectCount(new QueryWrapper<ComMngRealCompanyDO>().lambda().eq(ComMngRealCompanyDO::getCreditCode, comMngRealCompanyVO.getCreditCode()));
+ if (count > 0) {
return R.fail("该单位已存在，信用代码重复");
}
ComMngRealCompanyDO comMngRealCompanyDO = new ComMngRealCompanyDO();
- BeanUtils.copyProperties(comMngRealCompanyVO,comMngRealCompanyDO);
+ BeanUtils.copyProperties(comMngRealCompanyVO, comMngRealCompanyDO);
int insert = comMngRealCompanyDAO.insert(comMngRealCompanyDO);
- if(insert>0){
+ if (insert > 0) {
return R.ok();
}
}
@@ -86,11 +88,11 @@
@Override
public R deleteComMngRealCompany(Long id) {
ComMngRealCompanyDO comMngRealCompanyDO = comMngRealCompanyDAO.selectById(id);
- if(null==comMngRealCompanyDO){
+ if (null == comMngRealCompanyDO) {
return R.fail("该单位不存在");
}
int delete = comMngRealCompanyDAO.deleteById(id);
- if(delete>0){
+ if (delete > 0) {
return R.ok();
}
return R.fail("删除失败");
@@ -99,32 +101,36 @@
@Override
public R detailComMngRealCompany(Long id) {
ComMngRealCompanyDO comMngRealCompanyDO = comMngRealCompanyDAO.selectById(id);
- if(null==comMngRealCompanyDO){
+ if (null == comMngRealCompanyDO) {
return R.fail("该单位不存在");
}
ComMngRealCompanyVO comMngRealCompanyVO = new ComMngRealCompanyVO();
- BeanUtils.copyProperties(comMngRealCompanyDO,comMngRealCompanyVO);
+ BeanUtils.copyProperties(comMngRealCompanyDO, comMngRealCompanyVO);
return R.ok(comMngRealCompanyVO);
}
@Override
public R listSaveMngRealCompanyExcelVO(List<ComMngRealCompanyExcelVO> list, Long communityId) {
- StringBuffer message = new StringBuffer();
+ List<ComMngRealCompanyDO> dbComMngRealCompany = comMngRealCompanyDAO.selectList(new QueryWrapper<ComMngRealCompanyDO>().lambda());
List<ComMngRealCompanyDO> comMngRealCompanyDOS = new ArrayList<>();
- list.forEach(l->{
- Integer count = comMngRealCompanyDAO.selectCount(new QueryWrapper<ComMngRealCompanyDO>().lambda().eq(ComMngRealCompanyDO::getCreditCode,l.getCreditCode()));
- if(count==0){
+ list.forEach(l -> {
+ ComMngRealCompanyDO realCompany = dbComMngRealCompany.stream().filter(db -> db.getCreditCode().equals(l.getCreditCode())).findFirst().orElse(null);
+ if (realCompany == null) {
ComMngRealCompanyDO comMngRealCompanyDO = new ComMngRealCompanyDO();
- BeanUtils.copyProperties(l,comMngRealCompanyDO);
+ BeanUtils.copyProperties(l, comMngRealCompanyDO);
comMngRealCompanyDO.setCommunityId(communityId);
comMngRealCompanyDOS.add(comMngRealCompanyDO);
+ }else{
+ BeanUtils.copyProperties(l, realCompany);
+ realCompany.setCommunityId(communityId);
+ comMngRealCompanyDOS.add(realCompany);
}
});
- boolean batch = this.saveBatch(comMngRealCompanyDOS);
- if(batch){
+ boolean batch = this.saveOrUpdateBatch(comMngRealCompanyDOS);
+ if (batch) {
return R.ok();
}
- return R.fail("请检查数据是否重复，格合是否正确");
+ return R.fail("请检查格式是否正确");
}
@Override
@@ -132,4 +138,11 @@
List<ComMngRealCompanyExcelVO> list = comMngRealCompanyDAO.exportRealCompanyExcel(exportRealCompanyExcelDTO);
return R.ok(list);
}
+
+ @Override
+ public R belongsComMngRealCompany(ComMngRealCompanyBelongsDTO comMngRealCompanyBelongsDTO) {
+ ComMngRealCompanyBelongsVO comMngRealCompanyBelongsVO = comMngRealCompanyDAO.queryComMngRealCompanyBelongs(comMngRealCompanyBelongsDTO);
+ return R.ok(comMngRealCompanyBelongsVO);
+ }
+
}
--
Gitblit v1.7.1