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
a3b20ed4
Commit
a3b20ed4
authored
Nov 09, 2022
by
hongguangwu
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
劳务费
parent
60c6006d
Hide whitespace changes
Inline
Side-by-side
Showing
13 changed files
with
289 additions
and
199 deletions
+289
-199
EkpSalaryUtil.java
...a/com/yifu/cloud/plus/v1/yifu/ekp/util/EkpSalaryUtil.java
+2
-2
EkpSalaryBackParam.java
...om/yifu/cloud/plus/v1/yifu/ekp/vo/EkpSalaryBackParam.java
+4
-0
TSalaryAccount.java
...yifu/cloud/plus/v1/yifu/salary/entity/TSalaryAccount.java
+7
-4
TSalaryAccountVo.java
...m/yifu/cloud/plus/v1/yifu/salary/vo/TSalaryAccountVo.java
+7
-4
TSalaryEmployeeMapper.java
...oud/plus/v1/yifu/salary/mapper/TSalaryEmployeeMapper.java
+2
-0
TSalaryEmployeeService.java
...d/plus/v1/yifu/salary/service/TSalaryEmployeeService.java
+4
-1
SalaryUploadServiceImpl.java
.../v1/yifu/salary/service/impl/SalaryUploadServiceImpl.java
+9
-2
TSalaryEmployeeServiceImpl.java
.../yifu/salary/service/impl/TSalaryEmployeeServiceImpl.java
+16
-23
TSalaryStandardServiceImpl.java
.../yifu/salary/service/impl/TSalaryStandardServiceImpl.java
+6
-5
SalaryAccountUtil.java
...ifu/cloud/plus/v1/yifu/salary/util/SalaryAccountUtil.java
+202
-152
SalaryCommonUtil.java
...yifu/cloud/plus/v1/yifu/salary/util/SalaryCommonUtil.java
+6
-0
SalaryConstants.java
.../yifu/cloud/plus/v1/yifu/salary/util/SalaryConstants.java
+15
-6
TSalaryEmployeeMapper.xml
...y-biz/src/main/resources/mapper/TSalaryEmployeeMapper.xml
+9
-0
No files found.
yifu-common/yifu-common-ekp/src/main/java/com/yifu/cloud/plus/v1/yifu/ekp/util/EkpSalaryUtil.java
View file @
a3b20ed4
...
@@ -104,7 +104,7 @@ public class EkpSalaryUtil {
...
@@ -104,7 +104,7 @@ public class EkpSalaryUtil {
}
}
// 退表到ekp
// 退表到ekp
public
String
backStandardToEKP
(
String
loginName
,
EkpSalaryBackParam
param
){
public
String
backStandardToEKP
(
EkpSalaryBackParam
param
){
log
.
info
(
"推送EKP开始--薪资退表"
);
log
.
info
(
"推送EKP开始--薪资退表"
);
RestTemplate
yourRestTemplate
=
new
RestTemplate
();
RestTemplate
yourRestTemplate
=
new
RestTemplate
();
try
{
try
{
...
@@ -112,7 +112,7 @@ public class EkpSalaryUtil {
...
@@ -112,7 +112,7 @@ public class EkpSalaryUtil {
//把ModelingAppModelParameterAddForm转换成MultiValueMap
//把ModelingAppModelParameterAddForm转换成MultiValueMap
MultiValueMap
<
String
,
Object
>
wholeForm
=
new
LinkedMultiValueMap
<>();
MultiValueMap
<
String
,
Object
>
wholeForm
=
new
LinkedMultiValueMap
<>();
wholeForm
.
add
(
"docSubject"
,
ekpProperties
.
getDocSubject
());
wholeForm
.
add
(
"docSubject"
,
ekpProperties
.
getDocSubject
());
wholeForm
.
add
(
"docCreator"
,
"{\"LoginName\":\"
"
+
loginName
+
"
\"}"
);
wholeForm
.
add
(
"docCreator"
,
"{\"LoginName\":\"
admin
\"}"
);
wholeForm
.
add
(
"docStatus"
,
ekpProperties
.
getDocStatus
());
wholeForm
.
add
(
"docStatus"
,
ekpProperties
.
getDocStatus
());
String
formValues
=
new
ObjectMapper
().
writeValueAsString
(
param
);
String
formValues
=
new
ObjectMapper
().
writeValueAsString
(
param
);
wholeForm
.
add
(
"formValues"
,
formValues
);
wholeForm
.
add
(
"formValues"
,
formValues
);
...
...
yifu-common/yifu-common-ekp/src/main/java/com/yifu/cloud/plus/v1/yifu/ekp/vo/EkpSalaryBackParam.java
View file @
a3b20ed4
...
@@ -24,5 +24,9 @@ public class EkpSalaryBackParam implements Serializable {
...
@@ -24,5 +24,9 @@ public class EkpSalaryBackParam implements Serializable {
* 薪酬申请编号
* 薪酬申请编号
**/
**/
private
String
fd_3b3c293811c0ee
;
private
String
fd_3b3c293811c0ee
;
/**
* 薪酬推送姓名(英文的登录名)
**/
private
String
fd_3b422d73d73e02
;
}
}
yifu-salary/yifu-salary-api/src/main/java/com/yifu/cloud/plus/v1/yifu/salary/entity/TSalaryAccount.java
View file @
a3b20ed4
...
@@ -362,12 +362,15 @@ public class TSalaryAccount extends BaseEntity {
...
@@ -362,12 +362,15 @@ public class TSalaryAccount extends BaseEntity {
private
Integer
isRepeat
;
private
Integer
isRepeat
;
/**
/**
* 是否个人承担部分税费:0否1是
* 是否个人承担部分税费
* 公司承担全部税费0
* 个人承担部分税费1
* 个人承担全部税费2
*/
*/
@ExcelAttribute
(
name
=
"是否个人承担部分税费
:0否1是"
,
maxLength
=
1
)
@ExcelAttribute
(
name
=
"是否个人承担部分税费
"
,
maxLength
=
8
,
readConverterExp
=
"0=公司承担全部税费,1=个人承担部分税费,2=个人承担全部税费"
)
@Length
(
max
=
1
,
message
=
"是否个人承担部分税费
:0否1是
不能超过1个字符"
)
@Length
(
max
=
1
,
message
=
"是否个人承担部分税费不能超过1个字符"
)
@HeadFontStyle
(
fontHeightInPoints
=
11
)
@HeadFontStyle
(
fontHeightInPoints
=
11
)
@ExcelProperty
(
"是否个人承担部分税费
:0否1是
"
)
@ExcelProperty
(
"是否个人承担部分税费"
)
private
String
isPersonTax
;
private
String
isPersonTax
;
/**
/**
* 应发薪酬(劳务费、稿酬)
* 应发薪酬(劳务费、稿酬)
...
...
yifu-salary/yifu-salary-api/src/main/java/com/yifu/cloud/plus/v1/yifu/salary/vo/TSalaryAccountVo.java
View file @
a3b20ed4
...
@@ -283,12 +283,15 @@ public class TSalaryAccountVo implements Serializable {
...
@@ -283,12 +283,15 @@ public class TSalaryAccountVo implements Serializable {
private
String
bankCity
;
private
String
bankCity
;
/**
/**
* 是否个人承担部分税费:0否1是
* 是否个人承担部分税费
* 公司承担全部税费0
* 个人承担部分税费1
* 个人承担全部税费2
*/
*/
@ExcelAttribute
(
name
=
"是否个人承担部分税费
:0否1是"
,
maxLength
=
1
)
@ExcelAttribute
(
name
=
"是否个人承担部分税费
"
,
maxLength
=
8
)
@Length
(
max
=
1
,
message
=
"是否个人承担部分税费:0否1是
不能超过1个字符"
)
@Length
(
max
=
8
,
message
=
"是否个人承担部分税费:0否1是2全
不能超过1个字符"
)
@HeadFontStyle
(
fontHeightInPoints
=
11
)
@HeadFontStyle
(
fontHeightInPoints
=
11
)
@ExcelProperty
(
"是否个人承担部分税费
:0否1是
"
)
@ExcelProperty
(
"是否个人承担部分税费"
)
private
String
isPersonTax
;
private
String
isPersonTax
;
/**
/**
* 应发薪酬(劳务费、稿酬)
* 应发薪酬(劳务费、稿酬)
...
...
yifu-salary/yifu-salary-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/salary/mapper/TSalaryEmployeeMapper.java
View file @
a3b20ed4
...
@@ -46,4 +46,6 @@ public interface TSalaryEmployeeMapper extends BaseMapper<TSalaryEmployee> {
...
@@ -46,4 +46,6 @@ public interface TSalaryEmployeeMapper extends BaseMapper<TSalaryEmployee> {
List
<
TSalaryEmployeeExportVo
>
noPageDiy
(
@Param
(
"tSalaryEmployee"
)
TSalaryEmployeeSearchVo
searchVo
,
@Param
(
"idList"
)
List
<
String
>
idList
);
List
<
TSalaryEmployeeExportVo
>
noPageDiy
(
@Param
(
"tSalaryEmployee"
)
TSalaryEmployeeSearchVo
searchVo
,
@Param
(
"idList"
)
List
<
String
>
idList
);
List
<
TSalaryEmployee
>
getListByIdCard
(
@Param
(
"idCardList"
)
List
<
String
>
idCardList
);
List
<
TSalaryEmployee
>
getListByIdCard
(
@Param
(
"idCardList"
)
List
<
String
>
idCardList
);
TSalaryEmployee
getByEmpIdCard
(
@Param
(
"empIdCard"
)
String
empIdCard
);
}
}
yifu-salary/yifu-salary-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/salary/service/TSalaryEmployeeService.java
View file @
a3b20ed4
...
@@ -51,13 +51,14 @@ public interface TSalaryEmployeeService extends IService<TSalaryEmployee> {
...
@@ -51,13 +51,14 @@ public interface TSalaryEmployeeService extends IService<TSalaryEmployee> {
List
<
TSalaryEmployeeExportVo
>
noPageDiy
(
TSalaryEmployeeSearchVo
searchVo
);
List
<
TSalaryEmployeeExportVo
>
noPageDiy
(
TSalaryEmployeeSearchVo
searchVo
);
/**
/**
* @param notLabour 是:非劳务费人员。 否:劳务费,不保存
* @param employee
* @param employee
* @Description: 新建薪资员工,返回值为null,保存成功。其余都是失败原因
* @Description: 新建薪资员工,返回值为null,保存成功。其余都是失败原因
* @Author: hgw
* @Author: hgw
* @Date: 2022/8/17 16:03
* @Date: 2022/8/17 16:03
* @return: java.lang.String
* @return: java.lang.String
**/
**/
String
saveNewSalaryEmployee
(
TSalaryEmployee
employee
);
String
saveNewSalaryEmployee
(
boolean
notLabour
,
TSalaryEmployee
employee
);
/**
/**
* @param inputStream
* @param inputStream
...
@@ -68,4 +69,6 @@ public interface TSalaryEmployeeService extends IService<TSalaryEmployee> {
...
@@ -68,4 +69,6 @@ public interface TSalaryEmployeeService extends IService<TSalaryEmployee> {
**/
**/
R
<
List
<
ErrorMessage
>>
batchUpdateSalaryEmployee
(
InputStream
inputStream
);
R
<
List
<
ErrorMessage
>>
batchUpdateSalaryEmployee
(
InputStream
inputStream
);
TSalaryEmployee
getByEmpIdCard
(
String
empIdCard
);
}
}
yifu-salary/yifu-salary-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/salary/service/impl/SalaryUploadServiceImpl.java
View file @
a3b20ed4
...
@@ -1683,7 +1683,7 @@ public class SalaryUploadServiceImpl extends ServiceImpl<TSalaryStandardMapper,
...
@@ -1683,7 +1683,7 @@ public class SalaryUploadServiceImpl extends ServiceImpl<TSalaryStandardMapper,
BigDecimal
nowTaxY
;
BigDecimal
nowTaxY
;
BigDecimal
relaySalary
;
BigDecimal
relaySalary
;
BigDecimal
salaryTax
=
BigDecimal
.
ZERO
;
BigDecimal
salaryTax
=
BigDecimal
.
ZERO
;
if
(
CommonConstants
.
ONE_STRING
.
equals
(
a
.
getIsPersonTax
()))
{
if
(
SalaryConstants
.
IS_PERSON_OTHER
.
equals
(
a
.
getIsPersonTax
()))
{
nowTaxT
=
getNowTax
(
actualSalarySumNow
);
nowTaxT
=
getNowTax
(
actualSalarySumNow
);
if
(
actualSalarySum
.
compareTo
(
actualSalarySumNow
)
!=
0
)
{
if
(
actualSalarySum
.
compareTo
(
actualSalarySumNow
)
!=
0
)
{
actualSalarySumT
=
BigDecimalUtils
.
safeAdd
(
nowTaxT
,
sumSalaryTax
,
actualSalarySumNow
).
setScale
(
SalaryConstants
.
PLACES
,
BigDecimal
.
ROUND_HALF_UP
);
actualSalarySumT
=
BigDecimalUtils
.
safeAdd
(
nowTaxT
,
sumSalaryTax
,
actualSalarySumNow
).
setScale
(
SalaryConstants
.
PLACES
,
BigDecimal
.
ROUND_HALF_UP
);
...
@@ -1700,7 +1700,7 @@ public class SalaryUploadServiceImpl extends ServiceImpl<TSalaryStandardMapper,
...
@@ -1700,7 +1700,7 @@ public class SalaryUploadServiceImpl extends ServiceImpl<TSalaryStandardMapper,
a
.
setSalaryTax
(
salaryTax
);
a
.
setSalaryTax
(
salaryTax
);
a
.
setSalaryTaxUnit
(
nowTaxT
);
a
.
setSalaryTaxUnit
(
nowTaxT
);
a
.
setActualSalary
(
BigDecimalUtils
.
safeSubtract
(
actualSalarySumNow
,
salaryTax
));
a
.
setActualSalary
(
BigDecimalUtils
.
safeSubtract
(
actualSalarySumNow
,
salaryTax
));
}
else
{
}
else
if
(
SalaryConstants
.
IS_COMPANY
.
equals
(
a
.
getIsPersonTax
()))
{
getNowTax
(
actualSalarySumNow
);
getNowTax
(
actualSalarySumNow
);
nowTaxY
=
getNowTax
(
actualSalarySum
);
nowTaxY
=
getNowTax
(
actualSalarySum
);
a
.
setActualSalary
(
actualSalarySumNow
);
a
.
setActualSalary
(
actualSalarySumNow
);
...
@@ -1709,6 +1709,13 @@ public class SalaryUploadServiceImpl extends ServiceImpl<TSalaryStandardMapper,
...
@@ -1709,6 +1709,13 @@ public class SalaryUploadServiceImpl extends ServiceImpl<TSalaryStandardMapper,
}
}
a
.
setSalaryTaxUnit
(
nowTaxY
);
a
.
setSalaryTaxUnit
(
nowTaxY
);
relaySalary
=
BigDecimalUtils
.
safeAdd
(
actualSalarySumNow
,
nowTaxY
).
setScale
(
SalaryConstants
.
PLACES
,
BigDecimal
.
ROUND_HALF_UP
);
relaySalary
=
BigDecimalUtils
.
safeAdd
(
actualSalarySumNow
,
nowTaxY
).
setScale
(
SalaryConstants
.
PLACES
,
BigDecimal
.
ROUND_HALF_UP
);
}
else
{
// TODO-@胡 :个人承担全部税费,实发要变为应发,推算出实发、个税
nowTaxY
=
BigDecimal
.
ZERO
;
relaySalary
=
a
.
getActualSalary
();
}
}
a
.
setRelaySalaryUnit
(
relaySalary
);
a
.
setRelaySalaryUnit
(
relaySalary
);
a
.
setRelaySalary
(
actualSalarySumNow
);
a
.
setRelaySalary
(
actualSalarySumNow
);
...
...
yifu-salary/yifu-salary-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/salary/service/impl/TSalaryEmployeeServiceImpl.java
View file @
a3b20ed4
...
@@ -274,6 +274,7 @@ public class TSalaryEmployeeServiceImpl extends ServiceImpl<TSalaryEmployeeMappe
...
@@ -274,6 +274,7 @@ public class TSalaryEmployeeServiceImpl extends ServiceImpl<TSalaryEmployeeMappe
}
}
/**
/**
* @param notLabour 是:非劳务费人员。 否:劳务费,不保存
* @param employee
* @param employee
* @Description: 新建薪资员工,返回值为null,保存成功。其余都是失败原因
* @Description: 新建薪资员工,返回值为null,保存成功。其余都是失败原因
* @Author: hgw
* @Author: hgw
...
@@ -281,7 +282,7 @@ public class TSalaryEmployeeServiceImpl extends ServiceImpl<TSalaryEmployeeMappe
...
@@ -281,7 +282,7 @@ public class TSalaryEmployeeServiceImpl extends ServiceImpl<TSalaryEmployeeMappe
* @return: java.lang.String
* @return: java.lang.String
**/
**/
@Override
@Override
public
String
saveNewSalaryEmployee
(
TSalaryEmployee
employee
)
{
public
String
saveNewSalaryEmployee
(
boolean
notLabour
,
TSalaryEmployee
employee
)
{
if
(
Common
.
isNotNull
(
employee
.
getEmpName
())
&&
Common
.
isNotNull
(
employee
.
getEmpIdcard
()))
{
if
(
Common
.
isNotNull
(
employee
.
getEmpName
())
&&
Common
.
isNotNull
(
employee
.
getEmpIdcard
()))
{
// 银行卡
// 银行卡
if
(
Common
.
isNotNull
(
employee
.
getBankNo
()))
{
if
(
Common
.
isNotNull
(
employee
.
getBankNo
()))
{
...
@@ -306,22 +307,6 @@ public class TSalaryEmployeeServiceImpl extends ServiceImpl<TSalaryEmployeeMappe
...
@@ -306,22 +307,6 @@ public class TSalaryEmployeeServiceImpl extends ServiceImpl<TSalaryEmployeeMappe
return
pre
+
SalaryConstants
.
CHECK_NO_RESPONSE
;
return
pre
+
SalaryConstants
.
CHECK_NO_RESPONSE
;
}
}
}
}
// if (Common.isNotNull(employee.getBankNo())) {
// // 调用校验服务
// TCheckBankNo checkIdCard = new TCheckBankNo();
// checkIdCard.setName(employee.getEmpName());
// checkIdCard.setBankNo(employee.getBankNo());
// R<TCheckBankNo> checkListR = HttpDaprUtil.invokeMethodPost(checkProperties.getAppUrl(), checkProperties.getAppId()
// , "/tcheckbankno/inner/checkBankNo", checkIdCard, TCheckBankNo.class, SecurityConstants.FROM_IN);
// if (checkListR != null && checkListR.getData() != null) {
// TCheckBankNo check = checkListR.getData();
// if (!CommonConstants.ONE_STRING.equals(check.getResult())) {
// return check.getMessage();
// }
// } else {
// return "校验服务未找到银行卡,请联系管理员";
// }
// }
// 手机号
// 手机号
if
(
Common
.
isNotNull
(
employee
.
getEmpPhone
()))
{
if
(
Common
.
isNotNull
(
employee
.
getEmpPhone
()))
{
// 调用校验服务-校验手机号
// 调用校验服务-校验手机号
...
@@ -342,7 +327,9 @@ public class TSalaryEmployeeServiceImpl extends ServiceImpl<TSalaryEmployeeMappe
...
@@ -342,7 +327,9 @@ public class TSalaryEmployeeServiceImpl extends ServiceImpl<TSalaryEmployeeMappe
}
}
}
}
}
}
this
.
save
(
employee
);
if
(!
notLabour
)
{
this
.
save
(
employee
);
}
return
null
;
return
null
;
}
}
...
@@ -442,7 +429,7 @@ public class TSalaryEmployeeServiceImpl extends ServiceImpl<TSalaryEmployeeMappe
...
@@ -442,7 +429,7 @@ public class TSalaryEmployeeServiceImpl extends ServiceImpl<TSalaryEmployeeMappe
// 人员Map
// 人员Map
Map
<
String
,
TSalaryEmployee
>
empMap
=
new
HashMap
<>();
Map
<
String
,
TSalaryEmployee
>
empMap
=
new
HashMap
<>();
for
(
TSalaryEmployee
e
:
empList
)
{
for
(
TSalaryEmployee
e
:
empList
)
{
empMap
.
put
(
e
.
getEmpIdcard
()
+
CommonConstants
.
DOWN_LINE_STRING
+
e
.
getDeptNo
()
,
e
);
empMap
.
put
(
e
.
getEmpIdcard
(),
e
);
}
}
TSalaryEmployee
emp
;
TSalaryEmployee
emp
;
// 开户行省市的区域暂存
// 开户行省市的区域暂存
...
@@ -451,8 +438,8 @@ public class TSalaryEmployeeServiceImpl extends ServiceImpl<TSalaryEmployeeMappe
...
@@ -451,8 +438,8 @@ public class TSalaryEmployeeServiceImpl extends ServiceImpl<TSalaryEmployeeMappe
for
(
int
i
=
0
;
i
<
excelVOList
.
size
();
i
++)
{
for
(
int
i
=
0
;
i
<
excelVOList
.
size
();
i
++)
{
excel
=
excelVOList
.
get
(
i
);
excel
=
excelVOList
.
get
(
i
);
if
(
excel
!=
null
)
{
if
(
excel
!=
null
)
{
if
(
Common
.
isNotNull
(
excel
.
getEmpIdcard
())
&&
Common
.
isNotNull
(
excel
.
getDeptNo
())
)
{
if
(
Common
.
isNotNull
(
excel
.
getEmpIdcard
()))
{
emp
=
empMap
.
get
(
excel
.
getEmpIdcard
()
+
CommonConstants
.
DOWN_LINE_STRING
+
excel
.
getDeptNo
()
);
emp
=
empMap
.
get
(
excel
.
getEmpIdcard
());
if
(
Common
.
isNotNull
(
emp
))
{
if
(
Common
.
isNotNull
(
emp
))
{
curTaxMonth
=
false
;
curTaxMonth
=
false
;
if
(
Common
.
isNotNull
(
emp
.
getTaxMonth
())
&&
Common
.
isNotNull
(
excel
.
getTaxMonth
())
&&
emp
.
getTaxMonth
().
length
()==
6
)
{
if
(
Common
.
isNotNull
(
emp
.
getTaxMonth
())
&&
Common
.
isNotNull
(
excel
.
getTaxMonth
())
&&
emp
.
getTaxMonth
().
length
()==
6
)
{
...
@@ -501,11 +488,17 @@ public class TSalaryEmployeeServiceImpl extends ServiceImpl<TSalaryEmployeeMappe
...
@@ -501,11 +488,17 @@ public class TSalaryEmployeeServiceImpl extends ServiceImpl<TSalaryEmployeeMappe
errorMessageList
.
add
(
new
ErrorMessage
(
excel
.
getRowIndex
(),
SalaryConstants
.
NOT_HAVE_EMP
));
errorMessageList
.
add
(
new
ErrorMessage
(
excel
.
getRowIndex
(),
SalaryConstants
.
NOT_HAVE_EMP
));
}
}
}
else
{
}
else
{
errorMessageList
.
add
(
new
ErrorMessage
(
excel
.
getRowIndex
(),
SalaryConstants
.
ID
CARD_DEPT_NO
_MUST
));
errorMessageList
.
add
(
new
ErrorMessage
(
excel
.
getRowIndex
(),
SalaryConstants
.
ID
_CARD
_MUST
));
}
}
}
else
{
}
else
{
errorMessageList
.
add
(
new
ErrorMessage
(
CommonConstants
.
ZERO_INT
,
SalaryConstants
.
IDCARD_DEPT_NO
_MUST
));
errorMessageList
.
add
(
new
ErrorMessage
(
CommonConstants
.
ZERO_INT
,
SalaryConstants
.
DATA
_MUST
));
}
}
}
}
}
}
@Override
public
TSalaryEmployee
getByEmpIdCard
(
String
empIdCard
)
{
return
baseMapper
.
getByEmpIdCard
(
empIdCard
);
}
}
}
yifu-salary/yifu-salary-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/salary/service/impl/TSalaryStandardServiceImpl.java
View file @
a3b20ed4
...
@@ -416,6 +416,7 @@ public class TSalaryStandardServiceImpl extends ServiceImpl<TSalaryStandardMappe
...
@@ -416,6 +416,7 @@ public class TSalaryStandardServiceImpl extends ServiceImpl<TSalaryStandardMappe
if
(
sf
!=
null
&&
Common
.
isNotNull
(
sf
.
getId
()))
{
if
(
sf
!=
null
&&
Common
.
isNotNull
(
sf
.
getId
()))
{
if
(
sf
.
getStatus
()
!=
null
&&
!
SalaryConstants
.
AUDIT_STATUS
[
0
].
equals
(
sf
.
getStatus
())
if
(
sf
.
getStatus
()
!=
null
&&
!
SalaryConstants
.
AUDIT_STATUS
[
0
].
equals
(
sf
.
getStatus
())
&&
!
SalaryConstants
.
AUDIT_STATUS
[
5
].
equals
(
sf
.
getStatus
())
&&
!
SalaryConstants
.
AUDIT_STATUS
[
5
].
equals
(
sf
.
getStatus
())
&&
!
SalaryConstants
.
AUDIT_STATUS
[
6
].
equals
(
sf
.
getStatus
())
&&
!
SalaryConstants
.
AUDIT_STATUS
[
7
].
equals
(
sf
.
getStatus
()))
{
&&
!
SalaryConstants
.
AUDIT_STATUS
[
7
].
equals
(
sf
.
getStatus
()))
{
return
R
.
failed
(
"状态为:【"
+
SalaryConstants
.
AUDIT_STATUS_STRING
[
sf
.
getStatus
()]
+
"】,不可删除"
);
return
R
.
failed
(
"状态为:【"
+
SalaryConstants
.
AUDIT_STATUS_STRING
[
sf
.
getStatus
()]
+
"】,不可删除"
);
}
}
...
@@ -908,15 +909,14 @@ public class TSalaryStandardServiceImpl extends ServiceImpl<TSalaryStandardMappe
...
@@ -908,15 +909,14 @@ public class TSalaryStandardServiceImpl extends ServiceImpl<TSalaryStandardMappe
param
.
setFd_3b3c2935c13056
(
ss
.
getDeptNo
());
param
.
setFd_3b3c2935c13056
(
ss
.
getDeptNo
());
param
.
setFd_3b3c293811c0ee
(
ss
.
getApplyNo
());
param
.
setFd_3b3c293811c0ee
(
ss
.
getApplyNo
());
YifuUser
user
=
SecurityUtils
.
getUser
();
YifuUser
user
=
SecurityUtils
.
getUser
();
String
loginName
;
if
(
user
!=
null
)
{
if
(
user
!=
null
)
{
loginName
=
user
.
getUsername
(
);
param
.
setFd_3b422d73d73e02
(
user
.
getUsername
()
);
}
else
{
}
else
{
loginName
=
ss
.
getCreateName
(
);
param
.
setFd_3b422d73d73e02
(
""
);
}
}
String
sendBack
=
ekpSalaryUtil
.
backStandardToEKP
(
loginName
,
param
);
String
sendBack
=
ekpSalaryUtil
.
backStandardToEKP
(
param
);
if
(
Common
.
isEmpty
(
sendBack
)
||
sendBack
.
length
()
!=
32
)
{
if
(
Common
.
isEmpty
(
sendBack
)
||
sendBack
.
length
()
!=
32
)
{
sendBack
=
ekpSalaryUtil
.
backStandardToEKP
(
loginName
,
param
);
sendBack
=
ekpSalaryUtil
.
backStandardToEKP
(
param
);
}
}
if
(
Common
.
isNotNull
(
sendBack
)
&&
sendBack
.
length
()
==
32
)
{
if
(
Common
.
isNotNull
(
sendBack
)
&&
sendBack
.
length
()
==
32
)
{
// 更新薪资为确认不通过
// 更新薪资为确认不通过
...
@@ -936,6 +936,7 @@ public class TSalaryStandardServiceImpl extends ServiceImpl<TSalaryStandardMappe
...
@@ -936,6 +936,7 @@ public class TSalaryStandardServiceImpl extends ServiceImpl<TSalaryStandardMappe
,
Object
.
class
,
SecurityConstants
.
FROM_IN
);
,
Object
.
class
,
SecurityConstants
.
FROM_IN
);
// 添加流程进展明细
// 添加流程进展明细
if
(
user
!=
null
)
{
if
(
user
!=
null
)
{
ss
.
setRemark
(
" "
);
this
.
saveRecordLog
(
ss
,
user
,
CommonConstants
.
ZERO_STRING
,
"从EKP退表"
);
this
.
saveRecordLog
(
ss
,
user
,
CommonConstants
.
ZERO_STRING
,
"从EKP退表"
);
}
}
return
R
.
ok
();
return
R
.
ok
();
...
...
yifu-salary/yifu-salary-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/salary/util/SalaryAccountUtil.java
View file @
a3b20ed4
...
@@ -118,18 +118,15 @@ public class SalaryAccountUtil implements Serializable {
...
@@ -118,18 +118,15 @@ public class SalaryAccountUtil implements Serializable {
// 当前年月
// 当前年月
String
nowMonth
=
DateUtil
.
addMonth
(
CommonConstants
.
ZERO_INT
);
String
nowMonth
=
DateUtil
.
addMonth
(
CommonConstants
.
ZERO_INT
);
String
must
;
String
must
;
// 当前年(用来获取已有薪资的计税月份,覆盖填写的计税月份2022-1-19 17:11:24hgw根据郭华照等人提出的需求
int
nowYear
=
Integer
.
parseInt
(
nowMonth
.
substring
(
0
,
4
));
// 当前结算年,已有工资的最小计税月
String
minTaxMonth
;
// 开户行省市的区域暂存
String
areaStr
;
// 员工新建保存的反馈,null 保存成功,其他,保存失败,反馈原因
String
saveNewEmpReturn
;
// 每一行是否有错误 true : 无错误
// 每一行是否有错误 true : 无错误
boolean
errorFlag
;
boolean
errorFlag
;
// 是否含有年终奖 false 没有
// 是否含有年终奖 false 没有
boolean
annualBonusFlag
;
boolean
annualBonusFlag
;
// 是否 不是劳务费(劳务费不用进档,不用档案信息)
boolean
notLabour
=
true
;
if
(
CommonConstants
.
THREE_STRING
.
equals
(
salaryType
))
{
notLabour
=
false
;
}
for
(
int
i
=
0
;
i
<
rows
;
i
++)
{
for
(
int
i
=
0
;
i
<
rows
;
i
++)
{
annualBonusFlag
=
false
;
annualBonusFlag
=
false
;
errorFlag
=
true
;
errorFlag
=
true
;
...
@@ -309,7 +306,7 @@ public class SalaryAccountUtil implements Serializable {
...
@@ -309,7 +306,7 @@ public class SalaryAccountUtil implements Serializable {
continue
;
continue
;
}
}
if
(
"3"
.
equals
(
salaryType
)
&&
actualSalarySum
==
null
)
{
if
(
"3"
.
equals
(
salaryType
)
&&
actualSalarySum
==
null
)
{
error
=
"第"
+
(
i
+
2
)
+
"行:【
实发
劳务费】列_不可缺少"
;
error
=
"第"
+
(
i
+
2
)
+
"行:【劳务费】列_不可缺少"
;
errorList
.
add
(
new
ErrorMessage
((
i
+
2
),
error
));
errorList
.
add
(
new
ErrorMessage
((
i
+
2
),
error
));
continue
;
continue
;
}
}
...
@@ -367,152 +364,48 @@ public class SalaryAccountUtil implements Serializable {
...
@@ -367,152 +364,48 @@ public class SalaryAccountUtil implements Serializable {
if
(
newEmp
!=
null
&&
Common
.
isNotNull
(
entity
.
getEmpPhone
())
&&
Common
.
isEmpty
(
newEmp
.
getEmpPhone
()))
{
if
(
newEmp
!=
null
&&
Common
.
isNotNull
(
entity
.
getEmpPhone
())
&&
Common
.
isEmpty
(
newEmp
.
getEmpPhone
()))
{
newEmp
.
setEmpPhone
(
entity
.
getEmpPhone
());
newEmp
.
setEmpPhone
(
entity
.
getEmpPhone
());
}
}
if
(
emp
==
null
)
{
if
(
emp
==
null
&&
notLabour
&&
Common
.
isNotNull
(
newEmp
.
getEmpIdcard
()))
{
emp
=
tSalaryEmployeeService
.
getByEmpIdCard
(
newEmp
.
getEmpIdcard
());
if
(
emp
!=
null
)
{
emp
.
setDeptId
(
dept
.
getId
());
emp
.
setDeptName
(
dept
.
getDepartName
());
emp
.
setDeptNo
(
dept
.
getDepartNo
());
emp
.
setUnitId
(
dept
.
getCustomerId
());
emp
.
setUnitName
(
dept
.
getCustomerName
());
emp
.
setUnitNo
(
dept
.
getCustomerCode
());
tSalaryEmployeeService
.
updateById
(
emp
);
}
}
// 劳务费要使用人员信息
if
(!
notLabour
)
{
R
<
TSalaryEmployee
>
eR
=
this
.
getNewEmp
(
newEmp
,
i
,
errorList
,
notLabour
,
entity
,
salaryType
,
dept
,
user
,
salaryStyle
,
salaryGiveTimeFlag
,
invoiceTitle
,
tSalaryAccountService
,
tSalaryEmployeeService
);
if
(
eR
.
getCode
()
!=
200
)
{
continue
;
}
else
{
emp
=
eR
.
getData
();
}
}
else
if
(
emp
==
null
)
{
if
(
isNewEmployee
)
{
if
(
isNewEmployee
)
{
//增加工资人员档案:(临时使用)
R
<
TSalaryEmployee
>
eR
=
this
.
getNewEmp
(
newEmp
,
i
,
errorList
,
notLabour
,
entity
,
salaryType
,
dept
,
user
if
(
newEmp
!=
null
)
{
,
salaryStyle
,
salaryGiveTimeFlag
,
invoiceTitle
,
tSalaryAccountService
if
(
Common
.
isEmpty
(
newEmp
.
getEmpName
()))
{
,
tSalaryEmployeeService
);
error
=
"第"
+
(
i
+
2
)
+
"行:新员工-姓名-不可为空!"
;
if
(
eR
.
getCode
()
!=
200
)
{
errorList
.
add
(
new
ErrorMessage
((
i
+
2
),
error
));
continue
;
}
if
(
Common
.
isEmpty
(
newEmp
.
getEmpIdcard
()))
{
error
=
"第"
+
(
i
+
2
)
+
"行:新员工-身份证号-不可为空!"
;
errorList
.
add
(
new
ErrorMessage
((
i
+
2
),
error
));
continue
;
}
// 2021-8-31 hgw2.6.5新增手机号校验
if
(
Common
.
isEmpty
(
newEmp
.
getEmpPhone
()))
{
error
=
"第"
+
(
i
+
2
)
+
"行:新员工-手机号码-不可为空!"
;
errorList
.
add
(
new
ErrorMessage
((
i
+
2
),
error
));
continue
;
}
else
if
(!
ValidityUtil
.
validateEmpPhone
(
newEmp
.
getEmpPhone
()))
{
error
=
"第"
+
(
i
+
2
)
+
"行:新员工-手机号码格式错误:"
+
newEmp
.
getEmpPhone
();
errorList
.
add
(
new
ErrorMessage
((
i
+
2
),
error
));
continue
;
}
}
if
(
entity
!=
null
)
{
if
(!
"3"
.
equals
(
salaryType
)
&&
!
"4"
.
equals
(
salaryType
))
{
if
(
Common
.
isEmpty
(
entity
.
getTaxMonth
()))
{
error
=
"第"
+
(
i
+
2
)
+
"行:新员工-计税月份-不可为空!"
;
errorList
.
add
(
new
ErrorMessage
((
i
+
2
),
error
));
continue
;
}
else
if
(
entity
.
getTaxMonth
().
length
()
<
CommonConstants
.
dingleDigitIntArray
[
6
])
{
error
=
"第"
+
(
i
+
2
)
+
"行:新员工-计税月份-长度小于6:"
+
entity
.
getTaxMonth
();
errorList
.
add
(
new
ErrorMessage
((
i
+
2
),
error
));
continue
;
}
else
if
(
DateUtil
.
compareYearMonth
(
entity
.
getTaxMonth
(),
nowMonth
))
{
error
=
"第"
+
(
i
+
2
)
+
"行:新员工-计税月份-大于当前年月或错误,请调整:"
+
entity
.
getTaxMonth
();
errorList
.
add
(
new
ErrorMessage
((
i
+
2
),
error
));
continue
;
}
else
{
newEmp
.
setTaxMonth
(
entity
.
getTaxMonth
());
}
}
//工资发放方式(0现金/1银行)/2线下 && salaryGiveTime == true :立即发;false:暂停发:则不考虑开户行等
//银行+立即发,则考虑和开户行卡号
if
(
SalaryConstants
.
SALARY_STYLE_BANK
.
equals
(
salaryStyle
)
&&
salaryGiveTimeFlag
)
{
if
(
Common
.
isEmpty
(
entity
.
getBankName
()))
{
error
=
"第"
+
(
i
+
2
)
+
"行:新员工-开户行总行-不可为空!"
;
errorList
.
add
(
new
ErrorMessage
((
i
+
2
),
error
));
continue
;
}
else
{
newEmp
.
setBankName
(
entity
.
getBankName
());
}
if
(
Common
.
isEmpty
(
entity
.
getBankProvince
())
||
Common
.
isEmpty
(
entity
.
getBankCity
()))
{
error
=
"第"
+
(
i
+
2
)
+
"行:新员工-开户行省、市-不可为空!"
;
errorList
.
add
(
new
ErrorMessage
((
i
+
2
),
error
));
continue
;
}
else
{
areaStr
=
ExcelUtil
.
getRedisAreaValue
(
CacheConstants
.
AREA_VALUE
+
entity
.
getBankProvince
().
trim
());
if
(
Common
.
isNotNull
(
areaStr
))
{
newEmp
.
setBankProvince
(
areaStr
);
}
else
{
error
=
"第"
+
(
i
+
2
)
+
"行:新员工-开户行省错误:"
+
entity
.
getBankProvince
();
errorList
.
add
(
new
ErrorMessage
((
i
+
2
),
error
));
continue
;
}
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
+
2
)
+
"行:新员工-开户行市错误:"
+
entity
.
getBankCity
();
errorList
.
add
(
new
ErrorMessage
((
i
+
2
),
error
));
continue
;
}
}
if
(
Common
.
isEmpty
(
entity
.
getBankNo
()))
{
error
=
"第"
+
(
i
+
2
)
+
"行:新员工-银行卡号-不可为空!"
;
errorList
.
add
(
new
ErrorMessage
((
i
+
2
),
error
));
continue
;
}
else
{
newEmp
.
setBankNo
(
entity
.
getBankNo
());
}
if
(
Common
.
isNotNull
(
entity
.
getBankSubName
()))
{
newEmp
.
setBankSubName
(
entity
.
getBankSubName
());
}
}
else
{
if
(
Common
.
isNotNull
(
entity
.
getBankName
()))
{
newEmp
.
setBankName
(
entity
.
getBankName
());
}
if
(
Common
.
isNotNull
(
entity
.
getBankNo
()))
{
newEmp
.
setBankNo
(
entity
.
getBankNo
());
}
if
(
Common
.
isNotNull
(
entity
.
getBankSubName
()))
{
newEmp
.
setBankSubName
(
entity
.
getBankSubName
());
}
if
(
Common
.
isNotNull
(
entity
.
getBankProvince
()))
{
areaStr
=
ExcelUtil
.
getRedisAreaValue
(
CacheConstants
.
AREA_VALUE
+
entity
.
getBankProvince
().
trim
());
if
(
Common
.
isNotNull
(
areaStr
))
{
newEmp
.
setBankProvince
(
areaStr
);
}
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
);
}
}
}
}
}
newEmp
.
setFileStatus
(
CommonConstants
.
ZERO_STRING
);
//临时
newEmp
.
setDeptId
(
dept
.
getId
());
newEmp
.
setDeptName
(
dept
.
getDepartName
());
newEmp
.
setDeptNo
(
dept
.
getDepartNo
());
newEmp
.
setUnitId
(
dept
.
getCustomerId
());
newEmp
.
setUnitName
(
dept
.
getCustomerName
());
newEmp
.
setUnitNo
(
dept
.
getCustomerCode
());
newEmp
.
setCreateBy
(
String
.
valueOf
(
user
.
getId
()));
newEmp
.
setCreateName
(
user
.
getNickname
());
newEmp
.
setInvoiceTitle
(
invoiceTitle
);
if
(!
"3"
.
equals
(
salaryType
)
&&
!
"4"
.
equals
(
salaryType
))
{
minTaxMonth
=
tSalaryAccountService
.
getMinTaxMonthByNowYear
(
newEmp
.
getEmpIdcard
(),
nowYear
);
if
(
Common
.
isNotNull
(
minTaxMonth
)
&&
!
minTaxMonth
.
equals
(
entity
.
getTaxMonth
()))
{
error
=
"第"
+
(
i
+
2
)
+
"行:该员工已有发薪记录,计税月份请填写:【"
+
minTaxMonth
+
"】"
+
",你填写了计税月:【"
+
entity
.
getTaxMonth
()
+
"】"
;
errorList
.
add
(
new
ErrorMessage
((
i
+
2
),
error
));
continue
;
}
}
saveNewEmpReturn
=
tSalaryEmployeeService
.
saveNewSalaryEmployee
(
newEmp
);
if
(
Common
.
isNotNull
(
saveNewEmpReturn
))
{
error
=
"第"
+
(
i
+
2
)
+
"行:该员工新建失败:【"
+
saveNewEmpReturn
+
"】"
;
errorList
.
add
(
new
ErrorMessage
((
i
+
2
),
error
));
continue
;
continue
;
}
else
{
emp
=
eR
.
getData
();
}
}
emp
=
newEmp
;
}
else
{
}
else
{
if
(
"3"
.
equals
(
salaryType
)
||
"4"
.
equals
(
salaryType
))
{
if
(
"4"
.
equals
(
salaryType
))
{
error
=
"第"
+
(
i
+
2
)
+
"行:薪酬人员查询处中,该客户下无此员工,请添加<是否新员工>列,并录入身份证号、开户行总行、开户行省、开户行市、银行卡号、手机号码!"
;
error
=
"第"
+
(
i
+
2
)
+
"行:薪酬人员查询菜单无此员工,请添加<是否新员工(默认否)>列,并录入身份证号、开户行总行、开户行省、开户行市、银行卡号、手机号码!"
;
}
else
{
errorList
.
add
(
new
ErrorMessage
((
i
+
2
),
error
));
error
=
"第"
+
(
i
+
2
)
+
"行:薪酬人员查询处中,该客户下无此员工,请添加<是否新员工(默认否)>列,并录入身份证号、开户行总行、开户行省、开户行市、银行卡号、计税月份、手机号码!"
;
continue
;
}
else
if
(
notLabour
)
{
error
=
"第"
+
(
i
+
2
)
+
"行:薪酬人员查询菜单无此员工,请添加<是否新员工(默认否)>列,并录入身份证号、开户行总行、开户行省、开户行市、银行卡号、计税月份、手机号码!"
;
errorList
.
add
(
new
ErrorMessage
((
i
+
2
),
error
));
continue
;
}
}
errorList
.
add
(
new
ErrorMessage
((
i
+
2
),
error
));
continue
;
}
}
}
}
if
(
emp
!=
null
)
{
if
(
emp
!=
null
)
{
...
@@ -653,9 +546,9 @@ public class SalaryAccountUtil implements Serializable {
...
@@ -653,9 +546,9 @@ public class SalaryAccountUtil implements Serializable {
}
}
}
else
{
}
else
{
if
(
"3"
.
equals
(
salaryType
)
||
"4"
.
equals
(
salaryType
))
{
if
(
"3"
.
equals
(
salaryType
)
||
"4"
.
equals
(
salaryType
))
{
error
=
"第"
+
(
i
+
2
)
+
"行:薪酬人员查询
处中,该客户下
无此员工,请添加<是否新员工>列,并录入身份证号、开户行总行、开户行省、开户行市、银行卡号、手机号码!"
;
error
=
"第"
+
(
i
+
2
)
+
"行:薪酬人员查询
菜单
无此员工,请添加<是否新员工>列,并录入身份证号、开户行总行、开户行省、开户行市、银行卡号、手机号码!"
;
}
else
{
}
else
{
error
=
"第"
+
(
i
+
2
)
+
"行:薪酬人员查询
处中,该客户下
无此员工,请添加<是否新员工(默认否)>列,并录入身份证号、开户行总行、开户行省、开户行市、银行卡号、计税月份、手机号码!"
;
error
=
"第"
+
(
i
+
2
)
+
"行:薪酬人员查询
菜单
无此员工,请添加<是否新员工(默认否)>列,并录入身份证号、开户行总行、开户行省、开户行市、银行卡号、计税月份、手机号码!"
;
}
}
errorList
.
add
(
new
ErrorMessage
((
i
+
2
),
error
));
errorList
.
add
(
new
ErrorMessage
((
i
+
2
),
error
));
continue
;
continue
;
...
@@ -707,6 +600,163 @@ public class SalaryAccountUtil implements Serializable {
...
@@ -707,6 +600,163 @@ public class SalaryAccountUtil implements Serializable {
this
.
setErrorInfo
(
errorList
);
this
.
setErrorInfo
(
errorList
);
}
}
/**
* @Description: 处理表里人员相关数据
* @Author: hgw
* @Date: 2022/11/9 16:07
* @return: com.yifu.cloud.plus.v1.yifu.common.core.util.R<com.yifu.cloud.plus.v1.yifu.salary.entity.TSalaryEmployee>
**/
private
R
<
TSalaryEmployee
>
getNewEmp
(
TSalaryEmployee
newEmp
,
int
i
,
List
<
ErrorMessage
>
errorList
,
boolean
notLabour
,
TSalaryAccountVo
entity
,
String
salaryType
,
TSettleDomainSelectVo
dept
,
YifuUser
user
,
String
salaryStyle
,
boolean
salaryGiveTimeFlag
,
String
invoiceTitle
,
TSalaryAccountService
tSalaryAccountService
,
TSalaryEmployeeService
tSalaryEmployeeService
)
{
String
newEmpStr
=
"新员工"
;
if
(!
notLabour
)
{
newEmpStr
=
"劳务费"
;
}
String
error
;
String
nowMonth
=
DateUtil
.
addMonth
(
CommonConstants
.
ZERO_INT
);
//增加工资人员档案:(临时使用)
if
(
newEmp
!=
null
)
{
if
(
Common
.
isEmpty
(
newEmp
.
getEmpName
()))
{
error
=
"第"
+
(
i
+
2
)
+
"行:"
+
newEmpStr
+
"-姓名-不可为空!"
;
errorList
.
add
(
new
ErrorMessage
((
i
+
2
),
error
));
return
R
.
failed
();
}
if
(
Common
.
isEmpty
(
newEmp
.
getEmpIdcard
()))
{
error
=
"第"
+
(
i
+
2
)
+
"行:"
+
newEmpStr
+
"-身份证号-不可为空!"
;
errorList
.
add
(
new
ErrorMessage
((
i
+
2
),
error
));
return
R
.
failed
();
}
// 2021-8-31 hgw2.6.5新增手机号校验
if
(
Common
.
isEmpty
(
newEmp
.
getEmpPhone
()))
{
error
=
"第"
+
(
i
+
2
)
+
"行:"
+
newEmpStr
+
"-手机号码-不可为空!"
;
errorList
.
add
(
new
ErrorMessage
((
i
+
2
),
error
));
return
R
.
failed
();
}
else
if
(!
ValidityUtil
.
validateEmpPhone
(
newEmp
.
getEmpPhone
()))
{
error
=
"第"
+
(
i
+
2
)
+
"行:"
+
newEmpStr
+
"-手机号码格式错误:"
+
newEmp
.
getEmpPhone
();
errorList
.
add
(
new
ErrorMessage
((
i
+
2
),
error
));
return
R
.
failed
();
}
}
else
{
newEmp
=
new
TSalaryEmployee
();
}
if
(
entity
!=
null
)
{
if
(!
"3"
.
equals
(
salaryType
)
&&
!
"4"
.
equals
(
salaryType
))
{
if
(
Common
.
isEmpty
(
entity
.
getTaxMonth
()))
{
error
=
"第"
+
(
i
+
2
)
+
"行:"
+
newEmpStr
+
"-计税月份-不可为空!"
;
errorList
.
add
(
new
ErrorMessage
((
i
+
2
),
error
));
return
R
.
failed
();
}
else
if
(
entity
.
getTaxMonth
().
length
()
<
CommonConstants
.
dingleDigitIntArray
[
6
])
{
error
=
"第"
+
(
i
+
2
)
+
"行:"
+
newEmpStr
+
"-计税月份-长度小于6:"
+
entity
.
getTaxMonth
();
errorList
.
add
(
new
ErrorMessage
((
i
+
2
),
error
));
return
R
.
failed
();
}
else
if
(
DateUtil
.
compareYearMonth
(
entity
.
getTaxMonth
(),
nowMonth
))
{
error
=
"第"
+
(
i
+
2
)
+
"行:"
+
newEmpStr
+
"-计税月份-大于当前年月或错误,请调整:"
+
entity
.
getTaxMonth
();
errorList
.
add
(
new
ErrorMessage
((
i
+
2
),
error
));
return
R
.
failed
();
}
else
{
newEmp
.
setTaxMonth
(
entity
.
getTaxMonth
());
}
}
//工资发放方式(0现金/1银行)/2线下 && salaryGiveTime == true :立即发;false:暂停发:则不考虑开户行等
//银行+立即发,则考虑和开户行卡号
String
areaStr
;
if
(
SalaryConstants
.
SALARY_STYLE_BANK
.
equals
(
salaryStyle
)
&&
salaryGiveTimeFlag
)
{
if
(
Common
.
isEmpty
(
entity
.
getBankName
()))
{
error
=
"第"
+
(
i
+
2
)
+
"行:"
+
newEmpStr
+
"-开户行总行-不可为空!"
;
errorList
.
add
(
new
ErrorMessage
((
i
+
2
),
error
));
return
R
.
failed
();
}
else
{
newEmp
.
setBankName
(
entity
.
getBankName
());
}
if
(
Common
.
isEmpty
(
entity
.
getBankProvince
())
||
Common
.
isEmpty
(
entity
.
getBankCity
()))
{
error
=
"第"
+
(
i
+
2
)
+
"行:"
+
newEmpStr
+
"-开户行省、市-不可为空!"
;
errorList
.
add
(
new
ErrorMessage
((
i
+
2
),
error
));
return
R
.
failed
();
}
else
{
areaStr
=
ExcelUtil
.
getRedisAreaValue
(
CacheConstants
.
AREA_VALUE
+
entity
.
getBankProvince
().
trim
());
if
(
Common
.
isNotNull
(
areaStr
))
{
newEmp
.
setBankProvince
(
areaStr
);
}
else
{
error
=
"第"
+
(
i
+
2
)
+
"行:"
+
newEmpStr
+
"-开户行省错误:"
+
entity
.
getBankProvince
();
errorList
.
add
(
new
ErrorMessage
((
i
+
2
),
error
));
return
R
.
failed
();
}
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
+
2
)
+
"行:"
+
newEmpStr
+
"-开户行市错误:"
+
entity
.
getBankCity
();
errorList
.
add
(
new
ErrorMessage
((
i
+
2
),
error
));
return
R
.
failed
();
}
}
if
(
Common
.
isEmpty
(
entity
.
getBankNo
()))
{
error
=
"第"
+
(
i
+
2
)
+
"行:"
+
newEmpStr
+
"-银行卡号-不可为空!"
;
errorList
.
add
(
new
ErrorMessage
((
i
+
2
),
error
));
return
R
.
failed
();
}
else
{
newEmp
.
setBankNo
(
entity
.
getBankNo
());
}
if
(
Common
.
isNotNull
(
entity
.
getBankSubName
()))
{
newEmp
.
setBankSubName
(
entity
.
getBankSubName
());
}
}
else
{
if
(
Common
.
isNotNull
(
entity
.
getBankName
()))
{
newEmp
.
setBankName
(
entity
.
getBankName
());
}
if
(
Common
.
isNotNull
(
entity
.
getBankNo
()))
{
newEmp
.
setBankNo
(
entity
.
getBankNo
());
}
if
(
Common
.
isNotNull
(
entity
.
getBankSubName
()))
{
newEmp
.
setBankSubName
(
entity
.
getBankSubName
());
}
if
(
Common
.
isNotNull
(
entity
.
getBankProvince
()))
{
areaStr
=
ExcelUtil
.
getRedisAreaValue
(
CacheConstants
.
AREA_VALUE
+
entity
.
getBankProvince
().
trim
());
if
(
Common
.
isNotNull
(
areaStr
))
{
newEmp
.
setBankProvince
(
areaStr
);
}
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
);
}
}
}
}
}
newEmp
.
setFileStatus
(
CommonConstants
.
ZERO_STRING
);
//临时
newEmp
.
setDeptId
(
dept
.
getId
());
newEmp
.
setDeptName
(
dept
.
getDepartName
());
newEmp
.
setDeptNo
(
dept
.
getDepartNo
());
newEmp
.
setUnitId
(
dept
.
getCustomerId
());
newEmp
.
setUnitName
(
dept
.
getCustomerName
());
newEmp
.
setUnitNo
(
dept
.
getCustomerCode
());
newEmp
.
setCreateBy
(
String
.
valueOf
(
user
.
getId
()));
newEmp
.
setCreateName
(
user
.
getNickname
());
newEmp
.
setInvoiceTitle
(
invoiceTitle
);
if
(!
"3"
.
equals
(
salaryType
)
&&
!
"4"
.
equals
(
salaryType
))
{
int
nowYear
=
Integer
.
parseInt
(
nowMonth
.
substring
(
0
,
4
));
String
minTaxMonth
=
tSalaryAccountService
.
getMinTaxMonthByNowYear
(
newEmp
.
getEmpIdcard
(),
nowYear
);
if
(
Common
.
isNotNull
(
minTaxMonth
)
&&
!
minTaxMonth
.
equals
(
entity
.
getTaxMonth
()))
{
error
=
"第"
+
(
i
+
2
)
+
"行:该员工已有发薪记录,计税月份请填写:【"
+
minTaxMonth
+
"】"
+
",你填写了计税月:【"
+
entity
.
getTaxMonth
()
+
"】"
;
errorList
.
add
(
new
ErrorMessage
((
i
+
2
),
error
));
return
R
.
failed
();
}
}
String
saveNewEmpReturn
=
tSalaryEmployeeService
.
saveNewSalaryEmployee
(
notLabour
,
newEmp
);
if
(
Common
.
isNotNull
(
saveNewEmpReturn
))
{
error
=
"第"
+
(
i
+
2
)
+
"行:该员工新建失败:【"
+
saveNewEmpReturn
+
"】"
;
errorList
.
add
(
new
ErrorMessage
((
i
+
2
),
error
));
return
R
.
failed
();
}
return
R
.
ok
(
newEmp
);
}
/**
/**
* 按类型统一返回String内容
* 按类型统一返回String内容
*
*
...
...
yifu-salary/yifu-salary-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/salary/util/SalaryCommonUtil.java
View file @
a3b20ed4
...
@@ -463,6 +463,12 @@ public class SalaryCommonUtil implements Serializable {
...
@@ -463,6 +463,12 @@ public class SalaryCommonUtil implements Serializable {
field
.
set
(
entity
,
"0"
);
field
.
set
(
entity
,
"0"
);
}
else
if
(
"单独"
.
equals
(
cellValueStr
))
{
}
else
if
(
"单独"
.
equals
(
cellValueStr
))
{
field
.
set
(
entity
,
"1"
);
field
.
set
(
entity
,
"1"
);
}
else
if
(
SalaryConstants
.
IS_COMPANY
.
equals
(
cellValueStr
))
{
field
.
set
(
entity
,
SalaryConstants
.
IS_PERSON_TAX_ARR
[
0
]);
}
else
if
(
SalaryConstants
.
IS_PERSON_OTHER
.
equals
(
cellValueStr
))
{
field
.
set
(
entity
,
SalaryConstants
.
IS_PERSON_TAX_ARR
[
1
]);
}
else
if
(
SalaryConstants
.
IS_PERSON
.
equals
(
cellValueStr
))
{
field
.
set
(
entity
,
SalaryConstants
.
IS_PERSON_TAX_ARR
[
2
]);
}
else
{
}
else
{
field
.
set
(
entity
,
cellValueStr
);
field
.
set
(
entity
,
cellValueStr
);
}
}
...
...
yifu-salary/yifu-salary-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/salary/util/SalaryConstants.java
View file @
a3b20ed4
...
@@ -21,7 +21,7 @@ public class SalaryConstants {
...
@@ -21,7 +21,7 @@ public class SalaryConstants {
* @Date: 2019/10/10 14:55
* @Date: 2019/10/10 14:55
* @return:
* @return:
**/
**/
public
static
final
Integer
[]
AUDIT_STATUS
=
{
0
,
1
,
2
,
3
,
4
,
5
,
6
,
7
,
8
,
9
};
public
static
final
Integer
[]
AUDIT_STATUS
=
{
0
,
1
,
2
,
3
,
4
,
5
,
6
,
7
,
8
,
9
,
10
};
public
static
final
int
[]
STATUS
=
{
0
,
1
,
2
,
3
,
4
,
5
,
6
,
7
,
8
,
9
,
10
};
public
static
final
int
[]
STATUS
=
{
0
,
1
,
2
,
3
,
4
,
5
,
6
,
7
,
8
,
9
,
10
};
public
static
final
String
[]
AUDIT_STATUS_STRING
=
{
"待提交"
,
"待审核"
,
"-"
,
"待发放"
,
"已发放"
,
"审核不通过"
,
"确认不通过"
,
"财务退回"
,
"结算单调整待审核"
,
"结算单调整待打印"
};
public
static
final
String
[]
AUDIT_STATUS_STRING
=
{
"待提交"
,
"待审核"
,
"-"
,
"待发放"
,
"已发放"
,
"审核不通过"
,
"确认不通过"
,
"财务退回"
,
"结算单调整待审核"
,
"结算单调整待打印"
};
...
@@ -101,7 +101,7 @@ public class SalaryConstants {
...
@@ -101,7 +101,7 @@ public class SalaryConstants {
// 年终奖扣税方式:单独
// 年终奖扣税方式:单独
public
static
final
String
ANNUAL_BONUS_ALONE
=
"单独"
;
public
static
final
String
ANNUAL_BONUS_ALONE
=
"单独"
;
public
static
final
String
ANNUAL_BONUS_MERGE
=
"合并"
;
public
static
final
String
ANNUAL_BONUS_MERGE
=
"合并"
;
// 年终奖扣税方式的值:0合并/1单独
// 年终奖扣税方式的值:0合并/1单独
public
static
final
String
[]
ANNUAL_BONUS_TAX_TYPE_VALUE
=
{
"0"
,
"1"
};
public
static
final
String
[]
ANNUAL_BONUS_TAX_TYPE_VALUE
=
{
"0"
,
"1"
};
public
static
final
String
PRE_CURRENT_SUPPLY
=
"前次个人待补足"
;
public
static
final
String
PRE_CURRENT_SUPPLY
=
"前次个人待补足"
;
...
@@ -142,8 +142,17 @@ public class SalaryConstants {
...
@@ -142,8 +142,17 @@ public class SalaryConstants {
public
static
final
String
ACTUAL_SALARY_SUM
=
"个人实发合计"
;
public
static
final
String
ACTUAL_SALARY_SUM
=
"个人实发合计"
;
//个人实发合计
//个人实发合计
public
static
final
String
ACTUAL_SALARY_SUM_JAVA
=
"actualSalarySum"
;
public
static
final
String
ACTUAL_SALARY_SUM_JAVA
=
"actualSalarySum"
;
// 是否个人承担部分税费
//个人代扣
public
static
final
String
IS_PERSON_TAX
=
"isPersonTax"
;
// 是否个人承担部分税费数组
public
static
final
String
IS_PERSON_TAX_ARR
[]
=
{
"0"
,
"1"
,
"2"
};
// 公司承担全部税费0
public
static
final
String
IS_COMPANY
=
"公司承担全部税费"
;
// 个人承担部分税费1
public
static
final
String
IS_PERSON_OTHER
=
"个人承担部分税费"
;
// 个人承担全部税费2
public
static
final
String
IS_PERSON
=
"个人承担全部税费"
;
//个人代扣
public
static
final
String
PDEDUCTION_JAVA
=
"pdeduction"
;
public
static
final
String
PDEDUCTION_JAVA
=
"pdeduction"
;
//单位代扣
//单位代扣
public
static
final
String
UDEDUCTION_JAVA
=
"udeduction"
;
public
static
final
String
UDEDUCTION_JAVA
=
"udeduction"
;
...
@@ -168,9 +177,9 @@ public class SalaryConstants {
...
@@ -168,9 +177,9 @@ public class SalaryConstants {
public
static
final
String
CHECK_NO_RESPONSE
=
"校验服务器未返回,请联系管理员!"
;
public
static
final
String
CHECK_NO_RESPONSE
=
"校验服务器未返回,请联系管理员!"
;
public
static
final
String
LINE_EMP
=
"行:员工:"
;
public
static
final
String
LINE_EMP
=
"行:员工:"
;
public
static
final
String
IDCARD_DEPT_NO_MUST
=
"身份证、项目编码不可为空!"
;
public
static
final
String
DATA_MUST
=
"未获取到表格数据!"
;
public
static
final
String
ID_CARD_MUST
=
"身份证不可为空!"
;
public
static
final
String
NOT_HAVE_EMP
=
"根据身份证、项目编码未找到人员!"
;
public
static
final
String
NOT_HAVE_EMP
=
"根据身份证、项目编码未找到人员!"
;
public
static
final
String
TAX_MONTH_CUR
=
"计税月份已存在,不可更新,请清空计税月份单元格内容!"
;
public
static
final
String
PROVINCE_ERROR
=
"开户行省错误!"
;
public
static
final
String
PROVINCE_ERROR
=
"开户行省错误!"
;
public
static
final
String
CITY_ERROR
=
"开户行市错误!"
;
public
static
final
String
CITY_ERROR
=
"开户行市错误!"
;
public
static
final
String
CUR_TAX_INFO
=
"当前项目薪酬人员已维护计税月份,计税月份沿用系统原值,其他字段已更新!"
;
public
static
final
String
CUR_TAX_INFO
=
"当前项目薪酬人员已维护计税月份,计税月份沿用系统原值,其他字段已更新!"
;
...
...
yifu-salary/yifu-salary-biz/src/main/resources/mapper/TSalaryEmployeeMapper.xml
View file @
a3b20ed4
...
@@ -221,4 +221,13 @@
...
@@ -221,4 +221,13 @@
</foreach>
</foreach>
</if>
</if>
</select>
</select>
<!-- 按身份证查询人员 -->
<select
id=
"getByEmpIdCard"
resultMap=
"tSalaryEmployeeMap"
>
SELECT
<include
refid=
"Base_Column_List"
/>
FROM t_salary_employee a
where a.EMP_IDCARD = #{empIdCard}
ORDER BY a.BANK_CITY DESC LIMIT 1
</select>
</mapper>
</mapper>
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