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
31945cae
Commit
31945cae
authored
Oct 28, 2022
by
fangxinjiang
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
派单自定义提示优化
parent
0b8b24ca
Show whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
4 additions
and
3 deletions
+4
-3
TEmpChangeInfoVO.java
...yifu/cloud/plus/v1/yifu/archives/vo/TEmpChangeInfoVO.java
+0
-1
TEmpChangeInfoServiceImpl.java
...yifu/archives/service/impl/TEmpChangeInfoServiceImpl.java
+2
-2
CommonConstants.java
...ud/plus/v1/yifu/common/core/constant/CommonConstants.java
+2
-0
No files found.
yifu-archives/yifu-archives-api/src/main/java/com/yifu/cloud/plus/v1/yifu/archives/vo/TEmpChangeInfoVO.java
View file @
31945cae
...
...
@@ -78,7 +78,6 @@ public class TEmpChangeInfoVO implements Serializable {
*/
@HeadFontStyle
(
fontHeightInPoints
=
11
)
@ExcelProperty
(
value
=
"已产生未结算费用"
)
@NotNull
(
message
=
"已产生未结算费用不能为空"
)
private
String
unsettleDeal
;
/**
...
...
yifu-archives/yifu-archives-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/archives/service/impl/TEmpChangeInfoServiceImpl.java
View file @
31945cae
...
...
@@ -165,7 +165,7 @@ public class TEmpChangeInfoServiceImpl extends ServiceImpl<TEmpChangeInfoMapper,
}
errorMsg
=
new
HashSet
<>();
TEmpChangeInfoVO
excel
=
excelVOList
.
get
(
i
);
excel
.
setUnsettleDeal
(
CommonConstants
.
IS_NO_CHANGE
);
if
(
Common
.
isNotNull
(
excel
.
getChangeStartMonth
())
&&
excel
.
getChangeStartMonth
().
length
()
>
CommonConstants
.
dingleDigitIntArray
[
6
])
{
errorMsg
.
add
(
"划转起始月长度不能超过6位"
);
}
...
...
@@ -227,7 +227,7 @@ public class TEmpChangeInfoServiceImpl extends ServiceImpl<TEmpChangeInfoMapper,
updateTEmployeePro
.
setUnitName
(
tCustomerInfo
.
getCustomerName
());
}
updateTEmployeePro
.
setChangeStartMonth
(
excel
.
getChangeStartMonth
());
updateTEmployeePro
.
setUnsettleDeal
(
excel
.
getUnsettleDeal
()
);
updateTEmployeePro
.
setUnsettleDeal
(
CommonConstants
.
ONE_STRING
);
updateList
.
add
(
updateTEmployeePro
);
// 记录变更日志
tEmployeeLogService
.
saveModificationRecord
(
CommonConstants
.
dingleDigitIntArray
[
1
],
""
,
tEmployeeProjectOld
.
getId
(),
tEmployeeProjectOld
,
updateTEmployeePro
);
...
...
yifu-common/yifu-common-core/src/main/java/com/yifu/cloud/plus/v1/yifu/common/core/constant/CommonConstants.java
View file @
31945cae
...
...
@@ -392,6 +392,8 @@ public interface CommonConstants {
// 是否
String
IS_CHANGE
=
"划转"
;
String
IS_NO_CHANGE
=
"划转"
;
// 年
String
YEAR
=
"年"
;
// 月
...
...
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