From 86785ffe9d114b43c1284b3156eb3e1b455d0d84 Mon Sep 17 00:00:00 2001 From: wangzhijiang Date: Tue, 4 Apr 2023 21:06:57 +0800 Subject: [PATCH] =?UTF-8?q?67804=20=E7=AC=A6=E5=90=88=E6=80=A7=E6=B5=81?= =?UTF-8?q?=E7=A8=8B=EF=BC=8C=E8=B4=A3=E4=BB=BB=E4=BA=BA=E9=80=80=E5=9B=9E?= =?UTF-8?q?=E5=90=8E=EF=BC=8C=E7=BB=99=E6=B3=95=E8=A7=84=E5=B7=A5=E7=A8=8B?= =?UTF-8?q?=E5=B8=88=E5=88=86=E9=85=8D=E5=BE=85=E5=8A=9E=E4=BB=BB=E5=8A=A1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../impl/ParamsCollectManifestEOServiceImpl.java | 12 ++++++------ .../jero/modules/project/enums/OperatorTypeEnum.java | 1 + .../impl/ProjectLawsInventoryEOServiceImpl.java | 6 +++++- .../service/impl/ProcessInfoDetailEOServiceImpl.java | 7 ++++++- .../service/impl/ProcessInfoEOServiceImpl.java | 11 +++++++++++ 5 files changed, 29 insertions(+), 8 deletions(-) diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/cert/collect/service/impl/ParamsCollectManifestEOServiceImpl.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/cert/collect/service/impl/ParamsCollectManifestEOServiceImpl.java index 285e5d4cc..298ac28e4 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/cert/collect/service/impl/ParamsCollectManifestEOServiceImpl.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/cert/collect/service/impl/ParamsCollectManifestEOServiceImpl.java @@ -5498,12 +5498,12 @@ public class ParamsCollectManifestEOServiceImpl extends ServiceImpl { + return StringUtils.isNotBlank(all); + }).distinct().collect(Collectors.toList()); + /* for(String all : allList){ if(all.equals("")){ allList.remove(all); } } + */ //遍历所有人alllist中是否包含责任人,如果包含，不用操作。 //-------如果不包含,再去判断当前用户的角色是studio、法规还是认证 for(ProjectRelatedPersonnel relatedPersonnel : projectRelatedPersonnelList){ diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/todoCenter/service/impl/ProcessInfoDetailEOServiceImpl.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/todoCenter/service/impl/ProcessInfoDetailEOServiceImpl.java index feb2a195e..a69653e10 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/todoCenter/service/impl/ProcessInfoDetailEOServiceImpl.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/todoCenter/service/impl/ProcessInfoDetailEOServiceImpl.java @@ -128,7 +128,12 @@ public class ProcessInfoDetailEOServiceImpl extends ServiceImpl deleteWrapper = new QueryWrapper<>(); - deleteWrapper.lambda().eq(ProcessInfoDetailEO::getActiProcInstId,processInfoDetailEO.getActiProcInstId()); + if(StringUtils.isNotBlank(processInfoDetailEO.getActiProcInstId())){ + deleteWrapper.lambda().eq(ProcessInfoDetailEO::getActiProcInstId,processInfoDetailEO.getActiProcInstId()); + } + if(StringUtils.isNotBlank(processInfoDetailEO.getProcessInfoId())){ + deleteWrapper.lambda().eq(ProcessInfoDetailEO::getProcessInfoId,processInfoDetailEO.getProcessInfoId()); + } deleteWrapper.lambda().eq(ProcessInfoDetailEO::getUserId,processInfoDetailEO.getUserId()); deleteWrapper.lambda().eq(ProcessInfoDetailEO::getFlowType,processInfoDetailEO.getFlowType()); this.baseMapper.delete(deleteWrapper); diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/todoCenter/service/impl/ProcessInfoEOServiceImpl.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/todoCenter/service/impl/ProcessInfoEOServiceImpl.java index a4b5ddfe3..699bf2da2 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/todoCenter/service/impl/ProcessInfoEOServiceImpl.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/todoCenter/service/impl/ProcessInfoEOServiceImpl.java @@ -194,6 +194,17 @@ public class ProcessInfoEOServiceImpl extends ServiceImpl pidQueryWrap = new QueryWrapper<>(); + pidQueryWrap.lambda().eq(ProcessInfoDetailEO::getProjectLawsInventoryId,projectLawsInventoryId); + pidQueryWrap.lambda().eq(ProcessInfoDetailEO::getFlowType,FlowTypeEnum.QDQR.getValue()); + List pidInfoList = this.processInfoDetailEOService.list(pidQueryWrap); + + if(CollectionUtils.isNotEmpty(pidInfoList)){ + ProcessInfoEO processInfoEO = this.queryById(pidInfoList.get(0).getProcessInfoId()); + return Result.OK(processInfoEO); + } } return new Result<>().success("调用成功！"); }