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
75f56954
Commit
75f56954
authored
Aug 14, 2024
by
hongguangwu
Browse files
Options
Browse Files
Download
Plain Diff
Merge remote-tracking branch 'origin/MVP1.6.8' into MVP1.6.8
parents
50a6ea84
4e4dd37d
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
56 additions
and
4 deletions
+56
-4
TEmployeeInfoServiceImpl.java
.../yifu/archives/service/impl/TEmployeeInfoServiceImpl.java
+20
-0
ResultConstants.java
...ud/plus/v1/yifu/common/core/constant/ResultConstants.java
+2
-0
TPaymentInfoServiceImpl.java
.../v1/yifu/social/service/impl/TPaymentInfoServiceImpl.java
+4
-4
TPaymentInfoMapper.xml
...cial-biz/src/main/resources/mapper/TPaymentInfoMapper.xml
+30
-0
No files found.
yifu-archives/yifu-archives-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/archives/service/impl/TEmployeeInfoServiceImpl.java
View file @
75f56954
...
...
@@ -1263,6 +1263,16 @@ public class TEmployeeInfoServiceImpl extends ServiceImpl<TEmployeeInfoMapper, T
saveEmp
.
setIdTown
(
Integer
.
parseInt
(
areaStr
));
}
}
// 档案所在地
if
(
Common
.
isNotNull
(
excel
.
getFileProvince
()))
{
saveEmp
.
setFileProvince
(
Integer
.
parseInt
(
excel
.
getFileProvince
()));
}
if
(
Common
.
isNotNull
(
excel
.
getFileCity
()))
{
saveEmp
.
setFileCity
(
Integer
.
parseInt
(
excel
.
getFileCity
()));
}
if
(
Common
.
isNotNull
(
excel
.
getFileTown
()))
{
saveEmp
.
setFileTown
(
Integer
.
parseInt
(
excel
.
getFileTown
()));
}
if
(
Common
.
isNotNull
(
excel
.
getIsCollege
()))
{
if
(
CommonConstants
.
IS_TRUE
.
equals
(
excel
.
getIsCollege
()))
{
saveEmp
.
setIsCollege
(
CommonConstants
.
ONE_INT
);
...
...
@@ -1781,6 +1791,16 @@ public class TEmployeeInfoServiceImpl extends ServiceImpl<TEmployeeInfoMapper, T
}
}
}
// 档案所在地
if
(
Common
.
isNotNull
(
excel
.
getFileProvince
()))
{
saveEmp
.
setFileProvince
(
Integer
.
parseInt
(
excel
.
getFileProvince
()));
}
if
(
Common
.
isNotNull
(
excel
.
getFileCity
()))
{
saveEmp
.
setFileCity
(
Integer
.
parseInt
(
excel
.
getFileCity
()));
}
if
(
Common
.
isNotNull
(
excel
.
getFileTown
()))
{
saveEmp
.
setFileTown
(
Integer
.
parseInt
(
excel
.
getFileTown
()));
}
// 邮箱
if
(
Common
.
isNotNull
(
excel
.
getEmpEmail
()))
{
if
(
excel
.
getEmpEmail
().
contains
(
"@"
))
{
...
...
yifu-common/yifu-common-core/src/main/java/com/yifu/cloud/plus/v1/yifu/common/core/constant/ResultConstants.java
View file @
75f56954
...
...
@@ -20,5 +20,7 @@ public class ResultConstants {
public
static
final
String
DATA_IMPORT_PARSING_RESULT
=
"数据导入解析!数据行数:"
;
public
static
final
String
NO_SELECT_DATA
=
"请选择数据"
;
public
static
final
String
NO_GETLOCK_DATA
=
"当前用户操作处理中,请稍后重试!"
;
public
static
final
String
NO_GETLOCK_DATA_SEARCH
=
"多用户同时请求中,请稍后重试!"
;
public
static
final
String
NO_ID
=
"操作失败,id不能为空!"
;
}
yifu-social/yifu-social-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/social/service/impl/TPaymentInfoServiceImpl.java
View file @
75f56954
...
...
@@ -5168,11 +5168,11 @@ public class TPaymentInfoServiceImpl extends ServiceImpl<TPaymentInfoMapper, TPa
&&
Common
.
isEmpty
(
searchVo
.
getSecondIndicatorBelong
())){
// 只有社保户
if
(
Common
.
isNotNull
(
searchVo
.
getSocialHousehold
())){
return
R
.
ok
(
baseMapper
.
selectCountPaymentSearchInfoSocial
(
searchVo
));
return
R
.
ok
(
baseMapper
.
selectCountPaymentSearchInfoSocial
ByLimit
(
searchVo
));
}
//只有公积金户
if
(
Common
.
isNotNull
(
searchVo
.
getProvidentHousehold
())){
return
R
.
ok
(
baseMapper
.
selectCountPaymentSearchInfo
Fund
(
searchVo
));
return
R
.
ok
(
baseMapper
.
selectCountPaymentSearchInfo
SocialByLimit
(
searchVo
));
}
}
return
R
.
ok
(
baseMapper
.
selectCountSumPaymentInfo
(
searchVo
));
...
...
@@ -5266,7 +5266,7 @@ public class TPaymentInfoServiceImpl extends ServiceImpl<TPaymentInfoMapper, TPa
//查询数据
return
new
R
<>(
this
.
getTPaymentInfoNewPage
(
page
,
tPaymentInfo
));
}
else
{
return
R
.
failed
(
ResultConstants
.
NO_GETLOCK_DATA
);
return
R
.
failed
(
ResultConstants
.
NO_GETLOCK_DATA
_SEARCH
);
}
}
finally
{
//主动释放锁
...
...
@@ -5287,7 +5287,7 @@ public class TPaymentInfoServiceImpl extends ServiceImpl<TPaymentInfoMapper, TPa
//查询数据
return
new
R
<>(
this
.
getTPaymentInfoPage
(
page
,
tPaymentInfo
));
}
else
{
return
R
.
failed
(
ResultConstants
.
NO_GETLOCK_DATA
);
return
R
.
failed
(
ResultConstants
.
NO_GETLOCK_DATA
_SEARCH
);
}
}
finally
{
//主动释放锁
...
...
yifu-social/yifu-social-biz/src/main/resources/mapper/TPaymentInfoMapper.xml
View file @
75f56954
...
...
@@ -941,6 +941,21 @@
${tPaymentInfo.authSql}
</if>
<!-- 区域 默认精准查询 0 包含下级查询 1 结束 2023-03-02 fxj -->
<if
test=
"tPaymentInfo.pushStatus != null and tPaymentInfo.pushStatus.trim() != ''"
>
AND a.PUSH_STATUS = #{tPaymentInfo.pushStatus}
</if>
<if
test=
"tPaymentInfo.createName != null and tPaymentInfo.createName.trim() != ''"
>
AND a.CREATE_NAME = #{tPaymentInfo.createName}
</if>
<if
test=
"tPaymentInfo.createTimeStart != null and tPaymentInfo.createTimeEnd != null"
>
AND a.CREATE_TIME BETWEEN #{tPaymentInfo.createTimeStart} AND #{tPaymentInfo.createTimeEnd}
</if>
<if
test=
"tPaymentInfo.lockStatus != null and tPaymentInfo.lockStatus.trim() != ''"
>
AND a.LOCK_STATUS = #{tPaymentInfo.lockStatus}
</if>
<if
test=
"tPaymentInfo.createBy != null and tPaymentInfo.createBy.trim() != ''"
>
AND a.CREATE_BY = #{tPaymentInfo.createBy}
</if>
</if>
</if>
</sql>
...
...
@@ -1113,6 +1128,21 @@
${tPaymentInfo.authSql}
</if>
<!-- 区域 默认精准查询 0 包含下级查询 1 结束 2023-03-02 fxj -->
<if
test=
"tPaymentInfo.pushStatus != null and tPaymentInfo.pushStatus.trim() != ''"
>
AND a.PUSH_STATUS = #{tPaymentInfo.pushStatus}
</if>
<if
test=
"tPaymentInfo.createName != null and tPaymentInfo.createName.trim() != ''"
>
AND a.CREATE_NAME = #{tPaymentInfo.createName}
</if>
<if
test=
"tPaymentInfo.createTimeStart != null and tPaymentInfo.createTimeEnd != null"
>
AND a.CREATE_TIME BETWEEN #{tPaymentInfo.createTimeStart} AND #{tPaymentInfo.createTimeEnd}
</if>
<if
test=
"tPaymentInfo.lockStatus != null and tPaymentInfo.lockStatus.trim() != ''"
>
AND a.LOCK_STATUS = #{tPaymentInfo.lockStatus}
</if>
<if
test=
"tPaymentInfo.createBy != null and tPaymentInfo.createBy.trim() != ''"
>
AND a.CREATE_BY = #{tPaymentInfo.createBy}
</if>
</if>
</if>
</sql>
...
...
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