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
e67d06d8
Commit
e67d06d8
authored
Jun 10, 2020
by
zhangkb
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
修改指标计分规则和单位计分规则新增接口。
parent
b6e2a909
Show whitespace changes
Inline
Side-by-side
Showing
5 changed files
with
21 additions
and
6 deletions
+21
-6
IndScorecardCtrl.java
.../keymobile/indicators/api/hytobacco/IndScorecardCtrl.java
+3
-2
ObjScoreRuleCtrl.java
.../keymobile/indicators/api/hytobacco/ObjScoreRuleCtrl.java
+3
-2
ScoreRule.java
...obile/indicators/model/entity/objscorerule/ScoreRule.java
+6
-0
IndScorecardService.java
...ile/indicators/service/hytobacco/IndScorecardService.java
+5
-1
ScoreRuleService.java
...mobile/indicators/service/hytobacco/ScoreRuleService.java
+4
-1
No files found.
src/main/java/com/keymobile/indicators/api/hytobacco/IndScorecardCtrl.java
View file @
e67d06d8
...
...
@@ -49,8 +49,9 @@ public class IndScorecardCtrl {
@ApiOperation
(
value
=
"新增/修改"
,
notes
=
"新增/修改"
)
@PostMapping
(
value
=
"/saveOrUpdate"
)
public
String
saveOrUpdate
(
@RequestBody
IndScorecard
indScorecard
)
{
return
indScorecardService
.
saveOrUpdate
(
indScorecard
);
public
String
saveOrUpdate
(
@RequestBody
IndScorecard
indScorecard
,
@RequestParam
String
catalogId
,
@RequestParam
String
catalogIdPath
,
@RequestParam
String
user
)
{
return
indScorecardService
.
saveOrUpdate
(
indScorecard
,
catalogId
,
catalogIdPath
,
user
);
}
@ApiOperation
(
value
=
"删除"
,
notes
=
"删除"
)
...
...
src/main/java/com/keymobile/indicators/api/hytobacco/ObjScoreRuleCtrl.java
View file @
e67d06d8
...
...
@@ -49,8 +49,9 @@ public class ObjScoreRuleCtrl {
@ApiOperation
(
value
=
"新增/修改"
,
notes
=
"新增/修改"
)
@PostMapping
(
value
=
"/saveOrUpdate"
)
public
String
saveOrUpdate
(
@RequestBody
ScoreRule
scoreRule
)
{
return
scoreRuleService
.
save
(
scoreRule
);
public
String
saveOrUpdate
(
@RequestBody
ScoreRule
scoreRule
,
@RequestParam
String
catalogId
,
@RequestParam
String
catalogIdPath
,
@RequestParam
String
user
)
{
return
scoreRuleService
.
saveOrUpdate
(
scoreRule
,
catalogId
,
catalogIdPath
,
user
);
}
@ApiOperation
(
value
=
"删除"
,
notes
=
"删除"
)
...
...
src/main/java/com/keymobile/indicators/model/entity/objscorerule/ScoreRule.java
View file @
e67d06d8
...
...
@@ -2,11 +2,14 @@ package com.keymobile.indicators.model.entity.objscorerule;
import
java.io.Serializable
;
import
java.util.ArrayList
;
import
java.util.Date
;
import
java.util.List
;
import
org.springframework.data.annotation.Id
;
import
org.springframework.data.mongodb.core.mapping.Document
;
import
com.keymobile.indicators.utils.DateUtils
;
import
lombok.Data
;
/**
...
...
@@ -33,6 +36,9 @@ public class ScoreRule implements Serializable{
private
String
code
;
//标识编码
private
String
desc
;
//规则描述
private
String
lastUpdateTime
=
DateUtils
.
formatDate
(
new
Date
(),
"yyyy-MM-dd HH:mm:ss"
);
private
String
lastUpdater
;
public
List
<
IndTypeWeight
>
getIndTypeWeights
(){
return
indTypeWeights
;
}
...
...
src/main/java/com/keymobile/indicators/service/hytobacco/IndScorecardService.java
View file @
e67d06d8
...
...
@@ -37,7 +37,11 @@ public class IndScorecardService {
private
DriveIndDefService
driveIndDefService
;
//id不为空为修改,为空为新增
public
String
saveOrUpdate
(
IndScorecard
indScorecard
)
{
public
String
saveOrUpdate
(
IndScorecard
indScorecard
,
String
catalogId
,
String
catalogIdPath
,
String
user
)
{
indScorecard
.
setCatalogId
(
catalogId
);
indScorecard
.
setCatalogIdPath
(
catalogIdPath
);
indScorecard
.
setLastUpdater
(
user
);
indScorecard
=
indScorecardRepo
.
save
(
indScorecard
);
return
indScorecard
.
getId
();
}
...
...
src/main/java/com/keymobile/indicators/service/hytobacco/ScoreRuleService.java
View file @
e67d06d8
...
...
@@ -37,7 +37,10 @@ public class ScoreRuleService {
private
static
final
Pattern
P
=
Pattern
.
compile
(
"(\\[[^\\]]*\\])"
);
public
String
save
(
ScoreRule
scoreRule
)
{
public
String
saveOrUpdate
(
ScoreRule
scoreRule
,
String
catalogId
,
String
catalogIdPath
,
String
user
)
{
scoreRule
.
setCatalogId
(
catalogId
);
scoreRule
.
setCatalogIdPath
(
catalogIdPath
);
scoreRule
.
setLastUpdater
(
user
);
scoreRule
=
scoreRuleRepo
.
save
(
scoreRule
);
return
scoreRule
.
getId
();
}
...
...
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