Merge remote-tracking branch 'origin/master-v4' into master-v4

cloudroam

2024-12-29 a02bed07c8281ae0fda850921eb7443393c5fb0c

 src/main/java/com/mzl/flower/service/impl/sms/SmsTaskServiceImpl.java

@@ -35,6 +35,7 @@
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
import org.springframework.util.CollectionUtils;
import org.springframework.util.ObjectUtils;
import org.springframework.util.StringUtils;

import java.io.File;
@@ -281,7 +282,7 @@
            smsTaskDTO.setNum((long) lineList.size());
        }

        if(!smsTaskDTO.getFileUrl().equals(smsTaskDO.getFileUrl())){
        if(Constants.SMS_RECEIVE_TYPE.IMPORT.name().equals(smsTaskDTO.getType()) && !smsTaskDTO.getFileUrl().equals(smsTaskDO.getFileUrl())){
            dealImportExcel(smsTaskDTO);
        }
        List<SmsUserDTO> smsUserDTOS = smsTaskDTO.getSmsUserDTOS();
@@ -358,7 +359,7 @@
        });
    }

    @Override
    @Override 
    public List<SmsSelectVO> getSelectList(Long id) {
        List<SmsSelectVO> smsSelectVOList = null;
        SmsTaskDO smsTaskDO = smsTaskMapper.selectById(id);
@@ -372,6 +373,19 @@
        }
    }

    @Override
    public SmsTaskVO getDetailById(Long id) {
        SmsTaskDO smsTaskDO = smsTaskMapper.selectById(id);
        SmsTaskVO smsTaskVO=new SmsTaskVO();
        BeanUtils.copyProperties(smsTaskDO,smsTaskVO);
        if(!ObjectUtils.isEmpty(smsTaskDO)){
            List<SmsSelectVO> selectList = getSelectList(id);
            smsTaskVO.setSmsUserDTOS(selectList);
            return smsTaskVO;
        }
        return null;
    }

    private List<SmsTaskDetailDO> createSmsTaskDetails(SmsTaskDO smsTaskDO, List<String> phoneNumbers) {
        return phoneNumbers.stream().map(phone -> {
            SmsTaskDetailDO detail = new SmsTaskDetailDO();