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
d3155218
Commit
d3155218
authored
Aug 21, 2025
by
fangxinjiang
Browse files
Options
Browse Files
Download
Plain Diff
Merge remote-tracking branch 'origin/MVP1.7.14' into MVP1.7.14
parents
f302e36c
7f7c9dfb
Hide whitespace changes
Inline
Side-by-side
Showing
13 changed files
with
95 additions
and
36 deletions
+95
-36
TGzEmpInfo.java
...m/yifu/cloud/plus/v1/yifu/archives/entity/TGzEmpInfo.java
+4
-0
EmployeeRegistrationPreServiceImpl.java
...ives/service/impl/EmployeeRegistrationPreServiceImpl.java
+1
-1
TEmployeeInfoServiceImpl.java
.../yifu/archives/service/impl/TEmployeeInfoServiceImpl.java
+2
-2
TEmployeePreLogServiceImpl.java
...ifu/archives/service/impl/TEmployeePreLogServiceImpl.java
+15
-1
TGzEmpInfoServiceImpl.java
.../v1/yifu/archives/service/impl/TGzEmpInfoServiceImpl.java
+10
-9
TGzEmpInfoMapper.xml
...chives-biz/src/main/resources/mapper/TGzEmpInfoMapper.xml
+8
-6
TEmployeeInsurancePreController.java
...nsurances/controller/TEmployeeInsurancePreController.java
+12
-0
TEmployeeInsurancePreService.java
...ances/service/insurance/TEmployeeInsurancePreService.java
+2
-0
TEmployeeInsurancePreServiceImpl.java
...vice/insurance/impl/TEmployeeInsurancePreServiceImpl.java
+9
-2
TInsuranceDetailServiceImpl.java
...s/service/insurance/impl/TInsuranceDetailServiceImpl.java
+1
-1
TSalaryEmployeeServiceImpl.java
.../yifu/salary/service/impl/TSalaryEmployeeServiceImpl.java
+12
-13
SalaryAccountUtil.java
...ifu/cloud/plus/v1/yifu/salary/util/SalaryAccountUtil.java
+17
-0
TDispatchInfoServiceImpl.java
...v1/yifu/social/service/impl/TDispatchInfoServiceImpl.java
+2
-1
No files found.
yifu-archives/yifu-archives-api/src/main/java/com/yifu/cloud/plus/v1/yifu/archives/entity/TGzEmpInfo.java
View file @
d3155218
...
...
@@ -30,6 +30,7 @@ import com.yifu.cloud.plus.v1.yifu.common.core.constant.ExcelAttribute;
import
org.hibernate.validator.constraints.Length
;
import
javax.validation.constraints.NotBlank
;
import
java.time.LocalDateTime
;
import
java.util.Date
;
/**
...
...
@@ -577,4 +578,7 @@ public class TGzEmpInfo extends BaseEntity {
@Schema
(
description
=
"档案状态(0:已提交,1:暂存)"
)
private
String
empStatus
;
@Schema
(
description
=
"档案提交时间"
)
private
LocalDateTime
submitTime
;
}
yifu-archives/yifu-archives-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/archives/service/impl/EmployeeRegistrationPreServiceImpl.java
View file @
d3155218
...
...
@@ -589,7 +589,7 @@ public class EmployeeRegistrationPreServiceImpl extends ServiceImpl<EmployeeRegi
}
employeeRegistrationPre
.
setInsurancePreList
(
newList
);
}
}
else
{
}
else
if
(
employeeRegistrationPre
.
getInsuranceIsBuy
().
equals
(
CommonConstants
.
ONE_STRING
))
{
if
(
employeeRegistrationPre
.
getInsurancePreList
()
==
null
||
employeeRegistrationPre
.
getInsurancePreList
().
isEmpty
())
{
return
R
.
failed
(
"含商险服务,商险配置不可为空"
);
...
...
yifu-archives/yifu-archives-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/archives/service/impl/TEmployeeInfoServiceImpl.java
View file @
d3155218
...
...
@@ -3209,14 +3209,14 @@ public class TEmployeeInfoServiceImpl extends ServiceImpl<TEmployeeInfoMapper, T
if
(
Common
.
isNotNull
(
basicInfo
.
getEmpIdCard
())){
// 赋值紧急联系人信息
if
(
Common
.
isNotNull
(
contactMap
.
get
(
basicInfo
.
getEmpIdCard
()))){
if
(
Common
.
isNotNull
(
contactMap
)
&&
Common
.
isNotNull
(
contactMap
.
get
(
basicInfo
.
getEmpIdCard
()))){
TEmpContactInfo
contactInfo
=
contactMap
.
get
(
basicInfo
.
getEmpIdCard
());
basicInfo
.
setEmergencyContactName
(
contactInfo
.
getEmpName
());
basicInfo
.
setEmergencyContactRelation
(
contactInfo
.
getRelationType
());
basicInfo
.
setEmergencyContactPhone
(
contactInfo
.
getTel
());
}
// 赋值社保户
if
(
Common
.
isNotNull
(
socialFundMap
.
get
(
basicInfo
.
getEmpIdCard
()))){
if
(
Common
.
isNotNull
(
socialFundMap
)
&&
Common
.
isNotNull
(
socialFundMap
.
get
(
basicInfo
.
getEmpIdCard
()))){
basicInfo
.
setSocialHouseholdName
(
socialFundMap
.
get
(
basicInfo
.
getEmpIdCard
()));
}
}
...
...
yifu-archives/yifu-archives-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/archives/service/impl/TEmployeePreLogServiceImpl.java
View file @
d3155218
...
...
@@ -263,8 +263,8 @@ public class TEmployeePreLogServiceImpl extends ServiceImpl<TEmployeePreLogMappe
detailList
.
add
(
detailInsuranceLog
);
}
//如果服务类型包含商险处理商险明细数据
newInfo
.
setId
(
empPreId
);
if
(
Common
.
isNotNull
(
newInfo
.
getServerItem
())
&&
newInfo
.
getServerItem
().
contains
(
"商险"
))
{
newInfo
.
setId
(
empPreId
);
if
(!
newInfo
.
getExitInsuranceInfoList
().
isEmpty
())
{
newInfo
.
getExitInsuranceInfoList
().
forEach
(
insurancePreVo
->
insurancePreVo
.
setRegisterId
(
empPreId
));
}
...
...
@@ -272,6 +272,13 @@ public class TEmployeePreLogServiceImpl extends ServiceImpl<TEmployeePreLogMappe
,
"/temployeeinsurancepre/inner/updateInfoSaveInsurancePreInfo"
,
newInfo
,
Boolean
.
class
,
SecurityConstants
.
FROM_IN
);
}
//如果服务类型不包含商险删除商险明细数据
if
(
Common
.
isNotNull
(
newInfo
.
getServerItem
())
&&
!
newInfo
.
getServerItem
().
contains
(
"商险"
))
{
HttpDaprUtil
.
invokeMethodPost
(
daprInsurancesProperties
.
getAppUrl
(),
daprInsurancesProperties
.
getAppId
()
,
"/temployeeinsurancepre/inner/deleteInsurancePreInfo"
,
newInfo
,
Boolean
.
class
,
SecurityConstants
.
FROM_IN
);
}
if
(
newList
!=
null
&&
!
newList
.
isEmpty
())
{
for
(
TEmployeeInsurancePre
newInsurance
:
newList
)
{
differenceInsuranceKey
=
null
;
...
...
@@ -334,6 +341,13 @@ public class TEmployeePreLogServiceImpl extends ServiceImpl<TEmployeePreLogMappe
diffTitle
=
"商险信息"
;
}
}
}
else
{
// 没有变更
if
(
Common
.
isNotNull
(
diffTitle
))
{
diffTitle
+=
"、商险信息"
;
}
else
{
diffTitle
=
"商险信息"
;
}
}
String
differenceContractKey
=
null
;
...
...
yifu-archives/yifu-archives-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/archives/service/impl/TGzEmpInfoServiceImpl.java
View file @
d3155218
...
...
@@ -543,18 +543,19 @@ public class TGzEmpInfoServiceImpl extends ServiceImpl<TGzEmpInfoMapper, TGzEmpI
if
(
Common
.
isEmpty
(
gzEmpId
))
{
tGzEmpInfo
.
setCreateBy
(
user
.
getId
());
tGzEmpInfo
.
setCreateName
(
user
.
getNickname
());
// 1.7.14: 档案状态是提交,才存 创建时间(提交时间)
tGzEmpInfo
.
setSubmitTime
(
null
);
// 1.7.14: 档案状态是提交,才存 提交时间
if
(
CommonConstants
.
ZERO_STRING
.
equals
(
tGzEmpInfoVo
.
getEmpStatus
())){
tGzEmpInfo
.
set
Create
Time
(
LocalDateTime
.
now
());
tGzEmpInfo
.
set
Submit
Time
(
LocalDateTime
.
now
());
}
this
.
save
(
tGzEmpInfo
);
gzEmpId
=
tGzEmpInfo
.
getId
();
}
else
{
tGzEmpInfo
.
setUpdateBy
(
user
.
getId
());
tGzEmpInfo
.
setUpdateTime
(
LocalDateTime
.
now
());
// 1.7.14: 档案状态是
暂存,清除 创建时间(提交时间)
if
(
CommonConstants
.
ONE
_STRING
.
equals
(
tGzEmpInfoVo
.
getEmpStatus
())){
tGzEmpInfo
.
set
CreateTime
(
null
);
// 1.7.14: 档案状态是
提交,更新 提交时间
if
(
CommonConstants
.
ZERO
_STRING
.
equals
(
tGzEmpInfoVo
.
getEmpStatus
())){
tGzEmpInfo
.
set
SubmitTime
(
LocalDateTime
.
now
()
);
}
this
.
updateById
(
tGzEmpInfo
);
}
...
...
@@ -861,16 +862,16 @@ public class TGzEmpInfoServiceImpl extends ServiceImpl<TGzEmpInfoMapper, TGzEmpI
// 41(瓜子申明签名)42(瓜子确认签名)NID_A(证件正面) NID_B(证件反面)
// 附件类型转化:声明签字:21;确认签字:22; 9身份证;24 身份证国徽
if
(
"41"
.
equals
(
atta
.
getRelationType
())){
atta
.
setRelationType
(
"21"
);
atta
Emp
.
setRelationType
(
"21"
);
}
if
(
"42"
.
equals
(
atta
.
getRelationType
())){
atta
.
setRelationType
(
"22"
);
atta
Emp
.
setRelationType
(
"22"
);
}
if
(
"NID_A"
.
equals
(
atta
.
getRelationType
())){
atta
.
setRelationType
(
"9"
);
atta
Emp
.
setRelationType
(
"9"
);
}
if
(
"NID_B"
.
equals
(
atta
.
getRelationType
())){
atta
.
setRelationType
(
"24"
);
atta
Emp
.
setRelationType
(
"24"
);
}
attaEmp
.
setDomainId
(
empId
);
...
...
yifu-archives/yifu-archives-biz/src/main/resources/mapper/TGzEmpInfoMapper.xml
View file @
d3155218
...
...
@@ -103,6 +103,7 @@
<result
property=
"accountProvinceAreaId"
column=
"account_province_area_id"
/>
<result
property=
"accountCityAreaId"
column=
"account_city_area_id"
/>
<result
property=
"empStatus"
column=
"emp_status"
/>
<result
property=
"submitTime"
column=
"submit_time"
/>
</resultMap>
<sql
id=
"Base_Column_List"
>
a.id,
...
...
@@ -183,7 +184,8 @@
a.hukou_county_area_id,
a.account_province_area_id,
a.account_city_area_id,
a.emp_status
a.emp_status,
a.submit_time
</sql>
<sql
id=
"tGzEmpInfo_where"
>
<if
test=
"tGzEmpInfo != null"
>
...
...
@@ -216,10 +218,10 @@
</if>
<!--查询提交档案时间-->
<if
test=
"tGzEmpInfo.createTimeStart != null "
>
AND a.
create
_time
>
= #{tGzEmpInfo.createTimeStart}
AND a.
submit
_time
>
= #{tGzEmpInfo.createTimeStart}
</if>
<if
test=
"tGzEmpInfo.createTimeEnd != null "
>
AND a.
create
_time
<
= #{tGzEmpInfo.createTimeEnd}
AND a.
submit
_time
<
= #{tGzEmpInfo.createTimeEnd}
</if>
<if
test=
"tGzEmpInfo.createBy != null and tGzEmpInfo.createBy.trim() != ''"
>
AND a.create_by = #{tGzEmpInfo.createBy}
...
...
@@ -416,7 +418,7 @@
a.del_flag = '0'
<include
refid=
"tGzEmpInfo_where"
/>
</where>
ORDER by a.emp_status,a.
create
_time desc,a.id desc
ORDER by a.emp_status,a.
submit
_time desc,a.id desc
</select>
<!--count-->
...
...
@@ -440,7 +442,7 @@
a.emp_push_status,
a.contract_push_status,
a.contract_atta_push_status,
date_format(a.
create
_time, '%Y-%m-%d %H:%i:%s') create_time,
date_format(a.
submit
_time, '%Y-%m-%d %H:%i:%s') create_time,
a.create_by,
a.create_name,
a.update_by,
...
...
@@ -523,7 +525,7 @@
<include
refid=
"tGzEmpInfo_where"
/>
</where>
group by a.id
ORDER by a.emp_status,a.
create
_time desc,a.id desc
ORDER by a.emp_status,a.
submit
_time desc,a.id desc
<if
test=
"tGzEmpInfo.limitStart != null"
>
limit #{tGzEmpInfo.limitStart},#{tGzEmpInfo.limitEnd}
</if>
...
...
yifu-insurances/yifu-insurances-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/insurances/controller/TEmployeeInsurancePreController.java
View file @
d3155218
...
...
@@ -200,6 +200,18 @@ public class TEmployeeInsurancePreController {
return
tEmployeeInsurancePreService
.
updateInfoSaveInsurancePreInfo
(
pre
);
}
/**
* 信息修改入口删除商险已购买明细
* @author huych
* @date 2025-08-14 11:46:16
**/
@Operation
(
description
=
"信息修改入口删除商险已购买明细"
)
@Inner
@PostMapping
(
"/inner/deleteInsurancePreInfo"
)
public
Boolean
deleteInsurancePreInfo
(
@RequestBody
EmployeeRegistrationPre
pre
)
{
return
tEmployeeInsurancePreService
.
deleteInsurancePreInfo
(
pre
);
}
/**
* 商险状态是否正常判断
* @author huych
...
...
yifu-insurances/yifu-insurances-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/insurances/service/insurance/TEmployeeInsurancePreService.java
View file @
d3155218
...
...
@@ -76,6 +76,8 @@ public interface TEmployeeInsurancePreService extends IService<TEmployeeInsuranc
*/
Boolean
updateInfoSaveInsurancePreInfo
(
EmployeeRegistrationPre
pre
);
Boolean
deleteInsurancePreInfo
(
EmployeeRegistrationPre
pre
);
Boolean
checkExitInsuanceIsProcess
(
EmployeeRegistrationPreVo
preVo
);
TEmployeeInsuranceSelectVo
selectInsurancePreInfoList
(
TEmployeeInsurancePreVo
preVo
);
...
...
yifu-insurances/yifu-insurances-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/insurances/service/insurance/impl/TEmployeeInsurancePreServiceImpl.java
View file @
d3155218
...
...
@@ -574,8 +574,7 @@ public class TEmployeeInsurancePreServiceImpl extends ServiceImpl<TEmployeeInsur
try
{
//删除已存在的入职确认信息对应的商险明细
preDetailService
.
remove
(
Wrappers
.<
TInsurancePreDetail
>
lambdaQuery
()
.
eq
(
TInsurancePreDetail:
:
getRegisterId
,
registrationPreVo
.
getExitInsuranceInfoList
()
.
get
(
0
).
getRegisterId
()));
.
eq
(
TInsurancePreDetail:
:
getRegisterId
,
employeeInsurancePreVos
.
get
(
0
).
getRegisterId
()));
for
(
TEmployeeInsurancePreVo
preVo
:
employeeInsurancePreVos
)
{
//判断是否存在商险待购买信息
preExit
=
baseMapper
.
selectOne
(
Wrappers
.<
TEmployeeInsurancePre
>
query
().
lambda
()
...
...
@@ -645,6 +644,14 @@ public class TEmployeeInsurancePreServiceImpl extends ServiceImpl<TEmployeeInsur
return
true
;
}
@Override
public
Boolean
deleteInsurancePreInfo
(
EmployeeRegistrationPre
registrationPre
)
{
//删除已存在的入职确认信息对应的商险明细
preDetailService
.
remove
(
Wrappers
.<
TInsurancePreDetail
>
lambdaQuery
()
.
eq
(
TInsurancePreDetail:
:
getRegisterId
,
registrationPre
.
getId
()));
return
true
;
}
@Override
public
Boolean
checkExitInsuanceIsProcess
(
EmployeeRegistrationPreVo
preVo
)
{
//如果状态有变动就会拦截
...
...
yifu-insurances/yifu-insurances-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/insurances/service/insurance/impl/TInsuranceDetailServiceImpl.java
View file @
d3155218
...
...
@@ -3882,7 +3882,7 @@ public class TInsuranceDetailServiceImpl extends ServiceImpl<TInsuranceDetailMap
}
//本次派单人员系统已有参保明细 如果是二次派单则无需校验
if
(
Common
.
isEmpty
(
param
.
getIsExit
()))
{
List
<
TInsurancePreDetail
>
listInsured
=
baseMapper
.
getOnProcessInsuredList
(
param
.
getEmpIdcardNo
());
List
<
TInsurancePreDetail
>
listInsured
=
baseMapper
.
getOnProcessInsuredList
(
param
.
get
Replace
EmpIdcardNo
());
if
(
Common
.
isNotNull
(
listInsured
)
&&
!
listInsured
.
isEmpty
())
{
param
.
setIsExit
(
CommonConstants
.
ONE_STRING
);
param
.
setErrorMessage
(
InsurancesConstants
.
DIS_PERSON_DATA_IS_EXIST
);
...
...
yifu-salary/yifu-salary-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/salary/service/impl/TSalaryEmployeeServiceImpl.java
View file @
d3155218
...
...
@@ -529,10 +529,10 @@ public class TSalaryEmployeeServiceImpl extends ServiceImpl<TSalaryEmployeeMappe
//if (Common.isEmpty(employee.getIssueStatus()) || employee.getIssueStatus().equals(CommonConstants.ZERO_INT)) {
oldEmp
=
updateEmpBankMap
.
get
(
employee
.
getEmpIdcard
());
if
(
oldEmp
!=
null
)
{
if
(
Common
.
isNotNull
(
employee
.
getBankProvince
()))
{
if
(
Common
.
isNotNull
(
employee
.
getBankProvince
())
&&
regNumber
(
employee
.
getBankProvince
())
)
{
areaProvince
=
ExcelUtil
.
getRedisAreaValue
(
CacheConstants
.
AREA_VALUE
+
employee
.
getBankProvince
().
trim
());
if
(
Common
.
isNotNull
(
areaProvince
))
{
if
(
Common
.
isNotNull
(
employee
.
getBankCity
()))
{
if
(
Common
.
isNotNull
(
employee
.
getBankCity
())
&&
regNumber
(
employee
.
getBankCity
())
)
{
areaCity
=
ExcelUtil
.
getRedisAreaValue
(
CacheConstants
.
AREA_VALUE
+
employee
.
getBankCity
().
trim
()
+
CommonConstants
.
DOWN_LINE_STRING
+
employee
.
getBankProvince
().
trim
());
if
(
Common
.
isNotNull
(
areaCity
))
{
...
...
@@ -884,8 +884,6 @@ public class TSalaryEmployeeServiceImpl extends ServiceImpl<TSalaryEmployeeMappe
empMap
.
put
(
e
.
getEmpIdcard
(),
e
);
}
TSalaryEmployee
emp
;
// 开户行省市的区域暂存
String
areaStr
;
...
...
@@ -1184,18 +1182,19 @@ public class TSalaryEmployeeServiceImpl extends ServiceImpl<TSalaryEmployeeMappe
for
(
TSalaryEmployee
e
:
empList
)
{
empMap
.
put
(
e
.
getEmpIdcard
(),
e
);
}
List
<
TSalaryEmployee
>
empPhoneList
=
baseMapper
.
getListByPhone
(
phoneList
);
// 人员手机号Map
Map
<
String
,
List
<
String
>>
empPhoneMap
=
new
HashMap
<>();
// 人员手机号Map
List
<
String
>
phoneIdCardList
;
for
(
TSalaryEmployee
e
:
empPhoneList
)
{
phoneIdCardList
=
empPhoneMap
.
get
(
e
.
getEmpPhone
());
if
(
phoneIdCardList
==
null
)
{
phoneIdCardList
=
new
ArrayList
<>();
if
(!
phoneList
.
isEmpty
())
{
List
<
TSalaryEmployee
>
empPhoneList
=
baseMapper
.
getListByPhone
(
phoneList
);
for
(
TSalaryEmployee
e
:
empPhoneList
)
{
phoneIdCardList
=
empPhoneMap
.
get
(
e
.
getEmpPhone
());
if
(
phoneIdCardList
==
null
)
{
phoneIdCardList
=
new
ArrayList
<>();
}
phoneIdCardList
.
add
(
e
.
getEmpIdcard
());
empPhoneMap
.
put
(
e
.
getEmpPhone
(),
phoneIdCardList
);
}
phoneIdCardList
.
add
(
e
.
getEmpIdcard
());
empPhoneMap
.
put
(
e
.
getEmpPhone
(),
phoneIdCardList
);
}
TSalaryEmployee
emp
;
// 开户行省市的区域暂存
...
...
yifu-salary/yifu-salary-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/salary/util/SalaryAccountUtil.java
View file @
d3155218
...
...
@@ -869,6 +869,10 @@ public class SalaryAccountUtil implements Serializable {
// 2025-8-5 17:29:33 以本表为准,且写了是新员工,新增手机号也用表里的 倩倩与荣珍同意
if
(
Common
.
isNotNull
(
entity
.
getEmpPhone
())){
emp
.
setEmpPhone
(
entity
.
getEmpPhone
());
}
else
{
error
=
"第"
+
i
+
SalaryConstants
.
LINE_EMP
+
emp
.
getEmpIdcard
()
+
"-新员工以本次导入为准,手机号不可为空,请在工资模板正确填写!"
;
errorList
.
add
(
new
ErrorMessage
(
i
,
error
));
return
true
;
}
updateEmpBankList
.
add
(
emp
);
}
else
if
(
salaryGiveTimeFlag
)
{
...
...
@@ -897,6 +901,11 @@ public class SalaryAccountUtil implements Serializable {
errorList
.
add
(
new
ErrorMessage
(
i
,
error
));
return
true
;
}
if
(
Common
.
isEmpty
(
emp
.
getEmpPhone
()))
{
error
=
"第"
+
i
+
SalaryConstants
.
LINE_EMP
+
emp
.
getEmpIdcard
()
+
"-发放方式为银行发放,但是-手机号-为空,请去薪酬人员查询处更新!"
;
errorList
.
add
(
new
ErrorMessage
(
i
,
error
));
return
true
;
}
entity
.
setBankName
(
emp
.
getBankName
());
entity
.
setBankNo
(
emp
.
getBankNo
());
entity
.
setBankProvince
(
String
.
valueOf
(
emp
.
getBankProvince
()));
...
...
@@ -1260,12 +1269,20 @@ public class SalaryAccountUtil implements Serializable {
areaStr
=
ExcelUtil
.
getRedisAreaValue
(
CacheConstants
.
AREA_VALUE
+
entity
.
getBankProvince
().
trim
());
if
(
Common
.
isNotNull
(
areaStr
))
{
newEmp
.
setBankProvince
(
areaStr
);
}
else
{
error
=
"第"
+
i
+
"行:"
+
newEmpStr
+
"-开户行省错误:"
+
entity
.
getBankProvince
();
errorList
.
add
(
new
ErrorMessage
(
i
,
error
));
return
false
;
}
if
(
Common
.
isNotNull
(
entity
.
getBankCity
()))
{
areaStr
=
ExcelUtil
.
getRedisAreaValue
(
CacheConstants
.
AREA_VALUE
+
entity
.
getBankCity
().
trim
()
+
CommonConstants
.
DOWN_LINE_STRING
+
entity
.
getBankProvince
().
trim
());
if
(
Common
.
isNotNull
(
areaStr
))
{
newEmp
.
setBankCity
(
areaStr
);
}
else
{
error
=
"第"
+
i
+
"行:"
+
newEmpStr
+
"-开户行市错误:"
+
entity
.
getBankCity
();
errorList
.
add
(
new
ErrorMessage
(
i
,
error
));
return
false
;
}
}
}
...
...
yifu-social/yifu-social-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/social/service/impl/TDispatchInfoServiceImpl.java
View file @
d3155218
...
...
@@ -4606,8 +4606,9 @@ public class TDispatchInfoServiceImpl extends ServiceImpl<TDispatchInfoMapper, T
}
//社保公积金派减办理成功
if
((
CommonConstants
.
ONE_STRING
.
equals
(
dis
.
getType
())
&&
CommonConstants
.
ZERO_INT
==
flag
&&
CommonConstants
.
EIGHT_STRING
.
equals
(
sf
.
getSocialStatus
(
))
&&
(
CommonConstants
.
EIGHT_STRING
.
equals
(
sf
.
getSocialStatus
())
||
CommonConstants
.
FIVE_STRING
.
equals
(
sf
.
getSocialStatus
()
))
&&
(
CommonConstants
.
SEVEN_STRING
.
equals
(
sf
.
getFundStatus
())
||
CommonConstants
.
FOUR_STRING
.
equals
(
sf
.
getFundStatus
())
||
Common
.
isEmpty
(
sf
.
getFundStatus
())))
||
(
CommonConstants
.
ZERO_STRING
.
equals
(
dis
.
getType
())
&&
CommonConstants
.
ONE_INT
==
flag
&&
CommonConstants
.
EIGHT_STRING
.
equals
(
sf
.
getSocialStatus
())
...
...
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