WL/laws_weilai
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/dev_20230828_RXWIN' into dev_20230828_RXWIN

Browse Source
This commit is contained in:
zyx.net
2023-08-29 10:56:05 +08:00
parent 5964678d04 cb570dc40d
commit 085935c862
4 changed files with 153 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files
jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/controller/ProjectRxswinEOController.java
+14 -2
View File
@@ -212,8 +212,7 @@ public class ProjectRxswinEOController extends JeroController<ProjectRxswinEO, I
@RequestParam(name="pageNo", defaultValue="1") Integer pageNo,
@RequestParam(name="pageSize", defaultValue="10") Integer pageSize,
HttpServletRequest req) {
Page<ProjectRxswinEO> page = new Page<ProjectRxswinEO>(pageNo, pageSize);
IPage<ProjectRxswinEO> pageList = projectRxswinEOService.getTwoPage(page,projectRxswinEO);
IPage<ProjectRxswinEO> pageList = projectRxswinEOService.getTwoPage(pageNo,pageSize,projectRxswinEO);
return Result.OK(pageList);
}
@@ -252,4 +251,17 @@ public class ProjectRxswinEOController extends JeroController<ProjectRxswinEO, I
return Result.OK("");
}
/**
* 对应版本下拉
*
* @return
*/
@AutoLog(value = "对应版本下拉")
@ApiOperation(value="对应版本下拉", notes="对应版本下拉")
@GetMapping(value = "/getVersionList")
public Result<List<String>> getVersionList(String projectId) {
List<String> list = projectRxswinEOService.getVersionList(projectId);
return Result.OK(list);
}
}
jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/entity/ProjectRxswinEO.java
+8
View File
@@ -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;
}
jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/IProjectRxswinEOService.java
+5 -2
View File
@@ -75,11 +75,12 @@ public interface IProjectRxswinEOService extends IService<ProjectRxswinEO> {
/**
* 调取--第二层
* @param page
* @param pageNo
* @param pageSize
* @param projectRxswinEO
* @return
*/
Page<ProjectRxswinEO> getTwoPage(Page<ProjectRxswinEO> page,ProjectRxswinEO projectRxswinEO);
Page<ProjectRxswinEO> getTwoPage(Integer pageNo,Integer pageSize,ProjectRxswinEO projectRxswinEO);
/**
* 提交
@@ -97,4 +98,6 @@ public interface IProjectRxswinEOService extends IService<ProjectRxswinEO> {
void addBatch(String projectId,String ids,String flag);
List<String> getVersionList(String projectId);
}
jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectRxswinEOServiceImpl.java
+126 -6
View File
@@ -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<ProjectRxswinEOMappe
if(StringUtils.isNotBlank(projectRxswinEO.getRxswin())){
wrapper.like(ProjectRxswinEO::getRxswin,projectRxswinEO.getRxswin());
}
if(StringUtils.isBlank(projectRxswinEO.getOrderByField())){
wrapper.orderByDesc(ProjectRxswinEO::getCreateTime);
}
List<ProjectRxswinEO> projectRxswinEOList = this.list(wrapper);
if(!projectRxswinEOList.isEmpty()){
@@ -158,6 +163,7 @@ public class ProjectRxswinEOServiceImpl extends ServiceImpl<ProjectRxswinEOMappe
projectRxswinEOList = projectRxswinEOList.stream()
.filter(e -> e.getSerialNumber().contains(projectRxswinEO.getSerialNumber())).collect(Collectors.toList());
}
heartSort(projectRxswinEO,projectRxswinEOList);
}
return PageUtil.getPages(pageNo,pageSize,projectRxswinEOList);
}
@@ -190,17 +196,50 @@ public class ProjectRxswinEOServiceImpl extends ServiceImpl<ProjectRxswinEOMappe
/**
* 调取--第二层
* @param page
* @param pageNo
* @param pageSize
* @param projectRxswinEO
* @return
*/
@Override
public Page<ProjectRxswinEO> getTwoPage(Page<ProjectRxswinEO> page,ProjectRxswinEO projectRxswinEO) {
LambdaQueryWrapper<ProjectRxswinEO> wrapper = new LambdaQueryWrapper<>();
public Page<ProjectRxswinEO> getTwoPage(Integer pageNo,Integer pageSize,ProjectRxswinEO projectRxswinEO) {
LambdaQueryWrapper<ProjectRxswinEO> 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());
}
if(StringUtils.isBlank(projectRxswinEO.getOrderByField())){
wrapper.orderByDesc(ProjectRxswinEO::getCreateTime);
}
List<ProjectRxswinEO> projectRxswinEOList = this.list(wrapper);
if(!projectRxswinEOList.isEmpty()){
List<String> documentIdList = projectRxswinEOList.stream().map(ProjectRxswinEO::getDocumentId).distinct().collect(Collectors.toList());
List<BussDocumentLibraryEO> bussDocumentLibraryEOList = getBussDocumentLibraryEOList(documentIdList);
for (ProjectRxswinEO projectRxswinEOTemp : projectRxswinEOList) {
List<BussDocumentLibraryEO> 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());
}
heartSort(projectRxswinEO,projectRxswinEOList);
}
return PageUtil.getPages(pageNo,pageSize,projectRxswinEOList);
}
/**
@@ -318,10 +357,91 @@ public class ProjectRxswinEOServiceImpl extends ServiceImpl<ProjectRxswinEOMappe
}
}
@Override
public List<String> getVersionList(String projectId) {
LambdaQueryWrapper<ProjectRxswinEO> wrapper = new LambdaQueryWrapper<>();
wrapper.eq(ProjectRxswinEO::getProjectId,projectId);
List<ProjectRxswinEO> rxswinEOList = this.list(wrapper);
List<String> 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<BussDocumentLibraryEO> getBussDocumentLibraryEOList(List<String> documentIdList){
LambdaQueryWrapper<BussDocumentLibraryEO> wrapper = new LambdaQueryWrapper<>();
wrapper.in(BussDocumentLibraryEO::getId,documentIdList);
return bussDocumentLibraryEOService.list(wrapper);
}
private void heartSort(ProjectRxswinEO projectRxswinEO, List<ProjectRxswinEO> 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);
});
}
}
}
}