Commit 4ac0bcd6 by hzc

新增指标积分改善提升基础分

parent 1b455519
...@@ -58,4 +58,6 @@ public class IndScorecard { ...@@ -58,4 +58,6 @@ public class IndScorecard {
private String lastUpdater; private String lastUpdater;
private String formulaInfo; private String formulaInfo;
private Double improveBaseScore;//改善提升基础分,新增改善提升基础分-hzc 2020 12 29
} }
...@@ -280,6 +280,11 @@ public class IndScorecardService { ...@@ -280,6 +280,11 @@ public class IndScorecardService {
importScoreDefList, currentCompareObjResult, importScoreDefList, currentCompareObjResult,
sameCompareObjResult,compareObjs, sameCompareObjResult,compareObjs,
driveIndDef.getGrowCalType(),code); driveIndDef.getGrowCalType(),code);
//新增基础分 hzc
Double improveBaseScore = scoreCard.getImproveBaseScore();
if(improveBaseScore!=null&&improveBaseScore!=0){
improveScore+=improveBaseScore;
}
if(scoreCard.getLimitScore()!=null) { if(scoreCard.getLimitScore()!=null) {
if(improveScore>scoreCard.getLimitScore()) { if(improveScore>scoreCard.getLimitScore()) {
improveScore = scoreCard.getLimitScore(); improveScore = scoreCard.getLimitScore();
......
<?xml version="1.0" encoding="UTF-8"?> <?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd"> <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.keymobile.indicators.model.mapper.indmapper.IndCatalogMapper"> <mapper namespace="com.keymobile.indicators.model.mapper.indmapper.IndCatalogMapper">
<delete id="deletefindByParentIdAndCodeInOrderByLastUpdateTimeDescByIdIn" parameterType="java.util.List"> <delete id="deleteByIdIn" parameterType="java.util.List">
delete delete
from base_ind_catalog from base_ind_catalog
where id in where id in
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment