From ddb9b1a011b26fec839618fe908dd7d1bacf4a9b Mon Sep 17 00:00:00 2001
From: Administrator <admin>
Date: Fri, 22 Oct 2021 20:02:36 +0800
Subject: [PATCH] 1.保安单位树接口修改 2.现场保安员，单位检查字段修改，接口修改 3.缴费记录接口修改 4.出资人，管理人员字段调整，接口修改，导出新增示例 5.考试中题目返回去除答案
---
src/main/java/org/springblade/modules/shareholder/service/impl/ShareholderServiceImpl.java | 11 +++++++++++
1 files changed, 11 insertions(+), 0 deletions(-)
diff --git a/src/main/java/org/springblade/modules/shareholder/service/impl/ShareholderServiceImpl.java b/src/main/java/org/springblade/modules/shareholder/service/impl/ShareholderServiceImpl.java
index ea5c88f..6bc9732 100644
--- a/src/main/java/org/springblade/modules/shareholder/service/impl/ShareholderServiceImpl.java
+++ b/src/main/java/org/springblade/modules/shareholder/service/impl/ShareholderServiceImpl.java
@@ -18,6 +18,7 @@
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import org.springblade.core.log.exception.ServiceException;
import org.springblade.core.tool.utils.BeanUtil;
import org.springblade.modules.information.entity.Information;
import org.springblade.modules.shareholder.entity.Shareholder;
@@ -25,6 +26,8 @@
import org.springblade.modules.shareholder.mapper.ShareholderMapper;
import org.springblade.modules.shareholder.service.IShareholderService;
import org.springblade.modules.shareholder.vo.ShareholderVO;
+import org.springblade.modules.system.service.IUserDeptService;
+import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import java.text.ParseException;
@@ -41,6 +44,9 @@
@Service
public class ShareholderServiceImpl extends ServiceImpl<ShareholderMapper, Shareholder> implements IShareholderService {
+ @Autowired
+ private IUserDeptService userDeptService;
+
@Override
public IPage<ShareholderVO> selectShareholderPage(IPage<ShareholderVO> page, ShareholderVO shareholder) {
return page.setRecords(baseMapper.selectShareholderPage(page, shareholder));
@@ -55,6 +61,11 @@
public void importshare(List<shareExcel> data, Boolean isCovered) {
data.forEach(shareExcel -> {
Shareholder shareholder = Objects.requireNonNull(BeanUtil.copy(shareExcel, Shareholder.class));
+ String deptId = userDeptService.selectIn(shareExcel.getDeptId());
+ if (null==deptId || deptId==""){
+ throw new ServiceException("公司名:["+shareExcel.getDeptId()+"]不存在!");
+ }
+ shareholder.setDeptId(deptId);
try {
shareholder.setCapitaltime(new SimpleDateFormat("yyyy/MM/dd").parse(shareExcel.getCapitaltime()));
} catch (ParseException e) {
--
Gitblit v1.9.3