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
9dbdca76
Commit
9dbdca76
authored
Jun 01, 2023
by
fangxinjiang
Browse files
Options
Browse Files
Download
Plain Diff
Merge remote-tracking branch 'origin/MVP1.5.4' into MVP1.5.4
parents
2df0836b
6c94995c
Show whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
209 additions
and
234 deletions
+209
-234
TEmployeeContractInfoServiceImpl.java
...chives/service/impl/TEmployeeContractInfoServiceImpl.java
+0
-5
TMinSalaryServiceImpl.java
...us/v1/yifu/salary/service/impl/TMinSalaryServiceImpl.java
+118
-210
TPaymentInfoNewExportVo.java
...cloud/plus/v1/yifu/social/vo/TPaymentInfoNewExportVo.java
+19
-18
TPaymentInfoMapper.xml
...cial-biz/src/main/resources/mapper/TPaymentInfoMapper.xml
+72
-1
No files found.
yifu-archives/yifu-archives-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/archives/service/impl/TEmployeeContractInfoServiceImpl.java
View file @
9dbdca76
...
...
@@ -483,11 +483,6 @@ public class TEmployeeContractInfoServiceImpl extends ServiceImpl<TEmployeeContr
}
}
else
{
baseMapper
.
updateById
(
tEmployeeContractInfo
);
if
(
CommonConstants
.
TWO_STRING
.
equals
(
tEmployeeContractInfo
.
getContractType
())
||
CommonConstants
.
ZERO_STRING
.
equals
(
tEmployeeContractInfo
.
getContractType
()))
{
tEmployeeContractInfo
.
setContractEnd
(
null
);
baseMapper
.
updateContractEnd
(
tEmployeeContractInfo
);
}
}
// 不是待提交,记录审核记录
...
...
yifu-salary/yifu-salary-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/salary/service/impl/TMinSalaryServiceImpl.java
View file @
9dbdca76
...
...
@@ -163,7 +163,6 @@ public class TMinSalaryServiceImpl extends ServiceImpl<TMinSalaryMapper, TMinSal
data
.
setErrorFlag
(
true
);
errorMessage
.
append
(
"ID为空;"
);
}
else
{
TMinSalary
ll
=
baseMapper
.
selectById
(
data
.
getId
());
if
(
Common
.
isEmpty
(
baseMapper
.
selectById
(
data
.
getId
())))
{
data
.
setErrorFlag
(
true
);
errorMessage
.
append
(
"ID不存在无法更新,请核实后再操作!;"
);
...
...
@@ -171,10 +170,12 @@ public class TMinSalaryServiceImpl extends ServiceImpl<TMinSalaryMapper, TMinSal
if
(
Common
.
isEmpty
(
data
.
getLocation
())
&&
Common
.
isEmpty
(
data
.
getSalaryBase
())
&&
Common
.
isEmpty
(
data
.
getStatus
()))
{
data
.
setErrorFlag
(
true
);
errorMessage
.
append
(
"所在地、最低工资(元)、状态为空;"
);
}
if
(
data
.
getLocation
().
contains
(
"-"
))
{
data
.
setErrorFlag
(
true
);
errorMessage
.
append
(
"所在地格式与列表保持一致;"
);
}
else
{
if
(
null
!=
data
.
getLocation
())
{
if
(
data
.
getLocation
().
contains
(
"/"
))
{
String
location
[]
=
data
.
getLocation
().
split
(
"/"
);
if
(!
data
.
getLocation
().
isEmpty
())
{
if
(
location
.
length
==
1
)
{
...
...
@@ -198,7 +199,7 @@ public class TMinSalaryServiceImpl extends ServiceImpl<TMinSalaryMapper, TMinSal
data
.
setErrorFlag
(
true
);
errorMessage
.
append
(
"对应区域不存在;"
);
}
}
else
{
TMinSalary
entity
=
baseMapper
.
selectById
(
data
.
getId
());
if
(
Common
.
isNotNull
(
entity
))
{
LambdaQueryWrapper
<
TMinSalary
>
query
=
new
LambdaQueryWrapper
<>();
...
...
@@ -219,6 +220,7 @@ public class TMinSalaryServiceImpl extends ServiceImpl<TMinSalaryMapper, TMinSal
}
}
}
}
if
(
location
.
length
>
2
)
{
String
redisProvinceName
=
getRedisAreaValue
(
location
[
CommonConstants
.
ZERO_INT
]);
if
(
Common
.
isEmpty
(
redisProvinceName
))
{
...
...
@@ -236,11 +238,12 @@ public class TMinSalaryServiceImpl extends ServiceImpl<TMinSalaryMapper, TMinSal
data
.
setErrorFlag
(
true
);
errorMessage
.
append
(
"对应区域不存在;"
);
}
else
{
TMinSalary
entity
=
baseMapper
.
selectById
(
data
.
getId
());
if
(
Common
.
isNotNull
(
entity
))
{
LambdaQueryWrapper
<
TMinSalary
>
query
=
new
LambdaQueryWrapper
<>();
if
(
Common
.
isNotNull
(
redis
City
Name
))
{
query
.
eq
(
TMinSalary:
:
getProvince
,
redis
City
Name
);
if
(
Common
.
isNotNull
(
redis
Province
Name
))
{
query
.
eq
(
TMinSalary:
:
getProvince
,
redis
Province
Name
);
}
if
(
Common
.
isNotNull
(
redisCityName
))
{
query
.
eq
(
TMinSalary:
:
getCity
,
redisCityName
);
...
...
@@ -260,104 +263,6 @@ public class TMinSalaryServiceImpl extends ServiceImpl<TMinSalaryMapper, TMinSal
}
}
}
if
(
null
!=
data
.
getSalaryBase
())
{
if
(!
ValidityUtil
.
validateStandard
(
data
.
getSalaryBase
()))
{
data
.
setErrorFlag
(
true
);
errorMessage
.
append
(
"最低工资,请填写>0的两位小数;"
);
}
}
if
(!
data
.
getStatus
().
isEmpty
())
{
if
(!(
CommonConstants
.
START
.
equals
(
data
.
getStatus
())
||
CommonConstants
.
STOP
.
equals
(
data
.
getStatus
())))
{
data
.
setErrorFlag
(
true
);
errorMessage
.
append
(
"填写的状态不是启用或停用"
);
}
}
}
if
(
data
.
getLocation
().
contains
(
"-"
))
{
String
location
[]
=
data
.
getLocation
().
split
(
"-"
);
if
(!
data
.
getLocation
().
isEmpty
())
{
if
(
location
.
length
==
1
)
{
data
.
setErrorFlag
(
true
);
errorMessage
.
append
(
"所在地”请精确到市或县/区;"
);
}
String
redisProvinceName
=
getRedisAreaValue
(
location
[
CommonConstants
.
ZERO_INT
]);
if
(
Common
.
isEmpty
(
redisProvinceName
))
{
data
.
setErrorFlag
(
true
);
errorMessage
.
append
(
"对应区域不存在;"
);
}
}
if
(
location
.
length
==
2
)
{
String
redisProvinceName
=
getRedisAreaValue
(
location
[
CommonConstants
.
ZERO_INT
]);
if
(
Common
.
isEmpty
(
redisProvinceName
))
{
data
.
setErrorFlag
(
true
);
errorMessage
.
append
(
"对应区域不存在;"
);
}
String
redisCityName
=
getRedisAreaValue
(
location
[
CommonConstants
.
ONE_INT
]
+
"_"
+
location
[
CommonConstants
.
ZERO_INT
]);
if
(
Common
.
isEmpty
(
redisCityName
))
{
data
.
setErrorFlag
(
true
);
errorMessage
.
append
(
"对应区域不存在;"
);
}
TMinSalary
entity
=
baseMapper
.
selectById
(
data
.
getId
());
if
(
Common
.
isNotNull
(
entity
))
{
LambdaQueryWrapper
<
TMinSalary
>
query
=
new
LambdaQueryWrapper
<>();
if
(
Common
.
isNotNull
(
redisProvinceName
))
{
query
.
eq
(
TMinSalary:
:
getProvince
,
redisProvinceName
);
}
if
(
Common
.
isNotNull
(
redisCityName
))
{
query
.
eq
(
TMinSalary:
:
getCity
,
redisCityName
);
}
query
.
ne
(
TMinSalary:
:
getId
,
data
.
getId
());
long
res
=
baseMapper
.
selectCount
(
query
);
if
(
res
>
CommonConstants
.
ZERO_INT
)
{
data
.
setErrorFlag
(
true
);
errorMessage
.
append
(
"已存在对应区域在用的配置信息;"
);
}
}
}
if
(
location
.
length
>
2
)
{
String
redisProvinceName
=
getRedisAreaValue
(
location
[
CommonConstants
.
ZERO_INT
]);
if
(
Common
.
isEmpty
(
redisProvinceName
))
{
data
.
setErrorFlag
(
true
);
errorMessage
.
append
(
"对应区域不存在;"
);
}
String
redisCityName
=
getRedisAreaValue
(
location
[
CommonConstants
.
ONE_INT
]
+
"_"
+
location
[
CommonConstants
.
ZERO_INT
]);
if
(
Common
.
isEmpty
(
redisCityName
))
{
data
.
setErrorFlag
(
true
);
errorMessage
.
append
(
"对应区域不存在;"
);
}
String
redisTownName
=
getRedisAreaValue
(
location
[
CommonConstants
.
TWO_INT
]
+
"_"
+
location
[
CommonConstants
.
ONE_INT
]);
if
(
Common
.
isEmpty
(
redisTownName
))
{
data
.
setErrorFlag
(
true
);
errorMessage
.
append
(
"对应区域不存在;"
);
}
TMinSalary
entity
=
baseMapper
.
selectById
(
data
.
getId
());
if
(
Common
.
isNotNull
(
entity
))
{
LambdaQueryWrapper
<
TMinSalary
>
query
=
new
LambdaQueryWrapper
<>();
if
(
Common
.
isNotNull
(
redisCityName
))
{
query
.
eq
(
TMinSalary:
:
getProvince
,
redisCityName
);
}
if
(
Common
.
isNotNull
(
redisCityName
))
{
query
.
eq
(
TMinSalary:
:
getCity
,
redisCityName
);
}
if
(
Common
.
isNotNull
(
redisTownName
))
{
query
.
eq
(
TMinSalary:
:
getTown
,
redisTownName
);
}
if
(
Common
.
isEmpty
(
location
[
2
]))
{
query
.
isNull
(
TMinSalary:
:
getTown
);
}
query
.
ne
(
TMinSalary:
:
getId
,
data
.
getId
());
long
res
=
baseMapper
.
selectCount
(
query
);
if
(
res
>
CommonConstants
.
ZERO_INT
)
{
data
.
setErrorFlag
(
true
);
errorMessage
.
append
(
"已存在对应区域在用的配置信息;"
);
}
}
}
...
...
@@ -374,23 +279,23 @@ public class TMinSalaryServiceImpl extends ServiceImpl<TMinSalaryMapper, TMinSal
}
}
}
}
}
}
if
(
data
.
isErrorFlag
())
{
if
(
data
.
isErrorFlag
())
{
data
.
setErrorMessage
(
errorMessage
.
toString
());
}
tMinSalaryImportVoList
.
add
(
data
);
}
@Override
public
void
doAfterAllAnalysed
(
AnalysisContext
context
)
{
public
void
doAfterAllAnalysed
(
AnalysisContext
context
)
{
saveData
();
}
private
void
saveData
()
{
private
void
saveData
()
{
List
<
TMinSalaryImportVo
>
salaryImportsSuccessList
=
tMinSalaryImportVoList
.
stream
().
filter
(
e
->
e
.
isErrorFlag
()
!=
true
).
collect
(
Collectors
.
toList
());
if
(
CollectionUtils
.
isNotEmpty
(
salaryImportsSuccessList
))
{
...
...
@@ -398,10 +303,10 @@ public class TMinSalaryServiceImpl extends ServiceImpl<TMinSalaryMapper, TMinSal
salaryImportsSuccessList
.
stream
().
forEach
(
e
->
{
TMinSalary
selectOne
=
new
TMinSalary
();
selectOne
.
setId
(
e
.
getId
());
if
(
null
!=
e
.
getLocation
())
{
if
(
null
!=
e
.
getLocation
())
{
if
(
e
.
getLocation
().
contains
(
"/"
))
{
String
location
[]
=
e
.
getLocation
().
split
(
"/"
);
if
(
location
.
length
>
1
)
{
if
(
location
.
length
>
1
)
{
for
(
int
i
=
0
;
i
<
location
.
length
;
i
++)
{
if
(
i
==
CommonConstants
.
ZERO_INT
)
{
int
province
=
baseMapper
.
selectByAreaName
(
location
[
i
]);
...
...
@@ -454,7 +359,10 @@ public class TMinSalaryServiceImpl extends ServiceImpl<TMinSalaryMapper, TMinSal
}
}).
sheet
().
doRead
();
}
catch
(
Exception
e
)
{
}
catch
(
Exception
e
)
{
log
.
error
(
CommonConstants
.
IMPORT_DATA_ANALYSIS_ERROR
,
e
);
return
R
.
failed
(
CommonConstants
.
IMPORT_DATA_ANALYSIS_ERROR
);
}
...
...
@@ -463,7 +371,7 @@ public class TMinSalaryServiceImpl extends ServiceImpl<TMinSalaryMapper, TMinSal
List
<
TMinSalaryImportVo
>
errorImportErrorList
=
tMinSalaryImportVoList
.
stream
().
filter
(
e
->
e
.
isErrorFlag
()
==
true
).
collect
(
Collectors
.
toList
());
return
R
.
ok
(
errorImportErrorList
);
}
}
private
String
getRedisAreaValue
(
String
areaString
)
{
...
...
yifu-social/yifu-social-api/src/main/java/com/yifu/cloud/plus/v1/yifu/social/vo/TPaymentInfoNewExportVo.java
View file @
9dbdca76
...
...
@@ -71,13 +71,13 @@ public class TPaymentInfoNewExportVo extends RowIndex implements Serializable {
private
String
settleDomainName
;
/**
*
社保缴纳地
*
生成月份
*/
@ExcelAttribute
(
name
=
"
社保缴纳地"
)
@Schema
(
description
=
"
社保缴纳地
"
)
@ExcelAttribute
(
name
=
"
生成月份"
)
@Schema
(
description
=
"
生成月份
"
)
@HeadFontStyle
(
fontHeightInPoints
=
11
)
@ExcelProperty
(
"
社保缴纳地
"
)
private
String
social
PayAddr
;
@ExcelProperty
(
"
生成月份
"
)
private
String
social
CreateMonth
;
/**
* 缴纳月份
...
...
@@ -89,13 +89,22 @@ public class TPaymentInfoNewExportVo extends RowIndex implements Serializable {
private
String
socialPayMonth
;
/**
*
生成月份
*
社保户
*/
@ExcelAttribute
(
name
=
"
生成月份"
)
@Schema
(
description
=
"
生成月份
"
)
@ExcelAttribute
(
name
=
"
社保户"
)
@Schema
(
description
=
"
社保户
"
)
@HeadFontStyle
(
fontHeightInPoints
=
11
)
@ExcelProperty
(
"生成月份"
)
private
String
socialCreateMonth
;
@ExcelProperty
(
"社保户"
)
private
String
socialHousehold
;
/**
* 社保缴纳地
*/
@ExcelAttribute
(
name
=
"社保缴纳地"
)
@Schema
(
description
=
"社保缴纳地"
)
@HeadFontStyle
(
fontHeightInPoints
=
11
)
@ExcelProperty
(
"社保缴纳地"
)
private
String
socialPayAddr
;
/**
* 养老金额
...
...
@@ -147,14 +156,6 @@ public class TPaymentInfoNewExportVo extends RowIndex implements Serializable {
@ExcelProperty
(
"补缴利息"
)
private
BigDecimal
accrualSum
;
/**
* 社保户
*/
@ExcelAttribute
(
name
=
"社保户"
)
@Schema
(
description
=
"社保户"
)
@HeadFontStyle
(
fontHeightInPoints
=
11
)
@ExcelProperty
(
"社保户"
)
private
String
socialHousehold
;
/**
* 社保合计
...
...
yifu-social/yifu-social-biz/src/main/resources/mapper/TPaymentInfoMapper.xml
View file @
9dbdca76
...
...
@@ -830,6 +830,25 @@
</if>
</sql>
<sql
id=
"tPaymentInfo_export_socialFund_where1"
>
<if
test=
"tPaymentInfo != null"
>
<if
test=
"tPaymentInfo.idList == null"
>
<if
test=
"tPaymentInfo.socialHousehold != null and tPaymentInfo.socialHousehold.trim() != ''"
>
AND k.SOCIAL_HOUSEHOLD = #{tPaymentInfo.socialHousehold}
</if>
<if
test=
"tPaymentInfo.providentHousehold != null and tPaymentInfo.providentHousehold.trim() != ''"
>
AND k.PROVIDENT_HOUSEHOLD = #{tPaymentInfo.providentHousehold}
</if>
<if
test=
"tPaymentInfo.socialCreateMonth != null and tPaymentInfo.socialCreateMonth.trim() != ''"
>
AND k.SOCIAL_CREATE_MONTH = #{tPaymentInfo.socialCreateMonth}
</if>
<if
test=
"tPaymentInfo.socialPayMonth != null and tPaymentInfo.socialPayMonth.trim() != ''"
>
AND k.SOCIAL_PAY_MONTH = #{tPaymentInfo.socialPayMonth}
</if>
</if>
</if>
</sql>
<sql
id=
"tPaymentInfo_export_fund_where"
>
<if
test=
"tPaymentInfo != null"
>
<if
test=
"tPaymentInfo.idList == null"
>
...
...
@@ -1182,6 +1201,54 @@
<!--tPaymentInfo简单分页查询-->
<select
id=
"getTPaymentInfoNewPageInfo"
resultMap=
"tPaymentInfoNewMap"
>
SELECT
k.EMP_IDCARD,
k.EMP_NAME,
k.UNIT_NAME,
k.SETTLE_DOMAIN_NAME,
k.SOCIAL_HOUSEHOLD,
k.SOCIAL_SECURITY_NO,
k.SOCIAL_PAY_ADDR,
k.SOCIAL_PAY_MONTH,
k.SOCIAL_CREATE_MONTH,
k.PERSONAL_PROVIDENT_SUM,
k.SUM_ALL,
k.PROVIDENT_HOUSEHOLD,
k.PROVIDENT_PAY_ADDR,
k.SOCIAL_SUM,
k.UNIT_SOCIAL_SUM,
k.SOCIAL_SECURITY_PERSONAL_SUM,
k.PROVIDENT_SUM,
k.COMPANY_ACCRUAL,
k.PERSONAL_ACCRUAL,
k.UNIT_PENSION_SET,
k.UNIT_MEDICAL_SET,
k.UNIT_UNEMPLOYMENT_SET,
k.UNIT_INJURY_SET,
k.UNIT_BIRTH_SET,
k.UNIT_PENSION_MONEY,
k.UNIT_MEDICAL_MONEY,
k.UNIT_UNEMPLOYMENT_MONEY,
k.UNIT_INJURY_MONEY,
k.UNIT_BIRTH_MONEY,
k.UNIT_BIGMAILMENT_MONEY,
k.PERSONAL_PENSION_MONEY,
k.PERSONAL_MEDICAL_MONEY,
k.PERSONAL_UNEMPLOYMENT_MONEY,
k.PERSONAL_BIGMAILMENT_MONEY,
k.PENSION_MONEY_SUM,
k.MEDICAL_MONEY_SUM,
k.UNEMPLOYMENT_MONEY_SUM,
k.BIGMAILMENT_MONEY_SUM,
k.ACCRUAL_SUM,
k.PROVIDENT_NO,
k.PERSONAL_PROIDENT_SET,
k.UNIT_PROVIDENT_SET,
k.PROVIDENT_PERCENT,
k.SOCIAL_FUND_PERSONAL_SUM,
k.UNIT_SOCIAL_FUND_SUM,
k.UNIT_PROVIDENT_SUM
from (
select
w.keyGroup,
w.EMP_IDCARD,
w.EMP_NAME,
...
...
@@ -1338,7 +1405,11 @@
GROUP BY a.EMP_IDCARD,a.PROVIDENT_PAY_MONTH,a.PROVIDENT_CREATE_MONTH,a.SETTLE_DOMAIN_CODE
)
) w
GROUP BY w.keyGroup
GROUP BY w.keyGroup) k
<where>
1 = 1
<include
refid=
"tPaymentInfo_export_socialFund_where1"
/>
</where>
</select>
<!--tPaymentInfo数量查询-->
...
...
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