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
4d9abeb8
Commit
4d9abeb8
authored
Mar 17, 2025
by
fangxinjiang
Browse files
Options
Browse Files
Download
Plain Diff
Merge remote-tracking branch 'origin/MVP1.7.8' into MVP1.7.8
parents
52603ec0
9060388b
Expand all
Hide whitespace changes
Inline
Side-by-side
Showing
21 changed files
with
639 additions
and
158 deletions
+639
-158
EmployeeRegistrationPre.java
...plus/v1/yifu/archives/entity/EmployeeRegistrationPre.java
+7
-1
EmployeeRegistrationPreExportVo.java
.../v1/yifu/archives/vo/EmployeeRegistrationPreExportVo.java
+84
-0
EmployeeRegistrationPreSearchVo.java
.../v1/yifu/archives/vo/EmployeeRegistrationPreSearchVo.java
+0
-2
EmployeeRegistrationPreVo.java
...d/plus/v1/yifu/archives/vo/EmployeeRegistrationPreVo.java
+52
-0
EmployeeRegistrationPreController.java
...rchives/controller/EmployeeRegistrationPreController.java
+25
-14
EmployeeRegistrationPreMapper.java
...1/yifu/archives/mapper/EmployeeRegistrationPreMapper.java
+16
-0
EmployeeRegistrationPreService.java
...yifu/archives/service/EmployeeRegistrationPreService.java
+20
-2
EmployeeRegistrationPreServiceImpl.java
...ives/service/impl/EmployeeRegistrationPreServiceImpl.java
+75
-76
EmployeeRegistrationPreMapper.xml
...c/main/resources/mapper/EmployeeRegistrationPreMapper.xml
+63
-18
pom.xml
yifu-common/yifu-common-dapr/pom.xml
+6
-0
ArchivesDaprUtil.java
...cloud/plus/v1/yifu/common/dapr/util/ArchivesDaprUtil.java
+11
-0
CspDaprUtils.java
...ifu/cloud/plus/v1/yifu/common/dapr/util/CspDaprUtils.java
+13
-7
spring.factories
...-common-dapr/src/main/resources/META-INF/spring.factories
+2
-1
RegistConstants.java
...com/yifu/cloud/plus/v1/csp/constants/RegistConstants.java
+2
-0
EmployeeRegistrationReceiveVo.java
...u/cloud/plus/v1/csp/vo/EmployeeRegistrationReceiveVo.java
+38
-0
EmployeeRegistrationUpdateVo.java
...fu/cloud/plus/v1/csp/vo/EmployeeRegistrationUpdateVo.java
+32
-0
EmployeeRegistrationController.java
...lus/v1/csp/controller/EmployeeRegistrationController.java
+37
-7
EmployeeRegistrationMapper.java
.../cloud/plus/v1/csp/mapper/EmployeeRegistrationMapper.java
+2
-0
EmployeeRegistrationService.java
...loud/plus/v1/csp/service/EmployeeRegistrationService.java
+19
-3
EmployeeRegistrationServiceImpl.java
.../v1/csp/service/impl/EmployeeRegistrationServiceImpl.java
+123
-27
EmployeeRegistrationMapper.xml
.../src/main/resources/mapper/EmployeeRegistrationMapper.xml
+12
-0
No files found.
yifu-archives/yifu-archives-api/src/main/java/com/yifu/cloud/plus/v1/yifu/archives/entity/EmployeeRegistrationPre.java
View file @
4d9abeb8
package
com
.
yifu
.
cloud
.
plus
.
v1
.
yifu
.
archives
.
entity
;
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.mybatis.base.BaseEntity
;
...
...
@@ -8,6 +9,7 @@ import io.swagger.v3.oas.annotations.media.Schema;
import
lombok.Data
;
import
lombok.EqualsAndHashCode
;
import
java.time.LocalDateTime
;
import
java.util.Date
;
/**
...
...
@@ -75,7 +77,7 @@ public class EmployeeRegistrationPre extends BaseEntity {
private
String
dataSource
;
@Schema
(
description
=
"预计收集时间"
)
private
Dat
e
expectedCollectionTime
;
private
LocalDateTim
e
expectedCollectionTime
;
@Schema
(
description
=
"服务事项"
)
private
String
serverItem
;
...
...
@@ -98,5 +100,9 @@ public class EmployeeRegistrationPre extends BaseEntity {
@Schema
(
description
=
"最新的客服名称"
)
private
String
customerUsernameNew
;
@Schema
(
description
=
"拒绝入职原因"
)
@TableField
(
exist
=
false
)
private
String
reason
;
}
yifu-archives/yifu-archives-api/src/main/java/com/yifu/cloud/plus/v1/yifu/archives/vo/EmployeeRegistrationPreExportVo.java
0 → 100644
View file @
4d9abeb8
package
com
.
yifu
.
cloud
.
plus
.
v1
.
yifu
.
archives
.
vo
;
import
com.alibaba.excel.annotation.ExcelProperty
;
import
com.alibaba.excel.annotation.write.style.ColumnWidth
;
import
com.yifu.cloud.plus.v1.yifu.common.core.constant.ExcelAttribute
;
import
com.yifu.cloud.plus.v1.yifu.common.core.constant.ExcelAttributeConstants
;
import
io.swagger.v3.oas.annotations.media.Schema
;
import
lombok.Data
;
import
java.io.Serializable
;
import
java.time.LocalDateTime
;
import
java.util.Date
;
/**
* 入职待建档表
*
* @author huych
* @date 2025-03-12 17:14:19
*/
@Data
@ColumnWidth
(
17
)
public
class
EmployeeRegistrationPreExportVo
implements
Serializable
{
@ExcelAttribute
(
name
=
"项目名称"
)
@Schema
(
description
=
"项目名称"
)
@ExcelProperty
(
"项目名称"
)
private
String
deptName
;
@ExcelAttribute
(
name
=
"项目编码"
)
@Schema
(
description
=
"项目编码"
)
@ExcelProperty
(
"项目编码"
)
private
String
deptNo
;
@ExcelAttribute
(
name
=
"员工姓名"
)
@Schema
(
description
=
"员工姓名"
)
@ExcelProperty
(
"员工姓名"
)
private
String
employeeName
;
@ExcelAttribute
(
name
=
"身份证号"
)
@Schema
(
description
=
"身份证号"
)
@ExcelProperty
(
"身份证号"
)
private
String
empIdcard
;
@ExcelAttribute
(
name
=
"手机号码"
)
@Schema
(
description
=
"手机号码"
)
@ExcelProperty
(
"手机号码"
)
private
String
empPhone
;
@ExcelAttribute
(
name
=
"入职日期"
,
isDate
=
true
)
@Schema
(
description
=
"入职日期"
)
@ExcelProperty
(
"入职日期"
)
private
Date
joinLeaveDate
;
@ExcelAttribute
(
name
=
"员工类型"
,
isDataId
=
true
,
dataType
=
ExcelAttributeConstants
.
EMP_NATRUE
)
@Schema
(
description
=
"员工类型"
)
@ExcelProperty
(
"员工类型"
)
private
String
empNature
;
@ExcelAttribute
(
name
=
"合同类型(字典值)"
,
isDataId
=
true
,
dataType
=
ExcelAttributeConstants
.
PERSONNEL_TYPE
)
@Schema
(
description
=
"合同类型(字典值)"
)
@ExcelProperty
(
"合同类型"
)
private
String
contractType
;
@ExcelAttribute
(
name
=
"数据来源"
)
@Schema
(
description
=
"数据来源"
)
@ExcelProperty
(
"数据来源"
)
private
String
dataSource
;
@ExcelAttribute
(
name
=
"前端客服"
)
@Schema
(
description
=
"前端客服"
)
@ExcelProperty
(
"前端客服"
)
private
String
customerUsername
;
@ExcelAttribute
(
name
=
"预计收集时间"
,
isDate
=
true
)
@Schema
(
description
=
"预计收集时间"
)
@ExcelProperty
(
"预计收集时间"
)
private
LocalDateTime
expectedCollectionTime
;
@ExcelAttribute
(
name
=
"状态"
)
@Schema
(
description
=
"状态"
)
@ExcelProperty
(
"状态"
)
private
String
processStatus
;
}
yifu-archives/yifu-archives-api/src/main/java/com/yifu/cloud/plus/v1/yifu/archives/vo/EmployeeRegistrationPreSearchVo.java
View file @
4d9abeb8
...
...
@@ -45,12 +45,10 @@ public class EmployeeRegistrationPreSearchVo extends EmployeeRegistrationPre {
@TableField
(
exist
=
false
)
private
List
<
String
>
statusList
;
@Schema
(
description
=
"项目权限数组"
)
@TableField
(
exist
=
false
)
private
List
<
String
>
deptNoList
;
@Schema
(
description
=
"列表类型 1 待办 2监控"
)
private
String
type
;
}
yifu-archives/yifu-archives-api/src/main/java/com/yifu/cloud/plus/v1/yifu/archives/vo/EmployeeRegistrationPreVo.java
View file @
4d9abeb8
...
...
@@ -4,6 +4,8 @@ import io.swagger.v3.oas.annotations.media.Schema;
import
lombok.Data
;
import
java.io.Serializable
;
import
java.time.LocalDateTime
;
import
java.util.Date
;
/**
* 确认接受vo
...
...
@@ -42,4 +44,54 @@ public class EmployeeRegistrationPreVo implements Serializable {
private
String
fileTown
;
@Schema
(
description
=
"员工姓名"
)
private
String
employeeName
;
@Schema
(
description
=
"身份证号"
)
private
String
empIdcard
;
@Schema
(
description
=
"手机号码"
)
private
String
empPhone
;
@Schema
(
description
=
"就职岗位"
)
private
String
position
;
@Schema
(
description
=
"入职日期"
)
private
Date
joinLeaveDate
;
@Schema
(
description
=
"状态,0短信待发送,1信息待填写,2信息待审核,3拒绝入职,4已完成"
)
private
String
processStatus
;
@Schema
(
description
=
"前端客服"
)
private
String
customerUsername
;
@Schema
(
description
=
"前端客服登录名"
)
private
String
customerUserLoginname
;
@Schema
(
description
=
"项目名称"
)
private
String
deptName
;
@Schema
(
description
=
"项目编码"
)
private
String
deptNo
;
@Schema
(
description
=
"项目id"
)
private
String
deptId
;
@Schema
(
description
=
"数据来源"
)
private
String
dataSource
;
@Schema
(
description
=
"预计收集时间"
)
private
LocalDateTime
expectedCollectionTime
;
@Schema
(
description
=
"确认人"
)
private
String
confirmUser
;
@Schema
(
description
=
"确认时间"
)
private
Date
confirmTime
;
@Schema
(
description
=
"最新的客服名称"
)
private
String
customerUsernameNew
;
}
yifu-archives/yifu-archives-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/archives/controller/EmployeeRegistrationPreController.java
View file @
4d9abeb8
...
...
@@ -5,15 +5,19 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import
com.yifu.cloud.plus.v1.yifu.archives.entity.EmployeeRegistrationPre
;
import
com.yifu.cloud.plus.v1.yifu.archives.service.EmployeeRegistrationPreService
;
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.util.R
;
import
com.yifu.cloud.plus.v1.yifu.common.core.vo.YifuUser
;
import
com.yifu.cloud.plus.v1.yifu.common.dapr.util.MenuUtil
;
import
com.yifu.cloud.plus.v1.yifu.common.log.annotation.SysLog
;
import
com.yifu.cloud.plus.v1.yifu.common.security.annotation.Inner
;
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.web.bind.annotation.*
;
import
javax.servlet.http.HttpServletResponse
;
import
java.util.List
;
/**
* 入职待建档表
...
...
@@ -29,6 +33,8 @@ public class EmployeeRegistrationPreController {
private
final
EmployeeRegistrationPreService
employeeRegistrationPreService
;
private
final
MenuUtil
menuUtil
;
/**
* 简单分页查询
* @param page 分页对象
...
...
@@ -38,17 +44,9 @@ public class EmployeeRegistrationPreController {
@Operation
(
description
=
"简单分页查询"
)
@GetMapping
(
"/page"
)
public
R
<
IPage
<
EmployeeRegistrationPre
>>
getEmployeeRegistrationPrePage
(
Page
<
EmployeeRegistrationPre
>
page
,
EmployeeRegistrationPreSearchVo
employeeRegistrationPre
)
{
return
new
R
<>(
employeeRegistrationPreService
.
getEmployeeRegistrationPrePage
(
page
,
employeeRegistrationPre
));
}
/**
* 不分页查询
* @param employeeRegistrationPre 入职待建档表
* @return
*/
@Operation
(
summary
=
"不分页查询"
,
description
=
"不分页查询"
)
@PostMapping
(
"/noPage"
)
public
R
<
List
<
EmployeeRegistrationPre
>>
getEmployeeRegistrationPreNoPage
(
@RequestBody
EmployeeRegistrationPreSearchVo
employeeRegistrationPre
)
{
return
R
.
ok
(
employeeRegistrationPreService
.
noPageDiy
(
employeeRegistrationPre
));
YifuUser
user
=
SecurityUtils
.
getUser
();
menuUtil
.
setAuthSql
(
user
,
employeeRegistrationPre
);
return
new
R
<>(
employeeRegistrationPreService
.
getEmployeeRegistrationPrePage
(
page
,
employeeRegistrationPre
));
}
/**
...
...
@@ -82,8 +80,8 @@ public class EmployeeRegistrationPreController {
@Operation
(
summary
=
"修改入职待建档表"
,
description
=
"修改入职待建档表"
)
@SysLog
(
"修改入职待建档表"
)
@PostMapping
(
"/updateById"
)
public
R
<
Boolean
>
updateById
(
@RequestBody
EmployeeRegistrationPre
employeeRegistrationPre
)
{
return
R
.
ok
(
employeeRegistrationPreService
.
updateById
(
employeeRegistrationPre
)
);
public
R
updateById
(
@RequestBody
EmployeeRegistrationPre
employeeRegistrationPre
)
{
return
employeeRegistrationPreService
.
updateRegistById
(
employeeRegistrationPre
);
}
/**
...
...
@@ -96,4 +94,17 @@ public class EmployeeRegistrationPreController {
public
void
export
(
HttpServletResponse
response
,
@RequestBody
EmployeeRegistrationPreSearchVo
searchVo
)
{
employeeRegistrationPreService
.
listExport
(
response
,
searchVo
);
}
/**
* @Author huyc
* @Description 新增入职待建档信息
* @Date 14:34 2025/3/14
* @Param
* @return
**/
@Inner
@PostMapping
(
"/inner/saveRegistPreInfo"
)
public
Boolean
saveRegistPreInfo
(
@RequestBody
EmployeeRegistrationPreVo
preVo
)
{
return
employeeRegistrationPreService
.
saveRegistPreInfo
(
preVo
);
}
}
yifu-archives/yifu-archives-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/archives/mapper/EmployeeRegistrationPreMapper.java
View file @
4d9abeb8
...
...
@@ -4,9 +4,13 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import
com.baomidou.mybatisplus.core.metadata.IPage
;
import
com.baomidou.mybatisplus.extension.plugins.pagination.Page
;
import
com.yifu.cloud.plus.v1.yifu.archives.entity.EmployeeRegistrationPre
;
import
com.yifu.cloud.plus.v1.yifu.archives.vo.EmployeeRegistrationPreExportVo
;
import
com.yifu.cloud.plus.v1.yifu.archives.vo.EmployeeRegistrationPreSearchVo
;
import
org.apache.ibatis.annotations.Mapper
;
import
org.apache.ibatis.annotations.Param
;
import
java.util.List
;
/**
* 入职待建档表
*
...
...
@@ -21,4 +25,16 @@ public interface EmployeeRegistrationPreMapper extends BaseMapper<EmployeeRegist
* @return
*/
IPage
<
EmployeeRegistrationPre
>
getEmployeeRegistrationPrePage
(
Page
<
EmployeeRegistrationPre
>
page
,
@Param
(
"employeeRegistrationPre"
)
EmployeeRegistrationPre
employeeRegistrationPre
);
/**
* 入职待建档表导出数量查询
* @param searchVo 导出查询vo
* @return
*/
long
selectExportCount
(
@Param
(
"EmployeeRegistrationPre"
)
EmployeeRegistrationPreSearchVo
searchVo
);
/**
* 入职待建档表导出列表查询
* @param searchVo 导出查询vo
* @return
*/
List
<
EmployeeRegistrationPreExportVo
>
selectExportList
(
@Param
(
"EmployeeRegistrationPre"
)
EmployeeRegistrationPreSearchVo
searchVo
);
}
yifu-archives/yifu-archives-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/archives/service/EmployeeRegistrationPreService.java
View file @
4d9abeb8
...
...
@@ -5,9 +5,10 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import
com.baomidou.mybatisplus.extension.service.IService
;
import
com.yifu.cloud.plus.v1.yifu.archives.entity.EmployeeRegistrationPre
;
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.util.R
;
import
javax.servlet.http.HttpServletResponse
;
import
java.util.List
;
/**
* 入职待建档表
...
...
@@ -23,7 +24,24 @@ public interface EmployeeRegistrationPreService extends IService<EmployeeRegistr
*/
IPage
<
EmployeeRegistrationPre
>
getEmployeeRegistrationPrePage
(
Page
<
EmployeeRegistrationPre
>
page
,
EmployeeRegistrationPreSearchVo
employeeRegistrationPre
);
/**
* 入职待建档表导出
* @param searchVo 入职待建档导出查询vo
* @return
*/
void
listExport
(
HttpServletResponse
response
,
EmployeeRegistrationPreSearchVo
searchVo
);
List
<
EmployeeRegistrationPre
>
noPageDiy
(
EmployeeRegistrationPreSearchVo
searchVo
);
/**
* 新增入职待建档信息
* @param preVo 新增入职待建档vo
* @return
*/
Boolean
saveRegistPreInfo
(
EmployeeRegistrationPreVo
preVo
);
/**
* 拒绝入职
* @param employeeRegistrationPre 入职待建档表
* @return
*/
R
updateRegistById
(
EmployeeRegistrationPre
employeeRegistrationPre
);
}
yifu-archives/yifu-archives-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/archives/service/impl/EmployeeRegistrationPreServiceImpl.java
View file @
4d9abeb8
This diff is collapsed.
Click to expand it.
yifu-archives/yifu-archives-biz/src/main/resources/mapper/EmployeeRegistrationPreMapper.xml
View file @
4d9abeb8
...
...
@@ -35,6 +35,22 @@
<result
property=
"updateTime"
column=
"update_time"
/>
<result
property=
"customerUsernameNew"
column=
"customer_username_new"
/>
</resultMap>
<resultMap
id=
"employeeRegistrationPreExportMap"
type=
"com.yifu.cloud.plus.v1.yifu.archives.vo.EmployeeRegistrationPreExportVo"
>
<result
property=
"employeeName"
column=
"employee_name"
/>
<result
property=
"empIdcard"
column=
"emp_idcard"
/>
<result
property=
"empPhone"
column=
"emp_phone"
/>
<result
property=
"joinLeaveDate"
column=
"join_leave_date"
/>
<result
property=
"customerUsername"
column=
"customer_username"
/>
<result
property=
"deptName"
column=
"dept_name"
/>
<result
property=
"deptNo"
column=
"dept_no"
/>
<result
property=
"empNature"
column=
"emp_nature"
/>
<result
property=
"contractType"
column=
"contract_type"
/>
<result
property=
"dataSource"
column=
"data_source"
/>
<result
property=
"expectedCollectionTime"
column=
"expected_collection_time"
/>
<result
property=
"processStatus"
column=
"process_status"
/>
</resultMap>
<sql
id=
"Base_Column_List"
>
a.id,
a.employee_name,
...
...
@@ -134,24 +150,16 @@
<if
test=
"employeeRegistrationPre.confirmUser != null and employeeRegistrationPre.confirmUser.trim() != ''"
>
AND a.confirm_user = #{employeeRegistrationPre.confirmUser}
</if>
<if
test=
"employeeRegistrationPre.confirmTime != null"
>
AND a.confirm_time = #{employeeRegistrationPre.confirmTime}
</if>
<if
test=
"employeeRegistrationPre.createBy != null and employeeRegistrationPre.createBy.trim() != ''"
>
AND a.create_by = #{employeeRegistrationPre.createBy}
</if>
<if
test=
"employeeRegistrationPre.createName != null and employeeRegistrationPre.createName.trim() != ''"
>
AND a.create_name = #{employeeRegistrationPre.createName}
</if>
<if
test=
"employeeRegistrationPre.createTime != null"
>
AND a.create_time = #{employeeRegistrationPre.createTime}
</if>
<if
test=
"employeeRegistrationPre.updateBy != null and employeeRegistrationPre.updateBy.trim() != ''"
>
AND a.update_by = #{employeeRegistrationPre.updateBy}
</if>
<if
test=
"employeeRegistrationPre.updateTime != null"
>
AND a.update_time = #{employeeRegistrationPre.updateTime}
</if>
<if
test=
"employeeRegistrationPre.authSql != null and employeeRegistrationPre.authSql.trim() != ''"
>
${employeeRegistrationPre.authSql}
</if>
<if
test=
"employeeRegistrationPre.deptNoList != null and employeeRegistrationPre.deptNoList.size > 0"
>
AND a.dept_no in
<foreach
item=
"idStr"
index=
"index"
collection=
"employeeRegistrationPre.deptNoList"
open=
"("
separator=
","
close=
")"
>
#{idStr}
</foreach>
</if>
</if>
</sql>
<!--employeeRegistrationPre简单分页查询-->
...
...
@@ -164,4 +172,41 @@
<include
refid=
"employeeRegistrationPre_where"
/>
</where>
</select>
<select
id=
"selectExportCount"
resultType=
"java.lang.Long"
>
SELECT
count(1)
FROM employee_registration_pre a
<where>
1=1
<include
refid=
"employeeRegistrationPre_where"
/>
</where>
</select>
<!--employeeRegistrationPre导出查询-->
<select
id=
"selectExportList"
resultMap=
"employeeRegistrationPreExportMap"
>
SELECT
a.employee_name,
a.emp_idcard,
a.emp_phone,
a.join_leave_date,
a.customer_username,
a.dept_name,
a.dept_no,
a.emp_nature,
a.contract_type,
if(a.data_source = '1','客户端','客服端') data_source,
a.expected_collection_time,
if(a.process_status = '0','短信待发送',if(a.process_status = '1','信息待填写',if(a.process_status = '2','信息待审核','拒绝入职'))) process_status
FROM employee_registration_pre a
<where>
1=1
<include
refid=
"employeeRegistrationPre_where"
/>
</where>
order by a.create_time desc
<if
test=
"employeeRegistrationPre.limitStart != null"
>
limit #{employeeRegistrationPre.limitStart},#{employeeRegistrationPre.limitEnd}
</if>
</select>
</mapper>
yifu-common/yifu-common-dapr/pom.xml
View file @
4d9abeb8
...
...
@@ -68,6 +68,12 @@
<version>
1.0.0
</version>
<scope>
compile
</scope>
</dependency>
<dependency>
<groupId>
com.yifu.cloud.plus.v1
</groupId>
<artifactId>
yifu-csp-api
</artifactId>
<version>
1.0.0
</version>
<scope>
compile
</scope>
</dependency>
<dependency>
<groupId>
com.yifu.cloud.plus.v1
</groupId>
<artifactId>
yifu-common-process
</artifactId>
...
...
yifu-common/yifu-common-dapr/src/main/java/com/yifu/cloud/plus/v1/yifu/common/dapr/util/ArchivesDaprUtil.java
View file @
4d9abeb8
...
...
@@ -545,4 +545,15 @@ public class ArchivesDaprUtil {
}
return
res
;
}
/**
* @Author huyc
* @Description 新增入职待建档信息
* @Date 14:34 2025/3/14
* @Param
* @return
**/
public
R
<
Boolean
>
saveRegistPreInfo
(
EmployeeRegistrationPreVo
preVo
)
{
return
HttpDaprUtil
.
invokeMethodPost
(
daprArchivesProperties
.
getAppUrl
(),
daprArchivesProperties
.
getAppId
(),
"/employeeregistrationpre/inner/saveRegistPreInfo"
,
JSON
.
toJSONString
(
preVo
),
Boolean
.
class
,
SecurityConstants
.
FROM_IN
);
}
}
yifu-common/yifu-common-dapr/src/main/java/com/yifu/cloud/plus/v1/yifu/common/dapr/util/CspDaprUtils.java
View file @
4d9abeb8
package
com
.
yifu
.
cloud
.
plus
.
v1
.
yifu
.
common
.
dapr
.
util
;
import
com.alibaba.fastjson.JSON
;
import
com.yifu.cloud.plus.v1.ekp.vo.EkpIncomePushInfoVo
;
import
com.yifu.cloud.plus.v1.ekp.vo.EkpSocialPushInfoVo
;
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.util.R
;
import
com.yifu.cloud.plus.v1.yifu.common.dapr.config.DaprCspProperties
;
import
com.yifu.cloud.plus.v1.yifu.common.dapr.config.DaprEkpProperties
;
import
com.yifu.cloud.plus.v1.yifu.ekp.vo.*
;
import
lombok.extern.log4j.Log4j2
;
import
org.springframework.beans.factory.annotation.Autowired
;
import
org.springframework.boot.context.properties.EnableConfigurationProperties
;
import
java.util.List
;
/**
* @Author fxj
* @Description 客户服务平台 服务间调用工具类
...
...
@@ -26,6 +21,17 @@ import java.util.List;
public
class
CspDaprUtils
{
@Autowired
private
DaprEkpProperties
daprProperties
;
private
DaprCspProperties
daprCspProperties
;
/**
* @Author huyc
* @Description 更新入离职登记的状态和新增操作记录
* @Date 9:22 2025/3/17
* @Param
* @return
**/
public
R
<
Boolean
>
updateRegistByPreInfo
(
EmployeeRegistrationUpdateVo
updateVo
)
{
return
HttpDaprUtil
.
invokeMethodPost
(
daprCspProperties
.
getAppUrl
(),
daprCspProperties
.
getAppId
(),
"/employeeregistration/inner/updateRegistPreInfo"
,
JSON
.
toJSONString
(
updateVo
),
Boolean
.
class
,
SecurityConstants
.
FROM_IN
);
}
}
yifu-common/yifu-common-dapr/src/main/resources/META-INF/spring.factories
View file @
4d9abeb8
...
...
@@ -8,4 +8,5 @@ org.springframework.boot.autoconfigure.EnableAutoConfiguration=\
com.yifu.cloud.plus.v1.yifu.common.dapr.util.SalaryDaprUtil,\
com.yifu.cloud.plus.v1.yifu.common.dapr.util.EkpDaprUtils,\
com.yifu.cloud.plus.v1.yifu.common.dapr.util.PermissionDaprUtil,\
com.yifu.cloud.plus.v1.yifu.common.dapr.util.ProcessDaprUtils
com.yifu.cloud.plus.v1.yifu.common.dapr.util.ProcessDaprUtils,\
com.yifu.cloud.plus.v1.yifu.common.dapr.util.CspDaprUtils
yifu-csp/yifu-csp-api/src/main/java/com/yifu/cloud/plus/v1/csp/constants/RegistConstants.java
View file @
4d9abeb8
...
...
@@ -29,4 +29,6 @@ public class RegistConstants {
public
static
final
String
MESSAGE_FINISH
=
"已处理"
;
public
static
final
String
BACK_RECEIVE
=
"拒绝入职"
;
}
yifu-csp/yifu-csp-api/src/main/java/com/yifu/cloud/plus/v1/csp/vo/EmployeeRegistrationReceiveVo.java
0 → 100644
View file @
4d9abeb8
package
com
.
yifu
.
cloud
.
plus
.
v1
.
csp
.
vo
;
import
com.alibaba.excel.annotation.ExcelProperty
;
import
io.swagger.v3.oas.annotations.media.Schema
;
import
lombok.Data
;
import
java.io.Serializable
;
import
java.time.LocalDateTime
;
/**
* 入离职登记表
*
* @author huych
* @date 2025-02-25 14:48:11
*/
@Data
public
class
EmployeeRegistrationReceiveVo
implements
Serializable
{
@ExcelProperty
(
"id"
)
private
String
id
;
@ExcelProperty
(
"身份证号"
)
private
String
empIdcard
;
@ExcelProperty
(
"员工姓名"
)
private
String
employeeName
;
@ExcelProperty
(
"原因"
)
private
String
reason
;
@Schema
(
description
=
"项目立项时间"
)
private
LocalDateTime
projectCreateTime
;
@Schema
(
description
=
"项目档案id"
)
private
String
empProjectId
;
}
yifu-csp/yifu-csp-api/src/main/java/com/yifu/cloud/plus/v1/csp/vo/EmployeeRegistrationUpdateVo.java
0 → 100644
View file @
4d9abeb8
package
com
.
yifu
.
cloud
.
plus
.
v1
.
csp
.
vo
;
import
com.alibaba.excel.annotation.ExcelProperty
;
import
lombok.Data
;
import
java.io.Serializable
;
/**
* 入离职登记表
*
* @author huych
* @date 2025-03-17 9:48:11
*/
@Data
public
class
EmployeeRegistrationUpdateVo
implements
Serializable
{
@ExcelProperty
(
"id"
)
private
String
id
;
@ExcelProperty
(
"身份证号"
)
private
String
empIdcard
;
@ExcelProperty
(
"操作人人姓名"
)
private
String
employeeName
;
@ExcelProperty
(
"原因"
)
private
String
reason
;
@ExcelProperty
(
"项目编码"
)
private
String
depeNo
;
}
yifu-csp/yifu-csp-biz/src/main/java/com/yifu/cloud/plus/v1/csp/controller/EmployeeRegistrationController.java
View file @
4d9abeb8
...
...
@@ -4,7 +4,9 @@ import com.baomidou.mybatisplus.core.metadata.IPage;
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.EmployeeRegistrationReceiveVo
;
import
com.yifu.cloud.plus.v1.csp.vo.EmployeeRegistrationSearchVo
;
import
com.yifu.cloud.plus.v1.csp.vo.EmployeeRegistrationUpdateVo
;
import
com.yifu.cloud.plus.v1.yifu.archives.entity.TEmployeeProjectBelongDept
;
import
com.yifu.cloud.plus.v1.yifu.archives.vo.EmployeeRegistrationPreVo
;
import
com.yifu.cloud.plus.v1.yifu.archives.vo.TEmployeeProjectBelongDeptSearchCspVo
;
...
...
@@ -203,6 +205,8 @@ public class EmployeeRegistrationController {
@Operation
(
description
=
"入职待确认列表简单分页查询"
)
@GetMapping
(
"/hrConfirmPage"
)
public
R
<
IPage
<
EmployeeRegistration
>>
getHrConfirmEmployeeRegistrationPage
(
Page
<
EmployeeRegistration
>
page
,
EmployeeRegistrationSearchVo
employeeRegistration
)
{
YifuUser
user
=
SecurityUtils
.
getUser
();
menuUtil
.
setAuthSql
(
user
,
employeeRegistration
);
return
new
R
<>(
employeeRegistrationService
.
getHrConfirmEmployeeRegistrationPage
(
page
,
employeeRegistration
));
}
...
...
@@ -231,15 +235,41 @@ public class EmployeeRegistrationController {
}
/**
*
修改入离职登记表
*
入职待确认表 批量确认接收
*
* @param employeeRegistration 入离职登记表
* @author huych
* @date 2025-03-13 16:55:32
**/
@Operation
(
description
=
"入职待确认表批量接收"
)
@PostMapping
(
"/batchConfirmReceive"
)
public
R
batchConfirmReceive
(
@RequestBody
EmployeeRegistrationPreVo
preVo
)
{
return
employeeRegistrationService
.
batchConfirmReceive
(
preVo
);
}
/**
* 批量修改入离职登记表
*
* @param employeeRegistList 入离职登记表
* @return R
*/
@Operation
(
summary
=
"修改入离职登记表"
)
@SysLog
(
"修改入离职登记表"
)
@PostMapping
(
"/updatePreById"
)
public
R
updatePreById
(
@RequestBody
EmployeeRegistration
employeeRegistration
)
{
return
employeeRegistrationService
.
updatePreRegist
(
employeeRegistration
);
@Operation
(
summary
=
"批量修改入离职登记表"
)
@SysLog
(
"批量入离职登记表"
)
@PostMapping
(
"/batchUpdatePreById"
)
public
R
batchUpdatePreById
(
@RequestBody
List
<
EmployeeRegistrationReceiveVo
>
employeeRegistList
)
{
return
employeeRegistrationService
.
batchUpdatePreById
(
employeeRegistList
);
}
/**
* 更新入离职登记表
*
* @param updateVo 状态和日志新增vo
* @return R
*/
@Operation
(
summary
=
"更新入离职登记表"
)
@SysLog
(
"更新入离职登记表"
)
@Inner
@PostMapping
(
"/inner/updateRegistByPreInfo"
)
public
R
updateRegistByPreInfo
(
@RequestBody
EmployeeRegistrationUpdateVo
updateVo
)
{
return
employeeRegistrationService
.
updateRegistByPreInfo
(
updateVo
);
}
}
yifu-csp/yifu-csp-biz/src/main/java/com/yifu/cloud/plus/v1/csp/mapper/EmployeeRegistrationMapper.java
View file @
4d9abeb8
...
...
@@ -30,6 +30,8 @@ public interface EmployeeRegistrationMapper extends BaseMapper<EmployeeRegistrat
*/
IPage
<
EmployeeRegistration
>
getEmployeeRegistrationPage
(
Page
<
EmployeeRegistration
>
page
,
@Param
(
"employeeRegistration"
)
EmployeeRegistrationSearchVo
employeeRegistration
);
List
<
EmployeeRegistration
>
getEmployeeRegistrationList
(
@Param
(
"employeeRegistration"
)
EmployeeRegistrationSearchVo
employeeRegistration
);
long
selectExportCount
(
@Param
(
"employeeRegistration"
)
EmployeeRegistrationSearchVo
employeeRegistration
);
List
<
EmployeeRegistrationExportVo
>
selectExportList
(
@Param
(
"employeeRegistration"
)
EmployeeRegistrationSearchVo
employeeRegistration
);
...
...
yifu-csp/yifu-csp-biz/src/main/java/com/yifu/cloud/plus/v1/csp/service/EmployeeRegistrationService.java
View file @
4d9abeb8
...
...
@@ -4,7 +4,9 @@ import com.baomidou.mybatisplus.core.metadata.IPage;
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.EmployeeRegistrationReceiveVo
;
import
com.yifu.cloud.plus.v1.csp.vo.EmployeeRegistrationSearchVo
;
import
com.yifu.cloud.plus.v1.csp.vo.EmployeeRegistrationUpdateVo
;
import
com.yifu.cloud.plus.v1.yifu.archives.entity.TEmployeeProjectBelongDept
;
import
com.yifu.cloud.plus.v1.yifu.archives.vo.EmployeeRegistrationPreVo
;
import
com.yifu.cloud.plus.v1.yifu.archives.vo.TEmployeeProjectBelongDeptSearchCspVo
;
...
...
@@ -100,11 +102,25 @@ public interface EmployeeRegistrationService extends IService<EmployeeRegistrati
R
confirmReceive
(
EmployeeRegistrationPreVo
preVo
);
/**
* 单个更新
* @param registration 入离职登记
* 入职待确认表批量确认接收
* @param preVo 入离职登记
* @return
*/
R
batchConfirmReceive
(
EmployeeRegistrationPreVo
preVo
);
/**
* 批量更新
* @param employeeRegistList 入离职登记
* @return
*/
R
batchUpdatePreById
(
List
<
EmployeeRegistrationReceiveVo
>
employeeRegistList
);
/**
* 批量更新
* @param updateVo 状态和日志新增vo
* @return
*/
R
update
PreRegist
(
EmployeeRegistration
registration
);
R
update
RegistByPreInfo
(
EmployeeRegistrationUpdateVo
updateVo
);
/**
* @param searchCspVo 身份证 与 类型
...
...
yifu-csp/yifu-csp-biz/src/main/java/com/yifu/cloud/plus/v1/csp/service/impl/EmployeeRegistrationServiceImpl.java
View file @
4d9abeb8
This diff is collapsed.
Click to expand it.
yifu-csp/yifu-csp-biz/src/main/resources/mapper/EmployeeRegistrationMapper.xml
View file @
4d9abeb8
...
...
@@ -219,6 +219,18 @@
order by a.create_time desc
</select>
<!--employeeRegistration简单分页查询-->
<select
id=
"getEmployeeRegistrationList"
resultMap=
"employeeRegistrationMap"
>
SELECT
<include
refid=
"Base_Column_List"
/>
FROM employee_registration a
<where>
1=1
<include
refid=
"employeeRegistration_where"
/>
</where>
order by a.create_time desc
</select>
<select
id=
"selectExportCount"
resultType=
"java.lang.Long"
>
SELECT
count(1)
...
...
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