Merge remote-tracking branch 'origin/master'

src/main/java/com/pms/ocp/biz/BizModelRequirementInfoService.java

@@ -60,12 +60,12 @@ public interface BizModelRequirementInfoService {
     /**
      * 删除模型属性需求
      *
-     * @param demandId
-     * @param modelId
-     * @param proId
+     * @param requirementCode
+     * @param modelCode
+     * @param propCode
      * @return
      */
-    Integer deleteModelPropertyRequirementInfo(String demandId, String modelId, String proId);
+    Integer deleteModelPropertyRequirementInfo(String requirementCode, String modelCode, String propCode);
 
     /**
      * 获取模型需求

src/main/java/com/pms/ocp/biz/impl/BizModelRequirementInfoServiceImpl.java

@@ -153,6 +153,8 @@ public class BizModelRequirementInfoServiceImpl implements BizModelRequirementIn
 
         modelRequirementService.deleteModelRequirement(objId, requirementCode);
 
+        modelRequirementApprovalService.deleteModelRequirementApproval(null, requirementCode);
+
         if (StringUtils.isNotEmpty(requirementCode)) {
 
             modelBaseVersionService.deleteModelBaseVersion(requirementCode, modelCode);

src/main/java/com/pms/ocp/controller/ModelControlDemandController.java

@@ -67,6 +67,9 @@ public class ModelControlDemandController {
     public ResponseVO deleteModelRequirement(@ApiParam(value = "需求编号") @RequestParam(value = "objId", required = false) String objId,
                                              @ApiParam(value = "需求编码") @RequestParam(value = "requirementCode") String requirementCode,
                                              @ApiParam(value = "模型编码") @RequestParam(value = "modelCode") String modelCode) {
+
+
+        System.out.println("==============================================================" + requirementCode);
         return ResponseVO.ok(bizModelRequirementInfoService.deleteModelRequirementInfo(objId, requirementCode, modelCode));
     }
 
@@ -77,10 +80,10 @@ public class ModelControlDemandController {
      */
     @ApiOperation("模型属性需求-删除")
     @PostMapping("/delete/modelPropertyRequirement")
-    public ResponseVO deleteModelPropertyRequirement(@ApiParam(value = "模型订阅编号") @RequestParam(value = "objId", required = false) String objId,
+    public ResponseVO deleteModelPropertyRequirement(@ApiParam(value = "需求编码") @RequestParam(value = "requirementCode", required = false) String requirementCode,
                                                      @ApiParam(value = "模型编码") @RequestParam(value = "modelCode", required = false) String modelCode,
                                                      @ApiParam(value = "属性编码") @RequestParam(value = "propCode", required = false) String propCode) {
-        return ResponseVO.ok(bizModelRequirementInfoService.deleteModelPropertyRequirementInfo(objId, modelCode, propCode));
+        return ResponseVO.ok(bizModelRequirementInfoService.deleteModelPropertyRequirementInfo(requirementCode, modelCode, propCode));
     }
 
     /**
@@ -127,7 +130,7 @@ public class ModelControlDemandController {
      * @return
      */
     @ApiOperation("模型属性需求-查询列表")
-    @GetMapping("/get/modelPropertyDemand/list")
+    @GetMapping("/get/modelPropertyRequirement/list")
     public ResponseVO getModelPropertyDemandList(@ApiParam(value = "需求编码") @RequestParam(value = "requirementCode", required = false) String requirementCode,
                                                  @ApiParam(value = "模型编码") @RequestParam(value = "modelCode", required = false) String modelCode,
                                                  @ApiParam(value = "当前页") @RequestParam(value = "currentPage") Integer currentPage,
@@ -136,5 +139,20 @@ public class ModelControlDemandController {
 
     }
 
+    /**
+     * 模型属性需求-查询列表
+     *
+     * @return
+     */
+    @ApiOperation("模型需求-查询服务支撑")
+    @GetMapping("/get/modelRequirement/serviceSupport/list")
+    public ResponseVO getModelDemandServiceSupportList(@ApiParam(value = "需求编码") @RequestParam(value = "requirementCode", required = false) String requirementCode,
+                                                       @ApiParam(value = "模型编码") @RequestParam(value = "modelCode", required = false) String modelCode,
+                                                       @ApiParam(value = "当前页") @RequestParam(value = "currentPage") Integer currentPage,
+                                                       @ApiParam(value = "每页数量") @RequestParam(value = "pageSize") Integer pageSize) {
+        return ResponseVO.ok(bizModelRequirementInfoService.getModelPropertyRequirementInfoList(requirementCode, modelCode, currentPage, pageSize));
+
+    }
+
 
 }

src/main/java/com/pms/ocp/service/impl/ModelBaseVersionServiceImpl.java

@@ -35,7 +35,7 @@ public class ModelBaseVersionServiceImpl implements ModelBaseVersionService {
         QueryWrapper<ModelBaseVersion> queryWrapper = new QueryWrapper();
 
         if (StringUtils.isNotEmpty(requirementCode)) {
-            queryWrapper.lambda().eq(ModelBaseVersion::getObjId, requirementCode);
+            queryWrapper.lambda().eq(ModelBaseVersion::getRequirementCode, requirementCode);
         }
 
         if (StringUtils.isNotEmpty(modelCode)) {

src/main/java/com/pms/ocp/service/impl/ModelRequirementApprovalServiceImpl.java

@@ -42,8 +42,7 @@ public class ModelRequirementApprovalServiceImpl implements ModelRequirementAppr
         if (StringUtils.isNotEmpty(requirementCode)) {
             queryWrapper.lambda().eq(ModelRequirementApproval::getRequirementCode, requirementCode);
         }
-
-
+        
         return modelRequirementApprovalMapper.delete(queryWrapper);
     }