Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Contribute to GitLab
Sign in / Register
Toggle navigation
Y
yifu-mvp
Project
Project
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
fangxinjiang
yifu-mvp
Commits
6f80cbb4
Commit
6f80cbb4
authored
Nov 08, 2024
by
hongguangwu
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
MVP1.7.1 优化导出
parent
4bf4d1d4
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
4 additions
and
4 deletions
+4
-4
TCompleteMonitorServiceImpl.java
...fu/archives/service/impl/TCompleteMonitorServiceImpl.java
+1
-1
TPreEmpMainServiceImpl.java
...v1/yifu/archives/service/impl/TPreEmpMainServiceImpl.java
+3
-3
No files found.
yifu-archives/yifu-archives-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/archives/service/impl/TCompleteMonitorServiceImpl.java
View file @
6f80cbb4
...
...
@@ -711,7 +711,7 @@ public class TCompleteMonitorServiceImpl extends ServiceImpl<TCompleteMonitorMap
if
(
Common
.
isNotNull
(
field
)
&&
Common
.
isNotNull
(
attr
)){
if
(
Common
.
isNotNull
(
attr
.
dataType
()))
{
nameDicMap
.
put
(
field
.
getName
(),
attr
.
dataType
());
}
else
if
(
Common
.
isNotNull
(
attr
.
isArea
()))
{
}
else
if
(
Common
.
isNotNull
(
attr
.
isArea
())
&&
attr
.
isArea
()
)
{
nameDicMap
.
put
(
field
.
getName
(),
CacheConstants
.
AREA_VALUE_ALL
);
}
}
...
...
yifu-archives/yifu-archives-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/archives/service/impl/TPreEmpMainServiceImpl.java
View file @
6f80cbb4
...
...
@@ -2562,9 +2562,9 @@ public class TPreEmpMainServiceImpl extends ServiceImpl<TPreEmpMainMapper, TPreE
oneTitle
=
"不良记录"
;
headList
.
add
(
this
.
getNewArrayList
(
new
String
[]{
oneTitle
,
"不良记录描述"
}));
Set
<
String
>
titleContent
=
getExportFieldNameDetailByClass
(
TMainExportAllVO
.
class
);
Set
<
String
>
titleContent
=
getExportFieldNameDetailByClass
(
T
Pre
MainExportAllVO
.
class
);
// 获取所有字典type
Map
<
String
,
String
>
nameAndDicTypeMap
=
getConverterDicTypeAndArea
(
TMainExportAllVO
.
class
);
Map
<
String
,
String
>
nameAndDicTypeMap
=
getConverterDicTypeAndArea
(
T
Pre
MainExportAllVO
.
class
);
// 获取所有字典对应的值
Map
<
String
,
String
>
redisLabelMap
=
(
Map
<
String
,
String
>)
RedisUtil
.
redis
.
opsForValue
().
get
(
CacheConstants
.
REDIS_DICT_LABLE
);
Map
<
String
,
String
>
idLabelMap
=
(
Map
<
String
,
String
>)
RedisUtil
.
redis
.
opsForValue
().
get
(
CacheConstants
.
AREA_VALUE_ALL
);
...
...
@@ -2772,7 +2772,7 @@ public class TPreEmpMainServiceImpl extends ServiceImpl<TPreEmpMainMapper, TPreE
if
(
Common
.
isNotNull
(
field
)
&&
Common
.
isNotNull
(
attr
)){
if
(
Common
.
isNotNull
(
attr
.
dataType
()))
{
nameDicMap
.
put
(
field
.
getName
(),
attr
.
dataType
());
}
else
if
(
Common
.
isNotNull
(
attr
.
isArea
()))
{
}
else
if
(
Common
.
isNotNull
(
attr
.
isArea
())
&&
attr
.
isArea
()
)
{
nameDicMap
.
put
(
field
.
getName
(),
CacheConstants
.
AREA_VALUE_ALL
);
}
}
...
...
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