Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
F
fill-system
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Analytics
Analytics
CI / CD
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
廖旭伟
fill-system
Commits
6339e40f
Commit
6339e40f
authored
2 years ago
by
赵啸非
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
重构部分功能模块
parent
eefea3e0
master
first
reg
No related merge requests found
Pipeline
#2352
failed with stages
Changes
2
Pipelines
1
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
17 additions
and
3 deletions
+17
-3
fill-manager/src/main/java/com/mortals/xhx/common/pdu/Col.java
...manager/src/main/java/com/mortals/xhx/common/pdu/Col.java
+8
-0
fill-manager/src/main/java/com/mortals/xhx/module/matter/service/impl/MatterDatumServiceImpl.java
...hx/module/matter/service/impl/MatterDatumServiceImpl.java
+9
-3
No files found.
fill-manager/src/main/java/com/mortals/xhx/common/pdu/Col.java
0 → 100644
View file @
6339e40f
package
com.mortals.xhx.common.pdu
;
import
lombok.Data
;
@Data
public
class
Col
{
private
String
col
;
}
This diff is collapsed.
Click to expand it.
fill-manager/src/main/java/com/mortals/xhx/module/matter/service/impl/MatterDatumServiceImpl.java
View file @
6339e40f
...
...
@@ -33,6 +33,7 @@ import com.mortals.xhx.common.code.YesNoEnum;
import
com.mortals.xhx.common.formdesign.*
;
import
com.mortals.xhx.common.key.Constant
;
import
com.mortals.xhx.common.key.ParamKey
;
import
com.mortals.xhx.common.pdu.Col
;
import
com.mortals.xhx.common.pdu.gen.component.ComponentCons
;
import
com.mortals.xhx.common.utils.ExportDocUtil
;
import
com.mortals.xhx.common.utils.WordUtil
;
...
...
@@ -346,14 +347,19 @@ public class MatterDatumServiceImpl extends AbstractCRUDServiceImpl<MatterDatumD
}
}
//StrUtil
List
<
Map
<
String
,
String
>>
colList
=
valueList
.
stream
().
map
(
item
->
{
List
<
Col
>
colList
=
valueList
.
stream
().
map
(
item
->
{
Col
col
=
new
Col
();
col
.
setCol
(
item
);
return
col
;
/*
Map<String, String> map = new HashMap<>();
String colName = "col";
if
(
keys
.
size
()
>
3
)
{
if (keys.size() >
4
) {
colName = keys.get(4);
}
map.put(colName, item);
return
map
;
return map;
*/
}).
collect
(
Collectors
.
toList
());
builder
.
bind
(
entry
.
getKey
(),
new
LoopColumnTableRenderPolicy
());
data
.
put
(
entry
.
getKey
(),
colList
);
...
...
This diff is collapsed.
Click to expand it.
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