Skip to content
GitLab
Menu
Projects
Groups
Snippets
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Menu
Open sidebar
邬吉朋
relation
Commits
26c2bacf
"src/main/java/git@gitlab.ruzhoukj.com:wujipeng/relation.git" did not exist on "e2409a8b4372703c6ca06a066e6956b47cc075ed"
Commit
26c2bacf
authored
Aug 02, 2025
by
wujipeng
Browse files
模板新增字段展示
parent
5d971bd1
Changes
4
Hide whitespace changes
Inline
Side-by-side
src/main/java/com/platform/controller/ExcelTemplateController.java
View file @
26c2bacf
...
@@ -47,7 +47,7 @@ public class ExcelTemplateController extends BaseController {
...
@@ -47,7 +47,7 @@ public class ExcelTemplateController extends BaseController {
excelTemplateDTO
.
setJson
(
JSON
.
toJSONString
(
excelTemplateDTO
.
getTableHeaderList
()));
excelTemplateDTO
.
setJson
(
JSON
.
toJSONString
(
excelTemplateDTO
.
getTableHeaderList
()));
}
}
if
(!
ObjectUtils
.
isEmpty
(
excelTemplateDTO
)
&&
!
excelTemplateDTO
.
getAllList
().
isEmpty
()){
if
(!
ObjectUtils
.
isEmpty
(
excelTemplateDTO
)
&&
!
excelTemplateDTO
.
getAllList
().
isEmpty
()){
excelTemplateDTO
.
setAll
(
JSON
.
toJSONString
(
excelTemplateDTO
.
getAllList
()));
excelTemplateDTO
.
setAll
Header
(
JSON
.
toJSONString
(
excelTemplateDTO
.
getAllList
()));
}
}
return
Result
.
data
(
excelTemplateService
.
saveOrUpdate
(
excelTemplateDTO
));
return
Result
.
data
(
excelTemplateService
.
saveOrUpdate
(
excelTemplateDTO
));
}
}
...
...
src/main/java/com/platform/model/entity/ExcelTemplateEntity.java
View file @
26c2bacf
...
@@ -30,7 +30,8 @@ public class ExcelTemplateEntity {
...
@@ -30,7 +30,8 @@ public class ExcelTemplateEntity {
private
String
json
;
private
String
json
;
@ApiModelProperty
(
"原始全部表头"
)
@ApiModelProperty
(
"原始全部表头"
)
private
String
all
;
@TableField
(
value
=
"all_header"
)
private
String
allHeader
;
@ApiModelProperty
(
"模板json用于展示"
)
@ApiModelProperty
(
"模板json用于展示"
)
@TableField
(
exist
=
false
)
@TableField
(
exist
=
false
)
...
...
src/main/java/com/platform/service/impl/ExcelTemplateServiceImpl.java
View file @
26c2bacf
...
@@ -31,8 +31,8 @@ public class ExcelTemplateServiceImpl extends ServiceImpl<ExcelTemplateMapper, E
...
@@ -31,8 +31,8 @@ public class ExcelTemplateServiceImpl extends ServiceImpl<ExcelTemplateMapper, E
List
<
TableHeaderVO
>
tableHeaderList
=
JSON
.
parseArray
(
json
,
TableHeaderVO
.
class
);
List
<
TableHeaderVO
>
tableHeaderList
=
JSON
.
parseArray
(
json
,
TableHeaderVO
.
class
);
excelTemplateVO
.
setTableHeaderList
(
tableHeaderList
);
excelTemplateVO
.
setTableHeaderList
(
tableHeaderList
);
}
}
if
(!
ObjectUtils
.
isEmpty
(
excelTemplateVO
)
&&
!
ObjectUtils
.
isEmpty
(
excelTemplateVO
.
getAll
())){
if
(!
ObjectUtils
.
isEmpty
(
excelTemplateVO
)
&&
!
ObjectUtils
.
isEmpty
(
excelTemplateVO
.
getAll
Header
())){
String
json
=
excelTemplateVO
.
getAll
();
String
json
=
excelTemplateVO
.
getAll
Header
();
List
<
TableHeaderVO
>
tableHeaderList
=
JSON
.
parseArray
(
json
,
TableHeaderVO
.
class
);
List
<
TableHeaderVO
>
tableHeaderList
=
JSON
.
parseArray
(
json
,
TableHeaderVO
.
class
);
excelTemplateVO
.
setAllList
(
tableHeaderList
);
excelTemplateVO
.
setAllList
(
tableHeaderList
);
}
}
...
@@ -48,8 +48,8 @@ public class ExcelTemplateServiceImpl extends ServiceImpl<ExcelTemplateMapper, E
...
@@ -48,8 +48,8 @@ public class ExcelTemplateServiceImpl extends ServiceImpl<ExcelTemplateMapper, E
List
<
TableHeaderVO
>
tableHeaderList
=
JSON
.
parseArray
(
json
,
TableHeaderVO
.
class
);
List
<
TableHeaderVO
>
tableHeaderList
=
JSON
.
parseArray
(
json
,
TableHeaderVO
.
class
);
excelTemplate
.
setTableHeaderList
(
tableHeaderList
);
excelTemplate
.
setTableHeaderList
(
tableHeaderList
);
}
}
if
(!
ObjectUtils
.
isEmpty
(
excelTemplate
)
&&
!
ObjectUtils
.
isEmpty
(
excelTemplate
.
getAll
())){
if
(!
ObjectUtils
.
isEmpty
(
excelTemplate
)
&&
!
ObjectUtils
.
isEmpty
(
excelTemplate
.
getAll
Header
())){
String
json
=
excelTemplate
.
getAll
();
String
json
=
excelTemplate
.
getAll
Header
();
List
<
TableHeaderVO
>
tableHeaderList
=
JSON
.
parseArray
(
json
,
TableHeaderVO
.
class
);
List
<
TableHeaderVO
>
tableHeaderList
=
JSON
.
parseArray
(
json
,
TableHeaderVO
.
class
);
excelTemplate
.
setAllList
(
tableHeaderList
);
excelTemplate
.
setAllList
(
tableHeaderList
);
}
}
...
...
src/main/resources/com/platform/mapper/ExcelTemplateMapper.xml
View file @
26c2bacf
...
@@ -7,7 +7,8 @@
...
@@ -7,7 +7,8 @@
select
select
id,
id,
name,
name,
json
json,
all_header as allHeader
from
from
excel_template
excel_template
<where>
<where>
...
...
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