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
9e293a47
Commit
9e293a47
authored
Apr 17, 2026
by
fangxinjiang
Browse files
Options
Browse Files
Download
Plain Diff
Merge remote-tracking branch 'origin/MVP1.7.22' into MVP1.7.22
parents
427a7d86
3cc84e1f
Hide whitespace changes
Inline
Side-by-side
Showing
20 changed files
with
115 additions
and
7 deletions
+115
-7
TAutoContractScheme.java
...oud/plus/v1/yifu/archives/entity/TAutoContractScheme.java
+7
-0
TEmployeeContractPre.java
...ud/plus/v1/yifu/archives/entity/TEmployeeContractPre.java
+15
-0
TEmployeeContractPreNew.java
...plus/v1/yifu/archives/entity/TEmployeeContractPreNew.java
+12
-0
TEmployeeInfo.java
...ifu/cloud/plus/v1/yifu/archives/entity/TEmployeeInfo.java
+7
-0
TPreEmployeeInfo.java
.../cloud/plus/v1/yifu/archives/entity/TPreEmployeeInfo.java
+7
-0
EmployeeInsertVO.java
...yifu/cloud/plus/v1/yifu/archives/vo/EmployeeInsertVO.java
+8
-0
PreUploadEmpImportVo.java
.../cloud/plus/v1/yifu/archives/vo/PreUploadEmpImportVo.java
+3
-0
TEmployeeContractPrePushFascVo.java
...s/v1/yifu/archives/vo/TEmployeeContractPrePushFascVo.java
+4
-0
TEmployeeContractPreVo.java
...loud/plus/v1/yifu/archives/vo/TEmployeeContractPreVo.java
+7
-0
EmployeeConstants.java
...ud/plus/v1/yifu/archives/constants/EmployeeConstants.java
+1
-0
FascServiceImpl.java
...d/plus/v1/yifu/archives/service/impl/FascServiceImpl.java
+2
-0
TEmployeeInfoServiceImpl.java
.../yifu/archives/service/impl/TEmployeeInfoServiceImpl.java
+14
-0
TPreEmpMainServiceImpl.java
...v1/yifu/archives/service/impl/TPreEmpMainServiceImpl.java
+3
-1
TAutoContractSchemeMapper.xml
...z/src/main/resources/mapper/TAutoContractSchemeMapper.xml
+6
-1
TEmpContactInfoMapper.xml
...s-biz/src/main/resources/mapper/TEmpContactInfoMapper.xml
+1
-1
TEmployeeContractPreHistoryMapper.xml
...in/resources/mapper/TEmployeeContractPreHistoryMapper.xml
+1
-0
TEmployeeContractPreMapper.xml
.../src/main/resources/mapper/TEmployeeContractPreMapper.xml
+5
-1
TEmployeeContractPreNewMapper.xml
...c/main/resources/mapper/TEmployeeContractPreNewMapper.xml
+6
-1
TEmployeeInfoMapper.xml
...ves-biz/src/main/resources/mapper/TEmployeeInfoMapper.xml
+3
-1
TPreEmployeeInfoMapper.xml
...-biz/src/main/resources/mapper/TPreEmployeeInfoMapper.xml
+3
-1
No files found.
yifu-archives/yifu-archives-api/src/main/java/com/yifu/cloud/plus/v1/yifu/archives/entity/TAutoContractScheme.java
View file @
9e293a47
...
@@ -569,4 +569,11 @@ public class TAutoContractScheme extends BaseEntity {
...
@@ -569,4 +569,11 @@ public class TAutoContractScheme extends BaseEntity {
@Schema
(
description
=
"其他工作时间 (工作方式为第二种方式)"
)
@Schema
(
description
=
"其他工作时间 (工作方式为第二种方式)"
)
private
String
otherWorkDay
;
private
String
otherWorkDay
;
// MVP1.7.22版本新字段:
@ExcelAttribute
(
name
=
"发薪日"
,
maxLength
=
2
)
@Length
(
max
=
2
,
message
=
"发薪日不能超过2个字符"
)
@ExcelProperty
(
"发薪日"
)
@Schema
(
description
=
"发薪日"
)
private
String
salaryDay
;
}
}
yifu-archives/yifu-archives-api/src/main/java/com/yifu/cloud/plus/v1/yifu/archives/entity/TEmployeeContractPre.java
View file @
9e293a47
package
com
.
yifu
.
cloud
.
plus
.
v1
.
yifu
.
archives
.
entity
;
package
com
.
yifu
.
cloud
.
plus
.
v1
.
yifu
.
archives
.
entity
;
import
cn.hutool.core.date.DateTime
;
import
cn.hutool.core.date.DateTime
;
import
com.alibaba.excel.annotation.ExcelProperty
;
import
com.baomidou.mybatisplus.annotation.*
;
import
com.baomidou.mybatisplus.annotation.*
;
import
com.fasterxml.jackson.annotation.JsonFormat
;
import
com.fasterxml.jackson.annotation.JsonFormat
;
import
com.yifu.cloud.plus.v1.yifu.common.core.constant.ExcelAttribute
;
import
com.yifu.cloud.plus.v1.yifu.common.core.constant.ExcelAttribute
;
...
@@ -8,6 +9,7 @@ import com.yifu.cloud.plus.v1.yifu.common.mybatis.base.BaseEntity;
...
@@ -8,6 +9,7 @@ import com.yifu.cloud.plus.v1.yifu.common.mybatis.base.BaseEntity;
import
io.swagger.v3.oas.annotations.media.Schema
;
import
io.swagger.v3.oas.annotations.media.Schema
;
import
lombok.Data
;
import
lombok.Data
;
import
lombok.EqualsAndHashCode
;
import
lombok.EqualsAndHashCode
;
import
org.hibernate.validator.constraints.Length
;
import
java.time.LocalDateTime
;
import
java.time.LocalDateTime
;
import
java.util.Date
;
import
java.util.Date
;
...
@@ -352,6 +354,11 @@ public class TEmployeeContractPre extends BaseEntity {
...
@@ -352,6 +354,11 @@ public class TEmployeeContractPre extends BaseEntity {
@ExcelAttribute
(
name
=
"邮箱"
)
@ExcelAttribute
(
name
=
"邮箱"
)
private
String
empEmail
;
private
String
empEmail
;
// 1.7.22版本
@TableField
(
exist
=
false
)
@ExcelProperty
(
"微信号"
)
private
String
weChatId
;
// 紧急联系人表
// 紧急联系人表
@TableField
(
exist
=
false
)
@TableField
(
exist
=
false
)
@ExcelAttribute
(
name
=
"紧急联系人"
)
@ExcelAttribute
(
name
=
"紧急联系人"
)
...
@@ -364,6 +371,7 @@ public class TEmployeeContractPre extends BaseEntity {
...
@@ -364,6 +371,7 @@ public class TEmployeeContractPre extends BaseEntity {
@TableField
(
exist
=
false
)
@TableField
(
exist
=
false
)
@ExcelAttribute
(
name
=
"紧急联系人地址"
)
@ExcelAttribute
(
name
=
"紧急联系人地址"
)
private
String
contactAddress
;
private
String
contactAddress
;
// 电子签推送需要的新字段——END
// 电子签推送需要的新字段——END
/**
/**
* 是否拒绝入职: 0 是 1 否
* 是否拒绝入职: 0 是 1 否
...
@@ -377,4 +385,11 @@ public class TEmployeeContractPre extends BaseEntity {
...
@@ -377,4 +385,11 @@ public class TEmployeeContractPre extends BaseEntity {
@Schema
(
description
=
"是否已确认离职: 0 是 1 "
)
@Schema
(
description
=
"是否已确认离职: 0 是 1 "
)
private
String
isLeave
;
private
String
isLeave
;
// MVP1.7.22版本新字段:
@ExcelAttribute
(
name
=
"发薪日"
,
maxLength
=
2
)
@Length
(
max
=
2
,
message
=
"发薪日不能超过2个字符"
)
@ExcelProperty
(
"发薪日"
)
@Schema
(
description
=
"发薪日"
)
private
String
salaryDay
;
}
}
yifu-archives/yifu-archives-api/src/main/java/com/yifu/cloud/plus/v1/yifu/archives/entity/TEmployeeContractPreNew.java
View file @
9e293a47
...
@@ -735,4 +735,16 @@ public class TEmployeeContractPreNew extends BaseEntity {
...
@@ -735,4 +735,16 @@ public class TEmployeeContractPreNew extends BaseEntity {
@ExcelAttribute
(
name
=
"邮箱"
)
@ExcelAttribute
(
name
=
"邮箱"
)
private
String
empEmail
;
private
String
empEmail
;
// 1.7.22版本(档案字段)
@TableField
(
exist
=
false
)
@ExcelProperty
(
"微信号"
)
private
String
weChatId
;
// MVP1.7.22版本新字段:
@ExcelAttribute
(
name
=
"发薪日"
,
maxLength
=
2
)
@Length
(
max
=
2
,
message
=
"发薪日不能超过2个字符"
)
@ExcelProperty
(
"发薪日"
)
@Schema
(
description
=
"发薪日"
)
private
String
salaryDay
;
}
}
yifu-archives/yifu-archives-api/src/main/java/com/yifu/cloud/plus/v1/yifu/archives/entity/TEmployeeInfo.java
View file @
9e293a47
...
@@ -571,6 +571,13 @@ public class TEmployeeInfo extends BaseEntity {
...
@@ -571,6 +571,13 @@ public class TEmployeeInfo extends BaseEntity {
@Schema
(
description
=
"是否有职业资格证书:0 是 1 否"
)
@Schema
(
description
=
"是否有职业资格证书:0 是 1 否"
)
private
String
haveQualification
;
private
String
haveQualification
;
// 1.7.22版本新增字段
@ExcelAttribute
(
name
=
"微信号"
,
maxLength
=
50
)
@Length
(
max
=
50
,
message
=
"微信号不能超过50个字符"
)
@HeadFontStyle
(
fontHeightInPoints
=
11
)
@ExcelProperty
(
"微信号"
)
private
String
weChatId
;
/**
/**
* 其他附件--C段二维码扫码数据
* 其他附件--C段二维码扫码数据
*/
*/
...
...
yifu-archives/yifu-archives-api/src/main/java/com/yifu/cloud/plus/v1/yifu/archives/entity/TPreEmployeeInfo.java
View file @
9e293a47
...
@@ -518,4 +518,11 @@ public class TPreEmployeeInfo extends BaseEntity {
...
@@ -518,4 +518,11 @@ public class TPreEmployeeInfo extends BaseEntity {
@Schema
(
description
=
"是否有职业资格证书:0 是 1 否"
)
@Schema
(
description
=
"是否有职业资格证书:0 是 1 否"
)
private
String
haveQualification
;
private
String
haveQualification
;
// 1.7.22版本新增字段
@ExcelAttribute
(
name
=
"微信号"
,
maxLength
=
50
)
@Length
(
max
=
50
,
message
=
"微信号不能超过50个字符"
)
@HeadFontStyle
(
fontHeightInPoints
=
11
)
@ExcelProperty
(
"微信号"
)
private
String
weChatId
;
}
}
yifu-archives/yifu-archives-api/src/main/java/com/yifu/cloud/plus/v1/yifu/archives/vo/EmployeeInsertVO.java
View file @
9e293a47
...
@@ -8,6 +8,7 @@ import com.yifu.cloud.plus.v1.yifu.common.core.constant.ExcelAttribute;
...
@@ -8,6 +8,7 @@ import com.yifu.cloud.plus.v1.yifu.common.core.constant.ExcelAttribute;
import
com.yifu.cloud.plus.v1.yifu.common.core.vo.RowIndex
;
import
com.yifu.cloud.plus.v1.yifu.common.core.vo.RowIndex
;
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
javax.validation.constraints.Size
;
import
javax.validation.constraints.Size
;
import
java.io.Serializable
;
import
java.io.Serializable
;
...
@@ -245,6 +246,13 @@ public class EmployeeInsertVO extends RowIndex implements Serializable {
...
@@ -245,6 +246,13 @@ public class EmployeeInsertVO extends RowIndex implements Serializable {
@ExcelProperty
(
value
=
"通信地址-详细地址"
)
@ExcelProperty
(
value
=
"通信地址-详细地址"
)
private
String
contactAddress
;
private
String
contactAddress
;
// 1.7.22版本新增字段
@ExcelAttribute
(
name
=
"微信号"
,
maxLength
=
50
)
@Length
(
max
=
50
,
message
=
"微信号不能超过50个字符"
)
@HeadFontStyle
(
fontHeightInPoints
=
11
)
@ExcelProperty
(
"微信号"
)
private
String
weChatId
;
/*
/*
// 紧急联系人姓名 与本人关系 联系地址-省 联系地址-市 联系地址-区/县 联系地址-详细地址 手机号码(紧急联系人)
// 紧急联系人姓名 与本人关系 联系地址-省 联系地址-市 联系地址-区/县 联系地址-详细地址 手机号码(紧急联系人)
@ExcelAttribute(name = "紧急联系人姓名", isNotEmpty = true, errorInfo = "紧急联系人姓名不能为空", maxLength = 20)
@ExcelAttribute(name = "紧急联系人姓名", isNotEmpty = true, errorInfo = "紧急联系人姓名不能为空", maxLength = 20)
...
...
yifu-archives/yifu-archives-api/src/main/java/com/yifu/cloud/plus/v1/yifu/archives/vo/PreUploadEmpImportVo.java
View file @
9e293a47
...
@@ -56,6 +56,9 @@ public class PreUploadEmpImportVo implements Serializable {
...
@@ -56,6 +56,9 @@ public class PreUploadEmpImportVo implements Serializable {
private
String
empPhone
;
private
String
empPhone
;
@ExcelAttribute
(
name
=
"邮箱"
,
maxLength
=
50
)
@ExcelAttribute
(
name
=
"邮箱"
,
maxLength
=
50
)
private
String
empEmail
;
private
String
empEmail
;
// 1.7.22版本新增字段
@ExcelAttribute
(
name
=
"微信号"
,
maxLength
=
50
)
private
String
weChatId
;
// 区域ID
// 区域ID
@ExcelAttribute
(
name
=
"户籍所在地-省"
,
isArea
=
true
)
@ExcelAttribute
(
name
=
"户籍所在地-省"
,
isArea
=
true
)
private
String
idProvince
;
private
String
idProvince
;
...
...
yifu-archives/yifu-archives-api/src/main/java/com/yifu/cloud/plus/v1/yifu/archives/vo/TEmployeeContractPrePushFascVo.java
View file @
9e293a47
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.yifu.cloud.plus.v1.yifu.common.core.constant.ExcelAttribute
;
import
com.yifu.cloud.plus.v1.yifu.common.core.constant.ExcelAttribute
;
import
lombok.Data
;
import
lombok.Data
;
...
@@ -35,5 +36,8 @@ public class TEmployeeContractPrePushFascVo {
...
@@ -35,5 +36,8 @@ public class TEmployeeContractPrePushFascVo {
@ExcelAttribute
(
name
=
"手机号码"
)
@ExcelAttribute
(
name
=
"手机号码"
)
private
String
empPhone
;
private
String
empPhone
;
@ExcelProperty
(
"微信号"
)
private
String
weChatId
;
}
}
yifu-archives/yifu-archives-api/src/main/java/com/yifu/cloud/plus/v1/yifu/archives/vo/TEmployeeContractPreVo.java
View file @
9e293a47
...
@@ -574,4 +574,11 @@ public class TEmployeeContractPreVo extends RowIndex implements Serializable {
...
@@ -574,4 +574,11 @@ public class TEmployeeContractPreVo extends RowIndex implements Serializable {
@ExcelProperty
(
"法大大模版ID"
)
@ExcelProperty
(
"法大大模版ID"
)
private
String
fadadaTemplateId
;
private
String
fadadaTemplateId
;
// MVP1.7.22版本新字段:
@ExcelAttribute
(
name
=
"发薪日"
,
maxLength
=
2
)
@Length
(
max
=
2
,
message
=
"发薪日不能超过2个字符"
)
@ExcelProperty
(
"发薪日"
)
@Schema
(
description
=
"发薪日"
)
private
String
salaryDay
;
}
}
yifu-archives/yifu-archives-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/archives/constants/EmployeeConstants.java
View file @
9e293a47
...
@@ -9,6 +9,7 @@ public class EmployeeConstants {
...
@@ -9,6 +9,7 @@ public class EmployeeConstants {
public
static
final
String
REMARL_LENGTH
=
"备注长度超过200"
;
public
static
final
String
REMARL_LENGTH
=
"备注长度超过200"
;
public
static
final
String
POST_LENGTH
=
"就职岗位长度超过20"
;
public
static
final
String
POST_LENGTH
=
"就职岗位长度超过20"
;
public
static
final
String
DEPT_NO_LENGTH
=
"项目编码长度超过20"
;
public
static
final
String
DEPT_NO_LENGTH
=
"项目编码长度超过20"
;
public
static
final
String
WE_CHAT_ID_NO_LENGTH
=
"微信号长度超过50"
;
public
static
final
String
VALIDITY_START
=
"身份证开始日期必填"
;
public
static
final
String
VALIDITY_START
=
"身份证开始日期必填"
;
public
static
final
String
VALIDITY_END
=
"身份证截止日期必填"
;
public
static
final
String
VALIDITY_END
=
"身份证截止日期必填"
;
public
static
final
String
VALIDITY_END_FORMAT
=
"身份证截止日期只能为日期格式:yyyy-MM-dd或者固定值:长期"
;
public
static
final
String
VALIDITY_END_FORMAT
=
"身份证截止日期只能为日期格式:yyyy-MM-dd或者固定值:长期"
;
...
...
yifu-archives/yifu-archives-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/archives/service/impl/FascServiceImpl.java
View file @
9e293a47
...
@@ -343,6 +343,7 @@ public class FascServiceImpl extends ServiceImpl<FddContractInfoMapper, FddContr
...
@@ -343,6 +343,7 @@ public class FascServiceImpl extends ServiceImpl<FddContractInfoMapper, FddContr
contract
.
setContactArea
(
empInfo
.
getContactArea
());
contract
.
setContactArea
(
empInfo
.
getContactArea
());
contract
.
setEmpEmail
(
empInfo
.
getEmpEmail
());
contract
.
setEmpEmail
(
empInfo
.
getEmpEmail
());
contract
.
setEmpPhone
(
empInfo
.
getEmpPhone
());
contract
.
setEmpPhone
(
empInfo
.
getEmpPhone
());
contract
.
setWeChatId
(
empInfo
.
getWeChatId
());
}
}
if
(
Common
.
isEmpty
(
contract
.
getFadadaTemplateId
()))
{
if
(
Common
.
isEmpty
(
contract
.
getFadadaTemplateId
()))
{
...
@@ -407,6 +408,7 @@ public class FascServiceImpl extends ServiceImpl<FddContractInfoMapper, FddContr
...
@@ -407,6 +408,7 @@ public class FascServiceImpl extends ServiceImpl<FddContractInfoMapper, FddContr
contract
.
setContactArea
(
empInfo
.
getContactArea
());
contract
.
setContactArea
(
empInfo
.
getContactArea
());
contract
.
setEmpEmail
(
empInfo
.
getEmpEmail
());
contract
.
setEmpEmail
(
empInfo
.
getEmpEmail
());
contract
.
setEmpPhone
(
empInfo
.
getEmpPhone
());
contract
.
setEmpPhone
(
empInfo
.
getEmpPhone
());
contract
.
setWeChatId
(
empInfo
.
getWeChatId
());
}
}
if
(
Common
.
isEmpty
(
contract
.
getFadadaTemplateId
()))
{
if
(
Common
.
isEmpty
(
contract
.
getFadadaTemplateId
()))
{
...
...
yifu-archives/yifu-archives-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/archives/service/impl/TEmployeeInfoServiceImpl.java
View file @
9e293a47
...
@@ -1711,6 +1711,13 @@ public class TEmployeeInfoServiceImpl extends ServiceImpl<TEmployeeInfoMapper, T
...
@@ -1711,6 +1711,13 @@ public class TEmployeeInfoServiceImpl extends ServiceImpl<TEmployeeInfoMapper, T
saveEmp
.
setDeptNo
(
excel
.
getDeptNo
());
saveEmp
.
setDeptNo
(
excel
.
getDeptNo
());
}
}
}
}
if
(
Common
.
isNotNull
(
excel
.
getWeChatId
()))
{
if
(
excel
.
getWeChatId
().
length
()
>
50
)
{
errorMsg
.
add
(
EmployeeConstants
.
WE_CHAT_ID_NO_LENGTH
);
}
else
{
saveEmp
.
setWeChatId
(
excel
.
getWeChatId
());
}
}
this
.
setBaseData
(
saveEmp
,
CommonConstants
.
dingleDigitStrArray
[
5
],
user
);
this
.
setBaseData
(
saveEmp
,
CommonConstants
.
dingleDigitStrArray
[
5
],
user
);
saveList
.
add
(
saveEmp
);
saveList
.
add
(
saveEmp
);
}
}
...
@@ -2277,6 +2284,13 @@ public class TEmployeeInfoServiceImpl extends ServiceImpl<TEmployeeInfoMapper, T
...
@@ -2277,6 +2284,13 @@ public class TEmployeeInfoServiceImpl extends ServiceImpl<TEmployeeInfoMapper, T
saveEmp
.
setDeptNo
(
excel
.
getDeptNo
());
saveEmp
.
setDeptNo
(
excel
.
getDeptNo
());
}
}
}
}
if
(
Common
.
isNotNull
(
excel
.
getWeChatId
()))
{
if
(
excel
.
getWeChatId
().
length
()
>
50
)
{
errorMsg
.
add
(
EmployeeConstants
.
WE_CHAT_ID_NO_LENGTH
);
}
else
{
saveEmp
.
setWeChatId
(
excel
.
getWeChatId
());
}
}
// 判断空值
// 判断空值
//this.judgeNull(errorMsg, saveEmp);
//this.judgeNull(errorMsg, saveEmp);
...
...
yifu-archives/yifu-archives-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/archives/service/impl/TPreEmpMainServiceImpl.java
View file @
9e293a47
...
@@ -278,6 +278,7 @@ public class TPreEmpMainServiceImpl extends ServiceImpl<TPreEmpMainMapper, TPreE
...
@@ -278,6 +278,7 @@ public class TPreEmpMainServiceImpl extends ServiceImpl<TPreEmpMainMapper, TPreE
newEmp
.
setCreateBy
(
user
.
getId
());
newEmp
.
setCreateBy
(
user
.
getId
());
newEmp
.
setCreateName
(
user
.
getNickname
());
newEmp
.
setCreateName
(
user
.
getNickname
());
newEmp
.
setCreateTime
(
LocalDateTime
.
now
());
newEmp
.
setCreateTime
(
LocalDateTime
.
now
());
newEmp
.
setWeChatId
(
emp
.
getWeChatId
());
tPreEmployeeInfoService
.
save
(
newEmp
);
tPreEmployeeInfoService
.
save
(
newEmp
);
vo
.
setTpreEmployeeInfo
(
newEmp
);
vo
.
setTpreEmployeeInfo
(
newEmp
);
// 全部保留
// 全部保留
...
@@ -3554,7 +3555,7 @@ public class TPreEmpMainServiceImpl extends ServiceImpl<TPreEmpMainMapper, TPreE
...
@@ -3554,7 +3555,7 @@ public class TPreEmpMainServiceImpl extends ServiceImpl<TPreEmpMainMapper, TPreE
return
R
.
failed
(
voR
==
null
?
"预入职导入识别表格异常!"
:
voR
.
getMsg
());
return
R
.
failed
(
voR
==
null
?
"预入职导入识别表格异常!"
:
voR
.
getMsg
());
}
}
String
[]
modelTitle
=
{
"员工类型"
,
"员工姓名"
,
"身份证号"
,
"身份证开始日期"
,
"身份证截止日期"
,
"婚姻状况"
,
"民族"
String
[]
modelTitle
=
{
"员工类型"
,
"员工姓名"
,
"身份证号"
,
"身份证开始日期"
,
"身份证截止日期"
,
"婚姻状况"
,
"民族"
,
"政治面貌"
,
"手机号码"
,
"邮箱"
,
"户籍所在地-省"
,
"户籍所在地-市"
,
"户籍所在地-区/县"
,
"户口性质"
,
"档案所在地-省"
,
"政治面貌"
,
"手机号码"
,
"邮箱"
,
"
微信号"
,
"
户籍所在地-省"
,
"户籍所在地-市"
,
"户籍所在地-区/县"
,
"户口性质"
,
"档案所在地-省"
,
"档案所在地-市"
,
"档案所在地-区/县"
,
"通信地址-省"
,
"通信地址-市"
,
"通信地址-区/县"
,
"通信地址-详细地址"
,
"档案所在地-市"
,
"档案所在地-区/县"
,
"通信地址-省"
,
"通信地址-市"
,
"通信地址-区/县"
,
"通信地址-详细地址"
,
"紧急联系人姓名"
,
"紧急联系人与本人关系"
,
"联系地址-省"
,
"联系地址-市"
,
"联系地址-区/县"
,
"联系地址-详细地址"
,
"紧急联系人姓名"
,
"紧急联系人与本人关系"
,
"联系地址-省"
,
"联系地址-市"
,
"联系地址-区/县"
,
"联系地址-详细地址"
,
"手机号码(紧急联系人)"
,
"学历"
,
"学校"
,
"专业"
,
"教育开始时间"
,
"教育结束时间"
,
"是否为首份工作"
,
"工作单位"
,
"手机号码(紧急联系人)"
,
"学历"
,
"学校"
,
"专业"
,
"教育开始时间"
,
"教育结束时间"
,
"是否为首份工作"
,
"工作单位"
...
@@ -4136,6 +4137,7 @@ public class TPreEmpMainServiceImpl extends ServiceImpl<TPreEmpMainMapper, TPreE
...
@@ -4136,6 +4137,7 @@ public class TPreEmpMainServiceImpl extends ServiceImpl<TPreEmpMainMapper, TPreE
tPreEmployeeInfo
.
setEmpNational
(
info
.
getEmpNationalValue
());
tPreEmployeeInfo
.
setEmpNational
(
info
.
getEmpNationalValue
());
tPreEmployeeInfo
.
setPoliticalStatus
(
info
.
getPoliticalStatusValue
());
tPreEmployeeInfo
.
setPoliticalStatus
(
info
.
getPoliticalStatusValue
());
tPreEmployeeInfo
.
setEmpEmail
(
info
.
getEmpEmail
());
tPreEmployeeInfo
.
setEmpEmail
(
info
.
getEmpEmail
());
tPreEmployeeInfo
.
setWeChatId
(
info
.
getWeChatId
());
tPreEmployeeInfo
.
setEmpPhone
(
info
.
getEmpPhone
());
tPreEmployeeInfo
.
setEmpPhone
(
info
.
getEmpPhone
());
// 2024-10-30 20:02:53 测试jld认为如果没写户籍省,则带出档案。我认为有道理
// 2024-10-30 20:02:53 测试jld认为如果没写户籍省,则带出档案。我认为有道理
if
(
Common
.
isNotNull
(
info
.
getIdProvinceValue
()))
{
if
(
Common
.
isNotNull
(
info
.
getIdProvinceValue
()))
{
...
...
yifu-archives/yifu-archives-biz/src/main/resources/mapper/TAutoContractSchemeMapper.xml
View file @
9e293a47
...
@@ -80,6 +80,7 @@
...
@@ -80,6 +80,7 @@
<result
property=
"workDay"
column=
"WORK_DAY"
/>
<result
property=
"workDay"
column=
"WORK_DAY"
/>
<result
property=
"workHours"
column=
"WORK_HOURS"
/>
<result
property=
"workHours"
column=
"WORK_HOURS"
/>
<result
property=
"otherWorkDay"
column=
"OTHER_WORK_DAY"
/>
<result
property=
"otherWorkDay"
column=
"OTHER_WORK_DAY"
/>
<result
property=
"salaryDay"
column=
"SALARY_DAY"
/>
</resultMap>
</resultMap>
<sql
id=
"Base_Column_List"
>
<sql
id=
"Base_Column_List"
>
a.ID,
a.ID,
...
@@ -137,7 +138,8 @@
...
@@ -137,7 +138,8 @@
a.WORK_DAY_COUNT,
a.WORK_DAY_COUNT,
a.WORK_DAY,
a.WORK_DAY,
a.WORK_HOURS,
a.WORK_HOURS,
a.OTHER_WORK_DAY
a.OTHER_WORK_DAY,
a.SALARY_DAY
</sql>
</sql>
<sql
id=
"tAutoContractScheme_where"
>
<sql
id=
"tAutoContractScheme_where"
>
<if
test=
"tAutoContractScheme != null"
>
<if
test=
"tAutoContractScheme != null"
>
...
@@ -300,6 +302,9 @@
...
@@ -300,6 +302,9 @@
<if
test=
"tAutoContractScheme.workHours != null and tAutoContractScheme.workHours.trim() != ''"
>
<if
test=
"tAutoContractScheme.workHours != null and tAutoContractScheme.workHours.trim() != ''"
>
AND a.WORK_HOURS = #{tAutoContractScheme.workHours}
AND a.WORK_HOURS = #{tAutoContractScheme.workHours}
</if>
</if>
<if
test=
"tAutoContractScheme.salaryDay != null and tAutoContractScheme.salaryDay.trim() != ''"
>
AND a.SALARY_DAY = #{tAutoContractScheme.salaryDay}
</if>
</if>
</if>
</sql>
</sql>
<!--tAutoContractScheme简单分页查询-->
<!--tAutoContractScheme简单分页查询-->
...
...
yifu-archives/yifu-archives-biz/src/main/resources/mapper/TEmpContactInfoMapper.xml
View file @
9e293a47
...
@@ -137,7 +137,7 @@
...
@@ -137,7 +137,7 @@
,ifnull(st2.AREA_NAME,'')
,ifnull(st2.AREA_NAME,'')
,ifnull(a.CONTACT_ADDRESS,'')
,ifnull(a.CONTACT_ADDRESS,'')
) contactArea,a.EMP_EMAIL empEmail,
) contactArea,a.EMP_EMAIL empEmail,
a.EMP_PHONE empPhone
a.EMP_PHONE empPhone
,a.WE_CHAT_ID weChatId
from t_employee_info a
from t_employee_info a
left join sys_area sp on sp.id = a.ID_PROVINCE
left join sys_area sp on sp.id = a.ID_PROVINCE
left join sys_area sc on sc.id = a.ID_CITY
left join sys_area sc on sc.id = a.ID_CITY
...
...
yifu-archives/yifu-archives-biz/src/main/resources/mapper/TEmployeeContractPreHistoryMapper.xml
View file @
9e293a47
...
@@ -93,5 +93,6 @@
...
@@ -93,5 +93,6 @@
<result
property=
"changeTypeUser"
column=
"change_type_user"
/>
<result
property=
"changeTypeUser"
column=
"change_type_user"
/>
<result
property=
"changeTypeTime"
column=
"change_type_time"
/>
<result
property=
"changeTypeTime"
column=
"change_type_time"
/>
<result
property=
"archivesIsCreate"
column=
"archives_is_create"
/>
<result
property=
"archivesIsCreate"
column=
"archives_is_create"
/>
<result
property=
"salaryDay"
column=
"SALARY_DAY"
/>
</resultMap>
</resultMap>
</mapper>
</mapper>
yifu-archives/yifu-archives-biz/src/main/resources/mapper/TEmployeeContractPreMapper.xml
View file @
9e293a47
...
@@ -93,6 +93,7 @@
...
@@ -93,6 +93,7 @@
<result
property=
"changeTypeUser"
column=
"change_type_user"
/>
<result
property=
"changeTypeUser"
column=
"change_type_user"
/>
<result
property=
"changeTypeTime"
column=
"change_type_time"
/>
<result
property=
"changeTypeTime"
column=
"change_type_time"
/>
<result
property=
"archivesIsCreate"
column=
"archives_is_create"
/>
<result
property=
"archivesIsCreate"
column=
"archives_is_create"
/>
<result
property=
"salaryDay"
column=
"SALARY_DAY"
/>
</resultMap>
</resultMap>
<sql
id=
"Base_Column_List"
>
<sql
id=
"Base_Column_List"
>
a.id
a.id
...
@@ -175,7 +176,7 @@
...
@@ -175,7 +176,7 @@
,a.TASK_TYPE
,a.TASK_TYPE
,a.TASK_END_STANDARD,a.contract_flag,a.CONTRACT_SUB_NAME
,a.TASK_END_STANDARD,a.contract_flag,a.CONTRACT_SUB_NAME
,a.request_id
,a.request_id
,a.request_msg,a.over_flag,a.change_type_reason,a.change_type_user,a.change_type_time
,a.request_msg,a.over_flag,a.change_type_reason,a.change_type_user,a.change_type_time
,a.SALARY_DAY
</sql>
</sql>
<sql
id=
"tEmployeeContractPre_where"
>
<sql
id=
"tEmployeeContractPre_where"
>
<if
test=
"tEmployeeContractPre != null"
>
<if
test=
"tEmployeeContractPre != null"
>
...
@@ -262,6 +263,9 @@
...
@@ -262,6 +263,9 @@
<if
test=
"tEmployeeContractPre.revokeReason != null and tEmployeeContractPre.revokeReason.trim() != ''"
>
<if
test=
"tEmployeeContractPre.revokeReason != null and tEmployeeContractPre.revokeReason.trim() != ''"
>
AND a.revoke_reason = #{tEmployeeContractPre.revokeReason}
AND a.revoke_reason = #{tEmployeeContractPre.revokeReason}
</if>
</if>
<if
test=
"tEmployeeContractPre.salaryDay != null and tEmployeeContractPre.salaryDay.trim() != ''"
>
AND a.SALARY_DAY = #{tEmployeeContractPre.salaryDay}
</if>
<if
test=
"tEmployeeContractPre.expectedConfirmTime != null"
>
<if
test=
"tEmployeeContractPre.expectedConfirmTime != null"
>
AND DATE_FORMAT(a.expected_confirm_time,"%Y-%m-%d") =
AND DATE_FORMAT(a.expected_confirm_time,"%Y-%m-%d") =
DATE_FORMAT(#{tEmployeeContractPre.expectedConfirmTime},"%Y-%m-%d")
DATE_FORMAT(#{tEmployeeContractPre.expectedConfirmTime},"%Y-%m-%d")
...
...
yifu-archives/yifu-archives-biz/src/main/resources/mapper/TEmployeeContractPreNewMapper.xml
View file @
9e293a47
...
@@ -110,6 +110,7 @@
...
@@ -110,6 +110,7 @@
<result
property=
"createName"
column=
"create_name"
/>
<result
property=
"createName"
column=
"create_name"
/>
<result
property=
"createTime"
column=
"create_time"
/>
<result
property=
"createTime"
column=
"create_time"
/>
<result
property=
"updateBy"
column=
"update_by"
/>
<result
property=
"updateBy"
column=
"update_by"
/>
<result
property=
"salaryDay"
column=
"SALARY_DAY"
/>
</resultMap>
</resultMap>
<sql
id=
"Base_Column_List"
>
<sql
id=
"Base_Column_List"
>
a.id,
a.id,
...
@@ -196,7 +197,8 @@
...
@@ -196,7 +197,8 @@
a.create_by,
a.create_by,
a.create_name,
a.create_name,
a.create_time,
a.create_time,
a.update_by
a.update_by,
a.SALARY_DAY
</sql>
</sql>
<sql
id=
"tEmpContractAlert_where"
>
<sql
id=
"tEmpContractAlert_where"
>
<if
test=
"tEmpContractAlert != null"
>
<if
test=
"tEmpContractAlert != null"
>
...
@@ -638,6 +640,9 @@
...
@@ -638,6 +640,9 @@
<if
test=
"tEmployeeContractPreNew.updateBy != null and tEmployeeContractPreNew.updateBy.trim() != ''"
>
<if
test=
"tEmployeeContractPreNew.updateBy != null and tEmployeeContractPreNew.updateBy.trim() != ''"
>
AND a.update_by = #{tEmployeeContractPreNew.updateBy}
AND a.update_by = #{tEmployeeContractPreNew.updateBy}
</if>
</if>
<if
test=
"tEmployeeContractPreNew.salaryDay != null and tEmployeeContractPreNew.salaryDay.trim() != ''"
>
AND a.SALARY_DAY = #{tEmployeeContractPreNew.salaryDay}
</if>
</if>
</if>
</sql>
</sql>
<!--tEmployeeContractPreNew简单分页查询-->
<!--tEmployeeContractPreNew简单分页查询-->
...
...
yifu-archives/yifu-archives-biz/src/main/resources/mapper/TEmployeeInfoMapper.xml
View file @
9e293a47
...
@@ -88,6 +88,7 @@
...
@@ -88,6 +88,7 @@
<result
property=
"contactProvince"
column=
"CONTACT_PROVINCE"
/>
<result
property=
"contactProvince"
column=
"CONTACT_PROVINCE"
/>
<result
property=
"contactCity"
column=
"CONTACT_CITY"
/>
<result
property=
"contactCity"
column=
"CONTACT_CITY"
/>
<result
property=
"contactTown"
column=
"CONTACT_TOWN"
/>
<result
property=
"contactTown"
column=
"CONTACT_TOWN"
/>
<result
property=
"weChatId"
column=
"WE_CHAT_ID"
/>
</resultMap>
</resultMap>
...
@@ -264,7 +265,8 @@
...
@@ -264,7 +265,8 @@
a.TAX_MONTH,
a.TAX_MONTH,
a.CONTACT_PROVINCE,
a.CONTACT_PROVINCE,
a.CONTACT_CITY,
a.CONTACT_CITY,
a.CONTACT_TOWN
a.CONTACT_TOWN,
a.WE_CHAT_ID
</sql>
</sql>
<sql
id=
"Base_Export_List"
>
<sql
id=
"Base_Export_List"
>
...
...
yifu-archives/yifu-archives-biz/src/main/resources/mapper/TPreEmployeeInfoMapper.xml
View file @
9e293a47
...
@@ -90,6 +90,7 @@
...
@@ -90,6 +90,7 @@
<result
property=
"contactCity"
column=
"CONTACT_CITY"
/>
<result
property=
"contactCity"
column=
"CONTACT_CITY"
/>
<result
property=
"contactTown"
column=
"CONTACT_TOWN"
/>
<result
property=
"contactTown"
column=
"CONTACT_TOWN"
/>
<result
property=
"taxMonthFlag"
column=
"TAX_MONTH_FLAG"
/>
<result
property=
"taxMonthFlag"
column=
"TAX_MONTH_FLAG"
/>
<result
property=
"weChatId"
column=
"WE_CHAT_ID"
/>
</resultMap>
</resultMap>
<sql
id=
"Base_Column_List"
>
<sql
id=
"Base_Column_List"
>
...
@@ -158,7 +159,8 @@
...
@@ -158,7 +159,8 @@
a.CONTACT_PROVINCE,
a.CONTACT_PROVINCE,
a.CONTACT_CITY,
a.CONTACT_CITY,
a.CONTACT_TOWN,
a.CONTACT_TOWN,
a.TAX_MONTH_FLAG
a.TAX_MONTH_FLAG,
a.WE_CHAT_ID
</sql>
</sql>
<sql
id=
"tPreEmployeeInfo_where"
>
<sql
id=
"tPreEmployeeInfo_where"
>
<if
test=
"tPreEmployeeInfo != null"
>
<if
test=
"tPreEmployeeInfo != null"
>
...
...
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