wangli/tyr
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/feature/REQ-1102' into feature/REQ-1102

Browse Source
This commit is contained in:
zhansihu 2023-09-18 18:16:53 +08:00
commit aa870bd7e8
5 changed files with 12 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
pom.xml
View File

@ -11,7 +11,7 @@
<groupId>cn.axzo.tyr</groupId> <groupId>cn.axzo.tyr</groupId>
<artifactId>tyr</artifactId> <artifactId>tyr</artifactId>
<packaging>pom</packaging> <packaging>pom</packaging>
<version>1.0.0-SNAPSHOT</version> <version>${revision}</version>
<name>tyr</name> <name>tyr</name>
<modules> <modules>
@ -20,6 +20,7 @@
</modules> </modules>
<properties> <properties>
<revision>2.0.0-SNAPSHOT</revision>
<axzo-bom.version>2.0.0-SNAPSHOT</axzo-bom.version> <axzo-bom.version>2.0.0-SNAPSHOT</axzo-bom.version>
<axzo-dependencies.version>2.0.0-SNAPSHOT</axzo-dependencies.version> <axzo-dependencies.version>2.0.0-SNAPSHOT</axzo-dependencies.version>
<lombok.version>1.18.22</lombok.version> <lombok.version>1.18.22</lombok.version>

2
tyr-api/pom.xml
View File

@ -5,7 +5,7 @@
<parent> <parent>
<artifactId>tyr</artifactId> <artifactId>tyr</artifactId>
<groupId>cn.axzo.tyr</groupId> <groupId>cn.axzo.tyr</groupId>
<version>1.0.0-SNAPSHOT</version> <version>${revision}</version>
<relativePath>../pom.xml</relativePath> <relativePath>../pom.xml</relativePath>
</parent> </parent>

7
tyr-api/src/main/java/cn/axzo/tyr/client/model/product/ProductSearchListReq.java
View File

@ -7,6 +7,8 @@ import lombok.Data;
import lombok.NoArgsConstructor; import lombok.NoArgsConstructor;
import lombok.experimental.Accessors; import lombok.experimental.Accessors;
import java.util.List;
/** /**
* 产品分页搜索 * 产品分页搜索
* *
@ -16,7 +18,10 @@ import lombok.experimental.Accessors;
@Data @Data
@Accessors(chain = true) @Accessors(chain = true)
public class ProductSearchListReq{ public class ProductSearchListReq{
/**
* 产品 ID 集合
*/
private List<Long> ids;
/** /**
* 产品名称 * 产品名称
*/ */

2
tyr-server/pom.xml
View File

@ -3,7 +3,7 @@
<parent> <parent>
<artifactId>tyr</artifactId> <artifactId>tyr</artifactId>
<groupId>cn.axzo.tyr</groupId> <groupId>cn.axzo.tyr</groupId>
<version>1.0.0-SNAPSHOT</version> <version>${revision}</version>
<relativePath>../pom.xml</relativePath> <relativePath>../pom.xml</relativePath>
</parent> </parent>
<modelVersion>4.0.0</modelVersion> <modelVersion>4.0.0</modelVersion>

2
tyr-server/src/main/java/cn/axzo/tyr/server/service/impl/ProductServiceImpl.java
View File

@ -17,6 +17,7 @@ import com.baomidou.mybatisplus.core.metadata.IPage;
import lombok.RequiredArgsConstructor; import lombok.RequiredArgsConstructor;
import lombok.extern.slf4j.Slf4j; import lombok.extern.slf4j.Slf4j;
import org.springframework.stereotype.Service; import org.springframework.stereotype.Service;
import org.springframework.util.CollectionUtils;
import org.springframework.util.StringUtils; import org.springframework.util.StringUtils;
import java.util.List; import java.util.List;
@ -38,6 +39,7 @@ public class ProductServiceImpl implements ProductService {
@Override @Override
public ApiResult<List<ProductVO>> list(ProductSearchListReq req) { public ApiResult<List<ProductVO>> list(ProductSearchListReq req) {
List<ProductModule> list = productModuleDao.lambdaQuery() List<ProductModule> list = productModuleDao.lambdaQuery()
.in(!CollectionUtils.isEmpty(req.getIds()), ProductModule::getId, req.getIds())
.like(StringUtils.hasLength(req.getName()), ProductModule::getProductName, req.getName()) .like(StringUtils.hasLength(req.getName()), ProductModule::getProductName, req.getName())
.eq(Objects.nonNull(req.getDictWorkspaceTypeId()), ProductModule::getDictWorkspaceTypeId, req.getDictWorkspaceTypeId()) .eq(Objects.nonNull(req.getDictWorkspaceTypeId()), ProductModule::getDictWorkspaceTypeId, req.getDictWorkspaceTypeId())
.eq(Objects.nonNull(req.getStatus()), ProductModule::getStatus, req.getStatus()) .eq(Objects.nonNull(req.getStatus()), ProductModule::getStatus, req.getStatus())