|
|
@ -57,6 +57,7 @@ import org.springframework.util.StringUtils;
|
|
|
|
import javax.annotation.Resource;
|
|
|
|
import javax.annotation.Resource;
|
|
|
|
import java.math.BigDecimal;
|
|
|
|
import java.math.BigDecimal;
|
|
|
|
import java.text.SimpleDateFormat;
|
|
|
|
import java.text.SimpleDateFormat;
|
|
|
|
|
|
|
|
import java.time.LocalDateTime;
|
|
|
|
import java.time.format.DateTimeFormatter;
|
|
|
|
import java.time.format.DateTimeFormatter;
|
|
|
|
import java.util.*;
|
|
|
|
import java.util.*;
|
|
|
|
import java.util.stream.Collectors;
|
|
|
|
import java.util.stream.Collectors;
|
|
|
@ -710,7 +711,7 @@ public class ChanjetManager {
|
|
|
|
|
|
|
|
|
|
|
|
ListResultDataDTO resultData = result.getData();
|
|
|
|
ListResultDataDTO resultData = result.getData();
|
|
|
|
if(resultData != null && CollUtil.isNotEmpty(resultData.getRows())){
|
|
|
|
if(resultData != null && CollUtil.isNotEmpty(resultData.getRows())){
|
|
|
|
|
|
|
|
DateTimeFormatter df = DateTimeFormatter.ofPattern("yyyy/MM/dd");
|
|
|
|
// 转化对象
|
|
|
|
// 转化对象
|
|
|
|
List<List<String>> dataLists = resultData.getRows();
|
|
|
|
List<List<String>> dataLists = resultData.getRows();
|
|
|
|
dataLists.forEach(values -> {
|
|
|
|
dataLists.forEach(values -> {
|
|
|
@ -722,6 +723,7 @@ public class ChanjetManager {
|
|
|
|
resDTO.setUnit(values.get(4));
|
|
|
|
resDTO.setUnit(values.get(4));
|
|
|
|
resDTO.setAmount(new BigDecimal(values.get(5)).intValue());
|
|
|
|
resDTO.setAmount(new BigDecimal(values.get(5)).intValue());
|
|
|
|
resDTO.setWarehouseId(StringUtils.isEmpty(values.get(6)) ? null : ChanjetSpi.getIdPrefix()+Long.parseLong(values.get(6)));
|
|
|
|
resDTO.setWarehouseId(StringUtils.isEmpty(values.get(6)) ? null : ChanjetSpi.getIdPrefix()+Long.parseLong(values.get(6)));
|
|
|
|
|
|
|
|
resDTO.setOrderTime(LocalDateTime.parse(values.get(7), df));
|
|
|
|
resulDataList.add(resDTO);
|
|
|
|
resulDataList.add(resDTO);
|
|
|
|
});
|
|
|
|
});
|
|
|
|
hasMore = dataLists.size() == paramVO.getPageSize();
|
|
|
|
hasMore = dataLists.size() == paramVO.getPageSize();
|
|
|
|