From 5356bfb8ea2eef7657e4d32dc13fd164deba647d Mon Sep 17 00:00:00 2001 From: xiejunyu Date: Tue, 7 Jun 2022 18:19:28 +0800 Subject: [PATCH] =?UTF-8?q?=E7=BB=B4=E6=8A=A4=E8=99=9A=E6=8B=9F=E6=B8=85?= =?UTF-8?q?=E5=8D=95=E5=A2=9E=E5=8A=A0=E6=A0=A1=E9=AA=8C?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../DummyInventoryInfoEOController.java | 7 +- .../service/IDummyInventoryInfoEOService.java | 4 +- .../impl/DummyInventoryInfoEOServiceImpl.java | 121 +++++++++++++----- 3 files changed, 97 insertions(+), 35 deletions(-) diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/dummy/controller/DummyInventoryInfoEOController.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/dummy/controller/DummyInventoryInfoEOController.java index 4e6367700..3d8af6455 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/dummy/controller/DummyInventoryInfoEOController.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/dummy/controller/DummyInventoryInfoEOController.java @@ -127,8 +127,9 @@ public class DummyInventoryInfoEOController extends JeroController deleteBatch(@RequestParam(name="ids",required=true) String ids) { - this.dummyInventoryInfoEOService.deleteByIds(Arrays.asList(ids.split(","))); + public Result deleteBatch(@RequestParam(name="ids",required=true) String ids, + @RequestParam(name="cut",required=true) String cut) { + this.dummyInventoryInfoEOService.deleteByIds(Arrays.asList(ids.split(",")), cut); return Result.OK("批量删除成功!"); } @@ -228,7 +229,7 @@ public class DummyInventoryInfoEOController extends JeroController copyInfoByIds(@RequestParam(name="ids",required=true) String ids, @RequestParam(name="cut",required=true) String cut) { try { - dummyInventoryInfoEOService.copyInfoByIds(ids); + dummyInventoryInfoEOService.copyInfoByIds(ids,cut); } catch (Exception e) { if(CutEnum.CN.getValue().equals(cut)){ return Result.error("复制失败"); diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/dummy/service/IDummyInventoryInfoEOService.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/dummy/service/IDummyInventoryInfoEOService.java index 969e5433f..6d12f1937 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/dummy/service/IDummyInventoryInfoEOService.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/dummy/service/IDummyInventoryInfoEOService.java @@ -47,7 +47,7 @@ public interface IDummyInventoryInfoEOService extends IService ids); + void deleteByIds(List ids,String cut); /** * 通过id查询 @@ -57,7 +57,7 @@ public interface IDummyInventoryInfoEOService extends IService infoEOQueryWrapper = new QueryWrapper<>(); + List baseList = dummyInventoryBaseEOService.list(infoEOQueryWrapper.eq("id", dummyInventoryInfoEO.getDummyInventoryBaseId())); + if(CollectionUtils.isNotEmpty(baseList)){ + if(StringUtils.isNotBlank(dummyInventoryInfoEO.getIds())){ //虚拟清单详情数据 LambdaQueryWrapper lambdaQueryWrapper = new LambdaQueryWrapper<>(); @@ -181,6 +167,13 @@ public class DummyInventoryInfoEOServiceImpl extends ServiceImpl infoEOQueryWrapper = new QueryWrapper<>(); + List baseList = dummyInventoryBaseEOService.list(infoEOQueryWrapper.eq("id", dummyInventoryInfoEO.getDummyInventoryBaseId())); + if(CollectionUtils.isNotEmpty(baseList)){ + + Date now = new Date(); dummyInventoryInfoEO.setUpdateTime(now); DummyInventoryInfoEO dummyInventoryInfoEOCopy = SerializationUtils.clone(dummyInventoryInfoEO);//复制 @@ -242,6 +240,13 @@ public class DummyInventoryInfoEOServiceImpl extends ServiceImpl ids) { + public void deleteByIds(List ids,String cut) { + DummyInventoryInfoEO infoEO = queryById(ids.get(0)); + + //检查虚拟清单是否存在 + if(infoEO != null){ + //文件同步删除 LambdaQueryWrapper wrapper = new LambdaQueryWrapper<>(); wrapper.in(DummyInventoryInfoEO::getId,ids); @@ -291,6 +300,13 @@ public class DummyInventoryInfoEOServiceImpl extends ServiceImpl idsList = Arrays.asList(ids.split(",")); + + DummyInventoryInfoEO infoEO = queryById(idsList.get(0)); + + //检查虚拟清单是否存在 + if(infoEO != null){ if(StringUtils.isNotBlank(ids)){ LambdaQueryWrapper wrapper = new LambdaQueryWrapper<>(); wrapper.in(DummyInventoryInfoEO::getId,Arrays.asList(ids.split(","))); @@ -347,6 +369,13 @@ public class DummyInventoryInfoEOServiceImpl extends ServiceImpl infoEOQueryWrapper = new QueryWrapper<>(); + List baseList = dummyInventoryBaseEOService.list(infoEOQueryWrapper.in("id", dummyInventoryInfoEO.getIds())); + if(CollectionUtils.isNotEmpty(baseList)){ if(StringUtils.isNotBlank(dummyInventoryInfoEO.getIds())){ //根据id查询数据库中完整信息,翻译 List idList = Arrays.asList(dummyInventoryInfoEO.getIds().split(",")); @@ -539,6 +572,13 @@ public class DummyInventoryInfoEOServiceImpl extends ServiceImpl updateWrapper) { if(ObjectUtils.isEmpty(inventoryInfoEO.getXin1Che1Xing2Shi2Shi1Ri4Qi1())){ @@ -831,6 +871,10 @@ public class DummyInventoryInfoEOServiceImpl extends ServiceImpl infoEOQueryWrapper = new QueryWrapper<>(); + List baseList = dummyInventoryBaseEOService.list(infoEOQueryWrapper.eq("id", dummyInventoryInfoEO.getDummyInventoryBaseId())); + if(CollectionUtils.isNotEmpty(baseList)){ String title = ""; if(CutEnum.CN.getValue().equals(dummyInventoryInfoEO.getCut())){ title = "*编号,子标题,实施类别,WVTA ID,认证类型,*认证级别,适用增补件,*责任领域,备注," + @@ -1066,7 +1110,13 @@ public class DummyInventoryInfoEOServiceImpl extends ServiceImpl infoEOQueryWrapper = new QueryWrapper<>(); + List baseList = dummyInventoryBaseEOService.list(infoEOQueryWrapper.eq("id", dummyInventoryInfoEO.getDummyInventoryBaseId())); + if(CollectionUtils.isNotEmpty(baseList)){ List dataList = new ArrayList<>(); QueryWrapper queryWrapper = QueryGenerator.initQueryWrapper(dummyInventoryInfoEO,request.getParameterMap()); queryWrapper.in("dummy_inventory_base_id",dummyInventoryInfoEO.getDummyInventoryBaseId()); @@ -1778,6 +1832,13 @@ public class DummyInventoryInfoEOServiceImpl extends ServiceImpl dataListEn){