Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
I
indicators
Overview
Overview
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
zhangkb
indicators
Commits
4ac0bcd6
Commit
4ac0bcd6
authored
Dec 29, 2020
by
hzc
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
新增指标积分改善提升基础分
parent
1b455519
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
8 additions
and
1 deletion
+8
-1
IndScorecard.java
...obile/indicators/model/entity/scorecard/IndScorecard.java
+2
-0
IndScorecardService.java
...ile/indicators/service/hytobacco/IndScorecardService.java
+5
-0
IndCatalogMapper.xml
src/main/resources/mybatis/mapping/IndCatalogMapper.xml
+1
-1
No files found.
src/main/java/com/keymobile/indicators/model/entity/scorecard/IndScorecard.java
View file @
4ac0bcd6
...
...
@@ -58,4 +58,6 @@ public class IndScorecard {
private
String
lastUpdater
;
private
String
formulaInfo
;
private
Double
improveBaseScore
;
//改善提升基础分,新增改善提升基础分-hzc 2020 12 29
}
src/main/java/com/keymobile/indicators/service/hytobacco/IndScorecardService.java
View file @
4ac0bcd6
...
...
@@ -280,6 +280,11 @@ public class IndScorecardService {
importScoreDefList
,
currentCompareObjResult
,
sameCompareObjResult
,
compareObjs
,
driveIndDef
.
getGrowCalType
(),
code
);
//新增基础分 hzc
Double
improveBaseScore
=
scoreCard
.
getImproveBaseScore
();
if
(
improveBaseScore
!=
null
&&
improveBaseScore
!=
0
){
improveScore
+=
improveBaseScore
;
}
if
(
scoreCard
.
getLimitScore
()!=
null
)
{
if
(
improveScore
>
scoreCard
.
getLimitScore
())
{
improveScore
=
scoreCard
.
getLimitScore
();
...
...
src/main/resources/mybatis/mapping/IndCatalogMapper.xml
View file @
4ac0bcd6
<?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">
<mapper
namespace=
"com.keymobile.indicators.model.mapper.indmapper.IndCatalogMapper"
>
<delete
id=
"delete
findByParentIdAndCodeInOrderByLastUpdateTimeDesc
ByIdIn"
parameterType=
"java.util.List"
>
<delete
id=
"deleteByIdIn"
parameterType=
"java.util.List"
>
delete
from base_ind_catalog
where id in
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment