|
|
|
@ -12,6 +12,9 @@ import org.springframework.stereotype.Service;
|
|
|
|
|
|
|
|
|
|
import java.util.ArrayList;
|
|
|
|
|
import java.util.List;
|
|
|
|
|
import java.util.Map;
|
|
|
|
|
import java.util.function.Function;
|
|
|
|
|
import java.util.stream.Collectors;
|
|
|
|
|
|
|
|
|
|
@Service
|
|
|
|
|
public class ApproveServiceImpl implements ApproveService {
|
|
|
|
@ -33,16 +36,25 @@ public class ApproveServiceImpl implements ApproveService {
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
@Override
|
|
|
|
|
public ApproveList getApproveById(Long id){
|
|
|
|
|
public ApproveList getApproveById(Long id) {
|
|
|
|
|
return approveMapper.getApproveById(id);
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
public List<ApproveListDetail> getApproveDetailListById(Long id){
|
|
|
|
|
return approveMapper.getApproveDetailListById(id);
|
|
|
|
|
public List<ApproveListDetail> getApproveDetailListById(Long id) {
|
|
|
|
|
List<ApproveListDetail> approveDetailList = approveMapper.getApproveDetailListById(id);
|
|
|
|
|
List<Long> detailIds = approveDetailList.stream().map(v -> v.getId()).collect(Collectors.toList());
|
|
|
|
|
List<Coordinate> coordinates = approveMapper.getCoordinateByDetailIds(detailIds);
|
|
|
|
|
Map<Long, List<Coordinate>> coordinateMap = coordinates.stream().collect(
|
|
|
|
|
Collectors.groupingBy(
|
|
|
|
|
Coordinate::getDetailId, Collectors.mapping(Function.identity(), Collectors.toList())));
|
|
|
|
|
approveDetailList.stream().forEach(v -> {
|
|
|
|
|
v.setCoordinateList(coordinateMap.get(v.getId()));
|
|
|
|
|
});
|
|
|
|
|
return approveDetailList;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
@Override
|
|
|
|
|
public Long saveApprove(ApproveList approveList){
|
|
|
|
|
public Long saveApprove(ApproveList approveList) {
|
|
|
|
|
Long id = snowflakeIdWorker.getUUID();
|
|
|
|
|
approveList.setId(id);
|
|
|
|
|
approveMapper.saveApprove(approveList);
|
|
|
|
@ -50,7 +62,7 @@ public class ApproveServiceImpl implements ApproveService {
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
@Override
|
|
|
|
|
public void saveApproveDetail(List<ApproveListDetail> approveDetailList, Long approveId){
|
|
|
|
|
public void saveApproveDetail(List<ApproveListDetail> approveDetailList, Long approveId) {
|
|
|
|
|
List<Coordinate> coordinateList = new ArrayList<>();
|
|
|
|
|
approveDetailList.stream().forEach(v -> {
|
|
|
|
|
long id = snowflakeIdWorker.getUUID();
|
|
|
|
|