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
5e00156f
Commit
5e00156f
authored
Oct 27, 2020
by
hzc
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
修改短板运算交集bug
parent
2895233b
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
3 additions
and
2 deletions
+3
-2
ShortboardRuleService.java
...e/indicators/service/hytobacco/ShortboardRuleService.java
+3
-1
ShortboardUnitService.java
...e/indicators/service/hytobacco/ShortboardUnitService.java
+0
-1
No files found.
src/main/java/com/keymobile/indicators/service/hytobacco/ShortboardRuleService.java
View file @
5e00156f
...
@@ -20,6 +20,7 @@ import com.keymobile.indicators.model.mapper.indmapper.DriveIndCalResultDefMappe
...
@@ -20,6 +20,7 @@ import com.keymobile.indicators.model.mapper.indmapper.DriveIndCalResultDefMappe
import
com.keymobile.indicators.model.mapper.indmapper.ShortboardDriveIndRelMapper
;
import
com.keymobile.indicators.model.mapper.indmapper.ShortboardDriveIndRelMapper
;
import
com.keymobile.indicators.model.mapper.indmapper.ShortboardRuleMapper
;
import
com.keymobile.indicators.model.mapper.indmapper.ShortboardRuleMapper
;
import
com.keymobile.indicators.utils.CalculateUtils
;
import
com.keymobile.indicators.utils.CalculateUtils
;
import
org.springframework.transaction.annotation.Transactional
;
@Service
@Service
public
class
ShortboardRuleService
{
public
class
ShortboardRuleService
{
...
@@ -33,7 +34,7 @@ public class ShortboardRuleService {
...
@@ -33,7 +34,7 @@ public class ShortboardRuleService {
private
DriveIndCalResultDefMapper
driveIndCalResultDefMapper
;
private
DriveIndCalResultDefMapper
driveIndCalResultDefMapper
;
@Autowired
@Autowired
private
DriveIndDefService
driveIndDefService
;
private
DriveIndDefService
driveIndDefService
;
public
Integer
saveOrUpdate
(
ShortboardRule
shortboardRule
,
String
code
,
Integer
catalogId
,
public
Integer
saveOrUpdate
(
ShortboardRule
shortboardRule
,
String
code
,
Integer
catalogId
,
String
catalogIdPath
,
String
user
)
{
String
catalogIdPath
,
String
user
)
{
Gson
gson
=
new
Gson
();
Gson
gson
=
new
Gson
();
...
@@ -104,6 +105,7 @@ public class ShortboardRuleService {
...
@@ -104,6 +105,7 @@ public class ShortboardRuleService {
StringBuilder
shortboardName
=
new
StringBuilder
(
""
);
StringBuilder
shortboardName
=
new
StringBuilder
(
""
);
StringBuilder
shortboardDesc
=
new
StringBuilder
(
""
);
StringBuilder
shortboardDesc
=
new
StringBuilder
(
""
);
StringBuilder
shortboardType
=
new
StringBuilder
(
""
);
StringBuilder
shortboardType
=
new
StringBuilder
(
""
);
status
=
0
;
for
(
Integer
sbRuleId
:
shortBoardWarnData
.
getShortboardIds
())
{
for
(
Integer
sbRuleId
:
shortBoardWarnData
.
getShortboardIds
())
{
ShortboardRule
shortboardRule
=
this
.
getById
(
sbRuleId
);
ShortboardRule
shortboardRule
=
this
.
getById
(
sbRuleId
);
if
(
shortboardRule
!=
null
)
{
if
(
shortboardRule
!=
null
)
{
...
...
src/main/java/com/keymobile/indicators/service/hytobacco/ShortboardUnitService.java
View file @
5e00156f
...
@@ -134,7 +134,6 @@ public class ShortboardUnitService {
...
@@ -134,7 +134,6 @@ public class ShortboardUnitService {
shortComparedLog
.
setEndTime
(
new
Date
());
shortComparedLog
.
setEndTime
(
new
Date
());
shortComparedLog
.
setStatus
(
1
);
shortComparedLog
.
setStatus
(
1
);
shortComparedLog
.
setValue
(
result
.
size
());
shortComparedLog
.
setValue
(
result
.
size
());
}
catch
(
Exception
e
){
}
catch
(
Exception
e
){
String
message
=
""
;
String
message
=
""
;
if
(
e
!=
null
){
if
(
e
!=
null
){
...
...
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