From cfffa986e91bbffda00066c3883e8568a3d84a70 Mon Sep 17 00:00:00 2001 From: xiejunyu Date: Thu, 16 Jun 2022 15:40:23 +0800 Subject: [PATCH] =?UTF-8?q?=E8=99=9A=E6=8B=9F=E6=B8=85=E5=8D=95=E5=8F=91?= =?UTF-8?q?=E5=B8=83=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../service/impl/DummyInventoryBaseEOServiceImpl.java | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/dummy/service/impl/DummyInventoryBaseEOServiceImpl.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/dummy/service/impl/DummyInventoryBaseEOServiceImpl.java index a71c6ec1c..aaae03a61 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/dummy/service/impl/DummyInventoryBaseEOServiceImpl.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/dummy/service/impl/DummyInventoryBaseEOServiceImpl.java @@ -462,15 +462,14 @@ public class DummyInventoryBaseEOServiceImpl extends ServiceImpl e.getSerialNumber()).collect(Collectors.joining(",")); + if(list.size() != 0){//原详情为空,查所有数据,不限时间 QueryWrapper logEOQueryWrapper = new QueryWrapper<>(); logEOQueryWrapper.orderByAsc("create_time") - .between("create_time",lastIssueTime,now) +// .between("create_time",lastIssueTime,now) .eq("dummy_inventory_base_id",dummyInventoryBaseEO.getId()) .eq("is_en_log",CutEnum.EN.getValue()); List updateLogList = dummyLogEOService.list(logEOQueryWrapper); - contentLog = updateLogList.stream().map(e -> e.getLogContent()).collect(Collectors.joining(",")); + contentLog = updateLogList.stream().map(e -> e.getLogContent()).collect(Collectors.joining("
")); iDummyContentChangeEOService.saveBatch(list); sendMsg(null,dummyInventoryInfoEOList.get(0).getDummyInventoryBaseId(),contentLog ,dummyInventoryBaseEO.getState(),dummyInventoryBaseEO.getCut());