评价任务关联指标

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<List<QuotaMainAndSubQuotaVo>> 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);
     }
 

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<List<ScoringRuleDetailVo>> selectScoringRuleByQuotaAndDimension(@ApiParam(name = "dimensionId", value = "关联维度id", required = true)@RequestParam("dimensionId") String dimensionId,
+    public ResultBean<ScoringRuleDetailVo> 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);
     }

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<ModelRelation> {
      * @Date 2022/3/23 14:06
      * @param dimensionId
      * @param modelMainId
+     * @param editType
      * @return
      */
     ResultBean<List<QuotaMainAndSubQuotaVo>> selectQuotaListByModelMainId(String dimensionId, String modelMainId);

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<ScoringRuleMain> {
      * @param quotaMainId
      * @return
      */
-    ResultBean<List<ScoringRuleDetailVo>> selectScoringRuleByQuotaAndDimension(String dimensionId, String quotaMainId);
+    ResultBean<ScoringRuleDetailVo> selectScoringRuleByQuotaAndDimension(String dimensionId, String quotaMainId);
 
 }

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<ScoringRuleMainMappe
                     scoringRuleMain.setId(scoringRuleVo.getId());
                     scoringRuleMain.setDimensionId(scoringRuleListVo.getDimensionId());
                     scoringRuleMain.setQuotaId(scoringRuleVo.getQuotaId());
+                    scoringRuleMain.setDescription(scoringRuleVo.getDescription());
                     scoringRuleMain.setType(scoringRuleListVo.getType());
                     scoringRuleMain.setTotalScore(scoringRuleVo.getTotalScore());
                     scoringRuleMain.setDeleted(0);
@@ -98,6 +99,7 @@ public class ScoringRuleMainServiceImpl extends ServiceImpl<ScoringRuleMainMappe
                     scoringRuleMain.setQuotaId(scoringRuleVo.getQuotaId());
                     scoringRuleMain.setType(scoringRuleListVo.getType());
                     scoringRuleMain.setTotalScore(scoringRuleVo.getTotalScore());
+                    scoringRuleMain.setDescription(scoringRuleVo.getDescription());
                     scoringRuleMain.setDeleted(0);
                     scoringRuleMain.setGmtCreate(DateTime.now());
                     scoringRuleMain.setUpdateBy(scoringRuleListVo.getUserId());
@@ -143,8 +145,7 @@ public class ScoringRuleMainServiceImpl extends ServiceImpl<ScoringRuleMainMappe
     }
 
     @Override
-    public ResultBean<List<ScoringRuleDetailVo>> selectScoringRuleByQuotaAndDimension(String dimensionId, String quotaMainId) {
-        List<ScoringRuleDetailVo> scoringRuleDetailVoList = new ArrayList<>();
+    public ResultBean<ScoringRuleDetailVo> selectScoringRuleByQuotaAndDimension(String dimensionId, String quotaMainId) {
         List<QuotaAndScoringRuleVo>  childrenQuotaMainList  = new ArrayList<>();
         ScoringRuleDetailVo scoringRuleDetailVo = new ScoringRuleDetailVo();
         QuotaMain quotaMain = quotaMainMapper.selectById(quotaMainId);
@@ -174,6 +175,6 @@ public class ScoringRuleMainServiceImpl extends ServiceImpl<ScoringRuleMainMappe
                 scoringRuleDetailVo.setSubScoringRuleList(subScoringRuleList);
             }
         }
-        return ResultBean.success(scoringRuleDetailVoList);
+        return ResultBean.success(scoringRuleDetailVo);
     }
 }