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
2cca8adf
Commit
2cca8adf
authored
Nov 08, 2024
by
huyuchen
Browse files
Options
Browse Files
Download
Plain Diff
Merge remote-tracking branch 'origin/MVP1.7.1' into MVP1.7.1
parents
f3645bb7
1b9dbd18
Expand all
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
251 additions
and
19 deletions
+251
-19
TCompleteMonitorServiceImpl.java
...fu/archives/service/impl/TCompleteMonitorServiceImpl.java
+1
-1
TPreEmpMainServiceImpl.java
...v1/yifu/archives/service/impl/TPreEmpMainServiceImpl.java
+250
-18
No files found.
yifu-archives/yifu-archives-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/archives/service/impl/TCompleteMonitorServiceImpl.java
View file @
2cca8adf
...
@@ -708,7 +708,7 @@ public class TCompleteMonitorServiceImpl extends ServiceImpl<TCompleteMonitorMap
...
@@ -708,7 +708,7 @@ public class TCompleteMonitorServiceImpl extends ServiceImpl<TCompleteMonitorMap
if
(
Common
.
isNotNull
(
field
)
&&
Common
.
isNotNull
(
attr
)){
if
(
Common
.
isNotNull
(
field
)
&&
Common
.
isNotNull
(
attr
)){
if
(
Common
.
isNotNull
(
attr
.
dataType
()))
{
if
(
Common
.
isNotNull
(
attr
.
dataType
()))
{
nameDicMap
.
put
(
field
.
getName
(),
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
);
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 @
2cca8adf
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