From 93e4c1f2b8c37a328ddc51e2aa290497d54aee75 Mon Sep 17 00:00:00 2001
From: wangjingsheng <wangjinsheng@wodcloud.com>
Date: Thu, 10 Mar 2022 16:00:36 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../com/pms/ocp/controller/ModelBaseController.java    | 10 ++++++----
 .../java/com/pms/ocp/service/ModelPropertyService.java |  2 +-
 .../pms/ocp/service/impl/ModelPropertyServiceImpl.java |  6 +++++-
 3 files changed, 12 insertions(+), 6 deletions(-)

diff --git a/src/main/java/com/pms/ocp/controller/ModelBaseController.java b/src/main/java/com/pms/ocp/controller/ModelBaseController.java
index d6ef10b..0a69a7b 100644
--- a/src/main/java/com/pms/ocp/controller/ModelBaseController.java
+++ b/src/main/java/com/pms/ocp/controller/ModelBaseController.java
@@ -13,6 +13,7 @@ import com.pms.ocp.service.ModelPropertyService;
 import com.pms.ocp.service.ModelService;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
+import io.swagger.annotations.ApiParam;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -237,9 +238,10 @@ public class ModelBaseController {
      */
     @ApiOperation("模型属性-查询")
     @GetMapping("get/model/property")
-    public ResponseVO getModelProperty(@RequestParam(value = "modelCode", required = false) String modelCode,
-                                       @RequestParam(value = "propCode", required = false) String propCode) {
-        return ResponseVO.ok(modelPropertyService.listModelProperty(modelCode, propCode));
+    public ResponseVO getModelProperty(@ApiParam(value = "模型属性编号") @RequestParam(value = "objId", required = false) String objId,
+                                       @ApiParam(value = "模型编码") @RequestParam(value = "modelCode", required = false) String modelCode,
+                                       @ApiParam(value = "属性编码") @RequestParam(value = "propCode", required = false) String propCode) {
+        return ResponseVO.ok(modelPropertyService.listModelProperty(objId, modelCode, propCode));
     }
 
     /**
@@ -261,7 +263,7 @@ public class ModelBaseController {
      */
     @ApiOperation("模型属性-删除/批量删除")
     @PostMapping("/delete/model/property")
-    public ResponseVO deleteModelProperty(@RequestBody List<String> ids) {
+    public ResponseVO deleteModelProperty(@ApiParam(value = "属性ID集合") @RequestBody List<String> ids) {
         return ResponseVO.ok(modelPropertyService.deletePatchModelProperty(ids));
     }
 
diff --git a/src/main/java/com/pms/ocp/service/ModelPropertyService.java b/src/main/java/com/pms/ocp/service/ModelPropertyService.java
index 5fede09..c82dd3e 100644
--- a/src/main/java/com/pms/ocp/service/ModelPropertyService.java
+++ b/src/main/java/com/pms/ocp/service/ModelPropertyService.java
@@ -51,7 +51,7 @@ public interface ModelPropertyService {
      * @param
      * @return
      */
-    List<ModelProperty> listModelProperty(String modelCode, String propCode);
+    List<ModelProperty> listModelProperty(String objId, String modelCode, String propCode);
 
     /**
      * 获取模型属性列表
diff --git a/src/main/java/com/pms/ocp/service/impl/ModelPropertyServiceImpl.java b/src/main/java/com/pms/ocp/service/impl/ModelPropertyServiceImpl.java
index 0bcbfc4..0c4403f 100644
--- a/src/main/java/com/pms/ocp/service/impl/ModelPropertyServiceImpl.java
+++ b/src/main/java/com/pms/ocp/service/impl/ModelPropertyServiceImpl.java
@@ -75,10 +75,14 @@ public class ModelPropertyServiceImpl implements ModelPropertyService {
     }
 
     @Override
-    public List<ModelProperty> listModelProperty(String modelCode, String propCode) {
+    public List<ModelProperty> listModelProperty(String objId, String modelCode, String propCode) {
 
         QueryWrapper<ModelProperty> queryWrapper = new QueryWrapper();
 
+        if (StringUtils.isNotEmpty(objId)) {
+            queryWrapper.lambda().eq(ModelProperty::getObjId, objId);
+        }
+
         if (StringUtils.isNotEmpty(modelCode)) {
             queryWrapper.lambda().eq(ModelProperty::getModelCode, modelCode);
         }
-- 
2.26.0