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
14afa273
Commit
14afa273
authored
Jun 23, 2025
by
hongguangwu
Browse files
Options
Browse Files
Download
Plain Diff
Merge remote-tracking branch 'origin/MVP1.7.12' into MVP1.7.12
parents
e8eab790
999388e4
Show whitespace changes
Inline
Side-by-side
Showing
6 changed files
with
20 additions
and
7 deletions
+20
-7
TEmployeeContractPre.java
...ud/plus/v1/yifu/archives/entity/TEmployeeContractPre.java
+1
-1
TEmployeeContractPreVo.java
...loud/plus/v1/yifu/archives/vo/TEmployeeContractPreVo.java
+3
-3
EmployeeRegistrationPreServiceImpl.java
...ives/service/impl/EmployeeRegistrationPreServiceImpl.java
+12
-0
TEmployeeContractInfoServiceImpl.java
...chives/service/impl/TEmployeeContractInfoServiceImpl.java
+1
-0
TEmployeeContractPreMapper.xml
.../src/main/resources/mapper/TEmployeeContractPreMapper.xml
+2
-2
ArchivesDaprUtil.java
...cloud/plus/v1/yifu/common/dapr/util/ArchivesDaprUtil.java
+1
-1
No files found.
yifu-archives/yifu-archives-api/src/main/java/com/yifu/cloud/plus/v1/yifu/archives/entity/TEmployeeContractPre.java
View file @
14afa273
...
...
@@ -124,7 +124,7 @@ public class TEmployeeContractPre extends BaseEntity {
@Schema
(
description
=
"签订类型"
)
private
String
situation
;
@Schema
(
description
=
"
合同年
限, 0 固定期限 1 无固定期限 3.以完成一定工作任务为期限"
)
@Schema
(
description
=
"
签订期
限, 0 固定期限 1 无固定期限 3.以完成一定工作任务为期限"
)
private
String
contractTerm
;
@Schema
(
description
=
"合同年限-年"
)
...
...
yifu-archives/yifu-archives-api/src/main/java/com/yifu/cloud/plus/v1/yifu/archives/vo/TEmployeeContractPreVo.java
View file @
14afa273
...
...
@@ -216,10 +216,10 @@ public class TEmployeeContractPreVo extends RowIndex implements Serializable {
@ExcelProperty
(
"签订类型"
)
private
String
situation
;
/**
*
合同年
限
*
签订期
限
*/
@ExcelAttribute
(
name
=
"
合同年
限"
)
@Schema
(
description
=
"
合同年
限"
)
@ExcelAttribute
(
name
=
"
签订期
限"
)
@Schema
(
description
=
"
签订期
限"
)
private
String
contractTerm
;
@ExcelAttribute
(
name
=
"合同年限-年"
)
...
...
yifu-archives/yifu-archives-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/archives/service/impl/EmployeeRegistrationPreServiceImpl.java
View file @
14afa273
...
...
@@ -658,6 +658,18 @@ public class EmployeeRegistrationPreServiceImpl extends ServiceImpl<EmployeeRegi
//1.9.12合同自动化校验逻辑
if
(
employeeRegistrationPre
.
getServerItem
().
contains
(
"合同"
)
&&
null
!=
employeeRegistrationPre
.
getEmployeeContractPre
())
{
TEmployeeContractPre
employeeContractPreVo
=
employeeRegistrationPre
.
getEmployeeContractPre
();
if
(
Common
.
isNotNull
(
employeeContractPreVo
.
getId
()))
{
TEmployeeContractPre
contractStatus
=
contractPreMapper
.
selectById
(
employeeContractPreVo
.
getId
());
//待确认/待发起/发起失败/线下签待审核/线下签审核不通过/线下签待归档 不能编辑
if
(
Common
.
isNotNull
(
contractStatus
)
&&
(
CommonConstants
.
NINE_STRING
.
equals
(
contractStatus
.
getProcessStatus
())
||
CommonConstants
.
TWO_STRING
.
equals
(
contractStatus
.
getProcessStatus
())
||
CommonConstants
.
SIX_STRING
.
equals
(
contractStatus
.
getProcessStatus
())
||
CommonConstants
.
FOUR_STRING
.
equals
(
contractStatus
.
getProcessStatus
())
||
CommonConstants
.
EIGHT_STRING
.
equals
(
contractStatus
.
getProcessStatus
()))
)
{
return
R
.
failed
(
"流程中的合同待签订数据不可修改!"
);
}
}
//根据身份证号码和项目编号查询合同
boolean
flag
=
contractInfoMapper
.
selectCount
(
Wrappers
.<
TEmployeeContractInfo
>
query
().
lambda
()
.
eq
(
TEmployeeContractInfo:
:
getEmpIdcard
,
employeeRegistrationPre
.
getEmpIdcard
())
...
...
yifu-archives/yifu-archives-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/archives/service/impl/TEmployeeContractInfoServiceImpl.java
View file @
14afa273
...
...
@@ -1014,6 +1014,7 @@ public class TEmployeeContractInfoServiceImpl extends ServiceImpl<TEmployeeContr
TAttaInfo
attaInfoPre
=
new
TAttaInfo
();
BeanUtils
.
copyProperties
(
attaInfo
,
attaInfoPre
);
attaInfoPre
.
setDomainId
(
contractPre
.
getId
());
attaInfoPre
.
setId
(
null
);
tAttaInfoService
.
save
(
attaInfoPre
);
}
}
...
...
yifu-archives/yifu-archives-biz/src/main/resources/mapper/TEmployeeContractPreMapper.xml
View file @
14afa273
...
...
@@ -63,8 +63,8 @@
<result
property=
"dispatchPeriodYear"
column=
"DISPATCH_PERIOD_YEAR"
/>
<result
property=
"dispatchPeriodMonth"
column=
"DISPATCH_PERIOD_MONTH"
/>
<result
property=
"dispatchPeriodStart"
column=
"DISPATCH_PERIOD_START"
/>
<result
property=
"registerId"
column=
"
contract_flag
"
/>
<result
property=
"contractFlag"
column=
"
register_id
"
/>
<result
property=
"registerId"
column=
"
register_id
"
/>
<result
property=
"contractFlag"
column=
"
contract_flag
"
/>
<result
property=
"revokeReason"
column=
"revoke_reason"
/>
<result
property=
"dispatchPeriodEnd"
column=
"DISPATCH_PERIOD_END"
/>
<result
property=
"workType"
column=
"WORK_TYPE"
/>
...
...
yifu-common/yifu-common-dapr/src/main/java/com/yifu/cloud/plus/v1/yifu/common/dapr/util/ArchivesDaprUtil.java
View file @
14afa273
...
...
@@ -620,7 +620,7 @@ public class ArchivesDaprUtil {
* @return
**/
public
R
<
Boolean
>
selectExitEmpCopntract
(
TEmployeeAutoRegistCheckVo
cardVo
)
{
return
HttpDaprUtil
.
invokeMethodPost
(
daprArchivesProperties
.
getAppUrl
(),
daprArchivesProperties
.
getAppId
(),
"/temployeecontractinfo/
inner/
selectExitEmpCopntract"
,
JSON
.
toJSONString
(
cardVo
),
Boolean
.
class
,
SecurityConstants
.
FROM_IN
);
return
HttpDaprUtil
.
invokeMethodPost
(
daprArchivesProperties
.
getAppUrl
(),
daprArchivesProperties
.
getAppId
(),
"/temployeecontractinfo/selectExitEmpCopntract"
,
JSON
.
toJSONString
(
cardVo
),
Boolean
.
class
,
SecurityConstants
.
FROM_IN
);
}
...
...
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