diff --git a/pom.xml b/pom.xml
index 46173d6f8923f0eea4ef02111bd8e5d6bd81d782..047ea8015e7d2ca149b921d7fc0fa48ff1e33dc3 100644
--- a/pom.xml
+++ b/pom.xml
@@ -19,19 +19,19 @@
2.4.2
3.0.0
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
2.0.8
@@ -95,12 +95,6 @@
2.0.9
-
- javax.validation
- validation-api
- 1.1.0.Final
-
-
org.springframework.boot
spring-boot-starter-test
@@ -112,6 +106,7 @@
+
cn.hutool
hutool-all
diff --git a/src/main/java/com/pms/ocp/controller/ModelBaseController.java b/src/main/java/com/pms/ocp/controller/ModelBaseController.java
index 0bbbe16f52075349cb5f0cee6ad4622aa61993a5..ced0393b7092517b4c8a88a651907f60d5f7879f 100644
--- a/src/main/java/com/pms/ocp/controller/ModelBaseController.java
+++ b/src/main/java/com/pms/ocp/controller/ModelBaseController.java
@@ -78,11 +78,13 @@ public class ModelBaseController {
@GetMapping("/get/model/list")
public ResponseVO getModelList(@ApiParam(value = "模型订阅编号") @RequestParam(value = "objId", required = false) String objId,
@ApiParam(value = "模型编码") @RequestParam(value = "modelCode", required = false) String modelCode,
+ @ApiParam(value = "归属省编码数组EQ: ddas232, 2e1ssda, 3232") @RequestParam(value = "ownerCompanyCodes", required = false) List ownerCompanyCodes,
+ @ApiParam(value = "归属分类编码数组") @RequestParam(value = "modelGroupCodes", required = false) List modelGroupCodes,
@ApiParam(value = "当前页") @RequestParam(value = "currentPage", required = false) Integer currentPage,
@ApiParam(value = "每页数量") @RequestParam(value = "pageSize", required = false) Integer pageSize) {
PageHelper.startPage(currentPage, pageSize);
- List modelList = modelService.getModelList(objId, modelCode);
+ List modelList = modelService.getModelList(objId, modelCode, ownerCompanyCodes, modelGroupCodes);
PageInfo pageInfo = new PageInfo<>(modelList);
return ResponseVO.ok(pageInfo);
diff --git a/src/main/java/com/pms/ocp/service/ModelService.java b/src/main/java/com/pms/ocp/service/ModelService.java
index 86b94244bdd79853747fc58748cb40ef8b4d8979..740e9a4a26cf15737d0d3beaa53fd5fa39f346c3 100644
--- a/src/main/java/com/pms/ocp/service/ModelService.java
+++ b/src/main/java/com/pms/ocp/service/ModelService.java
@@ -53,7 +53,7 @@ public interface ModelService {
* @param
* @return
*/
- List getModelList(String objId, String modelCode);
+ List getModelList(String objId, String modelCode, List ownerCompanyCodes, List modelGroupCodes);
/**
* 获取模型列表
diff --git a/src/main/java/com/pms/ocp/service/impl/ModelServiceImpl.java b/src/main/java/com/pms/ocp/service/impl/ModelServiceImpl.java
index 9c01612ea33914ab0328172f73a19f7e03ecbf03..bce3830aac70ad6447dc60939a78f537471c0163 100644
--- a/src/main/java/com/pms/ocp/service/impl/ModelServiceImpl.java
+++ b/src/main/java/com/pms/ocp/service/impl/ModelServiceImpl.java
@@ -3,20 +3,16 @@ package com.pms.ocp.service.impl;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import com.pms.ocp.common.constants.CodeEnum;
import com.pms.ocp.common.utils.ExcelUtils;
import com.pms.ocp.mapper.ModelMapper;
import com.pms.ocp.model.dto.ModelDTO;
import com.pms.ocp.model.entity.Model;
-import com.pms.ocp.model.entity.ModelProperty;
import com.pms.ocp.model.vo.ModelVO;
-import com.pms.ocp.model.vo.ResponseVO;
import com.pms.ocp.service.ModelService;
import org.apache.commons.lang3.StringUtils;
import org.springframework.beans.BeanUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
-import org.springframework.util.CollectionUtils;
import org.springframework.web.multipart.MultipartFile;
import java.io.IOException;
@@ -133,7 +129,7 @@ public class ModelServiceImpl extends ServiceImpl implements
* @return
*/
@Override
- public List getModelList(String objId, String modelCode) {
+ public List getModelList(String objId, String modelCode, List ownerCompanyCodes, List modelGroupCodes) {
QueryWrapper queryWrapper = new QueryWrapper();
if (StringUtils.isNotEmpty(objId)) {
@@ -144,6 +140,34 @@ public class ModelServiceImpl extends ServiceImpl implements
queryWrapper.lambda().eq(Model::getModelCode, modelCode);
}
+ if (ownerCompanyCodes != null && !ownerCompanyCodes.isEmpty()) {
+ List modelList = new ArrayList<>();
+ for (String ownerCompanyCode : ownerCompanyCodes){
+ queryWrapper.lambda().eq(Model::getOwnerCompanyCode, ownerCompanyCode);
+ List modelList1;
+ modelList1 = modelMapper.selectList(queryWrapper);
+ modelList.addAll(modelList1);
+ queryWrapper.lambda().clear();
+ }
+ return modelList;
+ }
+
+ if (modelGroupCodes != null && !modelGroupCodes.isEmpty()) {
+ List modelList = new ArrayList<>();
+ for (String modelGroupCode : modelGroupCodes){
+ queryWrapper.lambda().eq(Model::getModelGroupCode, modelGroupCode);
+ List modelList1;
+ modelList1 = modelMapper.selectList(queryWrapper);
+ modelList.addAll(modelList1);
+ queryWrapper.lambda().clear();
+ }
+ return modelList;
+ }
+
+ if (StringUtils.isNotEmpty(modelCode)) {
+ queryWrapper.lambda().eq(Model::getModelCode, modelCode);
+ }
+
return modelMapper.selectList(queryWrapper);
}