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
57e4e1d2
Commit
57e4e1d2
authored
Jul 23, 2020
by
张祺
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
修改excel模板保存方法
parent
ff1bb665
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
11 additions
and
0 deletions
+11
-0
ExcelTempCtrl.java
...com/keymobile/indicators/api/hytobacco/ExcelTempCtrl.java
+9
-0
ExcelTemplate.java
...bile/indicators/model/entity/dataenter/ExcelTemplate.java
+2
-0
No files found.
src/main/java/com/keymobile/indicators/api/hytobacco/ExcelTempCtrl.java
View file @
57e4e1d2
...
@@ -8,8 +8,10 @@ import com.google.gson.Gson;
...
@@ -8,8 +8,10 @@ import com.google.gson.Gson;
import
com.keymobile.indicators.model.entity.dataenter.ExcelIndicator
;
import
com.keymobile.indicators.model.entity.dataenter.ExcelIndicator
;
import
com.keymobile.indicators.model.entity.dataenter.ExcelObj
;
import
com.keymobile.indicators.model.entity.dataenter.ExcelObj
;
import
com.keymobile.indicators.model.entity.dataenter.ExcelTemplate
;
import
com.keymobile.indicators.model.entity.dataenter.ExcelTemplate
;
import
com.keymobile.indicators.model.entity.dataenter.Task
;
import
com.keymobile.indicators.result.Result
;
import
com.keymobile.indicators.result.Result
;
import
com.keymobile.indicators.service.dataenter.ExcelTemplateService
;
import
com.keymobile.indicators.service.dataenter.ExcelTemplateService
;
import
com.keymobile.indicators.service.dataenter.TaskService
;
import
com.keymobile.indicators.utils.SystemUserUtil
;
import
com.keymobile.indicators.utils.SystemUserUtil
;
import
io.swagger.annotations.Api
;
import
io.swagger.annotations.Api
;
import
io.swagger.annotations.ApiOperation
;
import
io.swagger.annotations.ApiOperation
;
...
@@ -36,6 +38,9 @@ public class ExcelTempCtrl {
...
@@ -36,6 +38,9 @@ public class ExcelTempCtrl {
@Autowired
@Autowired
private
ExcelTemplateService
excelTemplateService
;
private
ExcelTemplateService
excelTemplateService
;
@Autowired
private
TaskService
taskService
;
@ApiOperation
(
"根据规则id任务id获取excel模板"
)
@ApiOperation
(
"根据规则id任务id获取excel模板"
)
@GetMapping
(
"findByTaskRule"
)
@GetMapping
(
"findByTaskRule"
)
public
List
<
ExcelTemplate
>
findByTaskRule
(
@ApiParam
(
name
=
"ruleId"
,
required
=
false
)
@RequestParam
(
"ruleId"
)
Integer
ruleId
,
public
List
<
ExcelTemplate
>
findByTaskRule
(
@ApiParam
(
name
=
"ruleId"
,
required
=
false
)
@RequestParam
(
"ruleId"
)
Integer
ruleId
,
...
@@ -67,6 +72,10 @@ public class ExcelTempCtrl {
...
@@ -67,6 +72,10 @@ public class ExcelTempCtrl {
return
Result
.
genFailedResult
(
"该任务已经存在设置好的模板!"
);
return
Result
.
genFailedResult
(
"该任务已经存在设置好的模板!"
);
}
}
}
}
Task
task
=
taskService
.
getById
(
template
.
getTaskId
(),
false
,
false
);
template
.
setRuleId
(
task
.
getRuleId
());
template
.
setRuleLevel
(
task
.
getRuleLevel
());
template
.
setRuleType
(
task
.
getRuleType
());
if
(
template
.
getId
()
==
null
||
template
.
getId
()
==
0
)
{
if
(
template
.
getId
()
==
null
||
template
.
getId
()
==
0
)
{
excelTemplateService
.
create
(
template
);
excelTemplateService
.
create
(
template
);
}
else
{
}
else
{
...
...
src/main/java/com/keymobile/indicators/model/entity/dataenter/ExcelTemplate.java
View file @
57e4e1d2
package
com
.
keymobile
.
indicators
.
model
.
entity
.
dataenter
;
package
com
.
keymobile
.
indicators
.
model
.
entity
.
dataenter
;
import
com.keymobile.indicators.model.entity.BaseModel
;
import
com.keymobile.indicators.model.entity.BaseModel
;
import
io.swagger.annotations.ApiModel
;
import
io.swagger.annotations.ApiModelProperty
;
import
io.swagger.annotations.ApiModelProperty
;
import
lombok.Data
;
import
lombok.Data
;
...
@@ -9,6 +10,7 @@ import java.util.List;
...
@@ -9,6 +10,7 @@ import java.util.List;
@Data
@Data
@Table
(
name
=
"data_enter_excel_temp"
)
@Table
(
name
=
"data_enter_excel_temp"
)
@ApiModel
(
"exel模板定义"
)
public
class
ExcelTemplate
extends
BaseModel
{
public
class
ExcelTemplate
extends
BaseModel
{
@Id
@Id
...
...
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