From 5a212a54f3a45005042d67bbfab8907b8470bf6c Mon Sep 17 00:00:00 2001 From: zhn <947514737@qq.com> Date: Tue, 29 Aug 2023 09:22:53 +0800 Subject: [PATCH 1/3] =?UTF-8?q?=E5=88=86=E9=A1=B5=E6=9F=A5=E8=AF=A2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/ProjectRxswinEOController.java | 3 +- .../service/IProjectRxswinEOService.java | 5 ++- .../impl/ProjectRxswinEOServiceImpl.java | 39 ++++++++++++++++--- 3 files changed, 38 insertions(+), 9 deletions(-) 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 1a1978c0c..eee80449d 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 @@ -212,8 +212,7 @@ public class ProjectRxswinEOController extends JeroController page = new Page(pageNo, pageSize); - IPage pageList = projectRxswinEOService.getTwoPage(page,projectRxswinEO); + IPage pageList = projectRxswinEOService.getTwoPage(pageNo,pageSize,projectRxswinEO); return Result.OK(pageList); } 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 f777c2dad..8eadcea48 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 @@ -75,11 +75,12 @@ public interface IProjectRxswinEOService extends IService { /** * 调取--第二层 - * @param page + * @param pageNo + * @param pageSize * @param projectRxswinEO * @return */ - Page getTwoPage(Page page,ProjectRxswinEO projectRxswinEO); + Page getTwoPage(Integer pageNo,Integer pageSize,ProjectRxswinEO projectRxswinEO); /** * 提交 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 2b708c2ed..1b10e7f4e 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 @@ -190,17 +190,46 @@ public class ProjectRxswinEOServiceImpl extends ServiceImpl getTwoPage(Page page,ProjectRxswinEO projectRxswinEO) { - LambdaQueryWrapper wrapper = new LambdaQueryWrapper<>(); + public Page getTwoPage(Integer pageNo,Integer pageSize,ProjectRxswinEO projectRxswinEO) { + + LambdaQueryWrapper wrapper =new LambdaQueryWrapper<>(); wrapper.eq(ProjectRxswinEO::getProjectId,projectRxswinEO.getProjectId()); wrapper.eq(ProjectRxswinEO::getState, StatusEnum.SUBMIT.getValue());//提交的 - this.page(page,wrapper); - return this.page(page,wrapper); + + if(StringUtils.isNotBlank(projectRxswinEO.getTheme())){ + wrapper.like(ProjectRxswinEO::getTheme,projectRxswinEO.getTheme()); + } + if(StringUtils.isNotBlank(projectRxswinEO.getVersion())){ + wrapper.eq(ProjectRxswinEO::getVersion,projectRxswinEO.getVersion()); + } + if(StringUtils.isNotBlank(projectRxswinEO.getRxswin())){ + wrapper.like(ProjectRxswinEO::getRxswin,projectRxswinEO.getRxswin()); + } + + List projectRxswinEOList = this.list(wrapper); + + if(!projectRxswinEOList.isEmpty()){ + List documentIdList = projectRxswinEOList.stream().map(ProjectRxswinEO::getDocumentId).distinct().collect(Collectors.toList()); + List bussDocumentLibraryEOList = getBussDocumentLibraryEOList(documentIdList); + for (ProjectRxswinEO projectRxswinEOTemp : projectRxswinEOList) { + List collect = bussDocumentLibraryEOList.stream() + .filter(e -> e.getId().equals(projectRxswinEOTemp.getDocumentId())).collect(Collectors.toList()); + if(!collect.isEmpty()){ + projectRxswinEOTemp.setSerialNumber(collect.get(0).getSerialNumber()); + } + } + if(StringUtils.isNotBlank(projectRxswinEO.getSerialNumber())){ + projectRxswinEOList = projectRxswinEOList.stream() + .filter(e -> e.getSerialNumber().contains(projectRxswinEO.getSerialNumber())).collect(Collectors.toList()); + } + } + return PageUtil.getPages(pageNo,pageSize,projectRxswinEOList); } /** From 17ffa7dbdcd8dc981a9c271dd0bc61d213d7abc5 Mon Sep 17 00:00:00 2001 From: zhn <947514737@qq.com> Date: Tue, 29 Aug 2023 09:54:44 +0800 Subject: [PATCH 2/3] =?UTF-8?q?=E5=AF=B9=E5=BA=94=E7=89=88=E6=9C=AC?= =?UTF-8?q?=E4=B8=8B=E6=8B=89?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/ProjectRxswinEOController.java | 13 +++++++++++++ .../project/service/IProjectRxswinEOService.java | 2 ++ .../service/impl/ProjectRxswinEOServiceImpl.java | 12 ++++++++++++ 3 files changed, 27 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 eee80449d..f2d5e03bc 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 @@ -251,4 +251,17 @@ public class ProjectRxswinEOController extends JeroController> getVersionList(String projectId) { + List list = projectRxswinEOService.getVersionList(projectId); + return Result.OK(list); + } + } 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 8eadcea48..13d9b1b03 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 @@ -98,4 +98,6 @@ public interface IProjectRxswinEOService extends IService { void addBatch(String projectId,String ids,String flag); + + List getVersionList(String projectId); } 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 1b10e7f4e..7f05bb5f7 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 @@ -347,6 +347,18 @@ public class ProjectRxswinEOServiceImpl extends ServiceImpl getVersionList(String projectId) { + LambdaQueryWrapper wrapper = new LambdaQueryWrapper<>(); + wrapper.eq(ProjectRxswinEO::getProjectId,projectId); + List rxswinEOList = this.list(wrapper); + List versionList = rxswinEOList.stream().map(ProjectRxswinEO::getVersion).distinct().collect(Collectors.toList()); + Collections.sort(versionList,(a,b)->{ + return Integer.parseInt(a) - Integer.parseInt(b); + }); + return versionList; + } + public List getBussDocumentLibraryEOList(List documentIdList){ LambdaQueryWrapper wrapper = new LambdaQueryWrapper<>(); From cb570dc40deb46e5e581eac16ea7da12af51ca7e Mon Sep 17 00:00:00 2001 From: zhn <947514737@qq.com> Date: Tue, 29 Aug 2023 10:18:12 +0800 Subject: [PATCH 3/3] =?UTF-8?q?=E8=A1=A8=E5=A4=B4=E6=8E=92=E5=BA=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../project/entity/ProjectRxswinEO.java | 8 ++ .../impl/ProjectRxswinEOServiceImpl.java | 81 ++++++++++++++++++- 2 files changed, 88 insertions(+), 1 deletion(-) diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/entity/ProjectRxswinEO.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/entity/ProjectRxswinEO.java index 6722e3428..78cd7a299 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/entity/ProjectRxswinEO.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/entity/ProjectRxswinEO.java @@ -97,4 +97,12 @@ public class ProjectRxswinEO implements Serializable { @ApiModelProperty(value = "编号") private String serialNumber; + @TableField(exist = false) + @ApiModelProperty(value = "表头排序字段") + private java.lang.String orderByField; + + @TableField(exist = false) + @ApiModelProperty(value = "排序") + private java.lang.String orderBy; + } 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 7f05bb5f7..4ce068582 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 @@ -9,6 +9,7 @@ import com.jero.common.system.vo.LoginUser; import com.jero.common.util.PageUtil; import com.jero.modules.document.entity.BussDocumentLibraryEO; import com.jero.modules.document.service.impl.BussDocumentLibraryEOServiceImpl; +import com.jero.modules.dummy.enums.OrderEnum; import com.jero.modules.project.entity.ProjectLibraryBase; import com.jero.modules.project.entity.ProjectRxswinEO; import com.jero.modules.project.enums.StatusEnum; @@ -19,10 +20,12 @@ import org.apache.shiro.SecurityUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; +import java.text.Collator; import java.util.Arrays; import java.util.Collections; import java.util.Date; import java.util.List; +import java.util.Locale; import java.util.UUID; import java.util.stream.Collectors; @@ -141,7 +144,9 @@ public class ProjectRxswinEOServiceImpl extends ServiceImpl projectRxswinEOList = this.list(wrapper); if(!projectRxswinEOList.isEmpty()){ @@ -158,6 +163,7 @@ public class ProjectRxswinEOServiceImpl extends ServiceImpl e.getSerialNumber().contains(projectRxswinEO.getSerialNumber())).collect(Collectors.toList()); } + heartSort(projectRxswinEO,projectRxswinEOList); } return PageUtil.getPages(pageNo,pageSize,projectRxswinEOList); } @@ -211,6 +217,9 @@ public class ProjectRxswinEOServiceImpl extends ServiceImpl projectRxswinEOList = this.list(wrapper); @@ -228,6 +237,7 @@ public class ProjectRxswinEOServiceImpl extends ServiceImpl e.getSerialNumber().contains(projectRxswinEO.getSerialNumber())).collect(Collectors.toList()); } + heartSort(projectRxswinEO,projectRxswinEOList); } return PageUtil.getPages(pageNo,pageSize,projectRxswinEOList); } @@ -365,4 +375,73 @@ public class ProjectRxswinEOServiceImpl extends ServiceImpl projectRxswinEOList) { + Collator comparator = Collator.getInstance(Locale.CHINESE); + // 编号 + if ("serialNumber".equals(projectRxswinEO.getOrderByField())) { + if (OrderEnum.POSITIVE.getValue().equals(projectRxswinEO.getOrderBy())) { + Collections.sort(projectRxswinEOList, (e1, e2) -> { + String e1PlannedBpLaunchBatch = com.jero.modules.system.util.StringUtils.isNotBlank(e1.getSerialNumber()) ? e1.getSerialNumber() : ""; + String e2PlannedBpLaunchBatch = com.jero.modules.system.util.StringUtils.isNotBlank(e2.getSerialNumber()) ? e2.getSerialNumber() : ""; + return comparator.compare(e1PlannedBpLaunchBatch, e2PlannedBpLaunchBatch); + }); + } else if (OrderEnum.REVERSE.getValue().equals(projectRxswinEO.getOrderBy())) { + Collections.sort(projectRxswinEOList, (e1, e2) -> { + String e1PlannedBpLaunchBatch = com.jero.modules.system.util.StringUtils.isNotBlank(e1.getSerialNumber()) ? e1.getSerialNumber() : ""; + String e2PlannedBpLaunchBatch = com.jero.modules.system.util.StringUtils.isNotBlank(e2.getSerialNumber()) ? e2.getSerialNumber() : ""; + return comparator.compare(e2PlannedBpLaunchBatch, e1PlannedBpLaunchBatch); + }); + } + } + // 主题 + if ("theme".equals(projectRxswinEO.getOrderByField())) { + if (OrderEnum.POSITIVE.getValue().equals(projectRxswinEO.getOrderBy())) { + Collections.sort(projectRxswinEOList, (e1, e2) -> { + String e1Market = com.jero.modules.system.util.StringUtils.isNotBlank(e1.getTheme()) ? e1.getTheme() : ""; + String e2Market = com.jero.modules.system.util.StringUtils.isNotBlank(e2.getTheme()) ? e2.getTheme() : ""; + return comparator.compare(e1Market, e2Market); + }); + } else if (OrderEnum.REVERSE.getValue().equals(projectRxswinEO.getOrderBy())) { + Collections.sort(projectRxswinEOList, (e1, e2) -> { + String e1Market = com.jero.modules.system.util.StringUtils.isNotBlank(e1.getTheme()) ? e1.getTheme() : ""; + String e2Market = com.jero.modules.system.util.StringUtils.isNotBlank(e2.getTheme()) ? e2.getTheme() : ""; + return comparator.compare(e2Market, e1Market); + }); + } + } + //RXSWIN + if ("rxswin".equals(projectRxswinEO.getOrderByField())) { + if (OrderEnum.POSITIVE.getValue().equals(projectRxswinEO.getOrderBy())) { + Collections.sort(projectRxswinEOList, (e1, e2) -> { + String e1Market = com.jero.modules.system.util.StringUtils.isNotBlank(e1.getRxswin()) ? e1.getRxswin() : ""; + String e2Market = com.jero.modules.system.util.StringUtils.isNotBlank(e2.getRxswin()) ? e2.getRxswin() : ""; + return comparator.compare(e1Market, e2Market); + }); + } else if (OrderEnum.REVERSE.getValue().equals(projectRxswinEO.getOrderBy())) { + Collections.sort(projectRxswinEOList, (e1, e2) -> { + String e1Market = com.jero.modules.system.util.StringUtils.isNotBlank(e1.getRxswin()) ? e1.getRxswin() : ""; + String e2Market = com.jero.modules.system.util.StringUtils.isNotBlank(e2.getRxswin()) ? e2.getRxswin() : ""; + return comparator.compare(e2Market, e1Market); + }); + } + } + + //对应版本 + if ("version".equals(projectRxswinEO.getOrderByField())) { + if (OrderEnum.POSITIVE.getValue().equals(projectRxswinEO.getOrderBy())) { + Collections.sort(projectRxswinEOList, (e1, e2) -> { + String e1Market = com.jero.modules.system.util.StringUtils.isNotBlank(e1.getVersion()) ? e1.getVersion() : ""; + String e2Market = com.jero.modules.system.util.StringUtils.isNotBlank(e2.getVersion()) ? e2.getVersion() : ""; + return comparator.compare(e1Market, e2Market); + }); + } else if (OrderEnum.REVERSE.getValue().equals(projectRxswinEO.getOrderBy())) { + Collections.sort(projectRxswinEOList, (e1, e2) -> { + String e1Market = com.jero.modules.system.util.StringUtils.isNotBlank(e1.getVersion()) ? e1.getVersion() : ""; + String e2Market = com.jero.modules.system.util.StringUtils.isNotBlank(e2.getVersion()) ? e2.getVersion() : ""; + return comparator.compare(e2Market, e1Market); + }); + } + } + } }