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
f83fca85
You need to sign in or sign up before continuing.
Commit
f83fca85
authored
Mar 04, 2025
by
fangxinjiang
Browse files
Options
Browse Files
Download
Plain Diff
Merge remote-tracking branch 'origin/MVP1.7.7' into MVP1.7.7
parents
4599f377
13cfabad
Hide whitespace changes
Inline
Side-by-side
Showing
23 changed files
with
385 additions
and
23 deletions
+385
-23
TEmployeeProjectBelongDept.java
...s/v1/yifu/archives/entity/TEmployeeProjectBelongDept.java
+7
-0
TEmployeeProjectBelongDeptSearchCspVo.java
...fu/archives/vo/TEmployeeProjectBelongDeptSearchCspVo.java
+52
-0
pom.xml
yifu-archives/yifu-archives-biz/pom.xml
+7
-1
TEmployeeProjectBelongDeptController.java
...ives/controller/TEmployeeProjectBelongDeptController.java
+1
-3
TEmployeeInfoService.java
...d/plus/v1/yifu/archives/service/TEmployeeInfoService.java
+1
-0
TEmployeeProjectService.java
...lus/v1/yifu/archives/service/TEmployeeProjectService.java
+10
-0
FddContractAttachInfoServiceImpl.java
...chives/service/impl/FddContractAttachInfoServiceImpl.java
+5
-2
TEmpChangeInfoServiceImpl.java
...yifu/archives/service/impl/TEmpChangeInfoServiceImpl.java
+66
-0
TEmployeeContractInfoServiceImpl.java
...chives/service/impl/TEmployeeContractInfoServiceImpl.java
+4
-0
TEmployeeInfoServiceImpl.java
.../yifu/archives/service/impl/TEmployeeInfoServiceImpl.java
+17
-9
TEmployeeProjectServiceImpl.java
...fu/archives/service/impl/TEmployeeProjectServiceImpl.java
+57
-1
TEmployeeProjectBelongDeptMapper.xml
...ain/resources/mapper/TEmployeeProjectBelongDeptMapper.xml
+1
-1
ClientNameConstants.java
...lus/v1/yifu/common/core/constant/ClientNameConstants.java
+5
-0
EmployeeRegistrationController.java
...lus/v1/csp/controller/EmployeeRegistrationController.java
+22
-0
TOperationLogController.java
...cloud/plus/v1/csp/controller/TOperationLogController.java
+5
-0
EmployeeRegistrationMapper.java
.../cloud/plus/v1/csp/mapper/EmployeeRegistrationMapper.java
+8
-0
EmployeeRegistrationService.java
...loud/plus/v1/csp/service/EmployeeRegistrationService.java
+11
-0
TOperationLogService.java
.../yifu/cloud/plus/v1/csp/service/TOperationLogService.java
+1
-0
EmployeeRegistrationServiceImpl.java
.../v1/csp/service/impl/EmployeeRegistrationServiceImpl.java
+66
-0
TOperationLogServiceImpl.java
...ud/plus/v1/csp/service/impl/TOperationLogServiceImpl.java
+4
-1
EmployeeRegistrationMapper.xml
.../src/main/resources/mapper/EmployeeRegistrationMapper.xml
+30
-0
SysDeptServiceImpl.java
...d/plus/v1/yifu/admin/service/impl/SysDeptServiceImpl.java
+2
-2
SysUserDeptPermissionServiceImpl.java
.../admin/service/impl/SysUserDeptPermissionServiceImpl.java
+3
-3
No files found.
yifu-archives/yifu-archives-api/src/main/java/com/yifu/cloud/plus/v1/yifu/archives/entity/TEmployeeProjectBelongDept.java
View file @
f83fca85
...
...
@@ -19,6 +19,7 @@ package com.yifu.cloud.plus.v1.yifu.archives.entity;
import
com.alibaba.excel.annotation.ExcelProperty
;
import
com.baomidou.mybatisplus.annotation.IdType
;
import
com.baomidou.mybatisplus.annotation.TableField
;
import
com.baomidou.mybatisplus.annotation.TableId
;
import
com.baomidou.mybatisplus.annotation.TableName
;
import
com.yifu.cloud.plus.v1.yifu.common.core.constant.ExcelAttribute
;
...
...
@@ -26,6 +27,8 @@ import io.swagger.v3.oas.annotations.media.Schema;
import
lombok.Data
;
import
org.hibernate.validator.constraints.Length
;
import
java.time.LocalDateTime
;
/**
* 项目档案所属部门表
*
...
...
@@ -61,4 +64,8 @@ public class TEmployeeProjectBelongDept {
@Schema
(
description
=
"所属部门id"
)
private
String
empDeptid
;
// 日志确认接收时间,与项目档案日期比较
@TableField
(
exist
=
false
)
private
LocalDateTime
logCreateTime
;
}
yifu-archives/yifu-archives-api/src/main/java/com/yifu/cloud/plus/v1/yifu/archives/vo/TEmployeeProjectBelongDeptSearchCspVo.java
0 → 100644
View file @
f83fca85
/*
* Copyright (c) 2018-2025, lengleng All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions are met:
*
* Redistributions of source code must retain the above copyright notice,
* this list of conditions and the following disclaimer.
* Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
* Neither the name of the yifu4cloud.com developer nor the names of its
* contributors may be used to endorse or promote products derived from
* this software without specific prior written permission.
* Author: lengleng (wangiegie@gmail.com)
*/
package
com
.
yifu
.
cloud
.
plus
.
v1
.
yifu
.
archives
.
vo
;
import
io.swagger.v3.oas.annotations.media.Schema
;
import
lombok.Data
;
import
java.time.LocalDateTime
;
/**
* 查询Csp数据的传参vo
* @author hgw
* @date 2025-3-3 17:31:58
*/
@Data
public
class
TEmployeeProjectBelongDeptSearchCspVo
{
// 项目ID
@Schema
(
description
=
"项目ID"
)
private
String
deptId
;
// 身份证
@Schema
(
description
=
"身份证"
)
private
String
empIdCard
;
// 登记类型 1入职 2离职
@Schema
(
description
=
"登记类型"
)
private
String
feedbackType
;
// 项目档案入离职日期,与日志确认接收时间比较
@Schema
(
description
=
"项目档案创建与离职时间"
)
private
LocalDateTime
empCreateAndLeaveTime
;
// 项目档案入离职日期,与日志确认接收时间比较
@Schema
(
description
=
"项目档案创建与离职人"
)
private
String
empCreateAndLeaveUser
;
}
yifu-archives/yifu-archives-biz/pom.xml
View file @
f83fca85
...
...
@@ -111,7 +111,13 @@
<artifactId>
xlsx-streamer
</artifactId>
<version>
2.2.0
</version>
</dependency>
<!-- 二维码生成JAR结束 -->
<dependency>
<groupId>
com.yifu.cloud.plus.v1
</groupId>
<artifactId>
yifu-csp-api
</artifactId>
<version>
1.0.0
</version>
<scope>
compile
</scope>
</dependency>
<!-- 二维码生成JAR结束 -->
</dependencies>
<build>
...
...
yifu-archives/yifu-archives-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/archives/controller/TEmployeeProjectBelongDeptController.java
View file @
f83fca85
...
...
@@ -33,7 +33,6 @@ import com.yifu.cloud.plus.v1.yifu.common.security.util.SecurityUtils;
import
io.swagger.v3.oas.annotations.Operation
;
import
io.swagger.v3.oas.annotations.tags.Tag
;
import
lombok.RequiredArgsConstructor
;
import
org.springframework.security.access.prepost.PreAuthorize
;
import
org.springframework.web.bind.annotation.*
;
import
javax.servlet.http.HttpServletResponse
;
...
...
@@ -90,10 +89,9 @@ public class TEmployeeProjectBelongDeptController {
* @Date: 2025/3/3 9:37
* @return: com.yifu.cloud.plus.v1.yifu.common.core.util.R<java.lang.String>
**/
@Operation
(
summary
=
"项目组织维护"
,
description
=
"项目组织维护
:hasPermission('archives_temployeeprojectbelongdept_add')
"
)
@Operation
(
summary
=
"项目组织维护"
,
description
=
"项目组织维护"
)
@SysLog
(
"项目组织维护"
)
@PostMapping
(
"/saveOrUpdate"
)
@PreAuthorize
(
"@pms.hasPermission('archives_temployeeprojectbelongdept_add')"
)
public
R
<
String
>
saveOrUpdate
(
@RequestBody
TEmployeeProjectBelongDept
tEmployeeProjectBelongDept
)
{
if
(
Common
.
isEmpty
(
tEmployeeProjectBelongDept
.
getId
()))
{
return
R
.
failed
(
"项目ID必填"
);
...
...
yifu-archives/yifu-archives-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/archives/service/TEmployeeInfoService.java
View file @
f83fca85
...
...
@@ -22,6 +22,7 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import
com.baomidou.mybatisplus.extension.service.IService
;
import
com.pig4cloud.plugin.excel.vo.ErrorMessage
;
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.*
;
import
com.yifu.cloud.plus.v1.yifu.common.core.util.R
;
import
org.springframework.web.multipart.MultipartFile
;
...
...
yifu-archives/yifu-archives-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/archives/service/TEmployeeProjectService.java
View file @
f83fca85
...
...
@@ -292,4 +292,14 @@ public interface TEmployeeProjectService extends IService<TEmployeeProject> {
Boolean
selectExitEmpProject
(
TInsuranceUnpurchasePersonCardVo
cardVo
);
/**
* @param p 项目档案信息,含入离职时间等
* @param feedbackType 登记类型 1入职 2离职
* @Description: 新逻辑:加所属部门
* @Author: hgw
* @Date: 2025/3/4 11:39
* @return: void
**/
void
doSaveBelongDept
(
TEmployeeProject
p
,
String
feedbackType
);
}
yifu-archives/yifu-archives-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/archives/service/impl/FddContractAttachInfoServiceImpl.java
View file @
f83fca85
...
...
@@ -80,7 +80,7 @@ public class FddContractAttachInfoServiceImpl extends ServiceImpl<FddContractAtt
private
TEmployeeInfoMapper
tEmployeeInfoMapper
;
@Autowired
private
TEmployeeProject
Mapper
tEmployeeProjectMapper
;
private
TEmployeeProject
Service
tEmployeeProjectService
;
@Autowired
private
TEmployeeContractInfoMapper
employeeContractInfoMapper
;
...
...
@@ -240,6 +240,9 @@ public class FddContractAttachInfoServiceImpl extends ServiceImpl<FddContractAtt
tEmployeeProject
.
setLeaveTime
(
null
);
tEmployeeProject
.
setLeaveRemark
(
CommonConstants
.
EMPTY_STRING
);
tEmployeeProject
.
setLeaveUser
(
CommonConstants
.
EMPTY_STRING
);
// 增-同步处理CSP入离职申请为已处理,加日志
tEmployeeProjectService
.
doSaveBelongDept
(
tEmployeeProject
,
CommonConstants
.
ONE_STRING
);
}
//判断人员档案的状态,如果是减档状态就复档
...
...
@@ -695,7 +698,7 @@ public class FddContractAttachInfoServiceImpl extends ServiceImpl<FddContractAtt
empNO
=
getEmpNo
(
newTEmpProject
.
getDeptNo
());
newTEmpProject
.
setEmpNo
(
empNO
);
//新增档案
tE
mployeeProjectMapper
.
insert
(
newTEmpProject
);
e
mployeeProjectMapper
.
insert
(
newTEmpProject
);
}
//获取员工编码
...
...
yifu-archives/yifu-archives-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/archives/service/impl/TEmpChangeInfoServiceImpl.java
View file @
f83fca85
...
...
@@ -53,6 +53,7 @@ import org.springframework.stereotype.Service;
import
org.springframework.transaction.annotation.Transactional
;
import
org.springframework.validation.BindingResult
;
import
java.time.LocalDateTime
;
import
java.util.*
;
import
java.util.regex.Pattern
;
...
...
@@ -131,6 +132,10 @@ public class TEmpChangeInfoServiceImpl extends ServiceImpl<TEmpChangeInfoMapper,
updateTEmployeeProject
.
setOdlDeptId
(
tEmployeeProjectOld
.
getDeptId
());
updateTEmployeeProject
.
setOldDeptNo
(
tEmployeeProjectOld
.
getDeptNo
());
tEmployeeProjectService
.
updateById
(
updateTEmployeeProject
);
// 同步CSP
this
.
doAddAAndReduceB
(
updateTEmployeeProject
,
tEmployeeProjectOld
);
tEmpChangeInfo
.
setProId
(
updateTEmployeeProject
.
getId
());
UpdateSocialFoundVo
updateSocialFoundVo
=
new
UpdateSocialFoundVo
();
...
...
@@ -163,6 +168,35 @@ public class TEmpChangeInfoServiceImpl extends ServiceImpl<TEmpChangeInfoMapper,
return
R
.
ok
();
}
/**
* @param updateTEmployeeProject
* @param tEmployeeProjectOld
* @Description: 同步CSP服务,增加A,减少B
* @Author: hgw
* @Date: 2025/3/4 15:01
* @return: void
**/
private
void
doAddAAndReduceB
(
TEmployeeProject
updateTEmployeeProject
,
TEmployeeProject
tEmployeeProjectOld
)
{
YifuUser
user
=
SecurityUtils
.
getUser
();
if
(
user
!=
null
&&
Common
.
isNotNull
(
user
.
getId
()))
{
// 增B-同步处理CSP入离职申请为已处理,加日志
TEmployeeProject
huaZhuanProject
=
new
TEmployeeProject
();
huaZhuanProject
.
setId
(
updateTEmployeeProject
.
getId
());
huaZhuanProject
.
setDeptId
(
updateTEmployeeProject
.
getDeptId
());
huaZhuanProject
.
setCreateTime
(
LocalDateTime
.
now
());
huaZhuanProject
.
setCreateName
(
user
.
getNickname
());
tEmployeeProjectService
.
doSaveBelongDept
(
huaZhuanProject
,
CommonConstants
.
ONE_STRING
);
// 减A-同步处理CSP入离职申请为已处理,加日志
huaZhuanProject
=
new
TEmployeeProject
();
huaZhuanProject
.
setId
(
updateTEmployeeProject
.
getId
());
huaZhuanProject
.
setDeptId
(
tEmployeeProjectOld
.
getDeptId
());
huaZhuanProject
.
setLeaveTime
(
LocalDateTime
.
now
());
huaZhuanProject
.
setLeaveUser
(
user
.
getNickname
());
tEmployeeProjectService
.
doSaveBelongDept
(
huaZhuanProject
,
CommonConstants
.
TWO_STRING
);
}
}
@Override
public
R
<
List
<
ErrorMessage
>>
batchChangeArc
(
List
<
TEmpChangeInfoVO
>
excelVOList
,
BindingResult
bindingResult
)
{
// 通用校验获取失败的数据
...
...
@@ -172,9 +206,17 @@ public class TEmpChangeInfoServiceImpl extends ServiceImpl<TEmpChangeInfoMapper,
errorMessageList
.
forEach
(
errorMessage
->
errorMsgMap
.
put
(
errorMessage
.
getLineNum
(),
errorMessage
));
}
YifuUser
user
=
SecurityUtils
.
getUser
();
// 老项目已减项,划转后将删除 hgw 2023-8-22 10:47:41
List
<
TEmployeeProject
>
oldUpdateList
=
new
ArrayList
<>();
List
<
TEmployeeProject
>
updateList
=
new
ArrayList
<>();
// 同步CSP服务使用
List
<
TEmployeeProject
>
addCspList
=
new
ArrayList
<>();
List
<
TEmployeeProject
>
reduceCspList
=
new
ArrayList
<>();
TEmployeeProject
addProject
=
new
TEmployeeProject
();
TEmployeeProject
reduceProject
=
new
TEmployeeProject
();
Set
<
String
>
errorMsg
;
//对象声明
TEmpChangeInfoVO
excel
;
...
...
@@ -258,6 +300,22 @@ public class TEmpChangeInfoServiceImpl extends ServiceImpl<TEmpChangeInfoMapper,
updateTEmployeePro
.
setOdlDeptId
(
tEmployeeProjectOld
.
getDeptId
());
updateTEmployeePro
.
setOldDeptNo
(
tEmployeeProjectOld
.
getDeptNo
());
updateList
.
add
(
updateTEmployeePro
);
addProject
=
new
TEmployeeProject
();
addProject
.
setId
(
updateTEmployeePro
.
getId
());
addProject
.
setDeptId
(
updateTEmployeePro
.
getDeptId
());
addProject
.
setEmpIdcard
(
updateTEmployeePro
.
getEmpIdcard
());
addProject
.
setCreateTime
(
LocalDateTime
.
now
());
addProject
.
setCreateName
(
user
.
getNickname
());
addCspList
.
add
(
addProject
);
reduceProject
=
new
TEmployeeProject
();
reduceProject
.
setId
(
updateTEmployeePro
.
getId
());
reduceProject
.
setDeptId
(
tEmployeeProjectOld
.
getDeptId
());
reduceProject
.
setEmpIdcard
(
tEmployeeProjectOld
.
getEmpIdcard
());
reduceProject
.
setLeaveTime
(
LocalDateTime
.
now
());
reduceProject
.
setLeaveUser
(
user
.
getNickname
());
reduceCspList
.
add
(
reduceProject
);
}
}
else
{
errorMsg
.
add
(
MsgUtils
.
getMessage
(
ErrorCodes
.
PROJECT_PERSON_SEARCH_EXIT
,
excel
.
getOldSettleCode
()));
...
...
@@ -276,6 +334,14 @@ public class TEmpChangeInfoServiceImpl extends ServiceImpl<TEmpChangeInfoMapper,
tEmployeeProjectService
.
updateBatchById
(
oldUpdateList
);
}
tEmployeeProjectService
.
updateBatchById
(
updateList
);
// 同步CSP
for
(
TEmployeeProject
add
:
addCspList
)
{
tEmployeeProjectService
.
doSaveBelongDept
(
add
,
CommonConstants
.
ONE_STRING
);
}
for
(
TEmployeeProject
reduce
:
reduceCspList
)
{
tEmployeeProjectService
.
doSaveBelongDept
(
reduce
,
CommonConstants
.
TWO_STRING
);
}
// 循环里的申明
UpdateSocialFoundVo
updateSocialFoundVo
;
for
(
TEmployeeProject
tEmployeeProject:
updateList
)
{
...
...
yifu-archives/yifu-archives-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/archives/service/impl/TEmployeeContractInfoServiceImpl.java
View file @
f83fca85
...
...
@@ -1751,6 +1751,10 @@ public class TEmployeeContractInfoServiceImpl extends ServiceImpl<TEmployeeContr
tEmployeeProject
.
setLeaveRemark
(
"终止合同联动减项"
);
tEmployeeProject
.
setLeaveTime
(
LocalDateTime
.
now
());
tEmployeeProject
.
setLeaveUser
(
user
.
getNickname
());
// 减-同步处理CSP入离职申请为已处理,加日志
tEmployeeProjectService
.
doSaveBelongDept
(
tEmployeeProject
,
CommonConstants
.
TWO_STRING
);
workInfo
.
append
(
"减项成功,"
);
}
else
{
failueInfo
.
append
(
"存在社保/公积金,无法减项"
);
...
...
yifu-archives/yifu-archives-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/archives/service/impl/TEmployeeInfoServiceImpl.java
View file @
f83fca85
...
...
@@ -35,12 +35,10 @@ import com.yifu.cloud.plus.v1.check.entity.TCheckBankNo;
import
com.yifu.cloud.plus.v1.check.entity.TCheckIdCard
;
import
com.yifu.cloud.plus.v1.check.entity.TCheckMobile
;
import
com.yifu.cloud.plus.v1.check.vo.CheckBatchVo
;
import
com.yifu.cloud.plus.v1.csp.entity.TOperationLog
;
import
com.yifu.cloud.plus.v1.yifu.archives.constants.EmployeeConstants
;
import
com.yifu.cloud.plus.v1.yifu.archives.entity.*
;
import
com.yifu.cloud.plus.v1.yifu.archives.mapper.TArchivesLimitMapper
;
import
com.yifu.cloud.plus.v1.yifu.archives.mapper.TEmployeeContractAuditMapper
;
import
com.yifu.cloud.plus.v1.yifu.archives.mapper.TEmployeeInfoMapper
;
import
com.yifu.cloud.plus.v1.yifu.archives.mapper.TPreEmpDeclarationMapper
;
import
com.yifu.cloud.plus.v1.yifu.archives.mapper.*
;
import
com.yifu.cloud.plus.v1.yifu.archives.service.*
;
import
com.yifu.cloud.plus.v1.yifu.archives.vo.*
;
import
com.yifu.cloud.plus.v1.yifu.common.core.constant.*
;
...
...
@@ -50,6 +48,7 @@ import com.yifu.cloud.plus.v1.yifu.common.core.vo.ExcelColumnVo;
import
com.yifu.cloud.plus.v1.yifu.common.core.vo.ExcelSheetVo
;
import
com.yifu.cloud.plus.v1.yifu.common.core.vo.YifuUser
;
import
com.yifu.cloud.plus.v1.yifu.common.dapr.config.DaprCheckProperties
;
import
com.yifu.cloud.plus.v1.yifu.common.dapr.config.DaprCspProperties
;
import
com.yifu.cloud.plus.v1.yifu.common.dapr.config.DaprSalaryProperties
;
import
com.yifu.cloud.plus.v1.yifu.common.dapr.config.DaprUpmsProperties
;
import
com.yifu.cloud.plus.v1.yifu.common.dapr.util.HttpDaprUtil
;
...
...
@@ -98,18 +97,18 @@ import java.util.concurrent.atomic.AtomicInteger;
@Log4j2
@Service
@RequiredArgsConstructor
@EnableConfigurationProperties
({
DaprUpmsProperties
.
class
,
DaprCheckProperties
.
class
,
DaprSalaryProperties
.
class
,
DaprCheckProperties
.
class
})
@EnableConfigurationProperties
({
DaprUpmsProperties
.
class
,
DaprCheckProperties
.
class
,
DaprSalaryProperties
.
class
})
public
class
TEmployeeInfoServiceImpl
extends
ServiceImpl
<
TEmployeeInfoMapper
,
TEmployeeInfo
>
implements
TEmployeeInfoService
{
// 缓存信息
private
final
CacheManager
cacheManager
;
private
final
TEmployeeProjectService
tEmployeeProjectService
;
private
final
DaprCheckProperties
daprCheckProperties
;
private
final
DaprUpmsProperties
daprUpmsProperties
;
// // 档案批量更新校验开户行
private
final
DaprSalaryProperties
salaryProperties
;
// 档案批量更新校验身份证、卡号、手机号
private
final
DaprCheckProperties
checkProperties
;
private
final
DaprCheckProperties
daprCheckProperties
;
private
final
TEmployeeLogService
tEmployeeLogService
;
private
final
TEmpEducationService
tEmpEducationService
;
// 档案批量更新使用的紧急联系人
...
...
@@ -633,6 +632,10 @@ public class TEmployeeInfoServiceImpl extends ServiceImpl<TEmployeeInfoMapper, T
project
.
setLeaveTime
(
null
);
project
.
setProjectStatus
(
CommonConstants
.
ZERO_INT
);
tEmployeeProjectService
.
updateById
(
project
);
// 增-同步处理CSP入离职申请为已处理,加日志
tEmployeeProjectService
.
doSaveBelongDept
(
project
,
CommonConstants
.
ONE_STRING
);
projectNum
++;
}
}
...
...
@@ -2577,6 +2580,8 @@ public class TEmployeeInfoServiceImpl extends ServiceImpl<TEmployeeInfoMapper, T
.
last
(
CommonConstants
.
LAST_ONE_SQL
));
if
(
Common
.
isNotNull
(
p
))
{
p
.
setStatus
(
CommonConstants
.
ONE_INT
);
// hgw加所属部门逻辑:
tEmployeeProjectService
.
doSaveBelongDept
(
p
,
CommonConstants
.
ONE_STRING
);
}
}
}
...
...
@@ -3461,6 +3466,9 @@ public class TEmployeeInfoServiceImpl extends ServiceImpl<TEmployeeInfoMapper, T
break
;
}
}
if
(
isNum
&&
shuValue
.
length
()
!=
4
){
errorFormat
.
append
(
attr
.
name
()).
append
(
"_不符合年份格式;"
);
}
if
(
isNum
&&
shuValue
.
length
()
==
4
&&
(
Integer
.
parseInt
(
shuValue
)
>
DateUtil
.
getYearOfInt
(
new
Date
()))){
errorFormat
.
append
(
attr
.
name
()).
append
(
"_不可为未来年份;"
);
}
...
...
@@ -3643,14 +3651,14 @@ public class TEmployeeInfoServiceImpl extends ServiceImpl<TEmployeeInfoMapper, T
Map
<
String
,
Boolean
>
bankNoMap
=
new
HashMap
<>();
Map
<
String
,
Boolean
>
phoneMap
=
new
HashMap
<>();
if
(!
bankList
.
isEmpty
())
{
R
<
CheckBatchVo
>
checkListR
=
HttpDaprUtil
.
invokeMethodPost
(
checkProperties
.
getAppUrl
(),
c
heckProperties
.
getAppId
()
R
<
CheckBatchVo
>
checkListR
=
HttpDaprUtil
.
invokeMethodPost
(
daprCheckProperties
.
getAppUrl
(),
daprC
heckProperties
.
getAppId
()
,
"/tcheckbankno/inner/checkBankNoBatch"
,
bankList
,
CheckBatchVo
.
class
,
SecurityConstants
.
FROM_IN
);
if
(
checkListR
!=
null
&&
checkListR
.
getData
()
!=
null
)
{
bankNoMap
=
checkListR
.
getData
().
getCheckMap
();
}
}
if
(!
mobileList
.
isEmpty
())
{
R
<
CheckBatchVo
>
phoneR
=
HttpDaprUtil
.
invokeMethodPost
(
checkProperties
.
getAppUrl
(),
c
heckProperties
.
getAppId
()
R
<
CheckBatchVo
>
phoneR
=
HttpDaprUtil
.
invokeMethodPost
(
daprCheckProperties
.
getAppUrl
(),
daprC
heckProperties
.
getAppId
()
,
"/tcheckmobile/inner/checkMobileBatch"
,
mobileList
,
CheckBatchVo
.
class
,
SecurityConstants
.
FROM_IN
);
if
(
phoneR
!=
null
&&
phoneR
.
getData
()
!=
null
)
{
phoneMap
=
phoneR
.
getData
().
getCheckMap
();
...
...
yifu-archives/yifu-archives-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/archives/service/impl/TEmployeeProjectServiceImpl.java
View file @
f83fca85
...
...
@@ -48,6 +48,7 @@ import com.yifu.cloud.plus.v1.yifu.common.core.exception.ErrorCodes;
import
com.yifu.cloud.plus.v1.yifu.common.core.util.*
;
import
com.yifu.cloud.plus.v1.yifu.common.core.vo.YifuUser
;
import
com.yifu.cloud.plus.v1.yifu.common.dapr.config.DaprCheckProperties
;
import
com.yifu.cloud.plus.v1.yifu.common.dapr.config.DaprCspProperties
;
import
com.yifu.cloud.plus.v1.yifu.common.dapr.config.DaprSocialProperties
;
import
com.yifu.cloud.plus.v1.yifu.common.dapr.config.DaprUpmsProperties
;
import
com.yifu.cloud.plus.v1.yifu.common.dapr.util.HttpDaprUtil
;
...
...
@@ -80,7 +81,7 @@ import java.util.stream.Collectors;
@Service
@RequiredArgsConstructor
@Log4j2
@EnableConfigurationProperties
({
DaprUpmsProperties
.
class
,
DaprCheckProperties
.
class
,
DaprSocialProperties
.
class
})
@EnableConfigurationProperties
({
DaprUpmsProperties
.
class
,
DaprCheckProperties
.
class
,
DaprSocialProperties
.
class
,
DaprCspProperties
.
class
})
public
class
TEmployeeProjectServiceImpl
extends
ServiceImpl
<
TEmployeeProjectMapper
,
TEmployeeProject
>
implements
TEmployeeProjectService
{
@Autowired
...
...
@@ -104,6 +105,13 @@ public class TEmployeeProjectServiceImpl extends ServiceImpl<TEmployeeProjectMap
@Autowired
private
DaprSocialProperties
daprSocialProperties
;
@Autowired
private
DaprCspProperties
daprCspProperties
;
// 同步CSP的入离职信息的【所属部门】到项目档案的子表里
@Autowired
private
TEmployeeProjectBelongDeptService
tEmployeeProjectBelongDeptService
;
@Autowired
@Lazy
private
DoJointTask
doJointTask
;
...
...
@@ -1594,6 +1602,10 @@ public class TEmployeeProjectServiceImpl extends ServiceImpl<TEmployeeProjectMap
tEmployeeProject
.
setLeaveRemark
(
"社保派减联动减项"
);
tEmployeeProject
.
setLeaveTime
(
LocalDateTime
.
now
());
tEmployeeProject
.
setLeaveUser
(
vo
.
getUserName
());
// 减-同步处理CSP入离职申请为已处理,加日志
this
.
doSaveBelongDept
(
tEmployeeProject
,
CommonConstants
.
TWO_STRING
);
workInfo
.
append
(
"减项成功,"
);
}
else
{
failueInfo
.
append
(
"存在社保/公积金,无法减项"
);
...
...
@@ -1628,6 +1640,7 @@ public class TEmployeeProjectServiceImpl extends ServiceImpl<TEmployeeProjectMap
tEmployeeInfo
.
setLeaveTime
(
DateUtil
.
getCurrentDateTime
());
tEmployeeInfo
.
setLeaveUser
(
vo
.
getUserId
());
tEmployeeInfo
.
setLeaveUserName
(
vo
.
getUserName
());
workInfo
.
append
(
"减档成功,"
);
}
else
{
failueInfo
.
append
(
"存在其他项目,无法减档"
);
...
...
@@ -2000,4 +2013,47 @@ public class TEmployeeProjectServiceImpl extends ServiceImpl<TEmployeeProjectMap
return
count
>
0
;
}
/**
* @param feedbackType 登记类型 1入职 2离职
* @Description: 新逻辑:加所属部门
* @Author: hgw
* @Date: 2025/3/4 10:49
* @return: void
**/
@Override
public
void
doSaveBelongDept
(
TEmployeeProject
p
,
String
feedbackType
)
{
TEmployeeProjectBelongDeptSearchCspVo
searchCspVo
=
new
TEmployeeProjectBelongDeptSearchCspVo
();
searchCspVo
.
setDeptId
(
p
.
getDeptId
());
searchCspVo
.
setEmpIdCard
(
p
.
getEmpIdcard
());
searchCspVo
.
setFeedbackType
(
feedbackType
);
if
(
CommonConstants
.
ONE_STRING
.
equals
(
feedbackType
))
{
searchCspVo
.
setEmpCreateAndLeaveTime
(
p
.
getCreateTime
());
searchCspVo
.
setEmpCreateAndLeaveUser
(
p
.
getCreateName
());
}
else
{
searchCspVo
.
setEmpCreateAndLeaveTime
(
p
.
getLeaveTime
());
searchCspVo
.
setEmpCreateAndLeaveUser
(
p
.
getLeaveUser
());
}
// 查询CSP:已接收的身份证与项目对应的所属部门,加日志,改状态为已处理:
R
<
TEmployeeProjectBelongDept
>
cspEmpDeptR
=
HttpDaprUtil
.
invokeMethodPost
(
daprCspProperties
.
getAppUrl
(),
daprCspProperties
.
getAppId
()
,
"/employeeregistration/inner/getZeroRegistrationAndUpdateTwo"
,
searchCspVo
,
TEmployeeProjectBelongDept
.
class
,
SecurityConstants
.
FROM_IN
);
if
(
cspEmpDeptR
!=
null
&&
cspEmpDeptR
.
getData
()
!=
null
)
{
TEmployeeProjectBelongDept
cspEmpDept
=
cspEmpDeptR
.
getData
();
// 1项目档案改为在项,生成所属部门(同步CSP的入离职信息的【所属部门】到项目档案的子表里)
if
(
Common
.
isNotNull
(
cspEmpDept
.
getEmpDeptid
())
&&
Common
.
isNotNull
(
cspEmpDept
.
getEmpDeptname
()))
{
TEmployeeProjectBelongDept
belongDept
=
tEmployeeProjectBelongDeptService
.
getById
(
p
.
getId
());
if
(
belongDept
==
null
)
{
belongDept
=
new
TEmployeeProjectBelongDept
();
belongDept
.
setId
(
p
.
getId
());
belongDept
.
setEmpDeptid
(
cspEmpDept
.
getEmpDeptid
());
belongDept
.
setEmpDeptname
(
cspEmpDept
.
getEmpDeptname
());
tEmployeeProjectBelongDeptService
.
save
(
belongDept
);
}
else
{
belongDept
.
setEmpDeptid
(
cspEmpDept
.
getEmpDeptid
());
belongDept
.
setEmpDeptname
(
cspEmpDept
.
getEmpDeptname
());
tEmployeeProjectBelongDeptService
.
updateById
(
belongDept
);
}
}
}
}
}
yifu-archives/yifu-archives-biz/src/main/resources/mapper/TEmployeeProjectBelongDeptMapper.xml
View file @
f83fca85
...
...
@@ -85,7 +85,7 @@
#{idStr}
</foreach>
</if>
<if
test=
"tEmployeeProjectBelongDept.
enjoinDateAndLeaveTime != null and tEmployeeProjectBelongDept.enjoinDateAndLeaveTime
.length > 0"
>
<if
test=
"tEmployeeProjectBelongDept.
postArray != null and tEmployeeProjectBelongDept.postArray
.length > 0"
>
AND a.POST in
<foreach
item=
"idStr"
index=
"index"
collection=
"tEmployeeProjectBelongDept.postArray"
open=
"("
separator=
","
close=
")"
>
...
...
yifu-common/yifu-common-core/src/main/java/com/yifu/cloud/plus/v1/yifu/common/core/constant/ClientNameConstants.java
View file @
f83fca85
...
...
@@ -15,4 +15,9 @@ public interface ClientNameConstants {
* MVP
*/
String
CLIENT_B
=
"hrCustomer"
;
/**
* csp
*/
String
CLIENT_CSP
=
"yifu-csp"
;
}
yifu-csp/yifu-csp-biz/src/main/java/com/yifu/cloud/plus/v1/csp/controller/EmployeeRegistrationController.java
View file @
f83fca85
...
...
@@ -5,9 +5,14 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import
com.yifu.cloud.plus.v1.csp.entity.EmployeeRegistration
;
import
com.yifu.cloud.plus.v1.csp.service.EmployeeRegistrationService
;
import
com.yifu.cloud.plus.v1.csp.vo.EmployeeRegistrationSearchVo
;
import
com.yifu.cloud.plus.v1.yifu.archives.entity.TEmployeeProjectBelongDept
;
import
com.yifu.cloud.plus.v1.yifu.archives.vo.TEmployeeProjectBelongDeptSearchCspVo
;
import
com.yifu.cloud.plus.v1.yifu.common.core.constant.CommonConstants
;
import
com.yifu.cloud.plus.v1.yifu.common.core.util.Common
;
import
com.yifu.cloud.plus.v1.yifu.common.core.util.ErrorMessage
;
import
com.yifu.cloud.plus.v1.yifu.common.core.util.R
;
import
com.yifu.cloud.plus.v1.yifu.common.log.annotation.SysLog
;
import
com.yifu.cloud.plus.v1.yifu.common.security.annotation.Inner
;
import
io.swagger.v3.oas.annotations.Operation
;
import
io.swagger.v3.oas.annotations.tags.Tag
;
import
lombok.RequiredArgsConstructor
;
...
...
@@ -149,4 +154,21 @@ public class EmployeeRegistrationController {
public
void
hrExport
(
HttpServletResponse
response
,
@RequestBody
EmployeeRegistrationSearchVo
searchVo
)
{
employeeRegistrationService
.
listHrExport
(
response
,
searchVo
);
}
/**
* @Description: 获取已接收的入离职申请,同时更新为已处理
* @Author: hgw
* @Date: 2025-3-4 09:17:39
**/
@Operation
(
description
=
"获取已接收的入离职申请,同时更新为已处理"
)
@SysLog
(
"获取已接收的入离职申请,同时更新为已处理"
)
@Inner
@PostMapping
(
"/inner/getZeroRegistrationAndUpdateTwo"
)
public
TEmployeeProjectBelongDept
getZeroRegistrationAndUpdateTwo
(
@RequestBody
TEmployeeProjectBelongDeptSearchCspVo
searchCspVo
)
{
if
(
searchCspVo
!=
null
&&
Common
.
isNotNull
(
searchCspVo
.
getEmpIdCard
()))
{
return
employeeRegistrationService
.
getZeroRegistrationAndUpdateTwo
(
searchCspVo
);
}
return
null
;
}
}
yifu-csp/yifu-csp-biz/src/main/java/com/yifu/cloud/plus/v1/csp/controller/TOperationLogController.java
View file @
f83fca85
...
...
@@ -22,7 +22,12 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import
com.yifu.cloud.plus.v1.csp.entity.TOperationLog
;
import
com.yifu.cloud.plus.v1.csp.service.TOperationLogService
;
import
com.yifu.cloud.plus.v1.csp.vo.TOperationLogSearchVo
;
import
com.yifu.cloud.plus.v1.yifu.archives.vo.TEmployeeProjectBelongDeptSearchCspVo
;
import
com.yifu.cloud.plus.v1.yifu.common.core.constant.CommonConstants
;
import
com.yifu.cloud.plus.v1.yifu.common.core.util.Common
;
import
com.yifu.cloud.plus.v1.yifu.common.core.util.R
;
import
com.yifu.cloud.plus.v1.yifu.common.log.annotation.SysLog
;
import
com.yifu.cloud.plus.v1.yifu.common.security.annotation.Inner
;
import
io.swagger.v3.oas.annotations.Operation
;
import
io.swagger.v3.oas.annotations.tags.Tag
;
import
lombok.RequiredArgsConstructor
;
...
...
yifu-csp/yifu-csp-biz/src/main/java/com/yifu/cloud/plus/v1/csp/mapper/EmployeeRegistrationMapper.java
View file @
f83fca85
...
...
@@ -7,6 +7,8 @@ import com.yifu.cloud.plus.v1.csp.entity.EmployeeRegistration;
import
com.yifu.cloud.plus.v1.csp.vo.EmployeeRegistrationExportVo
;
import
com.yifu.cloud.plus.v1.csp.vo.EmployeeRegistrationHrExportVo
;
import
com.yifu.cloud.plus.v1.csp.vo.EmployeeRegistrationSearchVo
;
import
com.yifu.cloud.plus.v1.yifu.archives.entity.TEmployeeProjectBelongDept
;
import
com.yifu.cloud.plus.v1.yifu.archives.vo.TEmployeeProjectBelongDeptSearchCspVo
;
import
org.apache.ibatis.annotations.Mapper
;
import
org.apache.ibatis.annotations.Param
;
...
...
@@ -33,4 +35,10 @@ public interface EmployeeRegistrationMapper extends BaseMapper<EmployeeRegistrat
List
<
EmployeeRegistrationHrExportVo
>
selectHrExportList
(
@Param
(
"employeeRegistration"
)
EmployeeRegistrationSearchVo
employeeRegistration
);
// 获取已接收的入离职申请,同步所属部门到项目档案里
List
<
TEmployeeProjectBelongDept
>
getZeroRegistrationByIdCard
(
@Param
(
"searchCspVo"
)
TEmployeeProjectBelongDeptSearchCspVo
searchCspVo
);
// 将数据处理为已处理
int
updateTwoRegistrationByIdCard
(
@Param
(
"searchCspVo"
)
TEmployeeProjectBelongDeptSearchCspVo
searchCspVo
);
}
yifu-csp/yifu-csp-biz/src/main/java/com/yifu/cloud/plus/v1/csp/service/EmployeeRegistrationService.java
View file @
f83fca85
...
...
@@ -5,6 +5,8 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import
com.baomidou.mybatisplus.extension.service.IService
;
import
com.yifu.cloud.plus.v1.csp.entity.EmployeeRegistration
;
import
com.yifu.cloud.plus.v1.csp.vo.EmployeeRegistrationSearchVo
;
import
com.yifu.cloud.plus.v1.yifu.archives.entity.TEmployeeProjectBelongDept
;
import
com.yifu.cloud.plus.v1.yifu.archives.vo.TEmployeeProjectBelongDeptSearchCspVo
;
import
com.yifu.cloud.plus.v1.yifu.common.core.util.ErrorMessage
;
import
com.yifu.cloud.plus.v1.yifu.common.core.util.R
;
...
...
@@ -68,4 +70,13 @@ public interface EmployeeRegistrationService extends IService<EmployeeRegistrati
*/
void
listHrExport
(
HttpServletResponse
response
,
EmployeeRegistrationSearchVo
searchVo
);
/**
* @param searchCspVo 身份证 与 类型
* @Description: 获取已接收的入离职申请,同步所属部门到项目档案里
* @Author: hgw
* @Date: 2025/3/3 16:54
* @return: com.yifu.cloud.plus.v1.yifu.archives.entity.TEmployeeProjectBelongDept
**/
TEmployeeProjectBelongDept
getZeroRegistrationAndUpdateTwo
(
TEmployeeProjectBelongDeptSearchCspVo
searchCspVo
);
}
yifu-csp/yifu-csp-biz/src/main/java/com/yifu/cloud/plus/v1/csp/service/TOperationLogService.java
View file @
f83fca85
...
...
@@ -55,4 +55,5 @@ public interface TOperationLogService extends IService<TOperationLog> {
* @return: com.yifu.cloud.plus.v1.csp.entity.TOperationLog
**/
TOperationLog
saveLog
(
String
mainId
,
String
type
,
String
title
,
LocalDateTime
operationTime
,
String
operationName
,
String
remark
);
}
yifu-csp/yifu-csp-biz/src/main/java/com/yifu/cloud/plus/v1/csp/service/impl/EmployeeRegistrationServiceImpl.java
View file @
f83fca85
...
...
@@ -15,6 +15,7 @@ import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import
com.yifu.cloud.plus.v1.csp.config.WxConfig
;
import
com.yifu.cloud.plus.v1.csp.constants.RegistConstants
;
import
com.yifu.cloud.plus.v1.csp.entity.EmployeeRegistration
;
import
com.yifu.cloud.plus.v1.csp.entity.TOperationLog
;
import
com.yifu.cloud.plus.v1.csp.mapper.EmployeeRegistrationMapper
;
import
com.yifu.cloud.plus.v1.csp.service.EmployeeRegistrationService
;
import
com.yifu.cloud.plus.v1.csp.service.TOperationLogService
;
...
...
@@ -23,7 +24,9 @@ import com.yifu.cloud.plus.v1.csp.vo.EmployeeRegistrationHrExportVo;
import
com.yifu.cloud.plus.v1.csp.vo.EmployeeRegistrationSearchVo
;
import
com.yifu.cloud.plus.v1.csp.vo.EmployeeRegistrationVo
;
import
com.yifu.cloud.plus.v1.yifu.admin.api.entity.SysUser
;
import
com.yifu.cloud.plus.v1.yifu.archives.entity.TEmployeeProjectBelongDept
;
import
com.yifu.cloud.plus.v1.yifu.archives.vo.EmpProjectStatusVo
;
import
com.yifu.cloud.plus.v1.yifu.archives.vo.TEmployeeProjectBelongDeptSearchCspVo
;
import
com.yifu.cloud.plus.v1.yifu.archives.vo.TSettleDomainSelectVo
;
import
com.yifu.cloud.plus.v1.yifu.common.core.constant.CommonConstants
;
import
com.yifu.cloud.plus.v1.yifu.common.core.constant.SecurityConstants
;
...
...
@@ -479,4 +482,67 @@ public class EmployeeRegistrationServiceImpl extends ServiceImpl<EmployeeRegistr
}
}
}
/**
* @param searchCspVo 身份证与类型
* @Description: 获取已接收的入离职申请,同步所属部门到项目档案里
* @Author: hgw
* @Date: 2025/3/3 16:57
* @return: com.yifu.cloud.plus.v1.yifu.archives.entity.TEmployeeProjectBelongDept
**/
@Override
public
TEmployeeProjectBelongDept
getZeroRegistrationAndUpdateTwo
(
TEmployeeProjectBelongDeptSearchCspVo
searchCspVo
)
{
List
<
TEmployeeProjectBelongDept
>
belongDeptList
=
baseMapper
.
getZeroRegistrationByIdCard
(
searchCspVo
);
if
(
belongDeptList
!=
null
&&
!
belongDeptList
.
isEmpty
())
{
// 1:加日志
if
(
doSaveLogBatch
(
searchCspVo
,
belongDeptList
))
return
null
;
// 更新为已处理
baseMapper
.
updateTwoRegistrationByIdCard
(
searchCspVo
);
return
belongDeptList
.
get
(
0
);
}
else
{
return
null
;
}
}
/**
* @Description: 批量处理日志
* @Author: hgw
* @Date: 2025/3/4 10:41
* @return: boolean
**/
private
boolean
doSaveLogBatch
(
TEmployeeProjectBelongDeptSearchCspVo
searchCspVo
,
List
<
TEmployeeProjectBelongDept
>
belongDeptList
)
{
YifuUser
user
=
SecurityUtils
.
getUser
();
if
(
user
==
null
||
Common
.
isEmpty
(
user
.
getId
()))
{
return
true
;
}
TOperationLog
log
;
List
<
TOperationLog
>
logList
=
new
ArrayList
<>();
String
title
=
"已处理"
;
for
(
TEmployeeProjectBelongDept
belongDept
:
belongDeptList
)
{
log
=
new
TOperationLog
();
log
.
setMainId
(
belongDept
.
getId
());
log
.
setType
(
CommonConstants
.
ZERO_STRING
);
log
.
setTitle
(
title
);
log
.
setOperationTime
(
searchCspVo
.
getEmpCreateAndLeaveTime
());
log
.
setOperationName
(
searchCspVo
.
getEmpCreateAndLeaveUser
());
if
(
searchCspVo
.
getEmpCreateAndLeaveTime
()
!=
null
&&
belongDept
.
getLogCreateTime
()
!=
null
&&
searchCspVo
.
getEmpCreateAndLeaveTime
().
isBefore
(
belongDept
.
getLogCreateTime
()))
{
if
(
CommonConstants
.
ONE_STRING
.
equals
(
searchCspVo
.
getFeedbackType
()))
{
log
.
setRemark
(
"入职登记前已增员"
);
}
else
{
log
.
setRemark
(
"离职登记前已减员"
);
}
}
log
.
setCreateBy
(
user
.
getId
());
log
.
setCreateName
(
user
.
getNickname
());
log
.
setCreateTime
(
LocalDateTime
.
now
());
logList
.
add
(
log
);
}
if
(!
logList
.
isEmpty
())
{
logService
.
saveBatch
(
logList
);
}
return
false
;
}
}
yifu-csp/yifu-csp-biz/src/main/java/com/yifu/cloud/plus/v1/csp/service/impl/TOperationLogServiceImpl.java
View file @
f83fca85
...
...
@@ -79,6 +79,10 @@ public class TOperationLogServiceImpl extends ServiceImpl<TOperationLogMapper, T
if
(
Common
.
isNotNull
(
entity
.
getCreateName
()))
{
wrapper
.
eq
(
TOperationLog:
:
getCreateName
,
entity
.
getCreateName
());
}
if
(
Common
.
isNotNull
(
entity
.
getMainId
()))
{
wrapper
.
eq
(
TOperationLog:
:
getMainId
,
entity
.
getMainId
());
wrapper
.
eq
(
TOperationLog:
:
getType
,
CommonConstants
.
ZERO_STRING
);
}
return
wrapper
;
}
...
...
@@ -115,7 +119,6 @@ public class TOperationLogServiceImpl extends ServiceImpl<TOperationLogMapper, T
log
.
setCreateBy
(
user
.
getId
());
log
.
setCreateName
(
user
.
getNickname
());
log
.
setCreateTime
(
LocalDateTime
.
now
());
log
.
setCreateTime
(
LocalDateTime
.
now
());
this
.
save
(
log
);
return
log
;
}
...
...
yifu-csp/yifu-csp-biz/src/main/resources/mapper/EmployeeRegistrationMapper.xml
View file @
f83fca85
...
...
@@ -229,4 +229,34 @@
limit #{employeeRegistration.limitStart},#{employeeRegistration.limitEnd}
</if>
</select>
<!-- 获取待处理的数据 -->
<select
id=
"getZeroRegistrationByIdCard"
resultType=
"com.yifu.cloud.plus.v1.yifu.archives.entity.TEmployeeProjectBelongDept"
>
SELECT
a.id,
a.emp_deptname empDeptname,
a.emp_deptid empDeptid,
l.CREATE_TIME logCreateTime
FROM employee_registration a
left join t_operation_log l on l.MAIN_ID=a.id and l.TITLE = '确认接收'
where a.emp_idcard = #{searchCspVo.empIdCard} and a.process_status= '0'
<if
test=
"searchCspVo.deptId != null and searchCspVo.deptId.trim() != ''"
>
AND a.dept_id = #{searchCspVo.deptId}
</if>
<if
test=
"searchCspVo.feedbackType != null and searchCspVo.feedbackType.trim() != ''"
>
AND a.feedback_type = #{searchCspVo.feedbackType}
</if>
order by a.create_time desc
</select>
<!-- 将数据处理为已处理 -->
<select
id=
"updateTwoRegistrationByIdCard"
resultType=
"java.lang.Integer"
>
update employee_registration a
set a.process_status= '2'
where a.emp_idcard = #{searchCspVo.empIdCard} and a.process_status= '0'
<if
test=
"searchCspVo.feedbackType != null and searchCspVo.feedbackType.trim() != ''"
>
AND a.feedback_type = #{searchCspVo.feedbackType}
</if>
</select>
</mapper>
yifu-upms/yifu-upms-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/admin/service/impl/SysDeptServiceImpl.java
View file @
f83fca85
...
...
@@ -37,6 +37,7 @@ import com.yifu.cloud.plus.v1.yifu.admin.mapper.SysDeptMapper;
import
com.yifu.cloud.plus.v1.yifu.admin.mapper.SysUserMapper
;
import
com.yifu.cloud.plus.v1.yifu.admin.service.SysDeptRelationService
;
import
com.yifu.cloud.plus.v1.yifu.admin.service.SysDeptService
;
import
com.yifu.cloud.plus.v1.yifu.common.core.constant.ClientNameConstants
;
import
com.yifu.cloud.plus.v1.yifu.common.core.constant.CommonConstants
;
import
com.yifu.cloud.plus.v1.yifu.common.core.util.Common
;
import
com.yifu.cloud.plus.v1.yifu.common.core.util.R
;
...
...
@@ -504,8 +505,7 @@ public class SysDeptServiceImpl extends ServiceImpl<SysDeptMapper, SysDept> impl
dept
.
setAncestors
(
info
.
getAncestors
()
+
","
+
dept
.
getParentId
());
}
}
// todo 去常量
dept
.
setClient
(
"yifu-csp"
);
dept
.
setClient
(
ClientNameConstants
.
CLIENT_CSP
);
this
.
save
(
dept
);
return
R
.
ok
(
"创建成功"
);
}
...
...
yifu-upms/yifu-upms-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/admin/service/impl/SysUserDeptPermissionServiceImpl.java
View file @
f83fca85
...
...
@@ -30,6 +30,7 @@ import com.yifu.cloud.plus.v1.yifu.admin.mapper.SysUserDeptPermissionMapper;
import
com.yifu.cloud.plus.v1.yifu.admin.mapper.SysUserMapper
;
import
com.yifu.cloud.plus.v1.yifu.admin.service.SysUserDeptPermissionService
;
import
com.yifu.cloud.plus.v1.yifu.common.core.constant.CacheConstants
;
import
com.yifu.cloud.plus.v1.yifu.common.core.constant.ClientNameConstants
;
import
com.yifu.cloud.plus.v1.yifu.common.core.constant.CommonConstants
;
import
com.yifu.cloud.plus.v1.yifu.common.core.util.Common
;
import
com.yifu.cloud.plus.v1.yifu.common.core.util.R
;
...
...
@@ -156,8 +157,7 @@ public class SysUserDeptPermissionServiceImpl extends ServiceImpl<SysUserDeptPer
}
// 更新用户数据权限
// todo 去常量
sysUserDeptPermission
.
setClient
(
"yifu-csp"
);
sysUserDeptPermission
.
setClient
(
ClientNameConstants
.
CLIENT_CSP
);
sysUserDeptPermission
.
setPermissionsType
(
CommonConstants
.
TWO_STRING
);
baseMapper
.
insert
(
sysUserDeptPermission
);
redisUtil
.
remove
(
CacheConstants
.
USER_DETAILS
+
"::"
+
userInfo
.
getUsername
());
...
...
@@ -316,7 +316,7 @@ public class SysUserDeptPermissionServiceImpl extends ServiceImpl<SysUserDeptPer
SysUserDeptPermission
permission
=
new
SysUserDeptPermission
();
permission
.
setDeptId
(
entity
.
getDeptId
());
permission
.
setUserId
(
user
.
getUserId
());
permission
.
setClient
(
"yifu-csp"
);
permission
.
setClient
(
ClientNameConstants
.
CLIENT_CSP
);
permission
.
setProjectName
(
entity
.
getProjectName
());
permission
.
setProjectNo
(
entity
.
getProjectNo
());
permission
.
setUserType
(
entity
.
getUserType
());
...
...
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