Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Contribute to GitLab
Sign in
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
bd401948
You need to sign in or sign up before continuing.
Commit
bd401948
authored
Apr 01, 2025
by
hongguangwu
Browse files
Options
Browse Files
Download
Plain Diff
Merge remote-tracking branch 'origin/MVP1.7.8' into MVP1.7.8
parents
558959db
2043796b
Hide whitespace changes
Inline
Side-by-side
Showing
5 changed files
with
17 additions
and
11 deletions
+17
-11
EmployeeRegistrationPreServiceImpl.java
...ives/service/impl/EmployeeRegistrationPreServiceImpl.java
+6
-6
TAutoMainRelServiceImpl.java
...1/yifu/archives/service/impl/TAutoMainRelServiceImpl.java
+0
-1
TAutoRuleLogMapper.xml
...ives-biz/src/main/resources/mapper/TAutoRuleLogMapper.xml
+1
-0
TCompleteMonitorMapper.xml
...-biz/src/main/resources/mapper/TCompleteMonitorMapper.xml
+2
-2
DoJointSocialTask.java
...ifu/cloud/plus/v1/yifu/social/util/DoJointSocialTask.java
+8
-2
No files found.
yifu-archives/yifu-archives-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/archives/service/impl/EmployeeRegistrationPreServiceImpl.java
View file @
bd401948
...
@@ -276,7 +276,7 @@ public class EmployeeRegistrationPreServiceImpl extends ServiceImpl<EmployeeRegi
...
@@ -276,7 +276,7 @@ public class EmployeeRegistrationPreServiceImpl extends ServiceImpl<EmployeeRegi
}
}
if
(
null
!=
preExit
.
getContractSubName
()
&&
null
==
pre
.
getContractSubName
())
{
if
(
null
!=
preExit
.
getContractSubName
()
&&
null
==
pre
.
getContractSubName
())
{
Map
<
String
,
String
>
dicObj
=
(
Map
<
String
,
String
>)
RedisUtil
.
redis
.
opsForValue
().
get
(
Map
<
String
,
String
>
dicObj
=
(
Map
<
String
,
String
>)
RedisUtil
.
redis
.
opsForValue
().
get
(
CacheConstants
.
DICT_DETAILS
+
CommonConstants
.
COLON_STRING
+
"
personnel_type_sub
"
);
CacheConstants
.
DICT_DETAILS
+
CommonConstants
.
COLON_STRING
+
"
contract_business_type
"
);
for
(
Map
.
Entry
<
String
,
String
>
entry
:
dicObj
.
entrySet
())
{
for
(
Map
.
Entry
<
String
,
String
>
entry
:
dicObj
.
entrySet
())
{
if
(
Common
.
isNotNull
(
entry
.
getKey
())
&&
entry
.
getKey
().
equals
(
preExit
.
getContractSubName
()))
{
if
(
Common
.
isNotNull
(
entry
.
getKey
())
&&
entry
.
getKey
().
equals
(
preExit
.
getContractSubName
()))
{
contractXfBefore
=
entry
.
getValue
();
contractXfBefore
=
entry
.
getValue
();
...
@@ -286,7 +286,7 @@ public class EmployeeRegistrationPreServiceImpl extends ServiceImpl<EmployeeRegi
...
@@ -286,7 +286,7 @@ public class EmployeeRegistrationPreServiceImpl extends ServiceImpl<EmployeeRegi
}
}
if
(
null
==
preExit
.
getContractSubName
()
&&
null
!=
pre
.
getContractSubName
())
{
if
(
null
==
preExit
.
getContractSubName
()
&&
null
!=
pre
.
getContractSubName
())
{
Map
<
String
,
String
>
dicObj
=
(
Map
<
String
,
String
>)
RedisUtil
.
redis
.
opsForValue
().
get
(
Map
<
String
,
String
>
dicObj
=
(
Map
<
String
,
String
>)
RedisUtil
.
redis
.
opsForValue
().
get
(
CacheConstants
.
DICT_DETAILS
+
CommonConstants
.
COLON_STRING
+
"
personnel_type_sub
"
);
CacheConstants
.
DICT_DETAILS
+
CommonConstants
.
COLON_STRING
+
"
contract_business_type
"
);
for
(
Map
.
Entry
<
String
,
String
>
entry
:
dicObj
.
entrySet
())
{
for
(
Map
.
Entry
<
String
,
String
>
entry
:
dicObj
.
entrySet
())
{
if
(
Common
.
isNotNull
(
entry
.
getKey
())
&&
entry
.
getKey
().
equals
(
pre
.
getContractSubName
()))
{
if
(
Common
.
isNotNull
(
entry
.
getKey
())
&&
entry
.
getKey
().
equals
(
pre
.
getContractSubName
()))
{
contractXfAfter
=
entry
.
getValue
();
contractXfAfter
=
entry
.
getValue
();
...
@@ -297,7 +297,7 @@ public class EmployeeRegistrationPreServiceImpl extends ServiceImpl<EmployeeRegi
...
@@ -297,7 +297,7 @@ public class EmployeeRegistrationPreServiceImpl extends ServiceImpl<EmployeeRegi
if
(
null
!=
preExit
.
getContractSubName
()
&&
null
!=
pre
.
getContractSubName
()
if
(
null
!=
preExit
.
getContractSubName
()
&&
null
!=
pre
.
getContractSubName
()
&&
!
preExit
.
getContractSubName
().
equals
(
pre
.
getContractSubName
()))
{
&&
!
preExit
.
getContractSubName
().
equals
(
pre
.
getContractSubName
()))
{
Map
<
String
,
String
>
dicObj
=
(
Map
<
String
,
String
>)
RedisUtil
.
redis
.
opsForValue
().
get
(
Map
<
String
,
String
>
dicObj
=
(
Map
<
String
,
String
>)
RedisUtil
.
redis
.
opsForValue
().
get
(
CacheConstants
.
DICT_DETAILS
+
CommonConstants
.
COLON_STRING
+
"
personnel_type_sub
"
);
CacheConstants
.
DICT_DETAILS
+
CommonConstants
.
COLON_STRING
+
"
contract_business_type
"
);
for
(
Map
.
Entry
<
String
,
String
>
entry
:
dicObj
.
entrySet
())
{
for
(
Map
.
Entry
<
String
,
String
>
entry
:
dicObj
.
entrySet
())
{
if
(
Common
.
isNotNull
(
entry
.
getKey
())
&&
entry
.
getKey
().
equals
(
preExit
.
getContractSubName
()))
{
if
(
Common
.
isNotNull
(
entry
.
getKey
())
&&
entry
.
getKey
().
equals
(
preExit
.
getContractSubName
()))
{
contractXfBefore
=
entry
.
getValue
();
contractXfBefore
=
entry
.
getValue
();
...
@@ -425,7 +425,7 @@ public class EmployeeRegistrationPreServiceImpl extends ServiceImpl<EmployeeRegi
...
@@ -425,7 +425,7 @@ public class EmployeeRegistrationPreServiceImpl extends ServiceImpl<EmployeeRegi
}
}
if
(
null
!=
comparePre
.
getContractSubName
()
&&
null
==
employeeRegistrationPre
.
getContractSubName
())
{
if
(
null
!=
comparePre
.
getContractSubName
()
&&
null
==
employeeRegistrationPre
.
getContractSubName
())
{
Map
<
String
,
String
>
dicObj
=
(
Map
<
String
,
String
>)
RedisUtil
.
redis
.
opsForValue
().
get
(
Map
<
String
,
String
>
dicObj
=
(
Map
<
String
,
String
>)
RedisUtil
.
redis
.
opsForValue
().
get
(
CacheConstants
.
DICT_DETAILS
+
CommonConstants
.
COLON_STRING
+
"
personnel_type_sub
"
);
CacheConstants
.
DICT_DETAILS
+
CommonConstants
.
COLON_STRING
+
"
contract_business_type
"
);
for
(
Map
.
Entry
<
String
,
String
>
entry:
dicObj
.
entrySet
()){
for
(
Map
.
Entry
<
String
,
String
>
entry:
dicObj
.
entrySet
()){
if
(
Common
.
isNotNull
(
entry
.
getKey
())
&&
entry
.
getKey
().
equals
(
comparePre
.
getContractSubName
())){
if
(
Common
.
isNotNull
(
entry
.
getKey
())
&&
entry
.
getKey
().
equals
(
comparePre
.
getContractSubName
())){
contractXfBefore
=
entry
.
getValue
();
contractXfBefore
=
entry
.
getValue
();
...
@@ -435,7 +435,7 @@ public class EmployeeRegistrationPreServiceImpl extends ServiceImpl<EmployeeRegi
...
@@ -435,7 +435,7 @@ public class EmployeeRegistrationPreServiceImpl extends ServiceImpl<EmployeeRegi
}
}
if
(
null
==
comparePre
.
getContractSubName
()
&&
null
!=
employeeRegistrationPre
.
getContractSubName
())
{
if
(
null
==
comparePre
.
getContractSubName
()
&&
null
!=
employeeRegistrationPre
.
getContractSubName
())
{
Map
<
String
,
String
>
dicObj
=
(
Map
<
String
,
String
>)
RedisUtil
.
redis
.
opsForValue
().
get
(
Map
<
String
,
String
>
dicObj
=
(
Map
<
String
,
String
>)
RedisUtil
.
redis
.
opsForValue
().
get
(
CacheConstants
.
DICT_DETAILS
+
CommonConstants
.
COLON_STRING
+
"
personnel_type_sub
"
);
CacheConstants
.
DICT_DETAILS
+
CommonConstants
.
COLON_STRING
+
"
contract_business_type
"
);
for
(
Map
.
Entry
<
String
,
String
>
entry:
dicObj
.
entrySet
()){
for
(
Map
.
Entry
<
String
,
String
>
entry:
dicObj
.
entrySet
()){
if
(
Common
.
isNotNull
(
entry
.
getKey
())
&&
entry
.
getKey
().
equals
(
employeeRegistrationPre
.
getContractSubName
())){
if
(
Common
.
isNotNull
(
entry
.
getKey
())
&&
entry
.
getKey
().
equals
(
employeeRegistrationPre
.
getContractSubName
())){
contractXfAfter
=
entry
.
getValue
();
contractXfAfter
=
entry
.
getValue
();
...
@@ -446,7 +446,7 @@ public class EmployeeRegistrationPreServiceImpl extends ServiceImpl<EmployeeRegi
...
@@ -446,7 +446,7 @@ public class EmployeeRegistrationPreServiceImpl extends ServiceImpl<EmployeeRegi
if
(
null
!=
comparePre
.
getContractSubName
()
&&
null
!=
employeeRegistrationPre
.
getContractSubName
()
if
(
null
!=
comparePre
.
getContractSubName
()
&&
null
!=
employeeRegistrationPre
.
getContractSubName
()
&&
!
comparePre
.
getContractSubName
().
equals
(
employeeRegistrationPre
.
getContractSubName
()))
{
&&
!
comparePre
.
getContractSubName
().
equals
(
employeeRegistrationPre
.
getContractSubName
()))
{
Map
<
String
,
String
>
dicObj
=
(
Map
<
String
,
String
>)
RedisUtil
.
redis
.
opsForValue
().
get
(
Map
<
String
,
String
>
dicObj
=
(
Map
<
String
,
String
>)
RedisUtil
.
redis
.
opsForValue
().
get
(
CacheConstants
.
DICT_DETAILS
+
CommonConstants
.
COLON_STRING
+
"
personnel_type_sub
"
);
CacheConstants
.
DICT_DETAILS
+
CommonConstants
.
COLON_STRING
+
"
contract_business_type
"
);
for
(
Map
.
Entry
<
String
,
String
>
entry:
dicObj
.
entrySet
()){
for
(
Map
.
Entry
<
String
,
String
>
entry:
dicObj
.
entrySet
()){
if
(
Common
.
isNotNull
(
entry
.
getKey
())
&&
entry
.
getKey
().
equals
(
comparePre
.
getContractSubName
())){
if
(
Common
.
isNotNull
(
entry
.
getKey
())
&&
entry
.
getKey
().
equals
(
comparePre
.
getContractSubName
())){
contractXfBefore
=
entry
.
getValue
();
contractXfBefore
=
entry
.
getValue
();
...
...
yifu-archives/yifu-archives-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/archives/service/impl/TAutoMainRelServiceImpl.java
View file @
bd401948
...
@@ -276,7 +276,6 @@ public class TAutoMainRelServiceImpl extends ServiceImpl<TAutoMainRelMapper, TAu
...
@@ -276,7 +276,6 @@ public class TAutoMainRelServiceImpl extends ServiceImpl<TAutoMainRelMapper, TAu
}
}
// 校验字典项是否有重复标签
// 校验字典项是否有重复标签
List
<
SysAutoDictItem
>
autoDictItems
=
entity
.
getAutoDictItems
();
List
<
SysAutoDictItem
>
autoDictItems
=
entity
.
getAutoDictItems
();
Set
<
String
>
repeatItems
=
new
HashSet
<>();
if
(!
checkDictItemsForDuplicates
(
autoDictItems
))
{
if
(!
checkDictItemsForDuplicates
(
autoDictItems
))
{
return
R
.
failed
(
itemsLabelRepeat
);
return
R
.
failed
(
itemsLabelRepeat
);
}
}
...
...
yifu-archives/yifu-archives-biz/src/main/resources/mapper/TAutoRuleLogMapper.xml
View file @
bd401948
...
@@ -95,5 +95,6 @@
...
@@ -95,5 +95,6 @@
1=1
1=1
<include
refid=
"tAutoRuleLog_where"
/>
<include
refid=
"tAutoRuleLog_where"
/>
</where>
</where>
order by a.CREATE_TIME DESC
</select>
</select>
</mapper>
</mapper>
yifu-archives/yifu-archives-biz/src/main/resources/mapper/TCompleteMonitorMapper.xml
View file @
bd401948
...
@@ -170,8 +170,8 @@
...
@@ -170,8 +170,8 @@
a.DEPT_NAME as dept_name,
a.DEPT_NAME as dept_name,
a.DEPT_NO as dept_no,
a.DEPT_NO as dept_no,
a.CONTRACT_TYPE as contract_type,
a.CONTRACT_TYPE as contract_type,
if(ifnull(CONTRACT_TYPE,-1) != -1 and
ifnull(WORKING_HOURS,-1) != -1
if(ifnull(CONTRACT_TYPE,-1) != -1 and
CONTRACT_TYPE !='' and ifnull(WORKING_HOURS,-1) != -1 and WORKING_HOURS !=''
and ifnull(POST,-1) != -1 and
ifnull(ENJOIN_DATE,-1) != -1 and ifnull(TRY_PERIOD,-1) != -1
,'基本信息','合同信息') as type,
and ifnull(POST,-1) != -1 and
POST !='' and ifnull(ENJOIN_DATE,-1) != -1 and ifnull(TRY_PERIOD,-1) != -1 and TRY_PERIOD !=''
,'基本信息','合同信息') as type,
'1' as process_status,
'1' as process_status,
a.ENJOIN_DATE as join_leave_date,
a.ENJOIN_DATE as join_leave_date,
a.PROJECT_SOURCE as data_source,
a.PROJECT_SOURCE as data_source,
...
...
yifu-social/yifu-social-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/social/util/DoJointSocialTask.java
View file @
bd401948
...
@@ -970,7 +970,10 @@ public class DoJointSocialTask {
...
@@ -970,7 +970,10 @@ public class DoJointSocialTask {
//获取项目信息
//获取项目信息
settleDomain
=
selectVoMap
.
get
(
library
.
getDeptNo
());
settleDomain
=
selectVoMap
.
get
(
library
.
getDeptNo
());
if
(
Common
.
isEmpty
(
settleDomain
))
{
if
(
Common
.
isEmpty
(
settleDomain
))
{
ServiceUtil
.
runTimeExceptionDiy
(
"获取结算主体异常,请检查传参和档案服务状态!"
);
// 抛出异常错误,通过邮件提醒处理
log
.
error
(
"获取结算主体(“+library.getDeptNo()+”)异常,请检查传参和档案服务状态!"
);
continue
;
//ServiceUtil.runTimeExceptionDiy("获取结算主体异常,请检查传参和档案服务状态!");
}
}
if
(
CommonConstants
.
ZERO_STRING
.
equals
(
settleDomain
.
getSocialType
()))
{
if
(
CommonConstants
.
ZERO_STRING
.
equals
(
settleDomain
.
getSocialType
()))
{
continue
;
continue
;
...
@@ -1264,7 +1267,10 @@ public class DoJointSocialTask {
...
@@ -1264,7 +1267,10 @@ public class DoJointSocialTask {
//获取项目信息
//获取项目信息
settleDomain
=
selectVoMap
.
get
(
library
.
getDeptNo
());
settleDomain
=
selectVoMap
.
get
(
library
.
getDeptNo
());
if
(
Common
.
isEmpty
(
settleDomain
))
{
if
(
Common
.
isEmpty
(
settleDomain
))
{
ServiceUtil
.
runTimeExceptionDiy
(
"获取结算主体异常,请检查传参和档案服务状态!"
);
// 抛出异常错误,通过邮件提醒处理
log
.
error
(
"获取结算主体(“+library.getDeptNo()+”)异常,请检查传参和档案服务状态!"
);
continue
;
//ServiceUtil.runTimeExceptionDiy("获取结算主体异常,请检查传参和档案服务状态!");
}
}
if
(
CommonConstants
.
ZERO_STRING
.
equals
(
settleDomain
.
getFundType
()))
{
if
(
CommonConstants
.
ZERO_STRING
.
equals
(
settleDomain
.
getFundType
()))
{
continue
;
continue
;
...
...
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