qichexitong/car-system-api
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix-导入

Browse Source
This commit is contained in:
xl
2024-06-29 00:20:26 +08:00
parent e42a9b0b1f
commit ad62a4da66
1 changed files with 6 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
lxk-service/src/main/java/com/zbkj/service/service/impl/ReturnCommissionPlatformInformationJoinUserServiceImpl.java
View File

@@ -269,6 +269,7 @@ public class ReturnCommissionPlatformInformationJoinUserServiceImpl extends Serv
lqw.isNull(ReturnCommissionPlatformInformationJoinUser::getDriverSn);
List<ReturnCommissionPlatformInformationJoinUser> joinUserList = list(lqw);
Map<String, List<ReturnCommissionPlatformInformationJoinUser>> joinUsers = joinUserList.stream().collect(Collectors.groupingBy(ReturnCommissionPlatformInformationJoinUser::getIdCard));
Set<String> idCard = joinUsers.keySet();
for (ReturnCommissionPlatformInformationJoinUserExcelResponse vo : list) {
CheckReturnCommissionPlatformInformationJoinUserExcelVo checkExcel = this.checkVo(vo, joinUsers);
Boolean flag = checkExcel.getFlag();
@@ -290,6 +291,11 @@ public class ReturnCommissionPlatformInformationJoinUserServiceImpl extends Serv
flag = false;
errorInfo = errorInfo + StrUtil.format("滴友id存在重复{},", vo.getDriverSn());
}
boolean isIdCard = idCard.add(vo.getIdCard());
if (!isIdCard) {
flag = false;
errorInfo = errorInfo + StrUtil.format("重复参与活动{},", vo.getIdCard());
}
if (flag) {
if (this.updateJoinUser(finalVo)) {
successNum++;
@@ -357,18 +363,6 @@ public class ReturnCommissionPlatformInformationJoinUserServiceImpl extends Serv
if (CollUtil.isEmpty(joinUserList)) {
flag = false;
errorInfo = errorInfo + StrUtil.format("司机{}未参与活动,", vo.getIdCard());
} else if (joinUserList.size() > 1) {
for (int i = 0; i < joinUserList.size(); i++) {
if (i == 0) {
ReturnCommissionPlatformInformationJoinUser joinUser = joinUserList.get(i);
vo.setId(joinUser.getId());
vo.setRealName(joinUser.getRealName());
vo.setIdCard(joinUser.getIdCard());
continue;
}
flag = false;
errorInfo = errorInfo + StrUtil.format("重复参与活动{},", vo.getIdCard());
}
} else {
ReturnCommissionPlatformInformationJoinUser joinUser = joinUserList.get(0);
if (!vo.getPhone().equals(joinUser.getPhone())) {