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
1482cfae
You need to sign in or sign up before continuing.
Commit
1482cfae
authored
Mar 03, 2025
by
huyuchen
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
huych-入离职登记提交
parent
66fbb0ad
Hide whitespace changes
Inline
Side-by-side
Showing
10 changed files
with
76 additions
and
12 deletions
+76
-12
EmpProjectStatusVo.java
...fu/cloud/plus/v1/yifu/archives/vo/EmpProjectStatusVo.java
+2
-0
TEmployeeProjectController.java
.../yifu/archives/controller/TEmployeeProjectController.java
+11
-0
TSettleDomainController.java
.../v1/yifu/archives/controller/TSettleDomainController.java
+18
-0
TEmployeeProjectMapper.java
.../plus/v1/yifu/archives/mapper/TEmployeeProjectMapper.java
+2
-0
TEmployeeProjectService.java
...lus/v1/yifu/archives/service/TEmployeeProjectService.java
+2
-0
TEmployeeProjectServiceImpl.java
...fu/archives/service/impl/TEmployeeProjectServiceImpl.java
+6
-0
TEmployeeProjectMapper.xml
...-biz/src/main/resources/mapper/TEmployeeProjectMapper.xml
+17
-0
EmployeeRegistrationHrExportVo.java
.../cloud/plus/v1/csp/vo/EmployeeRegistrationHrExportVo.java
+5
-5
EmployeeRegistrationServiceImpl.java
.../v1/csp/service/impl/EmployeeRegistrationServiceImpl.java
+4
-1
EmployeeRegistrationMapper.xml
.../src/main/resources/mapper/EmployeeRegistrationMapper.xml
+9
-6
No files found.
yifu-archives/yifu-archives-api/src/main/java/com/yifu/cloud/plus/v1/yifu/archives/vo/EmpProjectStatusVo.java
View file @
1482cfae
package
com
.
yifu
.
cloud
.
plus
.
v1
.
yifu
.
archives
.
vo
;
package
com
.
yifu
.
cloud
.
plus
.
v1
.
yifu
.
archives
.
vo
;
import
com.fasterxml.jackson.annotation.JsonFormat
;
import
lombok.Data
;
import
lombok.Data
;
import
java.io.Serializable
;
import
java.io.Serializable
;
...
@@ -15,5 +16,6 @@ import java.time.LocalDateTime;
...
@@ -15,5 +16,6 @@ import java.time.LocalDateTime;
public
class
EmpProjectStatusVo
implements
Serializable
{
public
class
EmpProjectStatusVo
implements
Serializable
{
private
String
deptNo
;
private
String
deptNo
;
private
String
empIdcard
;
private
String
empIdcard
;
@JsonFormat
(
shape
=
JsonFormat
.
Shape
.
STRING
,
pattern
=
"yyyy-MM-dd HH:mm:ss"
)
private
LocalDateTime
projectTime
;
private
LocalDateTime
projectTime
;
}
}
yifu-archives/yifu-archives-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/archives/controller/TEmployeeProjectController.java
View file @
1482cfae
...
@@ -392,4 +392,15 @@ public class TEmployeeProjectController {
...
@@ -392,4 +392,15 @@ public class TEmployeeProjectController {
public
EmpProjectStatusVo
getEmpProjectStatus
(
@RequestBody
EmpProjectStatusVo
vo
)
{
public
EmpProjectStatusVo
getEmpProjectStatus
(
@RequestBody
EmpProjectStatusVo
vo
)
{
return
tEmployeeProjectService
.
getEmpProjectStatus
(
vo
);
return
tEmployeeProjectService
.
getEmpProjectStatus
(
vo
);
}
}
/**
* 通过项目编码查询项目信息
* @param tEmployeeProject
* @return R
*/
@Operation
(
summary
=
"通过项目编码查询项目信息"
,
description
=
"通过项目编码查询项目信息"
)
@GetMapping
(
"/getProjectByDetpNo"
)
public
R
<
IPage
<
TEmployeeProject
>>
getProjectByDetpNo
(
Page
page
,
TEmployeeProject
tEmployeeProject
)
{
return
R
.
ok
(
tEmployeeProjectService
.
getProjectByDetpNo
(
page
,
tEmployeeProject
));
}
}
}
yifu-archives/yifu-archives-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/archives/controller/TSettleDomainController.java
View file @
1482cfae
...
@@ -330,6 +330,24 @@ public class TSettleDomainController {
...
@@ -330,6 +330,24 @@ public class TSettleDomainController {
return
tSettleDomainService
.
getSettleInfoByCodes
(
codes
);
return
tSettleDomainService
.
getSettleInfoByCodes
(
codes
);
}
}
/**
* @Author huych
* @Description 通过项目编码获取项目信息
* @Date 11:37 2025/3/3
* @Param
* @return
**/
@Operation
(
description
=
"通过项目编码获取项目信息"
)
@SysLog
(
"通过项目编码获取项目信息"
)
@PostMapping
(
"/getSettleDomainByNo"
)
public
R
getSettleDomainByNo
(
@RequestParam
String
deptNo
)
{
TSettleDomain
tSettleDomain
=
tSettleDomainService
.
getOne
(
Wrappers
.<
TSettleDomain
>
query
().
lambda
()
.
eq
(
TSettleDomain:
:
getDepartNo
,
deptNo
)
.
eq
(
TSettleDomain:
:
getDeleteFlag
,
CommonConstants
.
ZERO_STRING
)
.
last
(
CommonConstants
.
LAST_ONE_SQL
));
return
R
.
ok
(
tSettleDomain
);
}
/**
/**
* @param id 项目主键
* @param id 项目主键
* @Description: 通过id获取结算主体及单位部分信息
* @Description: 通过id获取结算主体及单位部分信息
...
...
yifu-archives/yifu-archives-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/archives/mapper/TEmployeeProjectMapper.java
View file @
1482cfae
...
@@ -54,6 +54,8 @@ public interface TEmployeeProjectMapper extends BaseMapper<TEmployeeProject> {
...
@@ -54,6 +54,8 @@ public interface TEmployeeProjectMapper extends BaseMapper<TEmployeeProject> {
IPage
<
TEmployeeProject
>
getTEmployeeProjectInfoPage
(
Page
page
,
@Param
(
"tEmployeeProject"
)
TEmployeeProject
tEmployeeProject
);
IPage
<
TEmployeeProject
>
getTEmployeeProjectInfoPage
(
Page
page
,
@Param
(
"tEmployeeProject"
)
TEmployeeProject
tEmployeeProject
);
IPage
<
TEmployeeProject
>
getProjectByDetpNo
(
Page
page
,
@Param
(
"tEmployeeProject"
)
TEmployeeProject
tEmployeeProject
);
// getTEmployeeProjectExportPage 改造
// getTEmployeeProjectExportPage 改造
List
<
EmployeeProjectExportVO
>
noPageDiy
(
@Param
(
"tEmployeeProject"
)
EmployeeProjectExportParamVO
searchVo
);
List
<
EmployeeProjectExportVO
>
noPageDiy
(
@Param
(
"tEmployeeProject"
)
EmployeeProjectExportParamVO
searchVo
);
...
...
yifu-archives/yifu-archives-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/archives/service/TEmployeeProjectService.java
View file @
1482cfae
...
@@ -178,6 +178,8 @@ public interface TEmployeeProjectService extends IService<TEmployeeProject> {
...
@@ -178,6 +178,8 @@ public interface TEmployeeProjectService extends IService<TEmployeeProject> {
R
getItemByEmpNo
(
String
empIdcard
,
String
empNo
);
R
getItemByEmpNo
(
String
empIdcard
,
String
empNo
);
IPage
<
TEmployeeProject
>
getProjectByDetpNo
(
Page
page
,
TEmployeeProject
tEmployeeProject
);
/**
/**
* @param empId
* @param empId
* @param deptId
* @param deptId
...
...
yifu-archives/yifu-archives-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/archives/service/impl/TEmployeeProjectServiceImpl.java
View file @
1482cfae
...
@@ -1366,6 +1366,12 @@ public class TEmployeeProjectServiceImpl extends ServiceImpl<TEmployeeProjectMap
...
@@ -1366,6 +1366,12 @@ public class TEmployeeProjectServiceImpl extends ServiceImpl<TEmployeeProjectMap
return
R
.
ok
(
map
);
return
R
.
ok
(
map
);
}
}
@Override
public
IPage
<
TEmployeeProject
>
getProjectByDetpNo
(
Page
page
,
TEmployeeProject
tEmployeeProject
)
{
return
baseMapper
.
getProjectByDetpNo
(
page
,
tEmployeeProject
);
}
@Override
@Override
public
TEmployeeProject
getByEmpIdAndDeptId
(
String
empId
,
String
deptId
)
{
public
TEmployeeProject
getByEmpIdAndDeptId
(
String
empId
,
String
deptId
)
{
TEmployeeProject
employeeProject
=
null
;
TEmployeeProject
employeeProject
=
null
;
...
...
yifu-archives/yifu-archives-biz/src/main/resources/mapper/TEmployeeProjectMapper.xml
View file @
1482cfae
...
@@ -869,6 +869,23 @@
...
@@ -869,6 +869,23 @@
order by a.CREATE_TIME desc
order by a.CREATE_TIME desc
</select>
</select>
<!--tEmployeeInfo简单分页查询-->
<select
id=
"getProjectByDetpNo"
resultMap=
"tEmployeeProjectMap"
>
SELECT
a.ID,
a.EMP_NAME,
a.EMP_IDCARD,
b.EMP_PHONE
FROM t_employee_project a left join t_employee_info b on a.EMP_ID = b.id
where
a.DELETE_FLAG = '0' and a.DEPT_NO = #{tEmployeeProject.deptNo}
and a.PROJECT_STATUS = 0
<if
test=
"tEmployeeProject.empIdcard != null and tEmployeeProject.empIdcard.trim() != ''"
>
AND (a.EMP_IDCARD like concat('%',#{tEmployeeProject.empIdcard},'%') or a.EMP_NAME like concat('%',#{tEmployeeProject.empIdcard}))
</if>
order by a.CREATE_TIME desc
</select>
<!--tEmployeeInfo导出查询改造 fxj 2022-11-03-->
<!--tEmployeeInfo导出查询改造 fxj 2022-11-03-->
<select
id=
"noPageDiy"
resultMap=
"tEmployeeProjectExportMap"
>
<select
id=
"noPageDiy"
resultMap=
"tEmployeeProjectExportMap"
>
SELECT
SELECT
...
...
yifu-csp/yifu-csp-api/src/main/java/com/yifu/cloud/plus/v1/csp/vo/EmployeeRegistrationHrExportVo.java
View file @
1482cfae
...
@@ -20,16 +20,16 @@ import java.util.Date;
...
@@ -20,16 +20,16 @@ import java.util.Date;
@ColumnWidth
(
12
)
@ColumnWidth
(
12
)
public
class
EmployeeRegistrationHrExportVo
extends
RowIndex
implements
Serializable
{
public
class
EmployeeRegistrationHrExportVo
extends
RowIndex
implements
Serializable
{
@ExcelAttribute
(
name
=
"项目名称"
)
@Schema
(
description
=
"项目名称"
)
@ExcelProperty
(
"项目名称"
)
private
String
deptName
;
@ExcelAttribute
(
name
=
"项目编码"
)
@ExcelAttribute
(
name
=
"项目编码"
)
@Schema
(
description
=
"项目编码"
)
@Schema
(
description
=
"项目编码"
)
@ExcelProperty
(
"项目编码"
)
@ExcelProperty
(
"项目编码"
)
private
String
deptNo
;
private
String
deptNo
;
@ExcelAttribute
(
name
=
"项目名称"
)
@Schema
(
description
=
"项目名称"
)
@ExcelProperty
(
"项目名称"
)
private
String
deptName
;
@ExcelAttribute
(
name
=
"员工姓名"
)
@ExcelAttribute
(
name
=
"员工姓名"
)
@Schema
(
description
=
"员工姓名"
)
@Schema
(
description
=
"员工姓名"
)
@ExcelProperty
(
"员工姓名"
)
@ExcelProperty
(
"员工姓名"
)
...
...
yifu-csp/yifu-csp-biz/src/main/java/com/yifu/cloud/plus/v1/csp/service/impl/EmployeeRegistrationServiceImpl.java
View file @
1482cfae
...
@@ -383,7 +383,7 @@ public class EmployeeRegistrationServiceImpl extends ServiceImpl<EmployeeRegistr
...
@@ -383,7 +383,7 @@ public class EmployeeRegistrationServiceImpl extends ServiceImpl<EmployeeRegistr
return
RegistConstants
.
REGIST_SAME_CHECK
;
return
RegistConstants
.
REGIST_SAME_CHECK
;
}
}
//针对离职的判断人员项目档案状态是否正常
//针对离职的判断人员项目档案状态是否正常
if
(
CommonConstants
.
ONE
_STRING
.
equals
(
registration
.
getFeedbackType
()))
{
if
(
CommonConstants
.
TWO
_STRING
.
equals
(
registration
.
getFeedbackType
()))
{
EmpProjectStatusVo
vo
=
new
EmpProjectStatusVo
();
EmpProjectStatusVo
vo
=
new
EmpProjectStatusVo
();
vo
.
setEmpIdcard
(
registration
.
getEmpIdcard
());
vo
.
setEmpIdcard
(
registration
.
getEmpIdcard
());
vo
.
setDeptNo
(
registration
.
getDeptNo
());
vo
.
setDeptNo
(
registration
.
getDeptNo
());
...
@@ -428,6 +428,9 @@ public class EmployeeRegistrationServiceImpl extends ServiceImpl<EmployeeRegistr
...
@@ -428,6 +428,9 @@ public class EmployeeRegistrationServiceImpl extends ServiceImpl<EmployeeRegistr
private
void
sendMessageToWx
(
EmployeeRegistration
registration
,
String
type
)
{
private
void
sendMessageToWx
(
EmployeeRegistration
registration
,
String
type
)
{
//获取前端客服
//获取前端客服
SysUser
user
;
SysUser
user
;
if
(
Common
.
isEmpty
(
registration
.
getCustomerUserLoginname
()))
{
return
;
}
R
<
SysUser
>
res
=
upmsDaprUtils
.
getSimpleUserByLoginName
(
registration
.
getCustomerUserLoginname
());
R
<
SysUser
>
res
=
upmsDaprUtils
.
getSimpleUserByLoginName
(
registration
.
getCustomerUserLoginname
());
if
(
Common
.
isNotNull
(
res
)
&&
Common
.
isNotNull
(
res
.
getData
())){
if
(
Common
.
isNotNull
(
res
)
&&
Common
.
isNotNull
(
res
.
getData
())){
user
=
res
.
getData
();
user
=
res
.
getData
();
...
...
yifu-csp/yifu-csp-biz/src/main/resources/mapper/EmployeeRegistrationMapper.xml
View file @
1482cfae
...
@@ -165,6 +165,7 @@
...
@@ -165,6 +165,7 @@
1=1
1=1
<include
refid=
"employeeRegistration_where"
/>
<include
refid=
"employeeRegistration_where"
/>
</where>
</where>
order by a.create_time desc
</select>
</select>
<select
id=
"selectExportCount"
resultType=
"java.lang.Long"
>
<select
id=
"selectExportCount"
resultType=
"java.lang.Long"
>
...
@@ -193,10 +194,11 @@
...
@@ -193,10 +194,11 @@
<where>
<where>
1=1
1=1
<include
refid=
"employeeRegistration_where"
/>
<include
refid=
"employeeRegistration_where"
/>
<if
test=
"employeeRegistration.limitStart != null"
>
limit #{employeeRegistration.limitStart},#{employeeRegistration.limitEnd}
</if>
</where>
</where>
order by a.create_time desc
<if
test=
"employeeRegistration.limitStart != null"
>
limit #{employeeRegistration.limitStart},#{employeeRegistration.limitEnd}
</if>
</select>
</select>
...
@@ -218,9 +220,10 @@
...
@@ -218,9 +220,10 @@
<where>
<where>
1=1
1=1
<include
refid=
"employeeRegistration_where"
/>
<include
refid=
"employeeRegistration_where"
/>
<if
test=
"employeeRegistration.limitStart != null"
>
limit #{employeeRegistration.limitStart},#{employeeRegistration.limitEnd}
</if>
</where>
</where>
order by a.create_time desc
<if
test=
"employeeRegistration.limitStart != null"
>
limit #{employeeRegistration.limitStart},#{employeeRegistration.limitEnd}
</if>
</select>
</select>
</mapper>
</mapper>
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