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
fdcdcc0c
Commit
fdcdcc0c
authored
Jul 16, 2021
by
hzc
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
修复填报数据excel导出时数据错位问题
parent
03dde918
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
9 additions
and
0 deletions
+9
-0
DataEnterCtrl.java
...com/keymobile/indicators/api/hytobacco/DataEnterCtrl.java
+9
-0
No files found.
src/main/java/com/keymobile/indicators/api/hytobacco/DataEnterCtrl.java
View file @
fdcdcc0c
...
@@ -556,6 +556,7 @@ public class DataEnterCtrl {
...
@@ -556,6 +556,7 @@ public class DataEnterCtrl {
*/
*/
private
void
genernateData
(
List
<
TaskIndValue
>
values
,
ExcelIndicator
indicator
,
private
void
genernateData
(
List
<
TaskIndValue
>
values
,
ExcelIndicator
indicator
,
ExcelObj
obj
,
boolean
hasSameTerm
,
List
<
String
>
data
)
{
ExcelObj
obj
,
boolean
hasSameTerm
,
List
<
String
>
data
)
{
boolean
isExist
=
false
;
for
(
TaskIndValue
value
:
values
)
{
for
(
TaskIndValue
value
:
values
)
{
if
(
indicator
.
getIndId
().
equals
(
value
.
getIndId
())
&&
if
(
indicator
.
getIndId
().
equals
(
value
.
getIndId
())
&&
// obj.getObjType().equals(value.getObjType())&&
// obj.getObjType().equals(value.getObjType())&&
...
@@ -572,9 +573,17 @@ public class DataEnterCtrl {
...
@@ -572,9 +573,17 @@ public class DataEnterCtrl {
data
.
add
(
""
);
data
.
add
(
""
);
}
}
}
}
isExist
=
true
;
break
;
break
;
}
}
}
}
if
(
isExist
==
false
){
//找不到
data
.
add
(
""
);
if
(
hasSameTerm
){
data
.
add
(
""
);
}
}
}
}
@ApiOperation
(
"查询中间表的值(填报点击获取中间数据)"
)
@ApiOperation
(
"查询中间表的值(填报点击获取中间数据)"
)
@PostMapping
(
"findOldValueToEdit"
)
@PostMapping
(
"findOldValueToEdit"
)
...
...
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