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-07-18 19:10:30 +08:00
parent ba55de7d41
commit 5b5ba0bd6e
2 changed files with 7 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
lxk-service/src/main/java/com/zbkj/service/service/impl/CarInformationServiceImpl.java
View File

@@ -512,6 +512,7 @@ public class CarInformationServiceImpl extends ServiceImpl<CarInformationDao, Ca
return CommonPage.copyPageInfo(page, CollUtil.newArrayList());
}
}
lqw.eq(CarInformation::getIsHelp, Boolean.FALSE);
lqw.eq(CarInformation::getIsShow, Boolean.TRUE);
lqw.orderByDesc(CarInformation::getCreateTime);
List<CarInformation> list = list(lqw);

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

@@ -244,7 +244,7 @@ public class ReturnCommissionPlatformInformationJoinUserServiceImpl extends Serv
response.setIdCard(v.getIdCard());
response.setPhone(v.getPhone());
response.setPlatformName(Optional.ofNullable(mapByplatformIds.get(v.getPlatformId())).map(ReturnCommissionPlatformInformation::getName).orElse(""));
response.setPlatformName(Optional.ofNullable(mapByplatformIds.get(v.getPlatformId())).map(ReturnCommissionPlatformInformation::getAbbreviation).orElse(""));
response.setPlatformAbbreviation(Optional.ofNullable(mapByplatformIds.get(v.getPlatformId())).map(ReturnCommissionPlatformInformation::getAbbreviation).orElse(""));
User user = uidMapList.get(v.getUid());
if (ObjectUtil.isNotNull(user)) {
response.setDriverKey(Convert.toStr(user.getUserSn()));
@@ -395,6 +395,10 @@ public class ReturnCommissionPlatformInformationJoinUserServiceImpl extends Serv
private boolean updateJoinUser(ReturnCommissionPlatformInformationJoinUserExcelResponse finalVo, User user, ReturnCommissionPlatformInformation information) {
ReturnCommissionPlatformInformationJoinUser up = new ReturnCommissionPlatformInformationJoinUser();
if (LxkDateUtil.checkDateFormat(finalVo.getRegistrationDate(), DateConstants.DATE_FORMAT)) {
Date date = LxkDateUtil.strToDate(finalVo.getRegistrationDate(), DateConstants.DATE_FORMAT);
up.setBindingTime(date);
}
if (finalVo.getIsJoin()) {
up.setId(finalVo.getId());
up.setDriverSn(finalVo.getDriverSn());
@@ -405,7 +409,7 @@ public class ReturnCommissionPlatformInformationJoinUserServiceImpl extends Serv
up.setUid(user.getId());
up.setPlatformId(information.getId());
up.setParticipationTime(DateUtil.date());
up.setBindingTime(DateUtil.date());
//up.setBindingTime(finalVo.getRegistrationDate());
up.setStatus(OrderConstants.REBATE_PLAN_STATUS_3);
up.setDriverSn(finalVo.getDriverSn());
up.setDriverKey(user.getUserSn() + "");