lihongjie/coal
1
0
Fork 0
mirror of https://codeup.aliyun.com/64f7d6b8ce01efaafef1e678/coal/coal.git synced 2026-01-25 07:46:40 +08:00
Code Issues Packages Projects Releases Wiki Activity

feat: 增加上期结余

Browse Source
This commit is contained in:
lihongjie0209
2024-11-18 21:28:46 +08:00
parent 04ba884d46
commit c274ccefcc
1 changed files with 9 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
src/main/java/cn/lihongjie/coal/warehouseGoodsSummary/service/WarehouseGoodsSummaryService.java
View File

@@ -40,6 +40,7 @@ import java.time.format.DateTimeFormatter;
import java.util.ArrayList;
import java.util.Arrays;
import java.util.List;
import java.util.stream.Collectors;
@Service
@Slf4j
@@ -93,6 +94,9 @@ public class WarehouseGoodsSummaryService
public Page<WarehouseGoodsSummaryDto> list(CommonQuery query) {
log.info("query: {}", query.toString());
CommonQuery copy = new CommonQuery();
BeanUtil.copyProperties(query, copy);
@@ -135,7 +139,9 @@ public class WarehouseGoodsSummaryService
copy.getItems().add(new CommonQuery.QueryItem().withKey("startTime").withValue(LocalDateTimeUtil.format(startTime, "yyyy-MM-dd HH:mm:ss")));
copy.getItems().add(new CommonQuery.QueryItem().withKey("endTime").withValue(LocalDateTimeUtil.format(endTime, "yyyy-MM-dd HH:mm:ss")));
copy.getItems().add(new CommonQuery.QueryItem().withKey("id").withOpt("in").withValue(dtos.getContent().stream().map(WarehouseGoodsSummaryDto::getId).collect(Collectors.joining(","))));
em.clear();
Page<WarehouseGoodsSummaryDto> prevSummary = list(copy);
List<Tuple2<WarehouseGoodsSummaryDto, WarehouseGoodsSummaryDto>> join = cn.lihongjie.coal.common.CollectionUtils.leftHashJoin(
@@ -147,10 +153,10 @@ public class WarehouseGoodsSummaryService
for (Tuple2<WarehouseGoodsSummaryDto, WarehouseGoodsSummaryDto> tuple2 : join) {
WarehouseGoodsSummaryDto dto = tuple2._1;
WarehouseGoodsSummaryDto entity = tuple2._2;
WarehouseGoodsSummaryDto prev = tuple2._2;
dto.setPrevAmount(ObjectUtils.defaultIfNull(entity.getType0Amount(), 0.0) - ObjectUtils.defaultIfNull(entity.getType1Amount(), 0.0));
dto.setPrevNumber(ObjectUtils.defaultIfNull(entity.getType0Number(), 0.0) - ObjectUtils.defaultIfNull(entity.getType1Number(), 0.0));
dto.setPrevAmount(ObjectUtils.defaultIfNull(prev.getType0Amount(), 0.0) - ObjectUtils.defaultIfNull(prev.getType1Amount(), 0.0));
dto.setPrevNumber(ObjectUtils.defaultIfNull(prev.getType0Number(), 0.0) - ObjectUtils.defaultIfNull(prev.getType1Number(), 0.0));
}