From ec56906deb777deef3b31debbfb5402333611a5c Mon Sep 17 00:00:00 2001 From: cs <673849330@qq,com> Date: Fri, 8 Apr 2022 18:02:57 +0800 Subject: [PATCH] =?UTF-8?q?=E8=AF=84=E4=BB=B7=E4=BB=BB=E5=8A=A1=E5=85=B3?= =?UTF-8?q?=E8=81=94=E6=8C=87=E6=A0=87?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../zhpj/web/biz/controller/ModelRelationController.java | 4 +++- .../zhpj/web/biz/controller/ScoringRuleMainController.java | 4 ++-- .../hncy/zhpj/web/biz/service/ModelRelationService.java | 1 + .../hncy/zhpj/web/biz/service/ScoringRuleMainService.java | 2 +- .../web/biz/service/impl/ScoringRuleMainServiceImpl.java | 7 ++++--- 5 files changed, 11 insertions(+), 7 deletions(-) diff --git a/service-biz/service-zhpj-web/service-zhpj-web-biz/src/main/java/com/hncy/zhpj/web/biz/controller/ModelRelationController.java b/service-biz/service-zhpj-web/service-zhpj-web-biz/src/main/java/com/hncy/zhpj/web/biz/controller/ModelRelationController.java index 18e338b..f795e3d 100644 --- a/service-biz/service-zhpj-web/service-zhpj-web-biz/src/main/java/com/hncy/zhpj/web/biz/controller/ModelRelationController.java +++ b/service-biz/service-zhpj-web/service-zhpj-web-biz/src/main/java/com/hncy/zhpj/web/biz/controller/ModelRelationController.java @@ -68,7 +68,9 @@ public class ModelRelationController { @ApiOperation(value = "下拉框查询模型关联的所有指标(以及父指标关联的子指标)") @PostMapping(value = "/selectQuotaListByModelMainId",produces = "application/json;charset=UTF-8") public ResultBean> selectQuotaListByModelMainId(@ApiParam(name = "dimensionId", value = "当前入口的维度id", required = true)@RequestParam("dimensionId") String dimensionId, - @ApiParam(name = "modelMainId", value = "关联模型id", required = true)@RequestParam("modelMainId") String modelMainId){ + @ApiParam(name = "modelMainId", value = "关联模型id", required = true)@RequestParam("modelMainId") String modelMainId + //@ApiParam(name = "editType", value = "编辑类型: 1.新增 2.编辑", required = true)@RequestParam("editType") String editType + ){ return modelRelationService.selectQuotaListByModelMainId(dimensionId,modelMainId); } diff --git a/service-biz/service-zhpj-web/service-zhpj-web-biz/src/main/java/com/hncy/zhpj/web/biz/controller/ScoringRuleMainController.java b/service-biz/service-zhpj-web/service-zhpj-web-biz/src/main/java/com/hncy/zhpj/web/biz/controller/ScoringRuleMainController.java index a5ca9d4..384e0cc 100644 --- a/service-biz/service-zhpj-web/service-zhpj-web-biz/src/main/java/com/hncy/zhpj/web/biz/controller/ScoringRuleMainController.java +++ b/service-biz/service-zhpj-web/service-zhpj-web-biz/src/main/java/com/hncy/zhpj/web/biz/controller/ScoringRuleMainController.java @@ -39,9 +39,9 @@ public class ScoringRuleMainController { return scoringRuleMainService.editsubScoringRule(scoringRuleListVo); } - @ApiOperation(value = "根据维度和指标查询计分规则情况") + @ApiOperation(value = "根据维度和指标查询计分规则情况(回显)") @PostMapping(value = "/selectScoringRuleByQuotaAndDimension",produces = "application/json;charset=UTF-8") - public ResultBean> selectScoringRuleByQuotaAndDimension(@ApiParam(name = "dimensionId", value = "关联维度id", required = true)@RequestParam("dimensionId") String dimensionId, + public ResultBean selectScoringRuleByQuotaAndDimension(@ApiParam(name = "dimensionId", value = "关联维度id", required = true)@RequestParam("dimensionId") String dimensionId, @ApiParam(name = "quotaMainId", value = "关联指标id(父指标id)", required = true)@RequestParam("quotaMainId") String quotaMainId){ return scoringRuleMainService.selectScoringRuleByQuotaAndDimension(dimensionId,quotaMainId); } diff --git a/service-biz/service-zhpj-web/service-zhpj-web-biz/src/main/java/com/hncy/zhpj/web/biz/service/ModelRelationService.java b/service-biz/service-zhpj-web/service-zhpj-web-biz/src/main/java/com/hncy/zhpj/web/biz/service/ModelRelationService.java index 4ffaa60..acc73c4 100644 --- a/service-biz/service-zhpj-web/service-zhpj-web-biz/src/main/java/com/hncy/zhpj/web/biz/service/ModelRelationService.java +++ b/service-biz/service-zhpj-web/service-zhpj-web-biz/src/main/java/com/hncy/zhpj/web/biz/service/ModelRelationService.java @@ -46,6 +46,7 @@ public interface ModelRelationService extends IService { * @Date 2022/3/23 14:06 * @param dimensionId * @param modelMainId + * @param editType * @return */ ResultBean> selectQuotaListByModelMainId(String dimensionId, String modelMainId); diff --git a/service-biz/service-zhpj-web/service-zhpj-web-biz/src/main/java/com/hncy/zhpj/web/biz/service/ScoringRuleMainService.java b/service-biz/service-zhpj-web/service-zhpj-web-biz/src/main/java/com/hncy/zhpj/web/biz/service/ScoringRuleMainService.java index dee9e77..9000cc7 100644 --- a/service-biz/service-zhpj-web/service-zhpj-web-biz/src/main/java/com/hncy/zhpj/web/biz/service/ScoringRuleMainService.java +++ b/service-biz/service-zhpj-web/service-zhpj-web-biz/src/main/java/com/hncy/zhpj/web/biz/service/ScoringRuleMainService.java @@ -34,6 +34,6 @@ public interface ScoringRuleMainService extends IService { * @param quotaMainId * @return */ - ResultBean> selectScoringRuleByQuotaAndDimension(String dimensionId, String quotaMainId); + ResultBean selectScoringRuleByQuotaAndDimension(String dimensionId, String quotaMainId); } diff --git a/service-biz/service-zhpj-web/service-zhpj-web-biz/src/main/java/com/hncy/zhpj/web/biz/service/impl/ScoringRuleMainServiceImpl.java b/service-biz/service-zhpj-web/service-zhpj-web-biz/src/main/java/com/hncy/zhpj/web/biz/service/impl/ScoringRuleMainServiceImpl.java index 3cf37ad..027e704 100644 --- a/service-biz/service-zhpj-web/service-zhpj-web-biz/src/main/java/com/hncy/zhpj/web/biz/service/impl/ScoringRuleMainServiceImpl.java +++ b/service-biz/service-zhpj-web/service-zhpj-web-biz/src/main/java/com/hncy/zhpj/web/biz/service/impl/ScoringRuleMainServiceImpl.java @@ -61,6 +61,7 @@ public class ScoringRuleMainServiceImpl extends ServiceImpl> selectScoringRuleByQuotaAndDimension(String dimensionId, String quotaMainId) { - List scoringRuleDetailVoList = new ArrayList<>(); + public ResultBean selectScoringRuleByQuotaAndDimension(String dimensionId, String quotaMainId) { List childrenQuotaMainList = new ArrayList<>(); ScoringRuleDetailVo scoringRuleDetailVo = new ScoringRuleDetailVo(); QuotaMain quotaMain = quotaMainMapper.selectById(quotaMainId); @@ -174,6 +175,6 @@ public class ScoringRuleMainServiceImpl extends ServiceImpl