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
2c03b025
Commit
2c03b025
authored
Aug 30, 2024
by
hongguangwu
Browse files
Options
Browse Files
Download
Plain Diff
Merge remote-tracking branch 'origin/MVP1.6.9' into MVP1.6.9
parents
7ef82a56
53de339e
Show whitespace changes
Inline
Side-by-side
Showing
6 changed files
with
36 additions
and
13 deletions
+36
-13
UpProjectSocialFundVo.java
...cloud/plus/v1/yifu/archives/vo/UpProjectSocialFundVo.java
+4
-8
TEmployeeProjectServiceImpl.java
...fu/archives/service/impl/TEmployeeProjectServiceImpl.java
+3
-0
TEmployeeInfoMapper.xml
...ves-biz/src/main/resources/mapper/TEmployeeInfoMapper.xml
+1
-1
ErrorCodes.java
.../cloud/plus/v1/yifu/common/core/exception/ErrorCodes.java
+8
-0
messages_zh_CN.properties
...on-core/src/main/resources/i18n/messages_zh_CN.properties
+4
-0
TDispatchInfoServiceImpl.java
...v1/yifu/social/service/impl/TDispatchInfoServiceImpl.java
+16
-4
No files found.
yifu-archives/yifu-archives-api/src/main/java/com/yifu/cloud/plus/v1/yifu/archives/vo/UpProjectSocialFundVo.java
View file @
2c03b025
package
com
.
yifu
.
cloud
.
plus
.
v1
.
yifu
.
archives
.
vo
;
package
com
.
yifu
.
cloud
.
plus
.
v1
.
yifu
.
archives
.
vo
;
import
com.alibaba.excel.annotation.ExcelProperty
;
import
com.alibaba.excel.annotation.format.DateTimeFormat
;
import
com.alibaba.excel.annotation.write.style.HeadFontStyle
;
import
com.baomidou.mybatisplus.annotation.FieldStrategy
;
import
com.baomidou.mybatisplus.annotation.TableField
;
import
com.fasterxml.jackson.annotation.JsonFormat
;
import
com.yifu.cloud.plus.v1.yifu.common.core.constant.ExcelAttribute
;
import
io.swagger.v3.oas.annotations.media.Schema
;
import
io.swagger.v3.oas.annotations.media.Schema
;
import
lombok.Data
;
import
lombok.Data
;
import
org.hibernate.validator.constraints.Length
;
import
java.io.Serializable
;
import
java.io.Serializable
;
import
java.util.Date
;
import
java.util.Date
;
...
@@ -62,6 +54,10 @@ public class UpProjectSocialFundVo implements Serializable {
...
@@ -62,6 +54,10 @@ public class UpProjectSocialFundVo implements Serializable {
String
detailId
;
String
detailId
;
String
contactAddress
;
String
contactAddress
;
String
highEducation
;
String
highEducation
;
/**
* 户口性质
*/
private
String
empRegisType
;
/**
/**
* 学校
* 学校
*/
*/
...
...
yifu-archives/yifu-archives-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/archives/service/impl/TEmployeeProjectServiceImpl.java
View file @
2c03b025
...
@@ -1469,6 +1469,9 @@ public class TEmployeeProjectServiceImpl extends ServiceImpl<TEmployeeProjectMap
...
@@ -1469,6 +1469,9 @@ public class TEmployeeProjectServiceImpl extends ServiceImpl<TEmployeeProjectMap
if
(
Common
.
isNotNull
(
vo
.
getGradutionDate
())){
if
(
Common
.
isNotNull
(
vo
.
getGradutionDate
())){
employee
.
setGradutionDate
(
vo
.
getGradutionDate
());
employee
.
setGradutionDate
(
vo
.
getGradutionDate
());
}
}
if
(
Common
.
isNotNull
(
vo
.
getEmpRegisType
())){
employee
.
setEmpRegisType
(
vo
.
getEmpRegisType
());
}
tEmployeeInfoMapper
.
updateSocialInfoById
(
employee
);
tEmployeeInfoMapper
.
updateSocialInfoById
(
employee
);
}
}
TEmployeeProject
project
=
baseMapper
.
selectOne
(
Wrappers
.<
TEmployeeProject
>
query
().
lambda
()
TEmployeeProject
project
=
baseMapper
.
selectOne
(
Wrappers
.<
TEmployeeProject
>
query
().
lambda
()
...
...
yifu-archives/yifu-archives-biz/src/main/resources/mapper/TEmployeeInfoMapper.xml
View file @
2c03b025
...
@@ -1208,7 +1208,7 @@
...
@@ -1208,7 +1208,7 @@
<if
test=
"tEmployeeInfo.fileTown != null"
>
a.FILE_TOWN=#{tEmployeeInfo.fileTown},
</if>
<if
test=
"tEmployeeInfo.fileTown != null"
>
a.FILE_TOWN=#{tEmployeeInfo.fileTown},
</if>
<if
test=
"tEmployeeInfo.fileTown == null"
>
a.FILE_TOWN=null,
</if>
<if
test=
"tEmployeeInfo.fileTown == null"
>
a.FILE_TOWN=null,
</if>
</if>
</if>
<if
test=
"tEmployeeInfo.empRegisType != null"
>
a.EMP_REGIS_TYPE=#{tEmployeeInfo.empRegisType},
</if>
<if
test=
"tEmployeeInfo.empPhone != null and tEmployeeInfo.empPhone != ''"
>
a.EMP_PHONE=#{tEmployeeInfo.empPhone},
</if>
<if
test=
"tEmployeeInfo.empPhone != null and tEmployeeInfo.empPhone != ''"
>
a.EMP_PHONE=#{tEmployeeInfo.empPhone},
</if>
</trim>
</trim>
WHERE a.id=#{tEmployeeInfo.id}
WHERE a.id=#{tEmployeeInfo.id}
...
...
yifu-common/yifu-common-core/src/main/java/com/yifu/cloud/plus/v1/yifu/common/core/exception/ErrorCodes.java
View file @
2c03b025
...
@@ -618,4 +618,12 @@ public interface ErrorCodes {
...
@@ -618,4 +618,12 @@ public interface ErrorCodes {
* 工作岗位不可为空
* 工作岗位不可为空
*/
*/
String
EMP_WORKING_JOB_NOT_EMPTY
=
"emp.work.job.not.empty"
;
String
EMP_WORKING_JOB_NOT_EMPTY
=
"emp.work.job.not.empty"
;
/**
* 学历不可为空
*/
String
EMP_DISPATCH_EMP_EDUCATION_NOT_EMPTY
=
"dispatch.emp.education.not.empty"
;
/**
* 户口性质不可为空
*/
String
EMP_DISPATCH_EMP_REGISTYPE_NOT_EMPTY
=
"dispatch.emp.registype.not.empty"
;
}
}
yifu-common/yifu-common-core/src/main/resources/i18n/messages_zh_CN.properties
View file @
2c03b025
...
@@ -238,6 +238,10 @@ emp.work.record.end.date.not.empty=\u5DE5\u4F5C\u7ECF\u5386\u7ED3\u675F\u65E5\u6
...
@@ -238,6 +238,10 @@ emp.work.record.end.date.not.empty=\u5DE5\u4F5C\u7ECF\u5386\u7ED3\u675F\u65E5\u6
emp.work.job.not.empty
=
\u
5DE5
\u
4F5C
\u
5C97
\u
4F4D
\u
4E0D
\u
53EF
\u
4E3A
\u
7A7A
emp.work.job.not.empty
=
\u
5DE5
\u
4F5C
\u
5C97
\u
4F4D
\u
4E0D
\u
53EF
\u
4E3A
\u
7A7A
dispatch.emp.education.not.empty
=
\u
5DF2
\u6709\u6863\u6848\u
5B66
\u5386\u
4E3A
\u
7A7A
\u
FF0C
\u
6D3E
\u5355\u
6A21
\u
677F
\u
5B66
\u5386\u
4E0D
\u
53EF
\u
4E3A
\u
7A7A
\u
FF0C
\u
8BF7
\u8865\u5145\u
5B66
\u5386
dispatch.emp.registype.not.empty
=
\u
5DF2
\u6709\u6863\u6848\u6237\u
53E3
\u6027\u
8D28
\u
4E3A
\u
7A7A
\u
FF0C
\u
6D3E
\u5355\u
6A21
\u
677F
\u6237\u
53E3
\u6027\u
8D28
\u
4E0D
\u
53EF
\u
4E3A
\u
7A7A
\u
FF0C
\u
8BF7
\u8865\u5145\u6237\u
53E3
\u6027\u
8D28
...
...
yifu-social/yifu-social-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/social/service/impl/TDispatchInfoServiceImpl.java
View file @
2c03b025
...
@@ -813,11 +813,14 @@ public class TDispatchInfoServiceImpl extends ServiceImpl<TDispatchInfoMapper, T
...
@@ -813,11 +813,14 @@ public class TDispatchInfoServiceImpl extends ServiceImpl<TDispatchInfoMapper, T
vo
.
setFileTown
(
excel
.
getFileTown
());
vo
.
setFileTown
(
excel
.
getFileTown
());
vo
.
setMobile
(
excel
.
getEmpMobile
());
vo
.
setMobile
(
excel
.
getEmpMobile
());
vo
.
setEmpIdCard
(
socialFund
.
getEmpIdcard
());
vo
.
setEmpIdCard
(
socialFund
.
getEmpIdcard
());
if
(
Common
.
isNotNull
(
excel
.
getEducationName
()))
{
DispatchEmpVo
emp
=
null
;
DispatchEmpVo
emp
=
null
;
if
(
Common
.
isNotNull
(
empVoMap
))
{
if
(
Common
.
isNotNull
(
empVoMap
))
{
emp
=
empVoMap
.
get
(
excel
.
getEmpIdcard
());
emp
=
empVoMap
.
get
(
excel
.
getEmpIdcard
());
}
}
if
(
Common
.
isEmpty
(
emp
.
getEmpRegisType
())
&&
Common
.
isNotNull
(
excel
.
getEmpRegisType
())){
vo
.
setEmpRegisType
(
excel
.
getEmpRegisType
());
}
if
(
Common
.
isNotNull
(
excel
.
getEducationName
()))
{
if
(
Common
.
isNotNull
(
emp
))
{
if
(
Common
.
isNotNull
(
emp
))
{
if
(
Common
.
isEmpty
(
emp
.
getHignEducation
()))
{
if
(
Common
.
isEmpty
(
emp
.
getHignEducation
()))
{
vo
.
setHighEducation
(
""
);
vo
.
setHighEducation
(
""
);
...
@@ -2349,6 +2352,15 @@ public class TDispatchInfoServiceImpl extends ServiceImpl<TDispatchInfoMapper, T
...
@@ -2349,6 +2352,15 @@ public class TDispatchInfoServiceImpl extends ServiceImpl<TDispatchInfoMapper, T
签订期限:无固定期限 合同到期时间、合同期限非必填,合同开始时间必填;
签订期限:无固定期限 合同到期时间、合同期限非必填,合同开始时间必填;
签订期限:固定期限、已完成一定工作任务为期限 合同期限非必填,合同开始时间、合同到期时间都必填*/
签订期限:固定期限、已完成一定工作任务为期限 合同期限非必填,合同开始时间、合同到期时间都必填*/
if
(
Common
.
isNotNull
(
empVo
)){
if
(
Common
.
isNotNull
(
empVo
)){
// fxj 2024-08-30 有档案 学历或户口性质为空 派单必填 学历或客户性质
if
(
Common
.
isEmpty
(
empVo
.
getHignEducation
())
&&
Common
.
isEmpty
(
excel
.
getEducationName
())){
errorMessageList
.
add
(
new
ErrorMessage
(
excel
.
getRowIndex
(),
MsgUtils
.
getMessage
(
ErrorCodes
.
EMP_DISPATCH_EMP_EDUCATION_NOT_EMPTY
)));
return
true
;
}
if
(
Common
.
isEmpty
(
empVo
.
getEmpRegisType
())
&&
Common
.
isEmpty
(
excel
.
getEmpRegisType
())){
errorMessageList
.
add
(
new
ErrorMessage
(
excel
.
getRowIndex
(),
MsgUtils
.
getMessage
(
ErrorCodes
.
EMP_DISPATCH_EMP_REGISTYPE_NOT_EMPTY
)));
return
true
;
}
if
(
Common
.
isNotNull
(
empVo
.
getProjectStatus
())
&&
empVo
.
getProjectStatus
().
intValue
()
==
CommonConstants
.
ONE_INT
){
if
(
Common
.
isNotNull
(
empVo
.
getProjectStatus
())
&&
empVo
.
getProjectStatus
().
intValue
()
==
CommonConstants
.
ONE_INT
){
errorMessageList
.
add
(
new
ErrorMessage
(
excel
.
getRowIndex
(),
MsgUtils
.
getMessage
(
ErrorCodes
.
EMP_DISPATCH_EMP_PROJECT_NOT_USED
)));
errorMessageList
.
add
(
new
ErrorMessage
(
excel
.
getRowIndex
(),
MsgUtils
.
getMessage
(
ErrorCodes
.
EMP_DISPATCH_EMP_PROJECT_NOT_USED
)));
return
true
;
return
true
;
...
...
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