From 7b6c265986f57c738148ba3d81e914e116e460a5 Mon Sep 17 00:00:00 2001 From: wangjingsheng Date: Mon, 11 Apr 2022 20:27:33 +0800 Subject: [PATCH] =?UTF-8?q?=E9=9C=80=E6=B1=82=E4=BF=AE=E6=94=B9test3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../biz/BizModelRequirementInfoService.java | 8 +++---- .../BizModelRequirementInfoServiceImpl.java | 2 ++ .../ModelControlDemandController.java | 24 ++++++++++++++++--- .../impl/ModelBaseVersionServiceImpl.java | 2 +- .../ModelRequirementApprovalServiceImpl.java | 3 +-- 5 files changed, 29 insertions(+), 10 deletions(-) diff --git a/src/main/java/com/pms/ocp/biz/BizModelRequirementInfoService.java b/src/main/java/com/pms/ocp/biz/BizModelRequirementInfoService.java index 685a4af..3ce16db 100644 --- a/src/main/java/com/pms/ocp/biz/BizModelRequirementInfoService.java +++ b/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); /** * 获取模型需求 diff --git a/src/main/java/com/pms/ocp/biz/impl/BizModelRequirementInfoServiceImpl.java b/src/main/java/com/pms/ocp/biz/impl/BizModelRequirementInfoServiceImpl.java index 553c5c4..c20fe72 100644 --- a/src/main/java/com/pms/ocp/biz/impl/BizModelRequirementInfoServiceImpl.java +++ b/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); diff --git a/src/main/java/com/pms/ocp/controller/ModelControlDemandController.java b/src/main/java/com/pms/ocp/controller/ModelControlDemandController.java index a073988..66c5d45 100644 --- a/src/main/java/com/pms/ocp/controller/ModelControlDemandController.java +++ b/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)); + + } + } diff --git a/src/main/java/com/pms/ocp/service/impl/ModelBaseVersionServiceImpl.java b/src/main/java/com/pms/ocp/service/impl/ModelBaseVersionServiceImpl.java index 437b849..a38be57 100644 --- a/src/main/java/com/pms/ocp/service/impl/ModelBaseVersionServiceImpl.java +++ b/src/main/java/com/pms/ocp/service/impl/ModelBaseVersionServiceImpl.java @@ -35,7 +35,7 @@ public class ModelBaseVersionServiceImpl implements ModelBaseVersionService { QueryWrapper queryWrapper = new QueryWrapper(); if (StringUtils.isNotEmpty(requirementCode)) { - queryWrapper.lambda().eq(ModelBaseVersion::getObjId, requirementCode); + queryWrapper.lambda().eq(ModelBaseVersion::getRequirementCode, requirementCode); } if (StringUtils.isNotEmpty(modelCode)) { diff --git a/src/main/java/com/pms/ocp/service/impl/ModelRequirementApprovalServiceImpl.java b/src/main/java/com/pms/ocp/service/impl/ModelRequirementApprovalServiceImpl.java index 4b30974..0d7296c 100644 --- a/src/main/java/com/pms/ocp/service/impl/ModelRequirementApprovalServiceImpl.java +++ b/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); } -- 2.26.0