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
275a1d30
Commit
275a1d30
authored
Mar 13, 2025
by
huyuchen
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
huych-入离职登记提交
parent
9fb2cfe1
Hide whitespace changes
Inline
Side-by-side
Showing
5 changed files
with
80 additions
and
8 deletions
+80
-8
CommonConstants.java
...ud/plus/v1/yifu/common/core/constant/CommonConstants.java
+2
-0
EmployeeRegistrationPre.java
...ifu/cloud/plus/v1/csp/entity/EmployeeRegistrationPre.java
+3
-0
EmployeeRegistrationPreSearchVo.java
...cloud/plus/v1/csp/vo/EmployeeRegistrationPreSearchVo.java
+14
-0
EmployeeRegistrationPreServiceImpl.java
.../csp/service/impl/EmployeeRegistrationPreServiceImpl.java
+49
-1
EmployeeRegistrationPreMapper.xml
...c/main/resources/mapper/EmployeeRegistrationPreMapper.xml
+12
-7
No files found.
yifu-common/yifu-common-core/src/main/java/com/yifu/cloud/plus/v1/yifu/common/core/constant/CommonConstants.java
View file @
275a1d30
...
...
@@ -638,6 +638,8 @@ public interface CommonConstants {
List
<
String
>
processPreStatus
=
Stream
.
of
(
"1"
).
collect
(
Collectors
.
toList
());
List
<
String
>
processPreArchivesStatus
=
Stream
.
of
(
"0"
,
"1"
,
"2"
).
collect
(
Collectors
.
toList
());
List
<
String
>
socialInfoStatus
=
Stream
.
of
(
"1"
,
"3"
,
"5"
,
"7"
).
collect
(
Collectors
.
toList
());
List
<
String
>
deptList
=
Stream
.
of
(
"安徽一册档案管理有限公司"
,
"安徽顾合企业管理咨询有限公司"
,
"安徽赤道线数字传媒科技有限公司"
,
"劳务业务中心"
,
"易服智享&研究院"
).
collect
(
Collectors
.
toList
());
...
...
yifu-csp/yifu-csp-api/src/main/java/com/yifu/cloud/plus/v1/csp/entity/EmployeeRegistrationPre.java
View file @
275a1d30
...
...
@@ -95,5 +95,8 @@ public class EmployeeRegistrationPre extends BaseEntity {
@Schema
(
description
=
"确认时间"
)
private
Date
confirmTime
;
@Schema
(
description
=
"最新的客服名称"
)
private
String
customerUsernameNew
;
}
yifu-csp/yifu-csp-api/src/main/java/com/yifu/cloud/plus/v1/csp/vo/EmployeeRegistrationPreSearchVo.java
View file @
275a1d30
package
com
.
yifu
.
cloud
.
plus
.
v1
.
csp
.
vo
;
import
com.baomidou.mybatisplus.annotation.TableField
;
import
com.yifu.cloud.plus.v1.csp.entity.EmployeeRegistrationPre
;
import
io.swagger.v3.oas.annotations.media.Schema
;
import
lombok.Data
;
import
java.time.LocalDateTime
;
import
java.util.List
;
/**
* 入职待建档表
...
...
@@ -39,4 +41,16 @@ public class EmployeeRegistrationPreSearchVo extends EmployeeRegistrationPre {
@Schema
(
description
=
"查询limit 数据条数"
)
private
int
limitEnd
;
@Schema
(
description
=
"处理状态数组"
)
@TableField
(
exist
=
false
)
private
List
<
String
>
statusList
;
@Schema
(
description
=
"项目权限数组"
)
@TableField
(
exist
=
false
)
private
List
<
String
>
deptNoList
;
@Schema
(
description
=
"列表类型 1 待办 2监控"
)
private
String
type
;
}
yifu-csp/yifu-csp-biz/src/main/java/com/yifu/cloud/plus/v1/csp/service/impl/EmployeeRegistrationPreServiceImpl.java
View file @
275a1d30
...
...
@@ -13,12 +13,19 @@ import com.yifu.cloud.plus.v1.csp.entity.EmployeeRegistrationPre;
import
com.yifu.cloud.plus.v1.csp.mapper.EmployeeRegistrationPreMapper
;
import
com.yifu.cloud.plus.v1.csp.service.EmployeeRegistrationPreService
;
import
com.yifu.cloud.plus.v1.csp.vo.EmployeeRegistrationPreSearchVo
;
import
com.yifu.cloud.plus.v1.yifu.archives.vo.TSettleDomainRegistListVo
;
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.DateUtil
;
import
com.yifu.cloud.plus.v1.yifu.common.core.util.ExcelUtil
;
import
com.yifu.cloud.plus.v1.yifu.common.core.util.R
;
import
com.yifu.cloud.plus.v1.yifu.common.core.vo.YifuUser
;
import
com.yifu.cloud.plus.v1.yifu.common.dapr.util.ArchivesDaprUtil
;
import
com.yifu.cloud.plus.v1.yifu.common.mybatis.base.BaseEntity
;
import
com.yifu.cloud.plus.v1.yifu.common.security.util.SecurityUtils
;
import
lombok.extern.log4j.Log4j2
;
import
org.springframework.beans.factory.annotation.Autowired
;
import
org.springframework.stereotype.Service
;
import
javax.servlet.ServletOutputStream
;
...
...
@@ -37,6 +44,9 @@ import java.util.List;
@Service
public
class
EmployeeRegistrationPreServiceImpl
extends
ServiceImpl
<
EmployeeRegistrationPreMapper
,
EmployeeRegistrationPre
>
implements
EmployeeRegistrationPreService
{
@Autowired
private
ArchivesDaprUtil
archivesDaprUtil
;
/**
* 入职待建档表简单分页查询
* @param employeeRegistrationPre 入职待建档表
...
...
@@ -44,7 +54,13 @@ public class EmployeeRegistrationPreServiceImpl extends ServiceImpl<EmployeeRegi
*/
@Override
public
IPage
<
EmployeeRegistrationPre
>
getEmployeeRegistrationPrePage
(
Page
<
EmployeeRegistrationPre
>
page
,
EmployeeRegistrationPreSearchVo
employeeRegistrationPre
){
return
baseMapper
.
getEmployeeRegistrationPrePage
(
page
,
employeeRegistrationPre
);
//前端客服的所有项目权限赋值
initSearchVo
(
employeeRegistrationPre
);
//待办列表只查看未处理的数据
if
(
CommonConstants
.
ONE_STRING
.
equals
(
employeeRegistrationPre
.
getType
()))
{
employeeRegistrationPre
.
setStatusList
(
CommonConstants
.
processPreArchivesStatus
);
}
return
baseMapper
.
getEmployeeRegistrationPrePage
(
page
,
employeeRegistrationPre
);
}
/**
...
...
@@ -147,4 +163,36 @@ public class EmployeeRegistrationPreServiceImpl extends ServiceImpl<EmployeeRegi
}
return
wrapper
;
}
/**
* @Description: 获取前端客服的所有项目权限
* @Author: huych
* @Date: 2025/3/13 17:02
* @return:
**/
public
void
initSearchVo
(
EmployeeRegistrationPreSearchVo
searchVo
)
{
YifuUser
user
=
SecurityUtils
.
getUser
();
long
roleId
=
1839501715787390978L
;
boolean
isSsc
=
this
.
haveRole
(
user
,
roleId
);
if
(!
isSsc
&&
!
CommonConstants
.
ZERO_STRING
.
equals
(
user
.
getSystemFlag
()))
{
//获取项目信息
R
<
TSettleDomainRegistListVo
>
domainR
=
archivesDaprUtil
.
getAllDeptByCustomerLoginName
(
user
.
getUsername
());
if
(
null
!=
domainR
&&
null
!=
domainR
.
getData
()
&&
null
!=
domainR
.
getData
().
getDeptNos
())
{
searchVo
.
setDeptNoList
(
domainR
.
getData
().
getDeptNos
());
}
else
{
searchVo
.
setId
(
CommonConstants
.
ONE_STRING_NEGATE
);
}
}
}
public
boolean
haveRole
(
YifuUser
user
,
long
roleId
)
{
List
<
Long
>
roleList
=
user
.
getClientRoleMap
().
get
(
ClientNameConstants
.
CLIENT_MVP
);
for
(
Long
role
:
roleList
)
{
if
(
role
==
roleId
)
{
return
true
;
}
}
return
false
;
}
}
yifu-csp/yifu-csp-biz/src/main/resources/mapper/EmployeeRegistrationPreMapper.xml
View file @
275a1d30
...
...
@@ -33,6 +33,7 @@
<result
property=
"createTime"
column=
"create_time"
/>
<result
property=
"updateBy"
column=
"update_by"
/>
<result
property=
"updateTime"
column=
"update_time"
/>
<result
property=
"customerUsernameNew"
column=
"customer_username_new"
/>
</resultMap>
<sql
id=
"Base_Column_List"
>
a.id,
...
...
@@ -62,7 +63,8 @@
a.create_time,
a.update_by,
a.update_time,
a.contract_sub_name
a.contract_sub_name,
a.customer_username_new
</sql>
<sql
id=
"employeeRegistrationPre_where"
>
<if
test=
"employeeRegistrationPre != null"
>
...
...
@@ -70,10 +72,10 @@
AND a.id = #{employeeRegistrationPre.id}
</if>
<if
test=
"employeeRegistrationPre.employeeName != null and employeeRegistrationPre.employeeName.trim() != ''"
>
AND a.employee_name = #{employeeRegistrationPre.employeeName}
AND a.employee_name like CONCAT('%',#{employeeRegistrationPre.employeeName},'%')
</if>
<if
test=
"employeeRegistrationPre.empIdcard != null and employeeRegistrationPre.empIdcard.trim() != ''"
>
AND a.emp_idcard = #{employeeRegistrationPre.empIdcard}
AND a.emp_idcard like CONCAT('%',#{employeeRegistrationPre.empIdcard},'%')
</if>
<if
test=
"employeeRegistrationPre.empPhone != null and employeeRegistrationPre.empPhone.trim() != ''"
>
AND a.emp_phone = #{employeeRegistrationPre.empPhone}
...
...
@@ -85,16 +87,19 @@
AND a.join_leave_date = #{employeeRegistrationPre.joinLeaveDate}
</if>
<if
test=
"employeeRegistrationPre.processStatus != null and employeeRegistrationPre.processStatus.trim() != ''"
>
AND a.process_status = #{employeeRegistrationPre.processStatus}
AND a.process_status in
<foreach
item=
"item"
index=
"index"
collection=
"employeeRegistrationPre.statusList"
open=
"("
separator=
","
close=
")"
>
'${item}'
</foreach>
</if>
<if
test=
"employeeRegistrationPre.customerUsername
!= null and employeeRegistrationPre.customerUsername
.trim() != ''"
>
AND a.customer_username
= #{employeeRegistrationPre.customerUsername
}
<if
test=
"employeeRegistrationPre.customerUsername
New != null and employeeRegistrationPre.customerUsernameNew
.trim() != ''"
>
AND a.customer_username
_new = #{employeeRegistrationPre.customerUsernameNew
}
</if>
<if
test=
"employeeRegistrationPre.customerUserLoginname != null and employeeRegistrationPre.customerUserLoginname.trim() != ''"
>
AND a.customer_user_loginname = #{employeeRegistrationPre.customerUserLoginname}
</if>
<if
test=
"employeeRegistrationPre.deptName != null and employeeRegistrationPre.deptName.trim() != ''"
>
AND a.dept_name
= #{employeeRegistrationPre.deptName}
AND a.dept_name
like CONCAT('%',#{employeeRegistrationPre.deptName},'%')
</if>
<if
test=
"employeeRegistrationPre.deptNo != null and employeeRegistrationPre.deptNo.trim() != ''"
>
AND a.dept_no = #{employeeRegistrationPre.deptNo}
...
...
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