提交 6ddd0475 authored 作者: 马路路's avatar 马路路

Merge remote-tracking branch 'origin/v29.6_ultimate_interaction_20241017' into dev_jdk17

...@@ -3,6 +3,7 @@ package com.clx.performance.service.impl.collect; ...@@ -3,6 +3,7 @@ package com.clx.performance.service.impl.collect;
import com.clx.performance.dao.collect.CollectDriverTransportIntentionDao; import com.clx.performance.dao.collect.CollectDriverTransportIntentionDao;
import com.clx.performance.dao.collect.CollectDriverTransportIntentionRecordDao; import com.clx.performance.dao.collect.CollectDriverTransportIntentionRecordDao;
import com.clx.performance.dao.collect.DriverTransportIntentionInfoDao; import com.clx.performance.dao.collect.DriverTransportIntentionInfoDao;
import com.clx.performance.enums.PerformanceResultEnum;
import com.clx.performance.model.collect.CollectDriverTransportIntention; import com.clx.performance.model.collect.CollectDriverTransportIntention;
import com.clx.performance.model.collect.CollectDriverTransportIntentionRecord; import com.clx.performance.model.collect.CollectDriverTransportIntentionRecord;
import com.clx.performance.model.collect.DriverTransportIntentionInfo; import com.clx.performance.model.collect.DriverTransportIntentionInfo;
...@@ -13,6 +14,7 @@ import com.clx.performance.struct.collect.CollectDriverTransportIntentionDaoStru ...@@ -13,6 +14,7 @@ import com.clx.performance.struct.collect.CollectDriverTransportIntentionDaoStru
import com.clx.performance.struct.collect.CollectDriverTransportIntentionRecordDaoStruct; import com.clx.performance.struct.collect.CollectDriverTransportIntentionRecordDaoStruct;
import com.clx.performance.vo.pc.collect.CarrierDriverCollectTransportIntentionRecordVO; import com.clx.performance.vo.pc.collect.CarrierDriverCollectTransportIntentionRecordVO;
import com.clx.performance.vo.pc.collect.CarrierDriverCollectTransportIntentionVO; import com.clx.performance.vo.pc.collect.CarrierDriverCollectTransportIntentionVO;
import com.msl.common.exception.ServiceSystemException;
import com.msl.user.utils.TokenUtil; import com.msl.user.utils.TokenUtil;
import lombok.AllArgsConstructor; import lombok.AllArgsConstructor;
import lombok.extern.slf4j.Slf4j; import lombok.extern.slf4j.Slf4j;
...@@ -34,7 +36,6 @@ import java.util.stream.Collectors; ...@@ -34,7 +36,6 @@ import java.util.stream.Collectors;
public class DriverTransportIntentionInfoServiceImpl implements DriverTransportIntentionInfoService { public class DriverTransportIntentionInfoServiceImpl implements DriverTransportIntentionInfoService {
private final DriverTransportIntentionInfoDao driverTransportIntentionInfoDao; private final DriverTransportIntentionInfoDao driverTransportIntentionInfoDao;
private final CollectDriverTransportIntentionServiceImpl collectDriverTransportIntentionService;
private final CollectDriverTransportIntentionDao collectDriverTransportIntentionDao; private final CollectDriverTransportIntentionDao collectDriverTransportIntentionDao;
private final CollectDriverTransportIntentionRecordDao collectDriverTransportIntentionRecordDao; private final CollectDriverTransportIntentionRecordDao collectDriverTransportIntentionRecordDao;
private final CollectDriverTransportIntentionDaoStruct collectDriverTransportIntentionDaoStruct; private final CollectDriverTransportIntentionDaoStruct collectDriverTransportIntentionDaoStruct;
...@@ -43,13 +44,15 @@ public class DriverTransportIntentionInfoServiceImpl implements DriverTransportI ...@@ -43,13 +44,15 @@ public class DriverTransportIntentionInfoServiceImpl implements DriverTransportI
@Override @Override
public void saveCheckedList(AppCarrierDriverCollectSaveParam param) { public void saveCheckedList(AppCarrierDriverCollectSaveParam param) {
if (Objects.isNull(param) || CollectionUtils.isEmpty(param.getParamList())) { if (Objects.isNull(param) || CollectionUtils.isEmpty(param.getParamList())) {
// todo 错误提示 log.info("driverTransportIntentionInfoServiceImpl saveCheckedList param is null");
throw new ServiceSystemException(PerformanceResultEnum.DATA_NOT_FIND);
} }
List<DriverTransportIntentionInfo> driverTransportIntentionInfoList = new ArrayList<>(); List<DriverTransportIntentionInfo> driverTransportIntentionInfoList = new ArrayList<>();
for (AppCarrierDriverCollectMainParam saveParam : param.getParamList()) { for (AppCarrierDriverCollectMainParam saveParam : param.getParamList()) {
if (CollectionUtils.isEmpty(saveParam.getRecordIdList())) { if (CollectionUtils.isEmpty(saveParam.getRecordIdList())) {
// todo 错误提示 log.info("driverTransportIntentionInfoServiceImpl saveCheckedList saveParam is null");
throw new ServiceSystemException(PerformanceResultEnum.DATA_NOT_FIND);
} }
// 遍历已勾选的选项 // 遍历已勾选的选项
for (Integer intentionRecordId : saveParam.getRecordIdList()) { for (Integer intentionRecordId : saveParam.getRecordIdList()) {
...@@ -73,7 +76,8 @@ public class DriverTransportIntentionInfoServiceImpl implements DriverTransportI ...@@ -73,7 +76,8 @@ public class DriverTransportIntentionInfoServiceImpl implements DriverTransportI
driverTransportIntentionInfoDao.listByField(DriverTransportIntentionInfo::getCreateUserNo, driverTransportIntentionInfoDao.listByField(DriverTransportIntentionInfo::getCreateUserNo,
TokenUtil.getLoginUserInfo().getUserNo()); TokenUtil.getLoginUserInfo().getUserNo());
if (CollectionUtils.isEmpty(driverTransportIntentionInfoList)) { if (CollectionUtils.isEmpty(driverTransportIntentionInfoList)) {
// todo 错误提示 log.info("driverTransportIntentionInfoServiceImpl getCurrentUserCheckInfo driverTransportIntentionInfoList is null");
throw new ServiceSystemException(PerformanceResultEnum.DATA_NOT_FIND);
} }
// 2.组装主子表 // 2.组装主子表
......
Markdown 格式
0%
您添加了 0 到此讨论。请谨慎行事。
请先完成此评论的编辑!
注册 或者 后发表评论