Browse Source

业务属性代码修改

‘xugp 2 years ago
parent
commit
2f0a2ac565

+ 2 - 4
ims-service/ims-eval/src/main/java/com/ims/eval/entity/EvaluationScoringRule.java

@@ -109,11 +109,9 @@ public class EvaluationScoringRule extends Model {
 	 * 业务板块name
 	 */
 	@TableField(exist = false)
-	@Getter(AccessLevel.NONE)
-	@Setter(AccessLevel.NONE)
 	private String businessName;
 
-	public String getBusinessName(){
+	/*public String getBusinessName(){
 		List<DataDictionary> ddList = CacheContext.ddList;
 		for (DataDictionary dictionary : ddList){
 			if (businessPhase.equals(dictionary.getDataKey())){
@@ -121,7 +119,7 @@ public class EvaluationScoringRule extends Model {
 			}
 		}
 		return "";
-	}
+	}*/
 
 	/**
 	 * 指标单位

+ 7 - 19
ims-service/ims-eval/src/main/java/com/ims/eval/service/impl/EvaluationScoringRuleServiceImpl.java

@@ -5,14 +5,8 @@ import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.ims.common.utils.StringUtils;
 import com.ims.eval.config.CustomException;
-import com.ims.eval.dao.IndicatorDictionaryMapper;
-import com.ims.eval.dao.IndicatorMapper;
-import com.ims.eval.dao.IntervalScoringTableMapper;
-import com.ims.eval.entity.EvaluationScoringRule;
-import com.ims.eval.dao.EvaluationScoringRuleMapper;
-import com.ims.eval.entity.Indicator;
-import com.ims.eval.entity.IndicatorDictionary;
-import com.ims.eval.entity.IntervalScoringTable;
+import com.ims.eval.dao.*;
+import com.ims.eval.entity.*;
 import com.ims.eval.service.IEvaluationScoringRuleService;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -47,7 +41,7 @@ public class EvaluationScoringRuleServiceImpl extends ServiceImpl<EvaluationScor
 	private IndicatorMapper indicatorMapper;
 
 	@Autowired
-	private IndicatorDictionaryMapper indicatorDictionaryMapper;
+	private BinSectionMapper binSectionMapper;
 
 
 	@Override
@@ -81,16 +75,10 @@ public class EvaluationScoringRuleServiceImpl extends ServiceImpl<EvaluationScor
 					}
 				}
 				evaluationScoringRule.setIndicatorNames(list);
-			/*//设置指标项名称
-			List<Map<String,String>> maps = new ArrayList<>();
-			List<String> indicatorItemIds = evaluationScoringRule.getIndicatorItemIds();
-			for (String code : indicatorItemIds){
-				Map<String,String> map = new HashMap<>();
-				IndicatorDictionary indicatorDictionary = indicatorDictionaryMapper.selectByCode(code);
-				map.put(indicatorDictionary.getOptionCode(),indicatorDictionary.getOptionName());
-				maps.add(map);
-			}
-			evaluationScoringRule.setIndicatorItemNames(maps);*/
+				BinSection binSection = binSectionMapper.selectById(evaluationScoringRule.getBusinessPhase());
+				if (binSection != null){
+					evaluationScoringRule.setBusinessName(binSection.getSectionName());
+				}
 			}
 		}catch (Exception e){
 			e.printStackTrace();