Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Contribute to GitLab
Sign in
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
1b12c166
You need to sign in or sign up before continuing.
Commit
1b12c166
authored
Mar 17, 2025
by
huyuchen
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
huych-入离职登记提交
parent
0b81f66d
Hide whitespace changes
Inline
Side-by-side
Showing
15 changed files
with
297 additions
and
22 deletions
+297
-22
EmployeeRegistrationCountVo.java
.../v1/yifu/archives/entity/EmployeeRegistrationCountVo.java
+30
-0
EmployeeRegistrationPreSearchVo.java
.../v1/yifu/archives/vo/EmployeeRegistrationPreSearchVo.java
+13
-0
TSettleDomainRegistListVo.java
...d/plus/v1/yifu/archives/vo/TSettleDomainRegistListVo.java
+1
-1
EmployeeRegistrationPreController.java
...rchives/controller/EmployeeRegistrationPreController.java
+16
-0
TCompleteMonitorController.java
.../yifu/archives/controller/TCompleteMonitorController.java
+2
-0
TCompleteMonitorMapper.java
.../plus/v1/yifu/archives/mapper/TCompleteMonitorMapper.java
+2
-3
EmployeeRegistrationPreService.java
...yifu/archives/service/EmployeeRegistrationPreService.java
+7
-0
EmployeeRegistrationPreServiceImpl.java
...ives/service/impl/EmployeeRegistrationPreServiceImpl.java
+69
-9
TCompleteMonitorServiceImpl.java
...fu/archives/service/impl/TCompleteMonitorServiceImpl.java
+42
-1
CspDaprUtils.java
...ifu/cloud/plus/v1/yifu/common/dapr/util/CspDaprUtils.java
+12
-1
EmployeeRegistrationDaprCountVo.java
...cloud/plus/v1/csp/vo/EmployeeRegistrationDaprCountVo.java
+31
-0
EmployeeRegistrationUpdateVo.java
...fu/cloud/plus/v1/csp/vo/EmployeeRegistrationUpdateVo.java
+7
-6
EmployeeRegistrationController.java
...lus/v1/csp/controller/EmployeeRegistrationController.java
+18
-0
EmployeeRegistrationService.java
...loud/plus/v1/csp/service/EmployeeRegistrationService.java
+8
-0
EmployeeRegistrationServiceImpl.java
.../v1/csp/service/impl/EmployeeRegistrationServiceImpl.java
+39
-1
No files found.
yifu-archives/yifu-archives-api/src/main/java/com/yifu/cloud/plus/v1/yifu/archives/entity/EmployeeRegistrationCountVo.java
0 → 100644
View file @
1b12c166
package
com
.
yifu
.
cloud
.
plus
.
v1
.
yifu
.
archives
.
entity
;
import
io.swagger.v3.oas.annotations.media.Schema
;
import
lombok.Data
;
import
java.io.Serializable
;
/**
* 入职待办条数vo
*
* @author huych
* @date 2025-03-12 17:14:19
*/
@Data
public
class
EmployeeRegistrationCountVo
implements
Serializable
{
@Schema
(
description
=
"入职待确认数量"
)
private
long
typeOneCount
;
@Schema
(
description
=
"入职待建档数量"
)
private
long
typeTwoCount
;
@Schema
(
description
=
"档案待完整数量"
)
private
long
typeThreeCount
;
@Schema
(
description
=
"总数量"
)
private
long
totalCount
;
}
yifu-archives/yifu-archives-api/src/main/java/com/yifu/cloud/plus/v1/yifu/archives/vo/EmployeeRegistrationPreSearchVo.java
View file @
1b12c166
...
@@ -51,4 +51,17 @@ public class EmployeeRegistrationPreSearchVo extends EmployeeRegistrationPre {
...
@@ -51,4 +51,17 @@ public class EmployeeRegistrationPreSearchVo extends EmployeeRegistrationPre {
@Schema
(
description
=
"列表类型 1 待办 2监控 3入职确认信息"
)
@Schema
(
description
=
"列表类型 1 待办 2监控 3入职确认信息"
)
private
String
type
;
private
String
type
;
@Schema
(
description
=
"入职待确认"
)
@TableField
(
exist
=
false
)
private
String
mIdOne
;
@Schema
(
description
=
"入职待建档"
)
@TableField
(
exist
=
false
)
private
String
mIdTwo
;
@Schema
(
description
=
"入职待完整"
)
@TableField
(
exist
=
false
)
private
String
mIdThree
;
}
}
yifu-archives/yifu-archives-api/src/main/java/com/yifu/cloud/plus/v1/yifu/archives/vo/TSettleDomainRegistListVo.java
View file @
1b12c166
...
@@ -6,9 +6,9 @@ import java.util.List;
...
@@ -6,9 +6,9 @@ import java.util.List;
@Data
@Data
public
class
TSettleDomainRegistListVo
{
public
class
TSettleDomainRegistListVo
{
/**
/**
* 合同主体项目编码
* 合同主体项目编码
*/
*/
private
List
<
String
>
deptNos
;
private
List
<
String
>
deptNos
;
}
}
yifu-archives/yifu-archives-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/archives/controller/EmployeeRegistrationPreController.java
View file @
1b12c166
...
@@ -92,6 +92,8 @@ public class EmployeeRegistrationPreController {
...
@@ -92,6 +92,8 @@ public class EmployeeRegistrationPreController {
@Operation
(
description
=
"导出入职待建档表"
)
@Operation
(
description
=
"导出入职待建档表"
)
@PostMapping
(
"/export"
)
@PostMapping
(
"/export"
)
public
void
export
(
HttpServletResponse
response
,
@RequestBody
EmployeeRegistrationPreSearchVo
searchVo
)
{
public
void
export
(
HttpServletResponse
response
,
@RequestBody
EmployeeRegistrationPreSearchVo
searchVo
)
{
YifuUser
user
=
SecurityUtils
.
getUser
();
menuUtil
.
setAuthSql
(
user
,
searchVo
);
employeeRegistrationPreService
.
listExport
(
response
,
searchVo
);
employeeRegistrationPreService
.
listExport
(
response
,
searchVo
);
}
}
...
@@ -103,6 +105,8 @@ public class EmployeeRegistrationPreController {
...
@@ -103,6 +105,8 @@ public class EmployeeRegistrationPreController {
@Operation
(
description
=
"导出入职确认信息"
)
@Operation
(
description
=
"导出入职确认信息"
)
@PostMapping
(
"/confirmExport"
)
@PostMapping
(
"/confirmExport"
)
public
void
confirmExport
(
HttpServletResponse
response
,
@RequestBody
EmployeeRegistrationPreSearchVo
searchVo
)
{
public
void
confirmExport
(
HttpServletResponse
response
,
@RequestBody
EmployeeRegistrationPreSearchVo
searchVo
)
{
YifuUser
user
=
SecurityUtils
.
getUser
();
menuUtil
.
setAuthSql
(
user
,
searchVo
);
employeeRegistrationPreService
.
confirmExport
(
response
,
searchVo
);
employeeRegistrationPreService
.
confirmExport
(
response
,
searchVo
);
}
}
...
@@ -130,4 +134,16 @@ public class EmployeeRegistrationPreController {
...
@@ -130,4 +134,16 @@ public class EmployeeRegistrationPreController {
public
R
updateCommonInfo
(
@RequestBody
EmployeeRegistrationPre
employeeRegistrationPre
)
{
public
R
updateCommonInfo
(
@RequestBody
EmployeeRegistrationPre
employeeRegistrationPre
)
{
return
employeeRegistrationPreService
.
updateCommonInfo
(
employeeRegistrationPre
);
return
employeeRegistrationPreService
.
updateCommonInfo
(
employeeRegistrationPre
);
}
}
/**
* 入职确认信息信息修改
* @param searchVo type 查询类型 1待办列表 2 监控列表
* @return R
*/
@Operation
(
summary
=
"查询各个tab页签的入职待办条数"
,
description
=
"查询各个tab页签的入职待办条数"
)
@SysLog
(
"查询各个tab页签的入职待办条数"
)
@PostMapping
(
"/getListCount"
)
public
R
getListCount
(
@RequestBody
EmployeeRegistrationPreSearchVo
searchVo
)
{
return
employeeRegistrationPreService
.
getListCount
(
searchVo
);
}
}
}
yifu-archives/yifu-archives-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/archives/controller/TCompleteMonitorController.java
View file @
1b12c166
...
@@ -185,6 +185,8 @@ public class TCompleteMonitorController {
...
@@ -185,6 +185,8 @@ public class TCompleteMonitorController {
@Operation
(
description
=
"导出档案待完善"
)
@Operation
(
description
=
"导出档案待完善"
)
@PostMapping
(
"/archivesExport"
)
@PostMapping
(
"/archivesExport"
)
public
void
archivesExport
(
HttpServletResponse
response
,
@RequestBody
EmployeeRegistrationPreSearchVo
searchVo
)
{
public
void
archivesExport
(
HttpServletResponse
response
,
@RequestBody
EmployeeRegistrationPreSearchVo
searchVo
)
{
YifuUser
user
=
SecurityUtils
.
getUser
();
menuUtil
.
setAuthSql
(
user
,
searchVo
);
tCompleteMonitorService
.
archivesExport
(
response
,
searchVo
);
tCompleteMonitorService
.
archivesExport
(
response
,
searchVo
);
}
}
}
}
yifu-archives/yifu-archives-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/archives/mapper/TCompleteMonitorMapper.java
View file @
1b12c166
...
@@ -49,16 +49,15 @@ public interface TCompleteMonitorMapper extends BaseMapper<TCompleteMonitor> {
...
@@ -49,16 +49,15 @@ public interface TCompleteMonitorMapper extends BaseMapper<TCompleteMonitor> {
*/
*/
IPage
<
EmployeeRegistrationProjectListVo
>
getAllLackArchivesPage
(
Page
<
EmployeeRegistrationProjectListVo
>
page
,
@Param
(
"employeeRegistrationPre"
)
EmployeeRegistrationPreSearchVo
employeeRegistrationPre
);
IPage
<
EmployeeRegistrationProjectListVo
>
getAllLackArchivesPage
(
Page
<
EmployeeRegistrationProjectListVo
>
page
,
@Param
(
"employeeRegistrationPre"
)
EmployeeRegistrationPreSearchVo
employeeRegistrationPre
);
/**
/**
*
档案完整度监控简单分页
查询
*
入职待完善数量
查询
* @param employeeRegistrationPre 入职待完善
* @param employeeRegistrationPre 入职待完善
* @return
* @return
*/
*/
long
getAllLackArchivesExportCount
(
@Param
(
"employeeRegistrationPre"
)
EmployeeRegistrationPreSearchVo
employeeRegistrationPre
);
long
getAllLackArchivesExportCount
(
@Param
(
"employeeRegistrationPre"
)
EmployeeRegistrationPreSearchVo
employeeRegistrationPre
);
/**
/**
*
档案完整度监控
批量导出
*
入职待完善
批量导出
* @param employeeRegistrationPre 入职待完善
* @param employeeRegistrationPre 入职待完善
* @return
* @return
*/
*/
...
...
yifu-archives/yifu-archives-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/archives/service/EmployeeRegistrationPreService.java
View file @
1b12c166
...
@@ -59,4 +59,11 @@ public interface EmployeeRegistrationPreService extends IService<EmployeeRegistr
...
@@ -59,4 +59,11 @@ public interface EmployeeRegistrationPreService extends IService<EmployeeRegistr
* @return
* @return
*/
*/
R
updateCommonInfo
(
EmployeeRegistrationPre
employeeRegistrationPre
);
R
updateCommonInfo
(
EmployeeRegistrationPre
employeeRegistrationPre
);
/**
* 入职确认信息信息修改
* @param searchVo type 查询类型 1待办列表 2 监控列表
* @return
*/
R
getListCount
(
EmployeeRegistrationPreSearchVo
searchVo
);
}
}
yifu-archives/yifu-archives-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/archives/service/impl/EmployeeRegistrationPreServiceImpl.java
View file @
1b12c166
...
@@ -6,20 +6,28 @@ import com.alibaba.excel.write.metadata.WriteSheet;
...
@@ -6,20 +6,28 @@ import com.alibaba.excel.write.metadata.WriteSheet;
import
com.baomidou.mybatisplus.core.metadata.IPage
;
import
com.baomidou.mybatisplus.core.metadata.IPage
;
import
com.baomidou.mybatisplus.extension.plugins.pagination.Page
;
import
com.baomidou.mybatisplus.extension.plugins.pagination.Page
;
import
com.baomidou.mybatisplus.extension.service.impl.ServiceImpl
;
import
com.baomidou.mybatisplus.extension.service.impl.ServiceImpl
;
import
com.yifu.cloud.plus.v1.csp.vo.EmployeeRegistrationDaprCountVo
;
import
com.yifu.cloud.plus.v1.csp.vo.EmployeeRegistrationUpdateVo
;
import
com.yifu.cloud.plus.v1.csp.vo.EmployeeRegistrationUpdateVo
;
import
com.yifu.cloud.plus.v1.yifu.archives.entity.EmployeeRegistrationCountVo
;
import
com.yifu.cloud.plus.v1.yifu.archives.entity.EmployeeRegistrationPre
;
import
com.yifu.cloud.plus.v1.yifu.archives.entity.EmployeeRegistrationPre
;
import
com.yifu.cloud.plus.v1.yifu.archives.mapper.EmployeeRegistrationPreMapper
;
import
com.yifu.cloud.plus.v1.yifu.archives.mapper.EmployeeRegistrationPreMapper
;
import
com.yifu.cloud.plus.v1.yifu.archives.mapper.TCompleteMonitorMapper
;
import
com.yifu.cloud.plus.v1.yifu.archives.service.EmployeeRegistrationPreService
;
import
com.yifu.cloud.plus.v1.yifu.archives.service.EmployeeRegistrationPreService
;
import
com.yifu.cloud.plus.v1.yifu.archives.service.TEmployeeLogService
;
import
com.yifu.cloud.plus.v1.yifu.archives.service.TEmployeeLogService
;
import
com.yifu.cloud.plus.v1.yifu.archives.vo.*
;
import
com.yifu.cloud.plus.v1.yifu.archives.service.TSettleDomainService
;
import
com.yifu.cloud.plus.v1.yifu.archives.vo.EmployeeRegistrationPreExportVo
;
import
com.yifu.cloud.plus.v1.yifu.archives.vo.EmployeeRegistrationPreInfoExportVo
;
import
com.yifu.cloud.plus.v1.yifu.archives.vo.EmployeeRegistrationPreSearchVo
;
import
com.yifu.cloud.plus.v1.yifu.archives.vo.EmployeeRegistrationPreVo
;
import
com.yifu.cloud.plus.v1.yifu.common.core.constant.CacheConstants
;
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.ClientNameConstants
;
import
com.yifu.cloud.plus.v1.yifu.common.core.constant.CommonConstants
;
import
com.yifu.cloud.plus.v1.yifu.common.core.constant.CommonConstants
;
import
com.yifu.cloud.plus.v1.yifu.common.core.util.*
;
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.core.vo.YifuUser
;
import
com.yifu.cloud.plus.v1.yifu.common.dapr.util.ArchivesDaprUtil
;
import
com.yifu.cloud.plus.v1.yifu.common.dapr.util.CspDaprUtils
;
import
com.yifu.cloud.plus.v1.yifu.common.dapr.util.CspDaprUtils
;
import
com.yifu.cloud.plus.v1.yifu.common.dapr.util.MenuUtil
;
import
com.yifu.cloud.plus.v1.yifu.common.security.util.SecurityUtils
;
import
com.yifu.cloud.plus.v1.yifu.common.security.util.SecurityUtils
;
import
lombok.RequiredArgsConstructor
;
import
lombok.extern.log4j.Log4j2
;
import
lombok.extern.log4j.Log4j2
;
import
org.springframework.beans.BeanUtils
;
import
org.springframework.beans.BeanUtils
;
import
org.springframework.beans.factory.annotation.Autowired
;
import
org.springframework.beans.factory.annotation.Autowired
;
...
@@ -38,17 +46,21 @@ import java.util.*;
...
@@ -38,17 +46,21 @@ import java.util.*;
*/
*/
@Log4j2
@Log4j2
@Service
@Service
@RequiredArgsConstructor
public
class
EmployeeRegistrationPreServiceImpl
extends
ServiceImpl
<
EmployeeRegistrationPreMapper
,
EmployeeRegistrationPre
>
implements
EmployeeRegistrationPreService
{
public
class
EmployeeRegistrationPreServiceImpl
extends
ServiceImpl
<
EmployeeRegistrationPreMapper
,
EmployeeRegistrationPre
>
implements
EmployeeRegistrationPreService
{
@Autowired
private
ArchivesDaprUtil
archivesDaprUtil
;
@Autowired
@Autowired
private
CspDaprUtils
cspDaprUtils
;
private
CspDaprUtils
cspDaprUtils
;
@Autowired
@Autowired
private
TEmployeeLogService
tEmployeeLogService
;
private
TEmployeeLogService
tEmployeeLogService
;
private
final
TCompleteMonitorMapper
completeMonitorMapper
;
private
final
TSettleDomainService
tSettleDomainService
;
private
final
MenuUtil
menuUtil
;
/**
/**
* 入职待建档表简单分页查询
* 入职待建档表简单分页查询
* @param employeeRegistrationPre 入职待建档表
* @param employeeRegistrationPre 入职待建档表
...
@@ -215,7 +227,7 @@ public class EmployeeRegistrationPreServiceImpl extends ServiceImpl<EmployeeRegi
...
@@ -215,7 +227,7 @@ public class EmployeeRegistrationPreServiceImpl extends ServiceImpl<EmployeeRegi
receiveVo
.
setEmployeeName
(
user
.
getNickname
());
receiveVo
.
setEmployeeName
(
user
.
getNickname
());
receiveVo
.
setEmpIdcard
(
updatePre
.
getEmpIdcard
());
receiveVo
.
setEmpIdcard
(
updatePre
.
getEmpIdcard
());
receiveVo
.
setReason
(
employeeRegistrationPre
.
getReason
());
receiveVo
.
setReason
(
employeeRegistrationPre
.
getReason
());
receiveVo
.
setDep
e
No
(
employeeRegistrationPre
.
getDeptNo
());
receiveVo
.
setDep
t
No
(
employeeRegistrationPre
.
getDeptNo
());
try
{
try
{
//调用csp服务更新状态和新增操作记录
//调用csp服务更新状态和新增操作记录
cspDaprUtils
.
updateRegistByPreInfo
(
receiveVo
);
cspDaprUtils
.
updateRegistByPreInfo
(
receiveVo
);
...
@@ -295,6 +307,54 @@ public class EmployeeRegistrationPreServiceImpl extends ServiceImpl<EmployeeRegi
...
@@ -295,6 +307,54 @@ public class EmployeeRegistrationPreServiceImpl extends ServiceImpl<EmployeeRegi
return
R
.
ok
();
return
R
.
ok
();
}
}
@Override
public
R
getListCount
(
EmployeeRegistrationPreSearchVo
searchVo
)
{
try
{
YifuUser
user
=
SecurityUtils
.
getUser
();
menuUtil
.
setAuthSql
(
user
,
searchVo
);
EmployeeRegistrationCountVo
countVo
=
new
EmployeeRegistrationCountVo
();
//权限赋值
initSearchVo
(
searchVo
);
//入职确认数量
EmployeeRegistrationDaprCountVo
vo
=
new
EmployeeRegistrationDaprCountVo
();
vo
.
setUser
(
user
);
vo
.
setType
(
searchVo
.
getType
());
vo
.
setMId
(
searchVo
.
getMIdOne
());
R
<
EmployeeRegistrationDaprCountVo
>
daprVo
=
cspDaprUtils
.
getRegisterPreCount
(
vo
);
if
(
Common
.
isNotNull
(
daprVo
)
&&
Common
.
isNotNull
(
daprVo
.
getData
()))
{
vo
=
daprVo
.
getData
();
}
//入职待确认数量
long
countOne
=
vo
.
getCount
();
//入职待建档数量
EmployeeRegistrationPreSearchVo
preSearchVo
=
new
EmployeeRegistrationPreSearchVo
();
preSearchVo
.
setMId
(
searchVo
.
getMIdTwo
());
preSearchVo
.
setType
(
searchVo
.
getType
());
menuUtil
.
setAuthSql
(
user
,
preSearchVo
);
initSearchVo
(
preSearchVo
);
preSearchVo
.
setStatusList
(
CommonConstants
.
processPreArchivesStatus
);
long
countTwo
=
baseMapper
.
selectExportCount
(
preSearchVo
);
//档案待完整数量
EmployeeRegistrationPreSearchVo
monitorSearchVo
=
new
EmployeeRegistrationPreSearchVo
();
monitorSearchVo
.
setMIdThree
(
searchVo
.
getMIdThree
());
monitorSearchVo
.
setType
(
searchVo
.
getType
());
menuUtil
.
setAuthSql
(
user
,
monitorSearchVo
);
initSearchVo
(
monitorSearchVo
);
long
countThree
=
completeMonitorMapper
.
getAllLackArchivesExportCount
(
monitorSearchVo
);
countVo
.
setTypeOneCount
(
countOne
);
countVo
.
setTypeTwoCount
(
countTwo
);
countVo
.
setTypeThreeCount
(
countThree
);
countVo
.
setTotalCount
(
countOne
+
countTwo
+
countThree
);
return
R
.
ok
(
countVo
);
}
catch
(
Exception
e
)
{
log
.
error
(
"生成入职待确认信息修改操作日志异常"
,
e
);
return
R
.
failed
(
CommonConstants
.
RESULT_DATA_FAIL
);
}
}
/**
/**
* @Description: 获取前端客服的所有项目权限
* @Description: 获取前端客服的所有项目权限
* @Author: huych
* @Author: huych
...
@@ -312,9 +372,9 @@ public class EmployeeRegistrationPreServiceImpl extends ServiceImpl<EmployeeRegi
...
@@ -312,9 +372,9 @@ public class EmployeeRegistrationPreServiceImpl extends ServiceImpl<EmployeeRegi
if
(
Common
.
isNotNull
(
searchVo
.
getType
())
&&
CommonConstants
.
ONE_STRING
.
equals
(
searchVo
.
getType
()))
{
if
(
Common
.
isNotNull
(
searchVo
.
getType
())
&&
CommonConstants
.
ONE_STRING
.
equals
(
searchVo
.
getType
()))
{
searchVo
.
setAuthSql
(
null
);
searchVo
.
setAuthSql
(
null
);
//获取项目信息
//获取项目信息
R
<
TSettleDomainRegistListVo
>
domainR
=
archivesDaprUtil
.
getAllDeptByCustomerLoginName
(
user
.
getUsername
());
List
<
String
>
deptNos
=
tSettleDomainService
.
getAllDeptByCustomerLoginName
(
user
.
getUsername
());
if
(
null
!=
d
omainR
&&
null
!=
domainR
.
getData
()
&&
null
!=
domainR
.
getData
().
getDeptNos
())
{
if
(
null
!=
d
eptNos
&&
!
deptNos
.
isEmpty
())
{
searchVo
.
setDeptNoList
(
d
omainR
.
getData
().
getDeptNos
()
);
searchVo
.
setDeptNoList
(
d
eptNos
);
}
else
{
}
else
{
searchVo
.
setId
(
CommonConstants
.
ONE_STRING_NEGATE
);
searchVo
.
setId
(
CommonConstants
.
ONE_STRING_NEGATE
);
}
}
...
...
yifu-archives/yifu-archives-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/archives/service/impl/TCompleteMonitorServiceImpl.java
View file @
1b12c166
...
@@ -86,6 +86,8 @@ public class TCompleteMonitorServiceImpl extends ServiceImpl<TCompleteMonitorMap
...
@@ -86,6 +86,8 @@ public class TCompleteMonitorServiceImpl extends ServiceImpl<TCompleteMonitorMap
private
final
AtomicInteger
atomicInteger
=
new
AtomicInteger
(
0
);
private
final
AtomicInteger
atomicInteger
=
new
AtomicInteger
(
0
);
private
final
TSettleDomainService
tSettleDomainService
;
/**
/**
* 档案完整度监控简单分页查询
* 档案完整度监控简单分页查询
* @param tCompleteMonitor 档案完整度监控
* @param tCompleteMonitor 档案完整度监控
...
@@ -97,12 +99,14 @@ public class TCompleteMonitorServiceImpl extends ServiceImpl<TCompleteMonitorMap
...
@@ -97,12 +99,14 @@ public class TCompleteMonitorServiceImpl extends ServiceImpl<TCompleteMonitorMap
}
}
/**
/**
*
档案完整度监控
简单分页查询
*
入职待完善
简单分页查询
* @param preSearchVo 入职待完善
* @param preSearchVo 入职待完善
* @return
* @return
*/
*/
@Override
@Override
public
IPage
<
EmployeeRegistrationProjectListVo
>
getAllLackArchivesPage
(
Page
<
EmployeeRegistrationProjectListVo
>
page
,
EmployeeRegistrationPreSearchVo
preSearchVo
){
public
IPage
<
EmployeeRegistrationProjectListVo
>
getAllLackArchivesPage
(
Page
<
EmployeeRegistrationProjectListVo
>
page
,
EmployeeRegistrationPreSearchVo
preSearchVo
){
//权限赋值
initSearchVo
(
preSearchVo
);
return
baseMapper
.
getAllLackArchivesPage
(
page
,
preSearchVo
);
return
baseMapper
.
getAllLackArchivesPage
(
page
,
preSearchVo
);
}
}
...
@@ -181,6 +185,8 @@ public class TCompleteMonitorServiceImpl extends ServiceImpl<TCompleteMonitorMap
...
@@ -181,6 +185,8 @@ public class TCompleteMonitorServiceImpl extends ServiceImpl<TCompleteMonitorMap
String
fileName
=
"档案待完整列表"
+
DateUtil
.
getThisTime
()
+
".xlsx"
;
String
fileName
=
"档案待完整列表"
+
DateUtil
.
getThisTime
()
+
".xlsx"
;
//获取要导出的列表
//获取要导出的列表
List
<
EmployeeRegistrationProjectListVo
>
list
=
new
ArrayList
<>();
List
<
EmployeeRegistrationProjectListVo
>
list
=
new
ArrayList
<>();
//权限赋值
initSearchVo
(
searchVo
);
long
count
=
baseMapper
.
getAllLackArchivesExportCount
(
searchVo
);
long
count
=
baseMapper
.
getAllLackArchivesExportCount
(
searchVo
);
try
(
ServletOutputStream
out
=
response
.
getOutputStream
();){
try
(
ServletOutputStream
out
=
response
.
getOutputStream
();){
response
.
setContentType
(
CommonConstants
.
MULTIPART_FORM_DATA
);
response
.
setContentType
(
CommonConstants
.
MULTIPART_FORM_DATA
);
...
@@ -975,4 +981,39 @@ public class TCompleteMonitorServiceImpl extends ServiceImpl<TCompleteMonitorMap
...
@@ -975,4 +981,39 @@ public class TCompleteMonitorServiceImpl extends ServiceImpl<TCompleteMonitorMap
return
Arrays
.
asList
(
strArr
);
return
Arrays
.
asList
(
strArr
);
}
}
/**
* @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
()))
{
searchVo
.
setAuthSql
(
null
);
return
;
}
if
(
Common
.
isNotNull
(
searchVo
.
getType
())
&&
CommonConstants
.
ONE_STRING
.
equals
(
searchVo
.
getType
()))
{
searchVo
.
setAuthSql
(
null
);
//获取项目信息
List
<
String
>
deptNos
=
tSettleDomainService
.
getAllDeptByCustomerLoginName
(
user
.
getUsername
());
if
(
null
!=
deptNos
&&
!
deptNos
.
isEmpty
())
{
searchVo
.
setDeptNoList
(
deptNos
);
}
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-common/yifu-common-dapr/src/main/java/com/yifu/cloud/plus/v1/yifu/common/dapr/util/CspDaprUtils.java
View file @
1b12c166
package
com
.
yifu
.
cloud
.
plus
.
v1
.
yifu
.
common
.
dapr
.
util
;
package
com
.
yifu
.
cloud
.
plus
.
v1
.
yifu
.
common
.
dapr
.
util
;
import
com.alibaba.fastjson.JSON
;
import
com.alibaba.fastjson.JSON
;
import
com.yifu.cloud.plus.v1.csp.vo.EmployeeRegistrationDaprCountVo
;
import
com.yifu.cloud.plus.v1.csp.vo.EmployeeRegistrationUpdateVo
;
import
com.yifu.cloud.plus.v1.csp.vo.EmployeeRegistrationUpdateVo
;
import
com.yifu.cloud.plus.v1.yifu.common.core.constant.SecurityConstants
;
import
com.yifu.cloud.plus.v1.yifu.common.core.constant.SecurityConstants
;
import
com.yifu.cloud.plus.v1.yifu.common.core.util.R
;
import
com.yifu.cloud.plus.v1.yifu.common.core.util.R
;
...
@@ -23,7 +24,6 @@ public class CspDaprUtils {
...
@@ -23,7 +24,6 @@ public class CspDaprUtils {
@Autowired
@Autowired
private
DaprCspProperties
daprCspProperties
;
private
DaprCspProperties
daprCspProperties
;
/**
/**
* @Author huyc
* @Author huyc
* @Description 更新入离职登记的状态和新增操作记录
* @Description 更新入离职登记的状态和新增操作记录
...
@@ -34,4 +34,15 @@ public class CspDaprUtils {
...
@@ -34,4 +34,15 @@ public class CspDaprUtils {
public
R
<
Boolean
>
updateRegistByPreInfo
(
EmployeeRegistrationUpdateVo
updateVo
)
{
public
R
<
Boolean
>
updateRegistByPreInfo
(
EmployeeRegistrationUpdateVo
updateVo
)
{
return
HttpDaprUtil
.
invokeMethodPost
(
daprCspProperties
.
getAppUrl
(),
daprCspProperties
.
getAppId
(),
"/employeeregistration/inner/updateRegistPreInfo"
,
JSON
.
toJSONString
(
updateVo
),
Boolean
.
class
,
SecurityConstants
.
FROM_IN
);
return
HttpDaprUtil
.
invokeMethodPost
(
daprCspProperties
.
getAppUrl
(),
daprCspProperties
.
getAppId
(),
"/employeeregistration/inner/updateRegistPreInfo"
,
JSON
.
toJSONString
(
updateVo
),
Boolean
.
class
,
SecurityConstants
.
FROM_IN
);
}
}
/**
* @Author huyc
* @Description 查询入职待确认数量
* @Date 19:47 2025/3/17
* @Param
* @return
**/
public
R
<
EmployeeRegistrationDaprCountVo
>
getRegisterPreCount
(
EmployeeRegistrationDaprCountVo
countVo
)
{
return
HttpDaprUtil
.
invokeMethodPost
(
daprCspProperties
.
getAppUrl
(),
daprCspProperties
.
getAppId
(),
"/employeeregistration/inner/getRegisterPreCount"
,
JSON
.
toJSONString
(
countVo
),
EmployeeRegistrationDaprCountVo
.
class
,
SecurityConstants
.
FROM_IN
);
}
}
}
yifu-csp/yifu-csp-api/src/main/java/com/yifu/cloud/plus/v1/csp/vo/EmployeeRegistrationDaprCountVo.java
0 → 100644
View file @
1b12c166
package
com
.
yifu
.
cloud
.
plus
.
v1
.
csp
.
vo
;
import
com.alibaba.excel.annotation.ExcelProperty
;
import
com.yifu.cloud.plus.v1.yifu.common.core.vo.YifuUser
;
import
io.swagger.v3.oas.annotations.media.Schema
;
import
lombok.Data
;
import
java.io.Serializable
;
/**
* 入离职登记表
*
* @author huych
* @date 2025-03-17 9:48:11
*/
@Data
public
class
EmployeeRegistrationDaprCountVo
implements
Serializable
{
@Schema
(
description
=
"user"
)
private
YifuUser
user
;
@Schema
(
description
=
"类型"
)
private
String
type
;
@Schema
(
description
=
"数量"
)
private
long
count
;
@Schema
(
description
=
"mId"
)
private
String
mId
;
}
yifu-csp/yifu-csp-api/src/main/java/com/yifu/cloud/plus/v1/csp/vo/EmployeeRegistrationUpdateVo.java
View file @
1b12c166
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
io.swagger.v3.oas.annotations.media.Schema
;
import
lombok.Data
;
import
lombok.Data
;
import
java.io.Serializable
;
import
java.io.Serializable
;
...
@@ -14,19 +15,19 @@ import java.io.Serializable;
...
@@ -14,19 +15,19 @@ import java.io.Serializable;
@Data
@Data
public
class
EmployeeRegistrationUpdateVo
implements
Serializable
{
public
class
EmployeeRegistrationUpdateVo
implements
Serializable
{
@
ExcelProperty
(
"id"
)
@
Schema
(
description
=
"id"
)
private
String
id
;
private
String
id
;
@
ExcelProperty
(
"身份证号"
)
@
Schema
(
description
=
"身份证号"
)
private
String
empIdcard
;
private
String
empIdcard
;
@
ExcelProperty
(
"操作人人姓名"
)
@
Schema
(
description
=
"操作人人姓名"
)
private
String
employeeName
;
private
String
employeeName
;
@
ExcelProperty
(
"原因"
)
@
Schema
(
description
=
"原因"
)
private
String
reason
;
private
String
reason
;
@
ExcelProperty
(
"项目编码"
)
@
Schema
(
description
=
"项目编码"
)
private
String
dep
e
No
;
private
String
dep
t
No
;
}
}
yifu-csp/yifu-csp-biz/src/main/java/com/yifu/cloud/plus/v1/csp/controller/EmployeeRegistrationController.java
View file @
1b12c166
...
@@ -4,6 +4,7 @@ import com.baomidou.mybatisplus.core.metadata.IPage;
...
@@ -4,6 +4,7 @@ import com.baomidou.mybatisplus.core.metadata.IPage;
import
com.baomidou.mybatisplus.extension.plugins.pagination.Page
;
import
com.baomidou.mybatisplus.extension.plugins.pagination.Page
;
import
com.yifu.cloud.plus.v1.csp.entity.EmployeeRegistration
;
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.service.EmployeeRegistrationService
;
import
com.yifu.cloud.plus.v1.csp.vo.EmployeeRegistrationDaprCountVo
;
import
com.yifu.cloud.plus.v1.csp.vo.EmployeeRegistrationReceiveVo
;
import
com.yifu.cloud.plus.v1.csp.vo.EmployeeRegistrationReceiveVo
;
import
com.yifu.cloud.plus.v1.csp.vo.EmployeeRegistrationSearchVo
;
import
com.yifu.cloud.plus.v1.csp.vo.EmployeeRegistrationSearchVo
;
import
com.yifu.cloud.plus.v1.csp.vo.EmployeeRegistrationUpdateVo
;
import
com.yifu.cloud.plus.v1.csp.vo.EmployeeRegistrationUpdateVo
;
...
@@ -275,4 +276,21 @@ public class EmployeeRegistrationController {
...
@@ -275,4 +276,21 @@ public class EmployeeRegistrationController {
public
R
updateRegistByPreInfo
(
@RequestBody
EmployeeRegistrationUpdateVo
updateVo
)
{
public
R
updateRegistByPreInfo
(
@RequestBody
EmployeeRegistrationUpdateVo
updateVo
)
{
return
employeeRegistrationService
.
updateRegistByPreInfo
(
updateVo
);
return
employeeRegistrationService
.
updateRegistByPreInfo
(
updateVo
);
}
}
/**
* 查询入职待确认数量
*
* @author huych
* @date 2025-03-13 16:55:32
**/
@Operation
(
summary
=
"查询入职待确认数量"
)
@SysLog
(
"查询入职待确认数量"
)
@Inner
@PostMapping
(
"/inner/getRegisterPreCount"
)
public
EmployeeRegistrationDaprCountVo
getRegisterPreCount
(
@RequestBody
EmployeeRegistrationDaprCountVo
countVo
)
{
EmployeeRegistrationSearchVo
searchVo
=
new
EmployeeRegistrationSearchVo
();
searchVo
.
setMId
(
countVo
.
getMId
());
menuUtil
.
setAuthSql
(
countVo
.
getUser
(),
searchVo
);
return
employeeRegistrationService
.
getRegisterPreCount
(
countVo
,
searchVo
);
}
}
}
yifu-csp/yifu-csp-biz/src/main/java/com/yifu/cloud/plus/v1/csp/service/EmployeeRegistrationService.java
View file @
1b12c166
...
@@ -4,6 +4,7 @@ import com.baomidou.mybatisplus.core.metadata.IPage;
...
@@ -4,6 +4,7 @@ import com.baomidou.mybatisplus.core.metadata.IPage;
import
com.baomidou.mybatisplus.extension.plugins.pagination.Page
;
import
com.baomidou.mybatisplus.extension.plugins.pagination.Page
;
import
com.baomidou.mybatisplus.extension.service.IService
;
import
com.baomidou.mybatisplus.extension.service.IService
;
import
com.yifu.cloud.plus.v1.csp.entity.EmployeeRegistration
;
import
com.yifu.cloud.plus.v1.csp.entity.EmployeeRegistration
;
import
com.yifu.cloud.plus.v1.csp.vo.EmployeeRegistrationDaprCountVo
;
import
com.yifu.cloud.plus.v1.csp.vo.EmployeeRegistrationReceiveVo
;
import
com.yifu.cloud.plus.v1.csp.vo.EmployeeRegistrationReceiveVo
;
import
com.yifu.cloud.plus.v1.csp.vo.EmployeeRegistrationSearchVo
;
import
com.yifu.cloud.plus.v1.csp.vo.EmployeeRegistrationSearchVo
;
import
com.yifu.cloud.plus.v1.csp.vo.EmployeeRegistrationUpdateVo
;
import
com.yifu.cloud.plus.v1.csp.vo.EmployeeRegistrationUpdateVo
;
...
@@ -122,6 +123,13 @@ public interface EmployeeRegistrationService extends IService<EmployeeRegistrati
...
@@ -122,6 +123,13 @@ public interface EmployeeRegistrationService extends IService<EmployeeRegistrati
*/
*/
R
updateRegistByPreInfo
(
EmployeeRegistrationUpdateVo
updateVo
);
R
updateRegistByPreInfo
(
EmployeeRegistrationUpdateVo
updateVo
);
/**
* 查询入职待确认数量
* @param countVo 查询入职待确认数量vo
* @return
*/
EmployeeRegistrationDaprCountVo
getRegisterPreCount
(
EmployeeRegistrationDaprCountVo
countVo
,
EmployeeRegistrationSearchVo
searchVo
);
/**
/**
* @param searchCspVo 身份证 与 类型
* @param searchCspVo 身份证 与 类型
* @Description: 获取已接收的入离职申请,同步所属部门到项目档案里
* @Description: 获取已接收的入离职申请,同步所属部门到项目档案里
...
...
yifu-csp/yifu-csp-biz/src/main/java/com/yifu/cloud/plus/v1/csp/service/impl/EmployeeRegistrationServiceImpl.java
View file @
1b12c166
...
@@ -649,7 +649,7 @@ public class EmployeeRegistrationServiceImpl extends ServiceImpl<EmployeeRegistr
...
@@ -649,7 +649,7 @@ public class EmployeeRegistrationServiceImpl extends ServiceImpl<EmployeeRegistr
public
R
updateRegistByPreInfo
(
EmployeeRegistrationUpdateVo
updateVo
)
{
public
R
updateRegistByPreInfo
(
EmployeeRegistrationUpdateVo
updateVo
)
{
EmployeeRegistration
registration
=
baseMapper
.
selectOne
(
Wrappers
.<
EmployeeRegistration
>
query
().
lambda
()
EmployeeRegistration
registration
=
baseMapper
.
selectOne
(
Wrappers
.<
EmployeeRegistration
>
query
().
lambda
()
.
eq
(
EmployeeRegistration:
:
getEmpIdcard
,
updateVo
.
getEmpIdcard
())
.
eq
(
EmployeeRegistration:
:
getEmpIdcard
,
updateVo
.
getEmpIdcard
())
.
eq
(
EmployeeRegistration:
:
getDeptNo
,
updateVo
.
getDep
e
No
())
.
eq
(
EmployeeRegistration:
:
getDeptNo
,
updateVo
.
getDep
t
No
())
.
eq
(
EmployeeRegistration:
:
getFeedbackType
,
CommonConstants
.
ONE_STRING
)
.
eq
(
EmployeeRegistration:
:
getFeedbackType
,
CommonConstants
.
ONE_STRING
)
.
in
(
EmployeeRegistration:
:
getProcessStatus
,
CommonConstants
.
processStatus
)
.
in
(
EmployeeRegistration:
:
getProcessStatus
,
CommonConstants
.
processStatus
)
.
last
(
CommonConstants
.
LAST_ONE_SQL
));
.
last
(
CommonConstants
.
LAST_ONE_SQL
));
...
@@ -662,6 +662,19 @@ public class EmployeeRegistrationServiceImpl extends ServiceImpl<EmployeeRegistr
...
@@ -662,6 +662,19 @@ public class EmployeeRegistrationServiceImpl extends ServiceImpl<EmployeeRegistr
return
R
.
ok
();
return
R
.
ok
();
}
}
@Override
public
EmployeeRegistrationDaprCountVo
getRegisterPreCount
(
EmployeeRegistrationDaprCountVo
countVo
,
EmployeeRegistrationSearchVo
employeeRegistration
)
{
//权限和条件赋值
employeeRegistration
.
setType
(
countVo
.
getType
());
initDaprSearchVo
(
employeeRegistration
,
countVo
.
getUser
());
employeeRegistration
.
setStatusList
(
CommonConstants
.
processPreStatus
);
employeeRegistration
.
setTypeList
(
CommonConstants
.
processPreStatus
);
long
count
=
baseMapper
.
selectExportCount
(
employeeRegistration
);
countVo
.
setCount
(
count
);
return
countVo
;
}
//单个新增、导入校验
//单个新增、导入校验
private
String
registCheck
(
EmployeeRegistration
registration
)
{
private
String
registCheck
(
EmployeeRegistration
registration
)
{
//定义判别用户身份证号的正则表达式(要么是15位,要么是18位,最后一位可以为字母)
//定义判别用户身份证号的正则表达式(要么是15位,要么是18位,最后一位可以为字母)
...
@@ -923,6 +936,31 @@ public class EmployeeRegistrationServiceImpl extends ServiceImpl<EmployeeRegistr
...
@@ -923,6 +936,31 @@ public class EmployeeRegistrationServiceImpl extends ServiceImpl<EmployeeRegistr
}
}
}
}
/**
* @Description: 获取前端客服的所有项目权限
* @Author: huych
* @Date: 2025/3/13 17:02
* @return:
**/
public
void
initDaprSearchVo
(
EmployeeRegistrationSearchVo
searchVo
,
YifuUser
user
)
{
long
roleId
=
1839501715787390978L
;
boolean
isSsc
=
this
.
haveRole
(
user
,
roleId
);
if
(
isSsc
||
CommonConstants
.
ZERO_STRING
.
equals
(
user
.
getSystemFlag
()))
{
searchVo
.
setAuthSql
(
null
);
return
;
}
if
(
Common
.
isNotNull
(
searchVo
.
getType
())
&&
CommonConstants
.
ONE_STRING
.
equals
(
searchVo
.
getType
()))
{
searchVo
.
setAuthSql
(
null
);
//获取项目信息
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
)
{
public
boolean
haveRole
(
YifuUser
user
,
long
roleId
)
{
List
<
Long
>
roleList
=
user
.
getClientRoleMap
().
get
(
ClientNameConstants
.
CLIENT_MVP
);
List
<
Long
>
roleList
=
user
.
getClientRoleMap
().
get
(
ClientNameConstants
.
CLIENT_MVP
);
for
(
Long
role
:
roleList
)
{
for
(
Long
role
:
roleList
)
{
...
...
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