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
02da7e15
You need to sign in or sign up before continuing.
Commit
02da7e15
authored
Jul 29, 2022
by
huyuchen
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
预派单 代码修改
parent
f55345ec
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
17 additions
and
17 deletions
+17
-17
TPreDispatchInfo.java
...fu/cloud/plus/v1/yifu/social/entity/TPreDispatchInfo.java
+1
-1
TPreDispatchInfoServiceImpl.java
...yifu/social/service/impl/TPreDispatchInfoServiceImpl.java
+16
-16
No files found.
yifu-social/yifu-social-api/src/main/java/com/yifu/cloud/plus/v1/yifu/social/entity/TPreDispatchInfo.java
View file @
02da7e15
...
@@ -470,7 +470,7 @@ public class TPreDispatchInfo extends BaseEntity {
...
@@ -470,7 +470,7 @@ public class TPreDispatchInfo extends BaseEntity {
*/
*/
@Schema
(
description
=
"员工类型"
)
@Schema
(
description
=
"员工类型"
)
@Size
(
max
=
20
,
message
=
"员工类型不可超过20位"
)
@Size
(
max
=
20
,
message
=
"员工类型不可超过20位"
)
@NotNull
(
message
=
"员工
姓名
不可为空"
)
@NotNull
(
message
=
"员工
类型
不可为空"
)
private
String
empTypeAdd
;
private
String
empTypeAdd
;
/**
/**
...
...
yifu-social/yifu-social-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/social/service/impl/TPreDispatchInfoServiceImpl.java
View file @
02da7e15
...
@@ -1070,9 +1070,9 @@ public class TPreDispatchInfoServiceImpl extends ServiceImpl<TPreDispatchInfoMap
...
@@ -1070,9 +1070,9 @@ public class TPreDispatchInfoServiceImpl extends ServiceImpl<TPreDispatchInfoMap
info
.
setUnitIdAdd
(
selectVo
.
getCustomerId
());
info
.
setUnitIdAdd
(
selectVo
.
getCustomerId
());
info
.
setUnitNameAdd
(
selectVo
.
getCustomerName
());
info
.
setUnitNameAdd
(
selectVo
.
getCustomerName
());
}
}
// 默认合同名称为代理社保 合同类型为
固定期限1
// 默认合同名称为代理社保 合同类型为
其他
info
.
setContractNameAdd
(
PreDispatchConstants
.
CONTRACT_NAME
);
info
.
setContractNameAdd
(
PreDispatchConstants
.
CONTRACT_NAME
);
info
.
setContractTypeAdd
(
CommonConstants
.
ON
E_STRING
);
info
.
setContractTypeAdd
(
CommonConstants
.
THRE
E_STRING
);
info
.
setContractStartAdd
(
info
.
getContractStart
());
info
.
setContractStartAdd
(
info
.
getContractStart
());
// 默认为开始时间后的两年时间
// 默认为开始时间后的两年时间
info
.
setContractEndAdd
(
info
.
getContractEnd
());
info
.
setContractEndAdd
(
info
.
getContractEnd
());
...
@@ -1776,18 +1776,6 @@ public class TPreDispatchInfoServiceImpl extends ServiceImpl<TPreDispatchInfoMap
...
@@ -1776,18 +1776,6 @@ public class TPreDispatchInfoServiceImpl extends ServiceImpl<TPreDispatchInfoMap
}
}
}
}
private
void
initDayConfMap
(
HashMap
<
String
,
Integer
>
dayConfMap
)
{
List
<
TDispatchDayConf
>
dayConfList
=
dispatchDayConfMapper
.
selectList
(
Wrappers
.<
TDispatchDayConf
>
query
().
lambda
());
if
(
Common
.
isNotNull
(
dayConfList
))
{
for
(
TDispatchDayConf
conf
:
dayConfList
)
{
dayConfMap
.
put
(
Common
.
isBlankToNullString
(
conf
.
getProvince
())
+
CommonConstants
.
DOWN_LINE_STRING
+
Common
.
isBlankToNullString
(
conf
.
getCity
())
+
CommonConstants
.
DOWN_LINE_STRING
+
Common
.
isBlankToNullString
(
conf
.
getTown
()),
conf
.
getDay
());
}
}
}
/**
/**
* 通过身份证+派单类型 确定是否唯一(创建时间为当月的)
* 通过身份证+派单类型 确定是否唯一(创建时间为当月的)
*
*
...
@@ -1810,6 +1798,18 @@ public class TPreDispatchInfoServiceImpl extends ServiceImpl<TPreDispatchInfoMap
...
@@ -1810,6 +1798,18 @@ public class TPreDispatchInfoServiceImpl extends ServiceImpl<TPreDispatchInfoMap
initExistsMapByIdCards
(
existsMap
,
idcards
,
type
);
initExistsMapByIdCards
(
existsMap
,
idcards
,
type
);
}
}
private
void
initDayConfMap
(
HashMap
<
String
,
Integer
>
dayConfMap
)
{
List
<
TDispatchDayConf
>
dayConfList
=
dispatchDayConfMapper
.
selectList
(
Wrappers
.<
TDispatchDayConf
>
query
().
lambda
());
if
(
Common
.
isNotNull
(
dayConfList
))
{
for
(
TDispatchDayConf
conf
:
dayConfList
)
{
dayConfMap
.
put
(
Common
.
isBlankToNullString
(
conf
.
getProvince
())
+
CommonConstants
.
DOWN_LINE_STRING
+
Common
.
isBlankToNullString
(
conf
.
getCity
())
+
CommonConstants
.
DOWN_LINE_STRING
+
Common
.
isBlankToNullString
(
conf
.
getTown
()),
conf
.
getDay
());
}
}
}
private
void
initExistsMapByIdCards
(
Map
<
String
,
TPreDispatchInfo
>
existsMap
,
List
<
String
>
idcards
,
String
type
)
{
private
void
initExistsMapByIdCards
(
Map
<
String
,
TPreDispatchInfo
>
existsMap
,
List
<
String
>
idcards
,
String
type
)
{
if
(
Common
.
isNotNull
(
idcards
))
{
if
(
Common
.
isNotNull
(
idcards
))
{
List
<
TPreDispatchInfo
>
preDispatchInfoList
=
baseMapper
.
selectList
(
Wrappers
.<
TPreDispatchInfo
>
query
()
List
<
TPreDispatchInfo
>
preDispatchInfoList
=
baseMapper
.
selectList
(
Wrappers
.<
TPreDispatchInfo
>
query
()
...
@@ -2213,7 +2213,7 @@ public class TPreDispatchInfoServiceImpl extends ServiceImpl<TPreDispatchInfoMap
...
@@ -2213,7 +2213,7 @@ public class TPreDispatchInfoServiceImpl extends ServiceImpl<TPreDispatchInfoMap
**/
**/
private
void
initDispatchContractVo
(
TPreDispatchInfo
preInfo
,
TDispatchImportVo
importVo
)
{
private
void
initDispatchContractVo
(
TPreDispatchInfo
preInfo
,
TDispatchImportVo
importVo
)
{
if
(
Common
.
isNotNull
(
preInfo
.
getContractNameAdd
())){
if
(
Common
.
isNotNull
(
preInfo
.
getContractNameAdd
())){
importVo
.
setContractName
(
CommonConstants
.
THREE_STRING
);
importVo
.
setContractName
(
preInfo
.
getContractTypeAdd
()
);
if
(
Common
.
isNotNull
(
preInfo
.
getContractStartAdd
())){
if
(
Common
.
isNotNull
(
preInfo
.
getContractStartAdd
())){
importVo
.
setContractStart
(
DateUtil
.
stringToDate
(
ServiceUtil
.
importVo
.
setContractStart
(
DateUtil
.
stringToDate
(
ServiceUtil
.
replaceSeparator
(
preInfo
.
getContractStartAdd
(),
CommonConstants
.
CENTER_SPLIT_LINE_STRING
,
replaceSeparator
(
preInfo
.
getContractStartAdd
(),
CommonConstants
.
CENTER_SPLIT_LINE_STRING
,
...
@@ -2224,7 +2224,7 @@ public class TPreDispatchInfoServiceImpl extends ServiceImpl<TPreDispatchInfoMap
...
@@ -2224,7 +2224,7 @@ public class TPreDispatchInfoServiceImpl extends ServiceImpl<TPreDispatchInfoMap
replaceSeparator
(
preInfo
.
getContractEndAdd
(),
CommonConstants
.
CENTER_SPLIT_LINE_STRING
,
replaceSeparator
(
preInfo
.
getContractEndAdd
(),
CommonConstants
.
CENTER_SPLIT_LINE_STRING
,
CommonConstants
.
SLASH_SPLIT_LINE_STRING
),
DateUtil
.
ISO_DATE_FORMAT
));
CommonConstants
.
SLASH_SPLIT_LINE_STRING
),
DateUtil
.
ISO_DATE_FORMAT
));
}
}
importVo
.
setContractTerm
(
CommonConstants
.
TWO_STRING
);
importVo
.
setContractTerm
(
preInfo
.
getContractTermAdd
()
);
importVo
.
setContractType
(
CommonConstants
.
ONE_STRING
);
importVo
.
setContractType
(
CommonConstants
.
ONE_STRING
);
importVo
.
setContractSubName
(
PreDispatchConstants
.
CONTRACT_NAME
);
importVo
.
setContractSubName
(
PreDispatchConstants
.
CONTRACT_NAME
);
}
}
...
...
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