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
c9f55fa3
You need to sign in or sign up before continuing.
Commit
c9f55fa3
authored
Oct 27, 2023
by
fangxinjiang
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
权限批量导入
parent
99b04c33
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
33 additions
and
19 deletions
+33
-19
TSalaryEmpModLogServiceImpl.java
...yifu/salary/service/impl/TSalaryEmpModLogServiceImpl.java
+9
-9
TSocialfundHouseResServiceImpl.java
...u/social/service/impl/TSocialfundHouseResServiceImpl.java
+24
-10
No files found.
yifu-salary/yifu-salary-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/salary/service/impl/TSalaryEmpModLogServiceImpl.java
View file @
c9f55fa3
...
...
@@ -95,7 +95,7 @@ public class TSalaryEmpModLogServiceImpl extends ServiceImpl<TSalaryEmpModLogMap
str
.
append
(
oldEntity
.
getTaxMonth
());
str
.
append
(
"->"
);
str
.
append
(
newEntity
.
getTaxMonth
());
str
.
append
(
"
/n
"
);
str
.
append
(
" "
);
}
//开户行省
if
(
Common
.
isNotNull
(
newEntity
.
getBankProvince
())
...
...
@@ -104,7 +104,7 @@ public class TSalaryEmpModLogServiceImpl extends ServiceImpl<TSalaryEmpModLogMap
str
.
append
(
Common
.
isEmpty
(
oldEntity
.
getBankProvince
())?
""
:
util
.
getAreaLabelPublic
(
oldEntity
.
getBankProvince
()));
str
.
append
(
"->"
);
str
.
append
(
Common
.
isEmpty
(
newEntity
.
getBankProvince
())?
""
:
util
.
getAreaLabelPublic
(
newEntity
.
getBankProvince
()));
str
.
append
(
"
/n
"
);
str
.
append
(
" "
);
}
//开户行市
if
(
Common
.
isNotNull
(
newEntity
.
getBankCity
())
&&
!
oldEntity
.
getBankCity
().
equals
(
newEntity
.
getBankCity
())){
...
...
@@ -112,7 +112,7 @@ public class TSalaryEmpModLogServiceImpl extends ServiceImpl<TSalaryEmpModLogMap
str
.
append
(
Common
.
isEmpty
(
oldEntity
.
getBankCity
())?
""
:
util
.
getAreaLabelPublic
(
oldEntity
.
getBankCity
()));
str
.
append
(
"->"
);
str
.
append
(
Common
.
isEmpty
(
newEntity
.
getBankCity
())?
""
:
util
.
getAreaLabelPublic
(
newEntity
.
getBankCity
()));
str
.
append
(
"
/n
"
);
str
.
append
(
" "
);
}
log
.
setContent
(
str
.
toString
());
Log
.
error
(
"薪资人员变更记录表:"
+
str
.
toString
());
...
...
@@ -130,7 +130,7 @@ public class TSalaryEmpModLogServiceImpl extends ServiceImpl<TSalaryEmpModLogMap
str
.
append
(
oldEntity
.
getEmpName
());
str
.
append
(
"->"
);
str
.
append
(
newEntity
.
getEmpName
());
str
.
append
(
"
/n
"
);
str
.
append
(
" "
);
}
//开户行
if
(
Common
.
isNotNull
(
newEntity
.
getBankName
())
...
...
@@ -139,7 +139,7 @@ public class TSalaryEmpModLogServiceImpl extends ServiceImpl<TSalaryEmpModLogMap
str
.
append
(
oldEntity
.
getBankName
());
str
.
append
(
"->"
);
str
.
append
(
newEntity
.
getBankName
());
str
.
append
(
"
/n
"
);
str
.
append
(
" "
);
}
//银行卡号
if
(
Common
.
isNotNull
(
newEntity
.
getBankNo
())
...
...
@@ -148,7 +148,7 @@ public class TSalaryEmpModLogServiceImpl extends ServiceImpl<TSalaryEmpModLogMap
str
.
append
(
oldEntity
.
getBankNo
());
str
.
append
(
"->"
);
str
.
append
(
newEntity
.
getBankNo
());
str
.
append
(
"
/n
"
);
str
.
append
(
" "
);
}
//开户行支行
if
((
Common
.
isEmpty
(
oldEntity
.
getBankSubName
())
...
...
@@ -159,7 +159,7 @@ public class TSalaryEmpModLogServiceImpl extends ServiceImpl<TSalaryEmpModLogMap
str
.
append
(
oldEntity
.
getBankSubName
());
str
.
append
(
"->"
);
str
.
append
(
newEntity
.
getBankSubName
());
str
.
append
(
"
/n
"
);
str
.
append
(
" "
);
}
//在职状态
if
(
Common
.
isNotNull
(
newEntity
.
getFileStatus
())
...
...
@@ -168,7 +168,7 @@ public class TSalaryEmpModLogServiceImpl extends ServiceImpl<TSalaryEmpModLogMap
str
.
append
(
CommonConstants
.
ZERO_STRING
.
equals
(
oldEntity
.
getFileStatus
())?
"在职"
:
"离职"
);
str
.
append
(
"->"
);
str
.
append
(
CommonConstants
.
ZERO_STRING
.
equals
(
newEntity
.
getFileStatus
())?
"在职"
:
"离职"
);
str
.
append
(
"
/n
"
);
str
.
append
(
" "
);
}
//手机号码
if
(
Common
.
isNotNull
(
newEntity
.
getEmpPhone
())
...
...
@@ -177,7 +177,7 @@ public class TSalaryEmpModLogServiceImpl extends ServiceImpl<TSalaryEmpModLogMap
str
.
append
(
oldEntity
.
getEmpPhone
());
str
.
append
(
"->"
);
str
.
append
(
newEntity
.
getEmpPhone
());
str
.
append
(
"
/n
"
);
str
.
append
(
" "
);
}
}
...
...
yifu-social/yifu-social-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/social/service/impl/TSocialfundHouseResServiceImpl.java
View file @
c9f55fa3
...
...
@@ -303,17 +303,29 @@ public class TSocialfundHouseResServiceImpl extends ServiceImpl<TSocialfundHouse
// 重复校验
temp
=
existMap
.
get
(
excel
.
getUserLoginName
()
+
CommonConstants
.
DOWN_LINE_STRING
+
excel
.
getHouseHold
());
+
excel
.
getHouseHold
()
+
CommonConstants
.
DOWN_LINE_STRING
+
excel
.
getType
());
if
(
Common
.
isNotNull
(
temp
)){
errorMessageList
.
add
(
new
ErrorMessage
(
excel
.
getRowIndex
(),
"对应账号的权限已存在,请勿重复导入"
,
excel
));
continue
;
}
else
{
exist
=
baseMapper
.
selectOne
(
Wrappers
.<
TSocialfundHouseRes
>
query
().
lambda
()
.
eq
(
TSocialfundHouseRes:
:
getFundHousehold
,
excel
.
getHouseHold
())
.
eq
(
TSocialfundHouseRes:
:
getHouseNameType
,
excel
.
getType
())
.
eq
(
TSocialfundHouseRes:
:
getUserId
,
user
.
getUserId
())
.
eq
(
TSocialfundHouseRes:
:
getAuthType
,
CommonConstants
.
ZERO_STRING
)
.
last
(
CommonConstants
.
LAST_ONE_SQL
));
if
(
CommonConstants
.
ZERO_STRING
.
equals
(
excel
.
getType
())){
exist
=
baseMapper
.
selectOne
(
Wrappers
.<
TSocialfundHouseRes
>
query
().
lambda
()
.
eq
(
TSocialfundHouseRes:
:
getSocialHousehold
,
excel
.
getHouseHold
())
.
eq
(
TSocialfundHouseRes:
:
getHouseNameType
,
excel
.
getType
())
.
eq
(
TSocialfundHouseRes:
:
getUserId
,
user
.
getUserId
())
.
eq
(
TSocialfundHouseRes:
:
getAuthType
,
CommonConstants
.
ZERO_STRING
)
.
last
(
CommonConstants
.
LAST_ONE_SQL
));
}
else
{
exist
=
baseMapper
.
selectOne
(
Wrappers
.<
TSocialfundHouseRes
>
query
().
lambda
()
.
eq
(
TSocialfundHouseRes:
:
getFundHousehold
,
excel
.
getHouseHold
())
.
eq
(
TSocialfundHouseRes:
:
getHouseNameType
,
excel
.
getType
())
.
eq
(
TSocialfundHouseRes:
:
getUserId
,
user
.
getUserId
())
.
eq
(
TSocialfundHouseRes:
:
getAuthType
,
CommonConstants
.
ZERO_STRING
)
.
last
(
CommonConstants
.
LAST_ONE_SQL
));
}
if
(
Common
.
isNotNull
(
exist
)){
errorMessageList
.
add
(
new
ErrorMessage
(
excel
.
getRowIndex
(),
"对应账号的权限已存在,请勿重复导入"
,
excel
));
continue
;
...
...
@@ -328,13 +340,15 @@ public class TSocialfundHouseResServiceImpl extends ServiceImpl<TSocialfundHouse
save
.
setUserId
(
user
.
getUserId
());
save
.
setHouseNameType
(
baseSet
.
getBaseType
());
save
.
setCreateTime
(
LocalDateTime
.
now
());
save
.
setUserName
(
user
.
get
User
name
());
save
.
setUserName
(
user
.
get
Nick
name
());
save
.
setUserDeptName
(
user
.
getDeptName
());
insertExcel
(
save
);
// 加入map 验证当前表单数据是否重复
existMap
.
put
(
excel
.
getUserLoginName
()
+
CommonConstants
.
DOWN_LINE_STRING
+
excel
.
getHouseHold
(),
excel
.
getHouseHold
());
+
excel
.
getHouseHold
()
+
CommonConstants
.
DOWN_LINE_STRING
+
excel
.
getType
(),
excel
.
getHouseHold
());
errorMessageList
.
add
(
new
ErrorMessage
(
excel
.
getRowIndex
(),
CommonConstants
.
SAVE_SUCCESS
,
CommonConstants
.
GREEN
,
excel
));
}
}
...
...
@@ -525,7 +539,7 @@ public class TSocialfundHouseResServiceImpl extends ServiceImpl<TSocialfundHouse
save
.
setUserId
(
user
.
getUserId
());
save
.
setHouseNameType
(
type
);
save
.
setCreateTime
(
LocalDateTime
.
now
());
save
.
setUserName
(
user
.
get
User
name
());
save
.
setUserName
(
user
.
get
Nick
name
());
save
.
setUserDeptName
(
user
.
getDeptName
());
insertExcel
(
save
);
// 加入map 验证当前表单数据是否重复
...
...
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