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
24b68e38
Commit
24b68e38
authored
Nov 26, 2025
by
fangxinjiang
Browse files
Options
Browse Files
Download
Plain Diff
Merge remote-tracking branch 'origin/MVP1.7.17' into MVP1.7.17
parents
a2146a39
b37d8f4f
Expand all
Show whitespace changes
Inline
Side-by-side
Showing
10 changed files
with
307 additions
and
213 deletions
+307
-213
TEmployeeContractInfo.java
...d/plus/v1/yifu/archives/entity/TEmployeeContractInfo.java
+7
-0
EmployeeContractVO.java
...fu/cloud/plus/v1/yifu/archives/vo/EmployeeContractVO.java
+9
-0
TEmployeeContractInfoServiceImpl.java
...chives/service/impl/TEmployeeContractInfoServiceImpl.java
+28
-4
TEmployeeProjectServiceImpl.java
...fu/archives/service/impl/TEmployeeProjectServiceImpl.java
+6
-4
EmployeeRegistrationLeaveConfirmExportVo.java
...s/v1/csp/vo/EmployeeRegistrationLeaveConfirmExportVo.java
+2
-0
EmployeeRegistrationLeaveExportVo.java
...oud/plus/v1/csp/vo/EmployeeRegistrationLeaveExportVo.java
+2
-0
EmployeeRegistrationLeaveServiceImpl.java
...sp/service/impl/EmployeeRegistrationLeaveServiceImpl.java
+227
-183
TInsuranceDetailServiceImpl.java
...s/service/insurance/impl/TInsuranceDetailServiceImpl.java
+4
-0
TSocialFriendController.java
...us/v1/yifu/social/controller/TSocialFriendController.java
+3
-3
TDispatchInfoServiceImpl.java
...v1/yifu/social/service/impl/TDispatchInfoServiceImpl.java
+19
-19
No files found.
yifu-archives/yifu-archives-api/src/main/java/com/yifu/cloud/plus/v1/yifu/archives/entity/TEmployeeContractInfo.java
View file @
24b68e38
...
@@ -551,6 +551,13 @@ public class TEmployeeContractInfo extends BaseEntity {
...
@@ -551,6 +551,13 @@ public class TEmployeeContractInfo extends BaseEntity {
@TableField
(
exist
=
false
)
@TableField
(
exist
=
false
)
private
String
preName
;
private
String
preName
;
/**
* 离职待办的用户名称
*/
@Schema
(
description
=
"离职待办的用户名称"
)
@TableField
(
exist
=
false
)
private
String
leaveName
;
/**
/**
* 试用期(单位月)
* 试用期(单位月)
*/
*/
...
...
yifu-archives/yifu-archives-api/src/main/java/com/yifu/cloud/plus/v1/yifu/archives/vo/EmployeeContractVO.java
View file @
24b68e38
...
@@ -19,6 +19,7 @@ package com.yifu.cloud.plus.v1.yifu.archives.vo;
...
@@ -19,6 +19,7 @@ package com.yifu.cloud.plus.v1.yifu.archives.vo;
import
com.alibaba.excel.annotation.ExcelProperty
;
import
com.alibaba.excel.annotation.ExcelProperty
;
import
com.alibaba.excel.annotation.format.DateTimeFormat
;
import
com.alibaba.excel.annotation.format.DateTimeFormat
;
import
com.alibaba.excel.annotation.write.style.HeadFontStyle
;
import
com.alibaba.excel.annotation.write.style.HeadFontStyle
;
import
com.baomidou.mybatisplus.annotation.TableField
;
import
com.yifu.cloud.plus.v1.yifu.common.core.constant.ExcelAttribute
;
import
com.yifu.cloud.plus.v1.yifu.common.core.constant.ExcelAttribute
;
import
com.yifu.cloud.plus.v1.yifu.common.core.constant.ExcelAttributeConstants
;
import
com.yifu.cloud.plus.v1.yifu.common.core.constant.ExcelAttributeConstants
;
import
com.yifu.cloud.plus.v1.yifu.common.core.vo.RowIndex
;
import
com.yifu.cloud.plus.v1.yifu.common.core.vo.RowIndex
;
...
@@ -252,4 +253,12 @@ public class EmployeeContractVO extends RowIndex implements Serializable {
...
@@ -252,4 +253,12 @@ public class EmployeeContractVO extends RowIndex implements Serializable {
@ExcelAttribute
(
name
=
"preName"
)
@ExcelAttribute
(
name
=
"preName"
)
@ExcelProperty
(
value
=
"preName"
)
@ExcelProperty
(
value
=
"preName"
)
private
String
preName
;
private
String
preName
;
/**
* 离职待办的用户名称
*/
@Schema
(
description
=
"离职待办的用户名称"
)
@TableField
(
exist
=
false
)
private
String
leaveName
;
}
}
yifu-archives/yifu-archives-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/archives/service/impl/TEmployeeContractInfoServiceImpl.java
View file @
24b68e38
...
@@ -200,7 +200,7 @@ public class TEmployeeContractInfoServiceImpl extends ServiceImpl<TEmployeeContr
...
@@ -200,7 +200,7 @@ public class TEmployeeContractInfoServiceImpl extends ServiceImpl<TEmployeeContr
}
}
YifuUser
user
=
SecurityUtils
.
getUser
();
YifuUser
user
=
SecurityUtils
.
getUser
();
if
(
user
==
null
||
Common
.
isEmpty
(
user
.
getId
()))
{
if
(
user
==
null
||
Common
.
isEmpty
(
user
.
getId
()))
{
user
=
this
.
getNewYifuUser
();
user
=
this
.
getNewYifuUser
(
tEmployeeContractInfo
.
getLeaveName
()
);
}
}
if
(
user
==
null
||
Common
.
isEmpty
(
user
.
getId
()))
{
if
(
user
==
null
||
Common
.
isEmpty
(
user
.
getId
()))
{
return
R
.
failed
(
CommonConstants
.
PLEASE_LOG_IN
);
return
R
.
failed
(
CommonConstants
.
PLEASE_LOG_IN
);
...
@@ -508,6 +508,10 @@ public class TEmployeeContractInfoServiceImpl extends ServiceImpl<TEmployeeContr
...
@@ -508,6 +508,10 @@ public class TEmployeeContractInfoServiceImpl extends ServiceImpl<TEmployeeContr
initType
(
tEmployeeContractInfo
);
initType
(
tEmployeeContractInfo
);
if
(
Common
.
isEmpty
(
tEmployeeContractInfo
.
getId
()))
{
if
(
Common
.
isEmpty
(
tEmployeeContractInfo
.
getId
()))
{
if
(
Common
.
isEmpty
(
tEmployeeContractInfo
.
getApplyNo
()))
{
String
code
=
this
.
getCode
(
true
);
tEmployeeContractInfo
.
setApplyNo
(
code
);
}
// 针对编码再做一次重复性校验
// 针对编码再做一次重复性校验
String
isCur
=
baseMapper
.
getContractByApplyNo
(
tEmployeeContractInfo
.
getApplyNo
());
String
isCur
=
baseMapper
.
getContractByApplyNo
(
tEmployeeContractInfo
.
getApplyNo
());
if
(
Common
.
isNotNull
(
isCur
))
{
if
(
Common
.
isNotNull
(
isCur
))
{
...
@@ -701,6 +705,11 @@ public class TEmployeeContractInfoServiceImpl extends ServiceImpl<TEmployeeContr
...
@@ -701,6 +705,11 @@ public class TEmployeeContractInfoServiceImpl extends ServiceImpl<TEmployeeContr
audit
.
setCreateBy
(
"1"
);
audit
.
setCreateBy
(
"1"
);
audit
.
setCreateTime
(
LocalDateTime
.
now
());
audit
.
setCreateTime
(
LocalDateTime
.
now
());
}
}
if
(
Common
.
isNotNull
(
tEmployeeContractInfo
.
getLeaveName
()))
{
audit
.
setCreateName
(
tEmployeeContractInfo
.
getLeaveName
());
audit
.
setCreateBy
(
"1"
);
audit
.
setCreateTime
(
LocalDateTime
.
now
());
}
tEmployeeContractAuditMapper
.
updateById
(
audit
);
tEmployeeContractAuditMapper
.
updateById
(
audit
);
}
}
}
}
...
@@ -957,6 +966,11 @@ public class TEmployeeContractInfoServiceImpl extends ServiceImpl<TEmployeeContr
...
@@ -957,6 +966,11 @@ public class TEmployeeContractInfoServiceImpl extends ServiceImpl<TEmployeeContr
//审核通过瓜子合同状态更新合同审核通过
//审核通过瓜子合同状态更新合同审核通过
updateGzOfferStatus
(
contractInfo
,
CommonConstants
.
THIRTEEN_STRING
,
CommonConstants
.
EIGHT_STRING
,
user
.
getId
(),
user
.
getNickname
());
updateGzOfferStatus
(
contractInfo
,
CommonConstants
.
THIRTEEN_STRING
,
CommonConstants
.
EIGHT_STRING
,
user
.
getId
(),
user
.
getNickname
());
}
}
if
(
EmployeeConstants
.
SITUATION_SEVEN
.
equals
(
contractInfo
.
getSituation
()))
{
// 合同终止,通知离职待办变更状态
this
.
sendLeave
(
contractInfo
.
getId
(),
CommonConstants
.
EIGHT_STRING
,
CommonConstants
.
ONE_STRING
,
tEmployeeContractInfo
.
getAuditRemark
(),
user
);
}
}
}
if
(
tEmployeeContractInfo
.
getAuditStatus
()
==
CommonConstants
.
dingleDigitIntArray
[
3
])
{
if
(
tEmployeeContractInfo
.
getAuditStatus
()
==
CommonConstants
.
dingleDigitIntArray
[
3
])
{
if
(!
fascFlag
)
{
if
(!
fascFlag
)
{
...
@@ -970,6 +984,10 @@ public class TEmployeeContractInfoServiceImpl extends ServiceImpl<TEmployeeContr
...
@@ -970,6 +984,10 @@ public class TEmployeeContractInfoServiceImpl extends ServiceImpl<TEmployeeContr
contractPreMapper
.
updateById
(
contractPre
);
contractPreMapper
.
updateById
(
contractPre
);
}
}
}
}
if
(
EmployeeConstants
.
SITUATION_SEVEN
.
equals
(
contractInfo
.
getSituation
()))
{
// 合同终止,通知离职待办变更状态
this
.
sendLeave
(
contractInfo
.
getId
(),
CommonConstants
.
TEN_STRING
,
CommonConstants
.
ZERO_STRING
,
tEmployeeContractInfo
.
getAuditRemark
(),
user
);
}
}
}
tEmployeeContractInfo
.
setAuditUserName
(
user
.
getNickname
());
tEmployeeContractInfo
.
setAuditUserName
(
user
.
getNickname
());
tEmployeeContractInfo
.
setContractNo
(
contractInfo
.
getContractNo
());
tEmployeeContractInfo
.
setContractNo
(
contractInfo
.
getContractNo
());
...
@@ -1309,6 +1327,7 @@ public class TEmployeeContractInfoServiceImpl extends ServiceImpl<TEmployeeContr
...
@@ -1309,6 +1327,7 @@ public class TEmployeeContractInfoServiceImpl extends ServiceImpl<TEmployeeContr
public
BaseSearchListVO
leaveToReduceContract
(
BaseSearchListVO
paramVo
)
{
public
BaseSearchListVO
leaveToReduceContract
(
BaseSearchListVO
paramVo
)
{
List
<
String
>
idList
=
new
ArrayList
<>();
List
<
String
>
idList
=
new
ArrayList
<>();
List
<
BaseSearchVO
>
listParam
=
paramVo
.
getListParam
();
List
<
BaseSearchVO
>
listParam
=
paramVo
.
getListParam
();
String
userName
=
paramVo
.
getUserName
();
Map
<
String
,
BaseSearchVO
>
paramMap
=
new
HashMap
<>();
Map
<
String
,
BaseSearchVO
>
paramMap
=
new
HashMap
<>();
for
(
BaseSearchVO
param
:
listParam
)
{
for
(
BaseSearchVO
param
:
listParam
)
{
idList
.
add
(
param
.
getSearchKey
());
idList
.
add
(
param
.
getSearchKey
());
...
@@ -1327,6 +1346,7 @@ public class TEmployeeContractInfoServiceImpl extends ServiceImpl<TEmployeeContr
...
@@ -1327,6 +1346,7 @@ public class TEmployeeContractInfoServiceImpl extends ServiceImpl<TEmployeeContr
for
(
EmployeeContractVO
vo
:
excelVOList
)
{
for
(
EmployeeContractVO
vo
:
excelVOList
)
{
i
++;
i
++;
vo
.
setRowIndex
(
i
);
vo
.
setRowIndex
(
i
);
vo
.
setLeaveName
(
userName
);
baseSearchVO
=
paramMap
.
get
(
vo
.
getContractId
());
baseSearchVO
=
paramMap
.
get
(
vo
.
getContractId
());
leaveId
=
null
;
leaveId
=
null
;
if
(
baseSearchVO
!=
null
)
{
if
(
baseSearchVO
!=
null
)
{
...
@@ -2505,16 +2525,20 @@ public class TEmployeeContractInfoServiceImpl extends ServiceImpl<TEmployeeContr
...
@@ -2505,16 +2525,20 @@ public class TEmployeeContractInfoServiceImpl extends ServiceImpl<TEmployeeContr
}
}
}
}
private
YifuUser
getNewYifuUser
()
{
private
YifuUser
getNewYifuUser
(
String
leaveName
)
{
if
(
Common
.
isEmpty
(
leaveName
))
{
leaveName
=
"自动化派单"
;
}
Set
<
String
>
dbAuthsSet
=
new
HashSet
<>();
Set
<
String
>
dbAuthsSet
=
new
HashSet
<>();
Collection
<?
extends
GrantedAuthority
>
authorities
=
AuthorityUtils
Collection
<?
extends
GrantedAuthority
>
authorities
=
AuthorityUtils
.
createAuthorityList
(
dbAuthsSet
.
toArray
(
new
String
[
0
]));
.
createAuthorityList
(
dbAuthsSet
.
toArray
(
new
String
[
0
]));
return
new
YifuUser
(
"6"
,
1L
,
""
,
"自动化派单"
,
return
new
YifuUser
(
"6"
,
1L
,
""
,
leaveName
,
"自动化派单"
,
"0"
,
SecurityConstants
.
BCRYPT
+
"123456"
,
leaveName
,
"0"
,
SecurityConstants
.
BCRYPT
+
"123456"
,
"12345678911"
,
true
,
true
,
true
,
"12345678911"
,
true
,
true
,
true
,
true
,
true
,
"1"
,
authorities
,
"1"
,
"1"
,
authorities
,
"1"
,
null
,
null
,
null
,
null
,
null
,
null
);
null
,
null
);
}
}
}
}
yifu-archives/yifu-archives-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/archives/service/impl/TEmployeeProjectServiceImpl.java
View file @
24b68e38
...
@@ -129,6 +129,7 @@ public class TEmployeeProjectServiceImpl extends ServiceImpl<TEmployeeProjectMap
...
@@ -129,6 +129,7 @@ public class TEmployeeProjectServiceImpl extends ServiceImpl<TEmployeeProjectMap
@Autowired
@Autowired
@Lazy
@Lazy
private
EmployeeRegistrationPreService
registrationPreService
;
private
EmployeeRegistrationPreService
registrationPreService
;
private
StringBuilder
errorTemp
;
@Override
@Override
public
TSalaryStandardSelectViewVo
getUnProjectEmpList
(
List
<
TSalaryStandardUnprojectVo
>
voList
)
{
public
TSalaryStandardSelectViewVo
getUnProjectEmpList
(
List
<
TSalaryStandardUnprojectVo
>
voList
)
{
...
@@ -766,10 +767,11 @@ public class TEmployeeProjectServiceImpl extends ServiceImpl<TEmployeeProjectMap
...
@@ -766,10 +767,11 @@ public class TEmployeeProjectServiceImpl extends ServiceImpl<TEmployeeProjectMap
errorMessage
.
append
(
";"
);
errorMessage
.
append
(
";"
);
errorMessage
.
append
(
leaveReason
);
errorMessage
.
append
(
leaveReason
);
errorMessage
.
append
(
";"
);
errorMessage
.
append
(
";"
);
if
(
Common
.
isEmpty
(
excel
.
getLeaveRemark
()))
{
// 倩倩说优化一下,没有这个就不显示,且这段特殊逻辑代码不删除,以作历史记录(历史代码是wzb写的,应该是特殊要求
errorMessage
.
append
(
""
);
/*if Common.isEmpty(excel.getLeaveRemark(
errorMessage
.
append
(
";"
);
errorMessage.append("")
}
errorMessage.append(";")
*/
if
(
Common
.
isNotNull
(
excel
.
getLeaveRemark
()))
{
if
(
Common
.
isNotNull
(
excel
.
getLeaveRemark
()))
{
errorMessage
.
append
(
excel
.
getLeaveRemark
());
errorMessage
.
append
(
excel
.
getLeaveRemark
());
errorMessage
.
append
(
";"
);
errorMessage
.
append
(
";"
);
...
...
yifu-csp/yifu-csp-api/src/main/java/com/yifu/cloud/plus/v1/csp/vo/EmployeeRegistrationLeaveConfirmExportVo.java
View file @
24b68e38
...
@@ -17,6 +17,7 @@
...
@@ -17,6 +17,7 @@
package
com
.
yifu
.
cloud
.
plus
.
v1
.
csp
.
vo
;
package
com
.
yifu
.
cloud
.
plus
.
v1
.
csp
.
vo
;
import
com.alibaba.excel.annotation.ExcelProperty
;
import
com.alibaba.excel.annotation.ExcelProperty
;
import
com.alibaba.excel.annotation.write.style.ColumnWidth
;
import
lombok.Data
;
import
lombok.Data
;
/**
/**
...
@@ -26,6 +27,7 @@ import lombok.Data;
...
@@ -26,6 +27,7 @@ import lombok.Data;
* @date 2025-11-19 19:23:15
* @date 2025-11-19 19:23:15
*/
*/
@Data
@Data
@ColumnWidth
(
17
)
public
class
EmployeeRegistrationLeaveConfirmExportVo
{
public
class
EmployeeRegistrationLeaveConfirmExportVo
{
@ExcelProperty
(
"项目名称"
)
@ExcelProperty
(
"项目名称"
)
...
...
yifu-csp/yifu-csp-api/src/main/java/com/yifu/cloud/plus/v1/csp/vo/EmployeeRegistrationLeaveExportVo.java
View file @
24b68e38
...
@@ -17,6 +17,7 @@
...
@@ -17,6 +17,7 @@
package
com
.
yifu
.
cloud
.
plus
.
v1
.
csp
.
vo
;
package
com
.
yifu
.
cloud
.
plus
.
v1
.
csp
.
vo
;
import
com.alibaba.excel.annotation.ExcelProperty
;
import
com.alibaba.excel.annotation.ExcelProperty
;
import
com.alibaba.excel.annotation.write.style.ColumnWidth
;
import
lombok.Data
;
import
lombok.Data
;
/**
/**
...
@@ -26,6 +27,7 @@ import lombok.Data;
...
@@ -26,6 +27,7 @@ import lombok.Data;
* @date 2025-11-19 19:23:15
* @date 2025-11-19 19:23:15
*/
*/
@Data
@Data
@ColumnWidth
(
17
)
public
class
EmployeeRegistrationLeaveExportVo
{
public
class
EmployeeRegistrationLeaveExportVo
{
@ExcelProperty
(
"项目名称"
)
@ExcelProperty
(
"项目名称"
)
...
...
yifu-csp/yifu-csp-biz/src/main/java/com/yifu/cloud/plus/v1/csp/service/impl/EmployeeRegistrationLeaveServiceImpl.java
View file @
24b68e38
This diff is collapsed.
Click to expand it.
yifu-insurances/yifu-insurances-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/insurances/service/insurance/impl/TInsuranceDetailServiceImpl.java
View file @
24b68e38
...
@@ -5030,6 +5030,8 @@ public class TInsuranceDetailServiceImpl extends ServiceImpl<TInsuranceDetailMap
...
@@ -5030,6 +5030,8 @@ public class TInsuranceDetailServiceImpl extends ServiceImpl<TInsuranceDetailMap
//被替换人
//被替换人
one
=
tInsuranceReplaceService
.
getOne
(
Wrappers
.<
TInsuranceReplace
>
query
().
lambda
()
one
=
tInsuranceReplaceService
.
getOne
(
Wrappers
.<
TInsuranceReplace
>
query
().
lambda
()
.
eq
(
TInsuranceReplace:
:
getToInsuranceDetailId
,
vo
.
getId
())
.
eq
(
TInsuranceReplace:
:
getToInsuranceDetailId
,
vo
.
getId
())
//huyc-代码优化,取替换状态为成功的那一条数据
.
eq
(
TInsuranceReplace:
:
getReplaceStatus
,
CommonConstants
.
ONE_INT
)
.
last
(
CommonConstants
.
LAST_ONE_SQL
));
.
last
(
CommonConstants
.
LAST_ONE_SQL
));
if
(
Optional
.
ofNullable
(
one
).
isPresent
())
{
if
(
Optional
.
ofNullable
(
one
).
isPresent
())
{
byId
=
this
.
getById
(
one
.
getFromInsuranceDetailId
());
byId
=
this
.
getById
(
one
.
getFromInsuranceDetailId
());
...
@@ -5049,6 +5051,8 @@ public class TInsuranceDetailServiceImpl extends ServiceImpl<TInsuranceDetailMap
...
@@ -5049,6 +5051,8 @@ public class TInsuranceDetailServiceImpl extends ServiceImpl<TInsuranceDetailMap
//替换人
//替换人
fromOne
=
tInsuranceReplaceService
.
getOne
(
Wrappers
.<
TInsuranceReplace
>
query
().
lambda
()
fromOne
=
tInsuranceReplaceService
.
getOne
(
Wrappers
.<
TInsuranceReplace
>
query
().
lambda
()
.
eq
(
TInsuranceReplace:
:
getFromInsuranceDetailId
,
vo
.
getId
())
.
eq
(
TInsuranceReplace:
:
getFromInsuranceDetailId
,
vo
.
getId
())
//huyc-代码优化,取替换状态为成功的那一条数据
.
eq
(
TInsuranceReplace:
:
getReplaceStatus
,
CommonConstants
.
ONE_INT
)
.
last
(
CommonConstants
.
LAST_ONE_SQL
));
.
last
(
CommonConstants
.
LAST_ONE_SQL
));
if
(
Optional
.
ofNullable
(
fromOne
).
isPresent
())
{
if
(
Optional
.
ofNullable
(
fromOne
).
isPresent
())
{
byId
=
this
.
getById
(
fromOne
.
getToInsuranceDetailId
());
byId
=
this
.
getById
(
fromOne
.
getToInsuranceDetailId
());
...
...
yifu-social/yifu-social-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/social/controller/TSocialFriendController.java
View file @
24b68e38
...
@@ -71,10 +71,10 @@ public class TSocialFriendController {
...
@@ -71,10 +71,10 @@ public class TSocialFriendController {
return
tSocialFriendService
.
testToSocialFriendGet
();
return
tSocialFriendService
.
testToSocialFriendGet
();
}
}
@Operation
(
description
=
"测试线上税友接口返回值,慎用"
)
@Operation
(
description
=
"测试线上税友接口返回值,慎用
type : 空,查增,1 查减少
"
)
@
Ge
tMapping
(
"/testToSocialFriendOnline"
)
@
Pos
tMapping
(
"/testToSocialFriendOnline"
)
@SysLog
(
"测试线上税友接口返回值,慎用"
)
@SysLog
(
"测试线上税友接口返回值,慎用"
)
public
String
testToSocialFriendOnline
(
@Request
Param
List
<
String
>
requestIdList
,
@RequestParam
(
required
=
false
)
String
type
)
{
public
String
testToSocialFriendOnline
(
@Request
Body
List
<
String
>
requestIdList
,
@RequestParam
(
required
=
false
)
String
type
)
{
return
tSocialFriendService
.
testToSocialFriendOnline
(
requestIdList
,
type
);
return
tSocialFriendService
.
testToSocialFriendOnline
(
requestIdList
,
type
);
}
}
...
...
yifu-social/yifu-social-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/social/service/impl/TDispatchInfoServiceImpl.java
View file @
24b68e38
...
@@ -3930,8 +3930,7 @@ public class TDispatchInfoServiceImpl extends ServiceImpl<TDispatchInfoMapper, T
...
@@ -3930,8 +3930,7 @@ public class TDispatchInfoServiceImpl extends ServiceImpl<TDispatchInfoMapper, T
dispatchInfoPre
.
setErrorBackInfo
(
null
);
dispatchInfoPre
.
setErrorBackInfo
(
null
);
dispatchInfoPreMapper
.
updateById
(
dispatchInfoPre
);
dispatchInfoPreMapper
.
updateById
(
dispatchInfoPre
);
}
}
// 派减审核或办理,更新离职待办
this
.
sendLeave
(
dis
.
getId
(),
CommonConstants
.
TWO_STRING
,
CommonConstants
.
FIVE_STRING
,
CommonConstants
.
ONE_STRING
,
auditRemark
,
user
);
// 审核不通过
// 审核不通过
}
else
if
(
CommonConstants
.
ONE_INT
==
flag
)
{
}
else
if
(
CommonConstants
.
ONE_INT
==
flag
)
{
// 作废更新:公积金状态、同步档案的公积金状态、同步预估数据
// 作废更新:公积金状态、同步档案的公积金状态、同步预估数据
...
@@ -3955,8 +3954,7 @@ public class TDispatchInfoServiceImpl extends ServiceImpl<TDispatchInfoMapper, T
...
@@ -3955,8 +3954,7 @@ public class TDispatchInfoServiceImpl extends ServiceImpl<TDispatchInfoMapper, T
sendDisFalureMessageToWx
(
dispatchInfoPre
,
socialAutoLog
.
getId
());
sendDisFalureMessageToWx
(
dispatchInfoPre
,
socialAutoLog
.
getId
());
}
}
// 派减审核或办理,更新离职待办
this
.
sendLeave
(
dis
.
getId
(),
CommonConstants
.
TWO_STRING
,
CommonConstants
.
TEN_STRING
,
CommonConstants
.
ZERO_STRING
,
auditRemark
,
user
);
}
}
providentFund
.
setAuditTime
(
now
);
providentFund
.
setAuditTime
(
now
);
providentFund
.
setAuditUser
(
user
.
getId
());
providentFund
.
setAuditUser
(
user
.
getId
());
...
@@ -3971,12 +3969,16 @@ public class TDispatchInfoServiceImpl extends ServiceImpl<TDispatchInfoMapper, T
...
@@ -3971,12 +3969,16 @@ public class TDispatchInfoServiceImpl extends ServiceImpl<TDispatchInfoMapper, T
sf
.
setFundReduceStatus
(
CommonConstants
.
ONE_STRING
);
sf
.
setFundReduceStatus
(
CommonConstants
.
ONE_STRING
);
sf
.
setFundStatus
(
CommonConstants
.
SIX_STRING
);
sf
.
setFundStatus
(
CommonConstants
.
SIX_STRING
);
}
}
// 派减审核或办理,更新离职待办
this
.
sendLeave
(
dis
.
getId
(),
CommonConstants
.
TWO_STRING
,
CommonConstants
.
FIVE_STRING
,
CommonConstants
.
ONE_STRING
,
auditRemark
,
user
);
// 审核不通过
// 审核不通过
}
else
if
(
CommonConstants
.
ONE_INT
==
flag
)
{
}
else
if
(
CommonConstants
.
ONE_INT
==
flag
)
{
// 作废更新:公积金状态、同步档案的公积金状态
// 作废更新:公积金状态、同步档案的公积金状态
sf
.
setFundReduceStatus
(
CommonConstants
.
ONE_STRING_NEGATE
);
sf
.
setFundReduceStatus
(
CommonConstants
.
ONE_STRING_NEGATE
);
sf
.
setFundStatus
(
CommonConstants
.
THREE_STRING
);
sf
.
setFundStatus
(
CommonConstants
.
THREE_STRING
);
sf
.
setFundReduceDate
(
null
);
sf
.
setFundReduceDate
(
null
);
// 派减审核或办理,更新离职待办
this
.
sendLeave
(
dis
.
getId
(),
CommonConstants
.
TWO_STRING
,
CommonConstants
.
TEN_STRING
,
CommonConstants
.
ZERO_STRING
,
auditRemark
,
user
);
}
}
}
}
fundMapper
.
updateByIdOfAudit
(
providentFund
);
fundMapper
.
updateByIdOfAudit
(
providentFund
);
...
@@ -4729,13 +4731,7 @@ public class TDispatchInfoServiceImpl extends ServiceImpl<TDispatchInfoMapper, T
...
@@ -4729,13 +4731,7 @@ public class TDispatchInfoServiceImpl extends ServiceImpl<TDispatchInfoMapper, T
temp
.
append
(
ServiceUtil
.
ifNullToEmpty
(
handleRemark
));
temp
.
append
(
ServiceUtil
.
ifNullToEmpty
(
handleRemark
));
initAuditInfo
(
auditInfo
,
temp
.
toString
(),
CommonConstants
.
THREE_STRING
,
user
,
temp
.
toString
(),
remark
);
initAuditInfo
(
auditInfo
,
temp
.
toString
(),
CommonConstants
.
THREE_STRING
,
user
,
temp
.
toString
(),
remark
);
// 派减审核或办理,更新离职待办
if
(
Common
.
isNotNull
(
socialInfo
.
getHandleStatus
())
&&
CommonConstants
.
SEVEN_STRING
.
equals
(
socialInfo
.
getHandleStatus
()))
{
// 部分失败是0
this
.
sendLeave
(
dis
.
getId
(),
CommonConstants
.
ONE_STRING
,
CommonConstants
.
SIX_STRING
,
CommonConstants
.
ZERO_STRING
,
handleRemark
,
user
);
}
else
{
this
.
sendLeave
(
dis
.
getId
(),
CommonConstants
.
ONE_STRING
,
CommonConstants
.
EIGHT_STRING
,
CommonConstants
.
ONE_STRING
,
handleRemark
,
user
);
}
}
else
{
}
else
{
temp
.
setLength
(
CommonConstants
.
ZERO_INT
);
temp
.
setLength
(
CommonConstants
.
ZERO_INT
);
temp
.
append
(
DispatchConstants
.
DISPATCH_SOCIAL_REDUCE
);
temp
.
append
(
DispatchConstants
.
DISPATCH_SOCIAL_REDUCE
);
...
@@ -4743,18 +4739,22 @@ public class TDispatchInfoServiceImpl extends ServiceImpl<TDispatchInfoMapper, T
...
@@ -4743,18 +4739,22 @@ public class TDispatchInfoServiceImpl extends ServiceImpl<TDispatchInfoMapper, T
temp
.
append
(
DispatchConstants
.
DISPATCH_HANDLE_FAIL
);
temp
.
append
(
DispatchConstants
.
DISPATCH_HANDLE_FAIL
);
temp
.
append
(
ServiceUtil
.
ifNullToEmpty
(
handleRemark
));
temp
.
append
(
ServiceUtil
.
ifNullToEmpty
(
handleRemark
));
initAuditInfo
(
auditInfo
,
temp
.
toString
(),
CommonConstants
.
FOUR_STRING
,
user
,
temp
.
toString
(),
remark
);
initAuditInfo
(
auditInfo
,
temp
.
toString
(),
CommonConstants
.
FOUR_STRING
,
user
,
temp
.
toString
(),
remark
);
}
auditInfo
.
setSocialId
(
dis
.
getId
());
// 派减审核或办理,更新离职待办
// 派减审核或办理,更新离职待办
// 7 派减部分办理失败
if
(
Common
.
isNotNull
(
socialInfo
.
getHandleStatus
()))
{
if
(
Common
.
isNotNull
(
socialInfo
.
getHandleStatus
())
&&
CommonConstants
.
SEVEN_STRING
.
equals
(
socialInfo
.
getHandleStatus
()))
{
if
(
CommonConstants
.
SEVEN_STRING
.
equals
(
socialInfo
.
getHandleStatus
()))
{
// 部分失败是0
this
.
sendLeave
(
dis
.
getId
(),
CommonConstants
.
ONE_STRING
,
CommonConstants
.
SIX_STRING
,
CommonConstants
.
ZERO_STRING
,
handleRemark
,
user
);
this
.
sendLeave
(
dis
.
getId
(),
CommonConstants
.
ONE_STRING
,
CommonConstants
.
SIX_STRING
,
CommonConstants
.
ZERO_STRING
,
handleRemark
,
user
);
}
else
{
}
else
if
(
CommonConstants
.
SIX_STRING
.
equals
(
socialInfo
.
getHandleStatus
()))
{
this
.
sendLeave
(
dis
.
getId
(),
CommonConstants
.
ONE_STRING
,
CommonConstants
.
NINE_STRING
,
CommonConstants
.
ZERO_STRING
,
handleRemark
,
user
);
// 派减办理中 - 后续改造这里和离职待办的导出
this
.
sendLeave
(
dis
.
getId
(),
CommonConstants
.
ONE_STRING
,
CommonConstants
.
FIVE_STRING
,
CommonConstants
.
ZERO_STRING
,
handleRemark
,
user
);
}
else
if
(
CommonConstants
.
THREE_STRING
.
equals
(
socialInfo
.
getHandleStatus
()))
{
// 部分失败是0
this
.
sendLeave
(
dis
.
getId
(),
CommonConstants
.
ONE_STRING
,
CommonConstants
.
EIGHT_STRING
,
CommonConstants
.
ONE_STRING
,
handleRemark
,
user
);
}
}
}
}
auditInfo
.
setSocialId
(
dis
.
getId
());
}
else
{
}
else
{
errorList
.
add
(
new
ErrorMessage
(-
1
,
"找不到对应员工社保数据:"
+
dis
.
getEmpName
()));
errorList
.
add
(
new
ErrorMessage
(-
1
,
"找不到对应员工社保数据:"
+
dis
.
getEmpName
()));
...
...
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