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
6fa651a7
Commit
6fa651a7
authored
Jul 24, 2020
by
张祺
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
修改模板配置的字段名字
parent
4bcd6692
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
7 additions
and
5 deletions
+7
-5
DataEnterCtrl.java
...com/keymobile/indicators/api/hytobacco/DataEnterCtrl.java
+1
-1
ExcelTempCtrl.java
...com/keymobile/indicators/api/hytobacco/ExcelTempCtrl.java
+1
-1
ExcelTemplate.java
...bile/indicators/model/entity/dataenter/ExcelTemplate.java
+3
-2
bootstrap.yml
src/main/resources/bootstrap.yml
+2
-1
No files found.
src/main/java/com/keymobile/indicators/api/hytobacco/DataEnterCtrl.java
View file @
6fa651a7
...
@@ -227,7 +227,7 @@ public class DataEnterCtrl {
...
@@ -227,7 +227,7 @@ public class DataEnterCtrl {
}
}
StringBuilder
sb
=
new
StringBuilder
();
StringBuilder
sb
=
new
StringBuilder
();
List
<
TaskIndValue
>
taskIndValues
=
new
ArrayList
<>();
List
<
TaskIndValue
>
taskIndValues
=
new
ArrayList
<>();
if
(
template
.
getC
T
ype
()
==
1
)
{
if
(
template
.
getC
t
ype
()
==
1
)
{
// 指标是列值
// 指标是列值
if
(
hasSameTerm
)
{
if
(
hasSameTerm
)
{
startRow
=
2
;
startRow
=
2
;
...
...
src/main/java/com/keymobile/indicators/api/hytobacco/ExcelTempCtrl.java
View file @
6fa651a7
...
@@ -179,7 +179,7 @@ public class ExcelTempCtrl {
...
@@ -179,7 +179,7 @@ public class ExcelTempCtrl {
}
}
List
<
OnceAbsoluteMergeStrategy
>
merges
=
new
ArrayList
<>();
List
<
OnceAbsoluteMergeStrategy
>
merges
=
new
ArrayList
<>();
List
<
List
<
String
>>
headers
=
new
ArrayList
<>();
List
<
List
<
String
>>
headers
=
new
ArrayList
<>();
if
(
template
.
getC
T
ype
()
==
1
)
{
if
(
template
.
getC
t
ype
()
==
1
)
{
// 列类型:1、指标 2 考核对象
// 列类型:1、指标 2 考核对象
List
<
String
>
column1
=
new
ArrayList
<>();
List
<
String
>
column1
=
new
ArrayList
<>();
column1
.
add
(
""
);
column1
.
add
(
""
);
...
...
src/main/java/com/keymobile/indicators/model/entity/dataenter/ExcelTemplate.java
View file @
6fa651a7
...
@@ -4,6 +4,7 @@ import com.keymobile.indicators.model.entity.BaseModel;
...
@@ -4,6 +4,7 @@ import com.keymobile.indicators.model.entity.BaseModel;
import
io.swagger.annotations.ApiModel
;
import
io.swagger.annotations.ApiModel
;
import
io.swagger.annotations.ApiModelProperty
;
import
io.swagger.annotations.ApiModelProperty
;
import
lombok.Data
;
import
lombok.Data
;
import
lombok.Setter
;
import
javax.persistence.*
;
import
javax.persistence.*
;
import
java.util.List
;
import
java.util.List
;
...
@@ -26,8 +27,8 @@ public class ExcelTemplate extends BaseModel {
...
@@ -26,8 +27,8 @@ public class ExcelTemplate extends BaseModel {
/**
/**
* 列类型
* 列类型
*/
*/
@ApiModelProperty
(
"列类型:1、指标 2 考核对象"
)
@ApiModelProperty
(
"列类型:1、指标 2 考核对象"
)
private
Integer
c
T
ype
;
private
Integer
c
t
ype
;
/**
/**
* 是否需要同期值
* 是否需要同期值
...
...
src/main/resources/bootstrap.yml
View file @
6fa651a7
...
@@ -2,7 +2,7 @@ spring:
...
@@ -2,7 +2,7 @@ spring:
application
:
application
:
name
:
indicators
name
:
indicators
profiles
:
profiles
:
active
:
dev
active
:
test
cloud
:
cloud
:
config
:
config
:
uri
:
http://localhost:8082
uri
:
http://localhost:8082
\ No newline at end of file
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