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
b244adf3
Commit
b244adf3
authored
Aug 05, 2022
by
fangxinjiang
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
派单调整
parent
eef55806
Expand all
Show whitespace changes
Inline
Side-by-side
Showing
11 changed files
with
340 additions
and
87 deletions
+340
-87
TEmployeeProject.java
.../cloud/plus/v1/yifu/archives/entity/TEmployeeProject.java
+4
-3
UpProjectSocialFundVo.java
...cloud/plus/v1/yifu/archives/vo/UpProjectSocialFundVo.java
+23
-0
TEmployeeProjectController.java
.../yifu/archives/controller/TEmployeeProjectController.java
+14
-0
TEmployeeContractInfoService.java
...1/yifu/archives/service/TEmployeeContractInfoService.java
+2
-0
TEmployeeProjectService.java
...lus/v1/yifu/archives/service/TEmployeeProjectService.java
+3
-0
TEmployeeContractInfoServiceImpl.java
...chives/service/impl/TEmployeeContractInfoServiceImpl.java
+4
-1
TEmployeeInfoServiceImpl.java
.../yifu/archives/service/impl/TEmployeeInfoServiceImpl.java
+5
-2
TEmployeeProjectServiceImpl.java
...fu/archives/service/impl/TEmployeeProjectServiceImpl.java
+52
-0
ArchivesDaprUtil.java
...cloud/plus/v1/yifu/common/dapr/util/ArchivesDaprUtil.java
+23
-0
TDispatchInfoServiceImpl.java
...v1/yifu/social/service/impl/TDispatchInfoServiceImpl.java
+207
-78
TDispatchInfoMapper.xml
...ial-biz/src/main/resources/mapper/TDispatchInfoMapper.xml
+3
-3
No files found.
yifu-archives/yifu-archives-api/src/main/java/com/yifu/cloud/plus/v1/yifu/archives/entity/TEmployeeProject.java
View file @
b244adf3
...
...
@@ -285,15 +285,16 @@ public class TEmployeeProject extends BaseEntity {
private
Integer
insuranceStatus
;
/**
* 社保状态(字典)
* 社保状态(字典)
: 0 无社保 1 处理中 2.部分购买 3.正常 4.已派减
*/
@Schema
(
description
=
"社保状态(字典)"
)
@Schema
(
description
=
"社保状态(字典): 0 无社保 1 处理中 2.部分购买 3.正常 4.已派减"
)
private
Integer
socialStatus
;
/**
* 公积金状态(字典)
*/
@Schema
(
description
=
"公积金状态(字典)"
)
@Schema
(
description
=
"公积金状态(字典)
: 0 无公积金 1 处理中 2.部分购买 3.正常 4.已派减
"
)
private
Integer
fundStatus
;
/**
...
...
yifu-archives/yifu-archives-api/src/main/java/com/yifu/cloud/plus/v1/yifu/archives/vo/UpProjectSocialFundVo.java
0 → 100644
View file @
b244adf3
package
com
.
yifu
.
cloud
.
plus
.
v1
.
yifu
.
archives
.
vo
;
import
lombok.Data
;
import
java.io.Serializable
;
/**
* @Author fxj
* @Date 2022/8/5
* @Description
* @Version 1.0
*/
@Data
public
class
UpProjectSocialFundVo
implements
Serializable
{
// 社保状态
String
socialStatus
;
// 公积金状态
String
fundStatus
;
// 项目编码
String
departNo
;
// 身份证
String
empIdCard
;
}
yifu-archives/yifu-archives-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/archives/controller/TEmployeeProjectController.java
View file @
b244adf3
...
...
@@ -24,6 +24,8 @@ import com.yifu.cloud.plus.v1.yifu.archives.entity.TEmployeeProject;
import
com.yifu.cloud.plus.v1.yifu.archives.service.TEmployeeProjectService
;
import
com.yifu.cloud.plus.v1.yifu.archives.vo.EmpDispatchAddVo
;
import
com.yifu.cloud.plus.v1.yifu.archives.vo.EmployeeProjectExportVO
;
import
com.yifu.cloud.plus.v1.yifu.archives.vo.UpProjectSocialFundVo
;
import
com.yifu.cloud.plus.v1.yifu.archives.vo.UpdateEmpVo
;
import
com.yifu.cloud.plus.v1.yifu.common.core.constant.CommonConstants
;
import
com.yifu.cloud.plus.v1.yifu.common.core.util.ErrorMessage
;
import
com.yifu.cloud.plus.v1.yifu.common.core.util.R
;
...
...
@@ -291,4 +293,16 @@ public class TEmployeeProjectController {
public
TEmployeeProject
getByEmpIdAndDeptId
(
@RequestBody
TEmployeeProject
employeeProject
)
{
return
tEmployeeProjectService
.
getByEmpIdAndDeptId
(
employeeProject
.
getEmpId
(),
employeeProject
.
getDeptId
());
}
/**
* @Description: 更新社保公积金状态
* @Author: fxj
* @Date: 2022/08/01 18:52
**/
@Operation
(
summary
=
"更新社保公积金状态"
,
description
=
"更新社保公积金状态"
)
@Inner
@PostMapping
(
"/inner/updateProjectSocialFund"
)
public
Boolean
updateProjectSocialFund
(
@RequestBody
UpProjectSocialFundVo
vo
)
{
return
tEmployeeProjectService
.
updateProjectSocialFund
(
vo
);
}
}
yifu-archives/yifu-archives-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/archives/service/TEmployeeContractInfoService.java
View file @
b244adf3
...
...
@@ -97,6 +97,8 @@ public interface TEmployeeContractInfoService extends IService<TEmployeeContract
String
getCode
(
boolean
isNew
);
boolean
updateInUseStatusById
(
String
empId
,
String
deptId
,
String
ContractId
);
/**
* @param tEmployeeContractInfo
* @Description: 审核
...
...
yifu-archives/yifu-archives-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/archives/service/TEmployeeProjectService.java
View file @
b244adf3
...
...
@@ -25,6 +25,7 @@ import com.yifu.cloud.plus.v1.yifu.archives.entity.TEmployeeInfo;
import
com.yifu.cloud.plus.v1.yifu.archives.entity.TEmployeeProject
;
import
com.yifu.cloud.plus.v1.yifu.archives.vo.EmployeeProjectExportVO
;
import
com.yifu.cloud.plus.v1.yifu.archives.vo.EmployeeXProjectVO
;
import
com.yifu.cloud.plus.v1.yifu.archives.vo.UpProjectSocialFundVo
;
import
com.yifu.cloud.plus.v1.yifu.common.core.util.ErrorMessage
;
import
com.yifu.cloud.plus.v1.yifu.common.core.util.R
;
import
org.springframework.validation.BindingResult
;
...
...
@@ -190,4 +191,6 @@ public interface TEmployeeProjectService extends IService<TEmployeeProject> {
//获取员工编码
String
getEmpNo
(
String
deptNo
);
Boolean
updateProjectSocialFund
(
UpProjectSocialFundVo
vo
);
}
yifu-archives/yifu-archives-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/archives/service/impl/TEmployeeContractInfoServiceImpl.java
View file @
b244adf3
...
...
@@ -405,7 +405,10 @@ public class TEmployeeContractInfoServiceImpl extends ServiceImpl<TEmployeeContr
employeeInfo
.
setContractStatus
(
CommonConstants
.
ONE_INT
);
}
}
@Override
public
boolean
updateInUseStatusById
(
String
empId
,
String
deptId
,
String
ContractId
){
return
baseMapper
.
updateInUseStatusById
(
empId
,
deptId
,
ContractId
,
CommonConstants
.
ONE_STRING
)
>
0
;
}
@Override
public
R
<
String
>
auditContract
(
TEmployeeContractInfo
tEmployeeContractInfo
)
{
if
(
tEmployeeContractInfo
!=
null
)
{
...
...
yifu-archives/yifu-archives-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/archives/service/impl/TEmployeeInfoServiceImpl.java
View file @
b244adf3
...
...
@@ -2094,9 +2094,11 @@ public class TEmployeeInfoServiceImpl extends ServiceImpl<TEmployeeInfoMapper, T
@Override
public
Boolean
updateEmpInfo
(
UpdateEmpVo
vo
)
{
if
(
Common
.
isNotNull
(
vo
)){
TEmployeeInfo
employeeInfo
;
TEmployeeProject
p
=
null
;
if
(
Common
.
isNotNull
(
vo
.
getEmpIdCard
())){
if
(
CommonConstants
.
ZERO_STRING
.
equals
(
vo
.
getType
())){
TEmployeeInfo
employeeInfo
=
baseMapper
.
selectOne
(
Wrappers
.<
TEmployeeInfo
>
query
().
lambda
()
employeeInfo
=
baseMapper
.
selectOne
(
Wrappers
.<
TEmployeeInfo
>
query
().
lambda
()
.
eq
(
TEmployeeInfo:
:
getDeleteFlag
,
CommonConstants
.
ZERO_STRING
)
.
eq
(
TEmployeeInfo:
:
getEmpIdcard
,
vo
.
getEmpIdCard
())
.
eq
(
TEmployeeInfo:
:
getStatus
,
CommonConstants
.
ZERO_INT
)
...
...
@@ -2107,7 +2109,7 @@ public class TEmployeeInfoServiceImpl extends ServiceImpl<TEmployeeInfoMapper, T
}
if
(
Common
.
isNotNull
(
vo
.
getProjectNo
())){
TEmployeeProject
p
=
tEmployeeProjectService
.
getOne
(
Wrappers
.<
TEmployeeProject
>
query
().
lambda
()
p
=
tEmployeeProjectService
.
getOne
(
Wrappers
.<
TEmployeeProject
>
query
().
lambda
()
.
eq
(
TEmployeeProject:
:
getDeleteFlag
,
CommonConstants
.
ZERO_INT
)
.
eq
(
TEmployeeProject:
:
getEmpIdcard
,
vo
.
getEmpIdCard
())
.
eq
(
TEmployeeProject:
:
getDeptNo
,
vo
.
getProjectNo
())
...
...
@@ -2134,6 +2136,7 @@ public class TEmployeeInfoServiceImpl extends ServiceImpl<TEmployeeInfoMapper, T
c
.
setAuditStatus
(
CommonConstants
.
THREE_INT
);
c
.
setInUse
(
CommonConstants
.
ONE_STRING
);
}
contractServicer
.
updateInUseStatusById
(
c
.
getEmpId
(),
c
.
getDeptNo
(),
c
.
getSettleDomain
());
contractServicer
.
updateById
(
c
);
}
...
...
yifu-archives/yifu-archives-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/archives/service/impl/TEmployeeProjectServiceImpl.java
View file @
b244adf3
...
...
@@ -1407,4 +1407,56 @@ public class TEmployeeProjectServiceImpl extends ServiceImpl<TEmployeeProjectMap
}
return
false
;
}
/**
* @Description: 更新社保公积金状态 : 0 无社保|无公积金 1 处理中 2.部分购买 3.正常 4.已派减
* 派增:
* 1、派单处社保或公积金状态为待审核、待办理、办理中,项目档案处社保或公积金状态为处理中1;
* 2、派单处社保或公积金状态为审核不通过或办理失败,项目档案处社保状态为无社保,公积金状态为无公积金0;
* 3、派单处社保状态为部分办理失败,项目档案处社保状态为部分购买 2
* 4、派单处社保或公积金状态为办理成功,项目档案处社保或公积金状态为正常 3
* 派减:
* 1、派减状态为待审核、待办理、审核不通过、办理失败,项目档案处社保或公积金状态不变;
* 2、派减状态为办理成功,项目档案处社保或公积金状态变为已派减 4
* 人员档案处社保或公积金状态根据身份证+项目进行整合:
* 社保状态优先级:正常>部分购买>处理中>已派减>无社保
* 公积金状态优先级:正常>处理中>已派减>无公积金
* @Author: fxj
* @Date: 2022/08/01 18:52
**/
@Override
public
Boolean
updateProjectSocialFund
(
UpProjectSocialFundVo
vo
)
{
if
(
Common
.
isEmpty
(
vo
)
||
Common
.
isEmpty
(
vo
.
getEmpIdCard
())
||
Common
.
isEmpty
(
vo
.
getDepartNo
())){
return
false
;
}
TEmployeeInfo
employee
=
tEmployeeInfoMapper
.
selectOne
(
Wrappers
.<
TEmployeeInfo
>
query
().
lambda
()
.
eq
(
TEmployeeInfo:
:
getEmpIdcard
,
vo
.
getEmpIdCard
())
.
eq
(
TEmployeeInfo:
:
getDeleteFlag
,
CommonConstants
.
ZERO_STRING
).
last
(
CommonConstants
.
LAST_ONE_SQL
));
// : 0 无社保|无公积金 1 处理中 2.部分购买 3.正常 4.已派减
if
(
Common
.
isNotNull
(
employee
)){
if
(
Common
.
isNotNull
(
vo
.
getSocialStatus
())){
employee
.
setSocialStatus
(
Integer
.
parseInt
(
vo
.
getSocialStatus
()));
}
if
(
Common
.
isNotNull
(
vo
.
getFundStatus
())){
employee
.
setFundStatus
(
Integer
.
parseInt
(
vo
.
getFundStatus
()));
}
tEmployeeInfoMapper
.
updateById
(
employee
);
}
TEmployeeProject
project
=
baseMapper
.
selectOne
(
Wrappers
.<
TEmployeeProject
>
query
().
lambda
()
.
eq
(
TEmployeeProject:
:
getDeptNo
,
vo
.
getDepartNo
())
.
eq
(
TEmployeeProject:
:
getEmpIdcard
,
vo
.
getEmpIdCard
())
.
eq
(
TEmployeeProject:
:
getDeleteFlag
,
CommonConstants
.
ZERO_STRING
)
.
last
(
CommonConstants
.
LAST_ONE_SQL
));
// : 0 无社保|无公积金 1 处理中 2.部分购买 3.正常 4.已派减
if
(
Common
.
isNotNull
(
project
)){
if
(
Common
.
isNotNull
(
vo
.
getSocialStatus
())){
project
.
setSocialStatus
(
Integer
.
parseInt
(
vo
.
getSocialStatus
()));
}
if
(
Common
.
isNotNull
(
vo
.
getFundStatus
())){
project
.
setFundStatus
(
Integer
.
parseInt
(
vo
.
getFundStatus
()));
}
baseMapper
.
updateById
(
project
);
}
return
true
;
}
}
yifu-common/yifu-common-dapr/src/main/java/com/yifu/cloud/plus/v1/yifu/common/dapr/util/ArchivesDaprUtil.java
View file @
b244adf3
...
...
@@ -205,4 +205,27 @@ public class ArchivesDaprUtil {
}
return
res
;
}
/**
* @Author fxj
* @Description 更新项目档案和人员档案的社保公积金状态
* @Date 19:30 2022/8/1
* @Param type 0 审核通过 1 审核不通过
* @return
**/
public
R
<
Boolean
>
updateProjectSocialFund
(
UpProjectSocialFundVo
vo
){
if
(
Common
.
isEmpty
(
vo
.
getEmpIdCard
())
||
(
Common
.
isEmpty
(
vo
.
getSocialStatus
())
&&
Common
.
isEmpty
(
vo
.
getFundStatus
()))
||
Common
.
isEmpty
(
vo
.
getDepartNo
())){
return
R
.
failed
(
CommonConstants
.
PARAM_IS_NOT_ERROR
);
}
R
<
Boolean
>
res
=
HttpDaprUtil
.
invokeMethodPost
(
daprArchivesProperties
.
getAppUrl
(),
daprArchivesProperties
.
getAppId
()
,
"/temployeeproject/inner/updateProjectSocialFund"
,
JSON
.
toJSONString
(
vo
),
Boolean
.
class
,
SecurityConstants
.
FROM_IN
);
if
(
Common
.
isEmpty
(
res
)){
return
R
.
failed
(
"更新人员档案、项目档案社保公积金状态信息失败!"
);
}
return
res
;
}
}
yifu-social/yifu-social-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/social/service/impl/TDispatchInfoServiceImpl.java
View file @
b244adf3
This diff is collapsed.
Click to expand it.
yifu-social/yifu-social-biz/src/main/resources/mapper/TDispatchInfoMapper.xml
View file @
b244adf3
...
...
@@ -217,7 +217,7 @@
</sql>
<sql
id=
"tDispatchInfo_where"
>
<if
test=
"tDispatchInfo != null"
>
<if
test=
"tDispatchInfo.idList != null"
>
<if
test=
"tDispatchInfo.idList != null
and tDispatchInfo.idList.size >0
"
>
AND a.ID in
<foreach
item=
"idStr"
index=
"index"
collection=
"tDispatchInfo.idList"
open=
"("
separator=
","
close=
")"
>
#{idStr}
...
...
@@ -662,7 +662,7 @@
left join t_social_info b on a.SOCIAL_ID = b.id
<where>
1=1 and b.DELETE_FLAG = 0
<if
test=
"idsStr != null"
>
<if
test=
"idsStr != null
and idsStr.size > 0
"
>
AND a.ID in
<foreach
item=
"items"
index=
"index"
collection=
"idsStr"
open=
"("
separator=
","
close=
")"
>
#{items}
...
...
@@ -764,7 +764,7 @@
left join t_provident_fund c on a.FUND_ID = c.id
<where>
1=1 and a.DELETE_FLAG = 0
<if
test=
"idsStr != null"
>
<if
test=
"idsStr != null
and idsStr.size > 0
"
>
AND a.ID in
<foreach
item=
"items"
index=
"index"
collection=
"idsStr"
open=
"("
separator=
","
close=
")"
>
#{items}
...
...
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