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
858c3a71
Commit
858c3a71
authored
Oct 24, 2024
by
hongguangwu
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
MVP1.7.0 优化
parent
0402419e
Expand all
Hide whitespace changes
Inline
Side-by-side
Showing
6 changed files
with
607 additions
and
280 deletions
+607
-280
TMainExportAllVO.java
...yifu/cloud/plus/v1/yifu/archives/vo/TMainExportAllVO.java
+78
-63
TCompleteMonitorMapper.java
.../plus/v1/yifu/archives/mapper/TCompleteMonitorMapper.java
+7
-0
TCompleteMonitorServiceImpl.java
...fu/archives/service/impl/TCompleteMonitorServiceImpl.java
+343
-173
TPreEmpMainServiceImpl.java
...v1/yifu/archives/service/impl/TPreEmpMainServiceImpl.java
+1
-9
TCompleteMonitorMapper.xml
...-biz/src/main/resources/mapper/TCompleteMonitorMapper.xml
+177
-34
DiyExcelImportUtil.java
...oud/plus/v1/yifu/common/core/util/DiyExcelImportUtil.java
+1
-1
No files found.
yifu-archives/yifu-archives-api/src/main/java/com/yifu/cloud/plus/v1/yifu/archives/vo/TMainExportAllVO.java
View file @
858c3a71
This diff is collapsed.
Click to expand it.
yifu-archives/yifu-archives-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/archives/mapper/TCompleteMonitorMapper.java
View file @
858c3a71
...
...
@@ -93,6 +93,13 @@ public interface TCompleteMonitorMapper extends BaseMapper<TCompleteMonitor> {
int
getTEmpMainAllCount
(
@Param
(
"tCompleteMonitor"
)
TCompleteMonitor
tCompleteMonitor
);
// 导出详情使用 hgw 2024-6-26 11:05:41
List
<
TMainExportAllVO
>
getTEmpMainAllList
(
@Param
(
"tCompleteMonitor"
)
TCompleteMonitor
tCompleteMonitor
);
List
<
TMainExportAllVO
>
getTEmpMainAllListByContract
(
@Param
(
"tCompleteMonitor"
)
TCompleteMonitor
tCompleteMonitor
);
List
<
TMainExportAllVO
>
getTEmpMainAllListByEducation
(
@Param
(
"tCompleteMonitor"
)
TCompleteMonitor
tCompleteMonitor
);
List
<
TMainExportAllVO
>
getTEmpMainAllListByBad
(
@Param
(
"tCompleteMonitor"
)
TCompleteMonitor
tCompleteMonitor
);
List
<
TMainExportAllVO
>
getTEmpMainAllListByDisability
(
@Param
(
"tCompleteMonitor"
)
TCompleteMonitor
tCompleteMonitor
);
List
<
TMainExportAllVO
>
getTEmpMainAllListByWork
(
@Param
(
"tCompleteMonitor"
)
TCompleteMonitor
tCompleteMonitor
);
List
<
TMainExportAllVO
>
getTEmpMainAllListByFamily
(
@Param
(
"tCompleteMonitor"
)
TCompleteMonitor
tCompleteMonitor
);
List
<
TMainExportAllVO
>
getTEmpMainAllListByProfessional
(
@Param
(
"tCompleteMonitor"
)
TCompleteMonitor
tCompleteMonitor
);
// 导出详情使用 hgw 2024-6-26 11:05:41
int
getTEmpMainAllCountOneWork
(
@Param
(
"tCompleteMonitor"
)
TCompleteMonitor
tCompleteMonitor
);
...
...
yifu-archives/yifu-archives-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/archives/service/impl/TCompleteMonitorServiceImpl.java
View file @
858c3a71
This diff is collapsed.
Click to expand it.
yifu-archives/yifu-archives-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/archives/service/impl/TPreEmpMainServiceImpl.java
View file @
858c3a71
...
...
@@ -2984,14 +2984,6 @@ public class TPreEmpMainServiceImpl extends ServiceImpl<TPreEmpMainMapper, TPreE
if
(
Common
.
isNotNull
(
detail
.
getEmpPhone
()))
{
mobileList
.
add
(
detail
.
getEmpPhone
());
}
// 手机号码(紧急联系人)
if
(
Common
.
isNotNull
(
detail
.
getTel
()))
{
mobileList
.
add
(
detail
.
getTel
());
}
// 手机号码(家庭成员)
if
(
Common
.
isNotNull
(
detail
.
getContractTel
()))
{
mobileList
.
add
(
detail
.
getContractTel
());
}
}
StringBuilder
errorInfo
=
new
StringBuilder
();
if
(
errorMust
.
length
()
>
0
)
{
...
...
@@ -3001,7 +2993,7 @@ public class TPreEmpMainServiceImpl extends ServiceImpl<TPreEmpMainMapper, TPreE
errorInfo
.
append
(
"格式不正确:"
).
append
(
errorFormat
);
}
detail
.
setErrorInfo
(
errorInfo
.
toString
());
if
(
curVo
!=
null
)
{
if
(
curVo
!=
null
||
Common
.
isNotNull
(
errorInfo
)
)
{
detail
.
setIsMain
(
false
);
}
else
{
detail
.
setIsMain
(
true
);
...
...
yifu-archives/yifu-archives-biz/src/main/resources/mapper/TCompleteMonitorMapper.xml
View file @
858c3a71
This diff is collapsed.
Click to expand it.
yifu-common/yifu-common-core/src/main/java/com/yifu/cloud/plus/v1/yifu/common/core/util/DiyExcelImportUtil.java
View file @
858c3a71
...
...
@@ -78,7 +78,7 @@ public class DiyExcelImportUtil implements Serializable {
// 极限空白表头列,超过阈值,将不继续循环列
int
maxTitleNullColumNum
=
1
;
// 极限空白身份证,超过将不循环行
int
maxIdCardNullRow
=
1
;
int
maxIdCardNullRow
=
2
;
int
idCardNullNum
;
Cell
cell
;
// 循环每个sheet
...
...
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