From b95146e456d7a9df53deb3b86b0b817b56c775a0 Mon Sep 17 00:00:00 2001
From: 101captain <237651143@qq.com>
Date: 星期一, 30 五月 2022 14:35:03 +0800
Subject: [PATCH] bug修改
---
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComMngRealCompanyServiceImpl.java | 52 +++++++++++++++++++++++++++++++++++-----------------
1 files changed, 35 insertions(+), 17 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 0eb225b..0cb1c6d 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,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.QueryWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
@@ -14,12 +22,6 @@
import com.panzhihua.service_community.dao.ComMngRealCompanyDAO;
import com.panzhihua.service_community.model.dos.ComMngRealCompanyDO;
import com.panzhihua.service_community.service.ComMngRealCompanyService;
-import org.springframework.beans.BeanUtils;
-import org.springframework.stereotype.Service;
-
-import javax.annotation.Resource;
-import java.util.ArrayList;
-import java.util.List;
/**
* @description: 实有单位
@@ -27,7 +29,8 @@
* @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;
@@ -45,19 +48,21 @@
}
page.setSize(pageSize);
page.setCurrent(pageNum);
- IPage<ComMngRealCompanyVO> iPage = comMngRealCompanyDAO.pageQueryComMngRealCompany(page, pageComMngRealCompanyDTO);
+ IPage<ComMngRealCompanyVO> iPage =
+ comMngRealCompanyDAO.pageQueryComMngRealCompany(page, pageComMngRealCompanyDTO);
return R.ok(iPage);
}
@Override
public R saveComMngRealCompany(ComMngRealCompanyVO comMngRealCompanyVO) {
if (null != comMngRealCompanyVO.getId() && comMngRealCompanyVO.getId() != 0) {
- //修改
+ // 修改
ComMngRealCompanyDO comMngRealCompanyDO = comMngRealCompanyDAO.selectById(comMngRealCompanyVO.getId());
if (null == comMngRealCompanyDO) {
return R.fail("该单位不存在");
}
- ComMngRealCompanyDO checkCreditCode = comMngRealCompanyDAO.selectOne(new QueryWrapper<ComMngRealCompanyDO>().lambda().eq(ComMngRealCompanyDO::getCreditCode, comMngRealCompanyVO.getCreditCode()));
+ ComMngRealCompanyDO checkCreditCode = comMngRealCompanyDAO.selectOne(new QueryWrapper<ComMngRealCompanyDO>()
+ .lambda().eq(ComMngRealCompanyDO::getCreditCode, comMngRealCompanyVO.getCreditCode()));
if (null != checkCreditCode && comMngRealCompanyDO.getId() != checkCreditCode.getId()) {
return R.fail("该单位已存在，信用代码重复");
}
@@ -68,8 +73,9 @@
return R.ok();
}
} else {
- //新增
- Integer count = comMngRealCompanyDAO.selectCount(new QueryWrapper<ComMngRealCompanyDO>().lambda().eq(ComMngRealCompanyDO::getCreditCode, comMngRealCompanyVO.getCreditCode()));
+ // 新增
+ Integer count = comMngRealCompanyDAO.selectCount(new QueryWrapper<ComMngRealCompanyDO>().lambda()
+ .eq(ComMngRealCompanyDO::getCreditCode, comMngRealCompanyVO.getCreditCode()));
if (count > 0) {
return R.fail("该单位已存在，信用代码重复");
}
@@ -110,22 +116,28 @@
@Override
public R listSaveMngRealCompanyExcelVO(List<ComMngRealCompanyExcelVO> list, Long communityId) {
- List<ComMngRealCompanyDO> dbComMngRealCompany = comMngRealCompanyDAO.selectList(new QueryWrapper<ComMngRealCompanyDO>().lambda());
+ List<ComMngRealCompanyDO> dbComMngRealCompany =
+ comMngRealCompanyDAO.selectList(new QueryWrapper<ComMngRealCompanyDO>().lambda());
List<ComMngRealCompanyDO> comMngRealCompanyDOS = new ArrayList<>();
list.forEach(l -> {
- ComMngRealCompanyDO realCompany = dbComMngRealCompany.stream().filter(db -> db.getCreditCode().equals(l.getCreditCode())).findFirst().orElse(null);
+ 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);
comMngRealCompanyDO.setCommunityId(communityId);
comMngRealCompanyDOS.add(comMngRealCompanyDO);
+ } else {
+ BeanUtils.copyProperties(l, realCompany);
+ realCompany.setCommunityId(communityId);
+ comMngRealCompanyDOS.add(realCompany);
}
});
- boolean batch = this.saveBatch(comMngRealCompanyDOS);
+ boolean batch = this.saveOrUpdateBatch(comMngRealCompanyDOS);
if (batch) {
return R.ok();
}
- return R.fail("请检查数据是否重复，格合是否正确");
+ return R.fail("请检查格式是否正确");
}
@Override
@@ -136,8 +148,14 @@
@Override
public R belongsComMngRealCompany(ComMngRealCompanyBelongsDTO comMngRealCompanyBelongsDTO) {
- ComMngRealCompanyBelongsVO comMngRealCompanyBelongsVO = comMngRealCompanyDAO.queryComMngRealCompanyBelongs(comMngRealCompanyBelongsDTO);
+ ComMngRealCompanyBelongsVO comMngRealCompanyBelongsVO =
+ comMngRealCompanyDAO.queryComMngRealCompanyBelongs(comMngRealCompanyBelongsDTO);
return R.ok(comMngRealCompanyBelongsVO);
}
+ @Override
+ public R getComMngRealCompanyTotalByAdmin(Long communityId) {
+ return R.ok(this.baseMapper.getComMngRealCompanyTotalByAdmin(communityId));
+ }
+
}
--
Gitblit v1.7.1