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
b01d5329
Commit
b01d5329
authored
Jul 23, 2024
by
hongguangwu
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
MVP1.6.7-预入职档案
parent
1e335b17
Hide whitespace changes
Inline
Side-by-side
Showing
5 changed files
with
67 additions
and
2 deletions
+67
-2
TPreEmpMainServiceImpl.java
...v1/yifu/archives/service/impl/TPreEmpMainServiceImpl.java
+25
-2
TSalaryEmployeeController.java
.../v1/yifu/salary/controller/TSalaryEmployeeController.java
+13
-0
TSalaryEmployeeService.java
...d/plus/v1/yifu/salary/service/TSalaryEmployeeService.java
+15
-0
TSalaryEmployeeServiceImpl.java
.../yifu/salary/service/impl/TSalaryEmployeeServiceImpl.java
+13
-0
application.yml
...salary/yifu-salary-biz/src/main/resources/application.yml
+1
-0
No files found.
yifu-archives/yifu-archives-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/archives/service/impl/TPreEmpMainServiceImpl.java
View file @
b01d5329
...
...
@@ -487,8 +487,9 @@ public class TPreEmpMainServiceImpl extends ServiceImpl<TPreEmpMainMapper, TPreE
}
vo
.
setTpreEmpFamilyList
(
tPreEmpFamilyList
);
// 预入职-人员档案表
TPreEmployeeInfo
tPreEmployeeInfo
;
if
(
vo
.
getTpreEmployeeInfo
()
==
null
)
{
TPreEmployeeInfo
tPreEmployeeInfo
=
tPreEmployeeInfoService
.
getTPreEmployeeInfoList
(
id
);
tPreEmployeeInfo
=
tPreEmployeeInfoService
.
getTPreEmployeeInfoList
(
id
);
if
(
tPreEmployeeInfo
==
null
)
{
tPreEmployeeInfo
=
new
TPreEmployeeInfo
();
tPreEmployeeInfo
.
setEmpIdcard
(
main
.
getEmpIdcard
());
...
...
@@ -500,6 +501,22 @@ public class TPreEmpMainServiceImpl extends ServiceImpl<TPreEmpMainMapper, TPreE
}
vo
.
setTpreEmployeeInfo
(
tPreEmployeeInfo
);
}
tPreEmployeeInfo
=
vo
.
getTpreEmployeeInfo
();
if
(
tPreEmployeeInfo
!=
null
&&
Common
.
isEmpty
(
tPreEmployeeInfo
.
getBankNo
())
&&
Common
.
isNotNull
(
tPreEmployeeInfo
.
getEmpIdcard
()))
{
// 去薪资服务获取卡号
R
<
TSalaryEmployee
>
sdr
=
HttpDaprUtil
.
invokeMethodPost
(
salaryProperties
.
getAppUrl
(),
salaryProperties
.
getAppId
()
,
"/tsalaryemployee/inner/getSalaryEmployee"
,
tPreEmployeeInfo
.
getEmpIdcard
(),
TSalaryEmployee
.
class
,
SecurityConstants
.
FROM_IN
);
if
(
sdr
!=
null
&&
sdr
.
getData
()
!=
null
)
{
TSalaryEmployee
tSalaryEmployee
=
sdr
.
getData
();
if
(
tSalaryEmployee
!=
null
&&
Common
.
isNotNull
(
tSalaryEmployee
.
getBankNo
()))
{
tPreEmployeeInfo
.
setBankNo
(
tSalaryEmployee
.
getBankNo
());
tPreEmployeeInfo
.
setBankName
(
tSalaryEmployee
.
getBankName
());
tPreEmployeeInfo
.
setBankSubName
(
tSalaryEmployee
.
getBankSubName
());
tPreEmployeeInfo
.
setBankProvince
(
tSalaryEmployee
.
getBankProvince
());
tPreEmployeeInfo
.
setBankCity
(
tSalaryEmployee
.
getBankCity
());
}
}
}
// 预入职-项目档案表
if
(
vo
.
getTpreEmployeeProject
()
==
null
)
{
TPreEmployeeProject
tPreEmployeeProject
=
tPreEmployeeProjectService
.
getTPreEmployeeProjectList
(
id
);
...
...
@@ -1255,7 +1272,10 @@ public class TPreEmpMainServiceImpl extends ServiceImpl<TPreEmpMainMapper, TPreE
if
(
Common
.
isEmpty
(
tPreEmployeeProject
.
getTryPeriod
()))
{
tPreEmployeeProject
.
setTryPeriod
(
""
);
}
BeanUtil
.
copyProperties
(
tPreEmployeeProject
,
project
,
ID
);
// 2024-7-23 11:52:33 金龙弟预张倩倩认为不同步项目的合同信息
String
[]
ignoreProperties
=
new
String
[]{
"id"
,
"contractType"
,
"workingHours"
,
"post"
,
"enjoinDate"
,
"enjoinDate"
,
"tryPeriod"
};
BeanUtil
.
copyProperties
(
tPreEmployeeProject
,
project
,
ignoreProperties
);
if
(
CommonConstants
.
ONE_INT
==
project
.
getProjectStatus
())
{
project
.
setCreateTime
(
LocalDateTime
.
now
());
project
.
setDeleteFlag
(
CommonConstants
.
STATUS_NORMAL
);
...
...
@@ -1645,6 +1665,9 @@ public class TPreEmpMainServiceImpl extends ServiceImpl<TPreEmpMainMapper, TPreE
if
(
Common
.
isEmpty
(
tPreEmployeeProject
.
getTryPeriod
()))
{
tPreEmployeeProject
.
setTryPeriod
(
""
);
}
// 2024-7-23 11:52:33 金龙弟预张倩倩认为不同步项目的合同信息
ignoreProperties
=
new
String
[]{
"id"
,
"contractType"
,
"workingHours"
,
"post"
,
"enjoinDate"
,
"enjoinDate"
,
"tryPeriod"
};
BeanUtil
.
copyProperties
(
tPreEmployeeProject
,
project
,
ignoreProperties
);
if
(
Common
.
isEmpty
(
project
.
getStatus
()))
{
project
.
setStatus
(
CommonConstants
.
ZERO_INT
);
...
...
yifu-salary/yifu-salary-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/salary/controller/TSalaryEmployeeController.java
View file @
b01d5329
...
...
@@ -238,6 +238,19 @@ public class TSalaryEmployeeController {
return
tSalaryEmployeeService
.
getEmpTaxMonth
(
empIdCard
);
}
/**
* @param empIdCard 身份证
* @Description: 根据身份证获取计税月份
* @Author: hgw
* @Date: 2024-7-18 10:48:15
* @return: com.yifu.cloud.plus.v1.yifu.common.core.util.R<com.yifu.cloud.plus.v1.yifu.archives.vo.TSettleDomainSelectVo>
**/
@Inner
@PostMapping
(
"/inner/getSalaryEmployee"
)
public
TSalaryEmployee
getSalaryEmployee
(
@RequestBody
String
empIdCard
)
{
return
tSalaryEmployeeService
.
getSalaryEmployee
(
empIdCard
);
}
/**
* @Description: 预入职保存薪资人员
* @Author: hgw
...
...
yifu-salary/yifu-salary-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/salary/service/TSalaryEmployeeService.java
View file @
b01d5329
...
...
@@ -143,6 +143,21 @@ public interface TSalaryEmployeeService extends IService<TSalaryEmployee> {
**/
String
getEmpTaxMonth
(
String
empIdCard
);
/**
* @param empIdCard 身份证
* @Description: C端预入职获取薪资人员信息
* @Author: hgw
* @Date: 2024/7/23 11:22
* @return: com.yifu.cloud.plus.v1.yifu.salary.entity.TSalaryEmployee
**/
TSalaryEmployee
getSalaryEmployee
(
String
empIdCard
);
/**
* @Description: 保存
* @Author: hgw
* @Date: 2024/7/23 11:22
* @return: java.lang.String
**/
String
savePreNewEmpInfo
(
TSalaryEmployee
newEmp
);
}
yifu-salary/yifu-salary-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/salary/service/impl/TSalaryEmployeeServiceImpl.java
View file @
b01d5329
...
...
@@ -1185,6 +1185,19 @@ public class TSalaryEmployeeServiceImpl extends ServiceImpl<TSalaryEmployeeMappe
return
taxMonth
;
}
/**
* @param empIdCard 身份证
* @Description: C端预入职获取薪资人员信息
* @Author: hgw
* @Date: 2024-7-23 11:21:56
* @return: java.lang.String
**/
@Override
public
TSalaryEmployee
getSalaryEmployee
(
String
empIdCard
)
{
// 0表示 未找到薪资记录,C端可编辑
return
baseMapper
.
getByEmpIdCard
(
empIdCard
);
}
/**
* @Description: C端预入职获取计税月份
* @Author: hgw
...
...
yifu-salary/yifu-salary-biz/src/main/resources/application.yml
View file @
b01d5329
...
...
@@ -42,6 +42,7 @@ security:
-
/taveragesalary/getAverageSalary
-
/tbankset/getWebcBankSetIdNameList
-
/tsalaryemployee/inner/getEmpTaxMonth
-
/tsalaryemployee/inner/getSalaryEmployee
-
/tsalaryemployee/inner/savePreNewEmpInfo
...
...
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