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
9ef88f9a
Commit
9ef88f9a
authored
Nov 24, 2025
by
hongguangwu
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
MVP1.7.17-离职待办-派单暂存
parent
7d15b95f
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
14 additions
and
35 deletions
+14
-35
EmployeeRegistrationLeave.java
...u/cloud/plus/v1/csp/entity/EmployeeRegistrationLeave.java
+0
-16
BatchSureLeaveVo.java
.../java/com/yifu/cloud/plus/v1/csp/vo/BatchSureLeaveVo.java
+4
-2
EmployeeRegistrationLeaveServiceImpl.java
...sp/service/impl/EmployeeRegistrationLeaveServiceImpl.java
+10
-7
EmployeeRegistrationLeaveMapper.xml
...main/resources/mapper/EmployeeRegistrationLeaveMapper.xml
+0
-10
No files found.
yifu-csp/yifu-csp-api/src/main/java/com/yifu/cloud/plus/v1/csp/entity/EmployeeRegistrationLeave.java
View file @
9ef88f9a
...
...
@@ -156,14 +156,6 @@ public class EmployeeRegistrationLeave extends BaseEntity {
@ExcelProperty
(
"停缴社保日期"
)
@Schema
(
description
=
"停缴社保日期"
)
private
String
socialReduceDate
;
/**
* 减少原因(社保)ID默认为1
*/
@ExcelAttribute
(
name
=
"减少原因(社保)"
,
maxLength
=
50
)
@Length
(
max
=
50
,
message
=
"减少原因(社保)不能超过50个字符"
)
@ExcelProperty
(
"减少原因(社保)"
)
@Schema
(
description
=
"减少原因(社保)"
)
private
String
socialReasonType
;
/**
* 社保派减备注
*/
...
...
@@ -195,14 +187,6 @@ public class EmployeeRegistrationLeave extends BaseEntity {
@ExcelProperty
(
"停缴公积金日期"
)
@Schema
(
description
=
"停缴公积金日期"
)
private
String
fundReduceDate
;
/**
* 减少原因(公积金)
*/
@ExcelAttribute
(
name
=
"减少原因(公积金)"
,
maxLength
=
50
)
@Length
(
max
=
50
,
message
=
"减少原因(公积金)不能超过50个字符"
)
@ExcelProperty
(
"减少原因(公积金)"
)
@Schema
(
description
=
"减少原因(公积金)"
)
private
String
fundReasonType
;
/**
* 公积金派减备注
*/
...
...
yifu-csp/yifu-csp-api/src/main/java/com/yifu/cloud/plus/v1/csp/vo/BatchSureLeaveVo.java
View file @
9ef88f9a
...
...
@@ -29,8 +29,10 @@ public class BatchSureLeaveVo implements Serializable {
@Schema
(
description
=
"停缴公积金日期"
)
private
String
fundReduceDate
;
@Schema
(
description
=
"减少原因(社保和公积金)"
)
private
String
socialReasonTypeAndFund
;
@Schema
(
description
=
"减少原因(名称)"
)
private
String
leaveReasonName
;
@Schema
(
description
=
"减少原因(ID)"
)
private
String
leaveReasonId
;
@Schema
(
description
=
"社保公积金派减备注"
)
private
String
socialTrustRemarkAndFund
;
...
...
yifu-csp/yifu-csp-biz/src/main/java/com/yifu/cloud/plus/v1/csp/service/impl/EmployeeRegistrationLeaveServiceImpl.java
View file @
9ef88f9a
...
...
@@ -307,7 +307,6 @@ public class EmployeeRegistrationLeaveServiceImpl extends ServiceImpl<EmployeeRe
leave
.
setDoStatusSocial
(
CommonConstants
.
ZERO_STRING
);
leave
.
setSocialDispatchIdOld
(
socialId
);
leave
.
setSocialStatusOld
(
socialStatusOld
);
leave
.
setSocialReasonType
(
RegistConstants
.
BASE_REASON_TYPE
);
}
else
{
leave
.
setDoStatusSocial
(
CommonConstants
.
ONE_STRING
);
}
...
...
@@ -321,7 +320,6 @@ public class EmployeeRegistrationLeaveServiceImpl extends ServiceImpl<EmployeeRe
leave
.
setDoStatusFund
(
CommonConstants
.
ZERO_STRING
);
leave
.
setFundDispatchIdOld
(
fundId
);
leave
.
setFundStatusOld
(
fundStatusOld
);
leave
.
setFundReasonType
(
RegistConstants
.
BASE_REASON_TYPE
);
}
else
{
leave
.
setDoStatusFund
(
CommonConstants
.
ONE_STRING
);
}
...
...
@@ -423,6 +421,10 @@ public class EmployeeRegistrationLeaveServiceImpl extends ServiceImpl<EmployeeRe
leave
.
setDoStatusEmp
(
CommonConstants
.
ONE_STRING
);
}
leave
.
setLeaveReasonName
(
RegistConstants
.
BASE_REASON_TYPE_NAME
);
leave
.
setLeaveReasonId
(
RegistConstants
.
BASE_REASON_TYPE
);
// 设置需处理项(1社保2公积金3商险4合同5项目档案6人员档案)
leave
.
setDoType
(
doType
.
toString
());
// 设置联动端口(固定值:人员离职)
...
...
@@ -488,7 +490,8 @@ public class EmployeeRegistrationLeaveServiceImpl extends ServiceImpl<EmployeeRe
vo
.
setSocialReduceDate
(
DateUtil
.
addMonth
(
CommonConstants
.
ONE_INT
));
// 停缴公积金日期
vo
.
setFundReduceDate
(
DateUtil
.
addMonth
(
CommonConstants
.
ONE_INT
));
vo
.
setSocialReasonTypeAndFund
(
RegistConstants
.
BASE_REASON_TYPE
);
vo
.
setLeaveReasonId
(
RegistConstants
.
BASE_REASON_TYPE
);
vo
.
setLeaveReasonName
(
RegistConstants
.
BASE_REASON_TYPE_NAME
);
// 获取下个工作日,且大于等于今天,如果大于15点20,换下个工作日
vo
.
setSocialExpectedTimeAndFund
(
calculateNextWorkDays
(
holidayMap
));
// 设置合同终止
...
...
@@ -881,6 +884,8 @@ public class EmployeeRegistrationLeaveServiceImpl extends ServiceImpl<EmployeeRe
if
(
registration
!=
null
&&
leave
!=
null
&&
CommonConstants
.
ZERO_STRING
.
equals
(
leave
.
getLeaveStatus
()))
{
// 初始化信息
if
(
Common
.
isNotNull
(
leave
.
getDoType
()))
{
leave
.
setLeaveReasonId
(
vo
.
getLeaveReasonId
());
leave
.
setLeaveReasonName
(
vo
.
getLeaveReasonName
());
if
(
leave
.
getDoType
().
contains
(
CommonConstants
.
THREE_STRING
))
{
// 要处理商险初始值
if
(
Common
.
isNotNull
(
vo
.
getDoTypeInsurance
())
&&
CommonConstants
.
ONE_STRING
.
equals
(
vo
.
getDoTypeInsurance
()))
{
...
...
@@ -894,7 +899,6 @@ public class EmployeeRegistrationLeaveServiceImpl extends ServiceImpl<EmployeeRe
// 停缴社保日期
if
(
Common
.
isNotNull
(
leave
.
getSocialDispatchIdOld
()))
{
leave
.
setSocialReduceDate
(
vo
.
getSocialReduceDate
());
leave
.
setSocialReasonType
(
vo
.
getSocialReasonTypeAndFund
());
leave
.
setSocialTrustRemark
(
vo
.
getSocialTrustRemarkAndFund
());
leave
.
setSocialExpectedTime
(
vo
.
getSocialExpectedTimeAndFund
());
leave
.
setDoStatusSocial
(
CommonConstants
.
TWO_STRING
);
...
...
@@ -902,7 +906,6 @@ public class EmployeeRegistrationLeaveServiceImpl extends ServiceImpl<EmployeeRe
// 停缴公积金日期
if
(
Common
.
isNotNull
(
leave
.
getFundDispatchIdOld
()))
{
leave
.
setFundReduceDate
(
vo
.
getFundReduceDate
());
leave
.
setFundReasonType
(
vo
.
getSocialReasonTypeAndFund
());
leave
.
setFundTrustRemark
(
vo
.
getSocialTrustRemarkAndFund
());
leave
.
setFundExpectedTime
(
vo
.
getSocialExpectedTimeAndFund
());
leave
.
setDoStatusFund
(
CommonConstants
.
TWO_STRING
);
...
...
@@ -1046,7 +1049,7 @@ public class EmployeeRegistrationLeaveServiceImpl extends ServiceImpl<EmployeeRe
vo
.
setEmpIdcard
(
leave
.
getEmpIdcard
());
vo
.
setDepartNo
(
leave
.
getDeptNo
());
vo
.
setSocialReduceDate
(
leave
.
getSocialReduceDate
());
vo
.
setReasonType
(
leave
.
get
SocialReasonType
());
vo
.
setReasonType
(
leave
.
get
LeaveReasonId
());
vo
.
setTrustRemark
(
leave
.
getSocialTrustRemark
());
vo
.
setChangeContractAndEmployee
(
CommonConstants
.
ONE_STRING
);
socialOldList
.
add
(
vo
);
...
...
@@ -1061,7 +1064,7 @@ public class EmployeeRegistrationLeaveServiceImpl extends ServiceImpl<EmployeeRe
vo
.
setEmpIdcard
(
leave
.
getEmpIdcard
());
vo
.
setDepartNo
(
leave
.
getDeptNo
());
vo
.
setFundReduceDate
(
leave
.
getFundReduceDate
());
vo
.
setReasonType
(
leave
.
get
FundReasonType
());
vo
.
setReasonType
(
leave
.
get
LeaveReasonId
());
vo
.
setTrustRemark
(
leave
.
getFundTrustRemark
());
vo
.
setChangeContractAndEmployee
(
CommonConstants
.
ONE_STRING
);
fundOldList
.
add
(
vo
);
...
...
yifu-csp/yifu-csp-biz/src/main/resources/mapper/EmployeeRegistrationLeaveMapper.xml
View file @
9ef88f9a
...
...
@@ -93,12 +93,10 @@
<result
property=
"doType"
column=
"do_type"
/>
<result
property=
"socialId"
column=
"social_id"
/>
<result
property=
"socialReduceDate"
column=
"social_reduce_date"
/>
<result
property=
"socialReasonType"
column=
"social_reason_type"
/>
<result
property=
"socialTrustRemark"
column=
"social_trust_remark"
/>
<result
property=
"socialExpectedTime"
column=
"social_expected_time"
/>
<result
property=
"fundId"
column=
"fund_id"
/>
<result
property=
"fundReduceDate"
column=
"fund_reduce_date"
/>
<result
property=
"fundReasonType"
column=
"fund_reason_type"
/>
<result
property=
"fundTrustRemark"
column=
"fund_trust_remark"
/>
<result
property=
"fundExpectedTime"
column=
"fund_expected_time"
/>
<result
property=
"insuranceId"
column=
"insurance_id"
/>
...
...
@@ -180,12 +178,10 @@
a.do_type,
a.social_id,
a.social_reduce_date,
a.social_reason_type,
a.social_trust_remark,
a.social_expected_time,
a.fund_id,
a.fund_reduce_date,
a.fund_reason_type,
a.fund_trust_remark,
a.fund_expected_time,
a.insurance_id,
...
...
@@ -338,9 +334,6 @@
<if
test=
"employeeRegistrationLeave.socialReduceDate != null and employeeRegistrationLeave.socialReduceDate.trim() != ''"
>
AND a.social_reduce_date = #{employeeRegistrationLeave.socialReduceDate}
</if>
<if
test=
"employeeRegistrationLeave.socialReasonType != null and employeeRegistrationLeave.socialReasonType.trim() != ''"
>
AND a.social_reason_type = #{employeeRegistrationLeave.socialReasonType}
</if>
<if
test=
"employeeRegistrationLeave.socialTrustRemark != null and employeeRegistrationLeave.socialTrustRemark.trim() != ''"
>
AND a.social_trust_remark = #{employeeRegistrationLeave.socialTrustRemark}
</if>
...
...
@@ -353,9 +346,6 @@
<if
test=
"employeeRegistrationLeave.fundReduceDate != null and employeeRegistrationLeave.fundReduceDate.trim() != ''"
>
AND a.fund_reduce_date = #{employeeRegistrationLeave.fundReduceDate}
</if>
<if
test=
"employeeRegistrationLeave.fundReasonType != null and employeeRegistrationLeave.fundReasonType.trim() != ''"
>
AND a.fund_reason_type = #{employeeRegistrationLeave.fundReasonType}
</if>
<if
test=
"employeeRegistrationLeave.fundTrustRemark != null and employeeRegistrationLeave.fundTrustRemark.trim() != ''"
>
AND a.fund_trust_remark = #{employeeRegistrationLeave.fundTrustRemark}
</if>
...
...
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