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
3a656dd3
Commit
3a656dd3
authored
Jul 29, 2022
by
huyuchen
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
预派单 代码修改
parent
b47ab982
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
0 additions
and
21 deletions
+0
-21
PreDispatchConstants.java
...d/plus/v1/yifu/social/constants/PreDispatchConstants.java
+0
-3
TPreDispatchInfoServiceImpl.java
...yifu/social/service/impl/TPreDispatchInfoServiceImpl.java
+0
-18
No files found.
yifu-social/yifu-social-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/social/constants/PreDispatchConstants.java
View file @
3a656dd3
...
...
@@ -43,8 +43,5 @@ public class PreDispatchConstants {
public
static
final
String
DATA_IMPORT_ANALYSIS_ERROR
=
"数据导入解析失败!"
;
public
static
final
String
NO_SOCIAL_FUND_ADDRESS_ADD
=
"派增:养老城市和公积金城市不可同时为空,请确认表中有‘养老城市’和‘公积金城市’数据列及数据!"
;
public
static
final
String
NO_SOCIAL_FUND_ADDRESS_REDUCE
=
"派减:养老城市和公积金城市不可同时为空,请确认表中有‘养老城市’和‘公积金城市’数据列及数据!"
;
public
static
final
String
TEL_NOT_EMPTY
=
"联系电话1不可为空!"
;
public
static
final
String
TEL_INVALID
=
"联系电话1无效!"
;
public
static
final
String
TEL_INVALID2
=
"联系电话2无效!"
;
public
static
final
String
GET_AREA_INFO
=
"获取区域数据失败!"
;
}
yifu-social/yifu-social-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/social/service/impl/TPreDispatchInfoServiceImpl.java
View file @
3a656dd3
...
...
@@ -550,18 +550,6 @@ public class TPreDispatchInfoServiceImpl extends ServiceImpl<TPreDispatchInfoMap
if
(
x
!=
null
)
{
return
x
;
}
// 手机号码必填及格式校验
if
(
Common
.
isEmpty
(
tPreDispatchInfo
.
getTelOne
()))
{
return
R
.
failed
(
PreDispatchConstants
.
TEL_NOT_EMPTY
);
}
if
(
ValidityUtil
.
checkInvalidEmpPhone
(
tPreDispatchInfo
.
getTelOne
()))
{
return
R
.
failed
(
PreDispatchConstants
.
TEL_INVALID
);
}
if
(
ValidityUtil
.
checkInvalidEmpPhone
(
tPreDispatchInfo
.
getTelTwo
()))
{
return
R
.
failed
(
PreDispatchConstants
.
TEL_INVALID2
);
}
}
if
(
CommonConstants
.
ONE_STRING
.
equals
(
tPreDispatchInfo
.
getType
()))
{
initLeaveReason
(
tPreDispatchInfo
);
...
...
@@ -1149,12 +1137,6 @@ public class TPreDispatchInfoServiceImpl extends ServiceImpl<TPreDispatchInfoMap
private
String
checkAddPreDispatch
(
TPreDispatchInfo
tPreDispatchInfo
)
{
if
(
CommonConstants
.
ZERO_STRING
.
equals
(
tPreDispatchInfo
.
getType
()))
{
if
(
Common
.
isEmpty
(
tPreDispatchInfo
.
getTelOne
()))
{
return
PreDispatchConstants
.
TEL_NOT_EMPTY
;
}
if
(
ValidityUtil
.
checkInvalidEmpPhone
(
tPreDispatchInfo
.
getTelOne
()))
{
return
PreDispatchConstants
.
TEL_INVALID
;
}
if
(
Common
.
isEmpty
(
tPreDispatchInfo
.
getPensionAddress
())
&&
Common
.
isEmpty
(
tPreDispatchInfo
.
getFundAddress
()))
{
return
PreDispatchConstants
.
NO_SOCIAL_FUND_ADDRESS_ADD
;
...
...
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