Commit d61de272 authored by libin's avatar libin

员工,股东 身份修改

parent 7bac4337
...@@ -30,7 +30,6 @@ import java.text.ParseException; ...@@ -30,7 +30,6 @@ import java.text.ParseException;
import java.text.SimpleDateFormat; import java.text.SimpleDateFormat;
import java.util.*; import java.util.*;
import java.util.concurrent.CountDownLatch; import java.util.concurrent.CountDownLatch;
import java.util.concurrent.atomic.AtomicInteger;
import java.util.stream.Collectors; import java.util.stream.Collectors;
@Slf4j @Slf4j
...@@ -174,8 +173,6 @@ public class AppShareholderDetailBiz extends BaseBiz<AppShareholderDetailMapper, ...@@ -174,8 +173,6 @@ public class AppShareholderDetailBiz extends BaseBiz<AppShareholderDetailMapper,
@Transactional(rollbackFor = Exception.class, propagation = Propagation.REQUIRED) @Transactional(rollbackFor = Exception.class, propagation = Propagation.REQUIRED)
public int importShareholder(List<String[]> shareholderData, Integer userId, String userName) { public int importShareholder(List<String[]> shareholderData, Integer userId, String userName) {
List<AppShareholderDetail> appShareholderDetail = new ArrayList<>(); List<AppShareholderDetail> appShareholderDetail = new ArrayList<>();
Integer discount = 0;
AtomicInteger counter = new AtomicInteger(0);
int threadNums = shareholderData.size() / BORDER_NUM == 0 ? 1 : shareholderData.size() / BORDER_NUM; int threadNums = shareholderData.size() / BORDER_NUM == 0 ? 1 : shareholderData.size() / BORDER_NUM;
CountDownLatch latch = new CountDownLatch(threadNums); CountDownLatch latch = new CountDownLatch(threadNums);
for (int i = 0; i < threadNums; i++) { for (int i = 0; i < threadNums; i++) {
...@@ -183,7 +180,7 @@ public class AppShareholderDetailBiz extends BaseBiz<AppShareholderDetailMapper, ...@@ -183,7 +180,7 @@ public class AppShareholderDetailBiz extends BaseBiz<AppShareholderDetailMapper,
int endIndex = i == (threadNums - 1) ? shareholderData.size() : (i + 1) * BORDER_NUM; int endIndex = i == (threadNums - 1) ? shareholderData.size() : (i + 1) * BORDER_NUM;
List<String[]> subResultDate = shareholderData.subList(startIndex, endIndex); List<String[]> subResultDate = shareholderData.subList(startIndex, endIndex);
threadPoolTaskExecutor.execute(() -> { threadPoolTaskExecutor.execute(() -> {
wrapperData(subResultDate, discount, counter); wrapperData(subResultDate);
latch.countDown(); latch.countDown();
}); });
try { try {
...@@ -199,10 +196,8 @@ public class AppShareholderDetailBiz extends BaseBiz<AppShareholderDetailMapper, ...@@ -199,10 +196,8 @@ public class AppShareholderDetailBiz extends BaseBiz<AppShareholderDetailMapper,
/** /**
* @param subResultDate * @param subResultDate
* @param discount
* @param counter
*/ */
private void wrapperData(List<String[]> subResultDate, Integer discount, AtomicInteger counter) { private void wrapperData(List<String[]> subResultDate) {
for (String[] data : subResultDate) { for (String[] data : subResultDate) {
String name = data[0]; String name = data[0];
...@@ -247,7 +242,7 @@ public class AppShareholderDetailBiz extends BaseBiz<AppShareholderDetailMapper, ...@@ -247,7 +242,7 @@ public class AppShareholderDetailBiz extends BaseBiz<AppShareholderDetailMapper,
} catch (ParseException e) { } catch (ParseException e) {
e.printStackTrace(); log.error("股东导入失败:【{}】",e);
} }
} }
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment