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
f6d55681
Commit
f6d55681
authored
Apr 08, 2026
by
hongguangwu
Browse files
Options
Browse Files
Download
Plain Diff
Merge remote-tracking branch 'origin/MVP1.7.21' into MVP1.7.21
parents
ff31d2c2
f6623f35
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
5 additions
and
9 deletions
+5
-9
TEmployeeContractPreNew.java
...plus/v1/yifu/archives/entity/TEmployeeContractPreNew.java
+3
-4
TEmployeeContractPreNewServiceImpl.java
...ives/service/impl/TEmployeeContractPreNewServiceImpl.java
+2
-5
No files found.
yifu-archives/yifu-archives-api/src/main/java/com/yifu/cloud/plus/v1/yifu/archives/entity/TEmployeeContractPreNew.java
View file @
f6d55681
...
...
@@ -19,10 +19,7 @@ package com.yifu.cloud.plus.v1.yifu.archives.entity;
import
cn.hutool.core.date.DateTime
;
import
com.alibaba.excel.annotation.ExcelProperty
;
import
com.baomidou.mybatisplus.annotation.IdType
;
import
com.baomidou.mybatisplus.annotation.TableField
;
import
com.baomidou.mybatisplus.annotation.TableId
;
import
com.baomidou.mybatisplus.annotation.TableName
;
import
com.baomidou.mybatisplus.annotation.*
;
import
com.yifu.cloud.plus.v1.yifu.common.mybatis.base.BaseEntity
;
import
io.swagger.v3.oas.annotations.media.Schema
;
import
lombok.Data
;
...
...
@@ -542,6 +539,7 @@ public class TEmployeeContractPreNew extends BaseEntity {
/**
* 异常原因说明
*/
@TableField
(
updateStrategy
=
FieldStrategy
.
IGNORED
)
@ExcelAttribute
(
name
=
"异常原因说明"
,
maxLength
=
200
)
@Length
(
max
=
200
,
message
=
"异常原因说明不能超过200个字符"
)
@ExcelProperty
(
"异常原因说明"
)
...
...
@@ -574,6 +572,7 @@ public class TEmployeeContractPreNew extends BaseEntity {
/**
* 发起失败时间
*/
@TableField
(
updateStrategy
=
FieldStrategy
.
IGNORED
)
@ExcelAttribute
(
name
=
"发起失败时间"
,
isDate
=
true
)
@ExcelProperty
(
"发起失败时间"
)
@Schema
(
description
=
"发起失败时间"
)
...
...
yifu-archives/yifu-archives-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/archives/service/impl/TEmployeeContractPreNewServiceImpl.java
View file @
f6d55681
...
...
@@ -1183,17 +1183,14 @@ public class TEmployeeContractPreNewServiceImpl extends ServiceImpl<TEmployeeCon
//处理成功更新数据
EmployeeContractVO
contractVO
=
disList
.
stream
().
filter
(
vo
->
Objects
.
equals
(
vo
.
getRowIndex
(),
errorMessage
.
getLineNum
())).
collect
(
Collectors
.
toList
()).
get
(
0
);
// 先查询旧状态,判断是否需要清空错误信息
TEmployeeContractPreNew
oldPre
=
baseMapper
.
selectById
(
contractVO
.
getPreNewId
());
LambdaUpdateWrapper
<
TEmployeeContractPreNew
>
updateWrapper
=
new
LambdaUpdateWrapper
<>();
updateWrapper
.
eq
(
TEmployeeContractPreNew:
:
getId
,
contractVO
.
getPreNewId
())
.
in
(
TEmployeeContractPreNew:
:
getProcessStatus
,
CommonConstants
.
contractDIsStatus
)
.
set
(
TEmployeeContractPreNew:
:
getProcessStatus
,
CommonConstants
.
TWO_STRING
)
.
set
(
TEmployeeContractPreNew:
:
getSignType
,
CommonConstants
.
ONE_STRING
);
// 如果之前是发起失败状态,清空错误信息
if
(
Common
.
isNotNull
(
oldPre
)
&&
CommonConstants
.
FIVE_STRING
.
equals
(
oldPre
.
getProcessStatus
()))
{
updateWrapper
.
set
(
TEmployeeContractPreNew:
:
getErrorInfo
,
null
)
.
set
(
TEmployeeContractPreNew:
:
getErrorTime
,
null
);
}
updateWrapper
.
set
(
TEmployeeContractPreNew:
:
getErrorInfo
,
null
)
.
set
(
TEmployeeContractPreNew:
:
getErrorTime
,
null
);
this
.
update
(
updateWrapper
);
//更新合同的办理状态
...
...
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