From 6a3b345a731249765b0efae286300587e8cc5972 Mon Sep 17 00:00:00 2001 From: zhn <947514737@qq.com> Date: Mon, 28 Aug 2023 16:52:14 +0800 Subject: [PATCH] =?UTF-8?q?=E8=A6=86=E7=9B=96=E9=AA=8C=E8=AF=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/ProjectRxswinEOController.java | 9 ++++ .../service/IProjectRxswinEOService.java | 7 +++ .../impl/ProjectRxswinEOServiceImpl.java | 49 +++++++++++++++++++ 3 files changed, 65 insertions(+) diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/controller/ProjectRxswinEOController.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/controller/ProjectRxswinEOController.java index 459947cbc..9f63d9e9c 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/controller/ProjectRxswinEOController.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/controller/ProjectRxswinEOController.java @@ -227,4 +227,13 @@ public class ProjectRxswinEOController extends JeroController iSExist(@RequestParam(name="projectId",required=true) String projectId, + @RequestParam(name="ids",required=true) String ids) { + String iSExist = projectRxswinEOService.iSExist(projectId, ids); + return Result.OK(iSExist); + } + } diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/IProjectRxswinEOService.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/IProjectRxswinEOService.java index 8e3d9dea1..548d3ce41 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/IProjectRxswinEOService.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/IProjectRxswinEOService.java @@ -85,4 +85,11 @@ public interface IProjectRxswinEOService extends IService { * @param ids */ void submitInfo(String projectId,String ids); + + /** + * 覆盖验证 + * @param projectId + * @param ids + */ + String iSExist(String projectId,String ids); } diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectRxswinEOServiceImpl.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectRxswinEOServiceImpl.java index 66089f93e..82bd94611 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectRxswinEOServiceImpl.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectRxswinEOServiceImpl.java @@ -180,7 +180,56 @@ public class ProjectRxswinEOServiceImpl extends ServiceImpl wrapper = new LambdaQueryWrapper<>(); + wrapper.eq(ProjectRxswinEO::getId, Arrays.asList(ids.split(","))); + List rxswinEOList = this.list(wrapper); + + //已存在的 + LambdaQueryWrapper wrapperTemp = new LambdaQueryWrapper<>(); + wrapperTemp.eq(ProjectRxswinEO::getProjectId, projectId); + List rxswinEOS = this.list(wrapperTemp); + + if(!rxswinEOS.isEmpty()){ + List themeList = rxswinEOS.stream().map(ProjectRxswinEO::getTheme).collect(Collectors.toList()); + List projectRxswinEOS = rxswinEOList.stream().filter(e -> themeList.contains(e.getTheme())).collect(Collectors.toList()); + if(projectRxswinEOS.isEmpty()){ + //直接新增 + for (ProjectRxswinEO projectRxswinEO : rxswinEOList) { + projectRxswinEO.setId(UUID.randomUUID().toString().replaceAll("-","")); + projectRxswinEO.setProjectId(projectId); + projectRxswinEO.setCreateTime(new Date()); + projectRxswinEO.setCreateBy(user.getUsername()); + projectRxswinEO.setState(StatusEnum.SAVE.getValue()); + } + this.saveBatch(rxswinEOList); + }else{ + return "YES"; + } + }else{ + //直接新增 + for (ProjectRxswinEO projectRxswinEO : rxswinEOList) { + projectRxswinEO.setId(UUID.randomUUID().toString().replaceAll("-","")); + projectRxswinEO.setProjectId(projectId); + projectRxswinEO.setCreateTime(new Date()); + projectRxswinEO.setCreateBy(user.getUsername()); + projectRxswinEO.setState(StatusEnum.SAVE.getValue()); + } + this.saveBatch(rxswinEOList); + } + return "NO"; + } }