Merge branch 'master' into master-手术随访

陈昶聿

5 小时以前 27700927ebef0dbe669433ec2cdd3170647c226a

 smartor/src/main/java/com/smartor/service/impl/ServiceSubtaskRecordServiceImpl.java

@@ -4,10 +4,14 @@
import com.smartor.domain.ServiceSubtaskRecord;
import com.smartor.mapper.ServiceSubtaskRecordMapper;
import com.smartor.service.IServiceSubtaskRecordService;
import org.apache.commons.collections4.CollectionUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;

import java.util.ArrayList;
import java.util.List;
import java.util.Map;
import java.util.stream.Collectors;

/**
 * 【请填写功能名称】Service业务层处理
@@ -42,6 +46,14 @@
        return serviceSubtaskRecordMapper.selectServiceSubtaskRecordList(serviceSubtaskRecord);
    }

    @Override
    public Map<Long, List<ServiceSubtaskRecord>> selectRecordMapBySubtaskIds(List<Long> subtaskIds) {
        if (CollectionUtils.isEmpty(subtaskIds)) return new java.util.HashMap<>();
        List<ServiceSubtaskRecord> all = serviceSubtaskRecordMapper.selectServiceSubtaskRecordBySubtaskIds(subtaskIds);
        if (CollectionUtils.isEmpty(all)) return new java.util.HashMap<>();
        return all.stream().collect(Collectors.groupingBy(ServiceSubtaskRecord::getSubtaskId));
    }

    /**
     * 新增【请填写功能名称】
     *