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
6b763454
You need to sign in or sign up before continuing.
Commit
6b763454
authored
Aug 30, 2022
by
fangxinjiang
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
有工资无社保消息优化
parent
a3282b83
Hide whitespace changes
Inline
Side-by-side
Showing
6 changed files
with
27 additions
and
13 deletions
+27
-13
THaveSalaryNosocial.java
...cloud/plus/v1/yifu/salary/entity/THaveSalaryNosocial.java
+5
-5
THaveSalaryNosocialServiceImpl.java
...u/salary/service/impl/THaveSalaryNosocialServiceImpl.java
+13
-2
SysMessageSalaryMapper.xml
...-biz/src/main/resources/mapper/SysMessageSalaryMapper.xml
+1
-0
THaveSalaryNosocialMapper.xml
...z/src/main/resources/mapper/THaveSalaryNosocialMapper.xml
+4
-4
TSalaryAccountMapper.xml
...ry-biz/src/main/resources/mapper/TSalaryAccountMapper.xml
+3
-1
UserController.java
...u.cloud.plus.v1/yifu/admin/controller/UserController.java
+1
-1
No files found.
yifu-salary/yifu-salary-api/src/main/java/com/yifu/cloud/plus/v1/yifu/salary/entity/THaveSalaryNosocial.java
View file @
6b763454
...
...
@@ -111,12 +111,12 @@ public class THaveSalaryNosocial extends BaseEntity {
private
String
settlementOrganNo
;
/**
*
结算月
*
生成月--- 生成数据的月份 删除用
*/
@Length
(
max
=
10
,
message
=
"
结算
月不能超过10个字符"
)
@ExcelAttribute
(
name
=
"
结算
月"
,
maxLength
=
10
,
needExport
=
true
)
@Schema
(
description
=
"
结算月"
,
name
=
"settl
eMonth"
)
private
String
settl
eMonth
;
@Length
(
max
=
10
,
message
=
"
生成
月不能超过10个字符"
)
@ExcelAttribute
(
name
=
"
生成
月"
,
maxLength
=
10
,
needExport
=
true
)
@Schema
(
description
=
"
生成月"
,
name
=
"creat
eMonth"
)
private
String
creat
eMonth
;
/**
...
...
yifu-salary/yifu-salary-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/salary/service/impl/THaveSalaryNosocialServiceImpl.java
View file @
6b763454
...
...
@@ -117,7 +117,7 @@ public class THaveSalaryNosocialServiceImpl extends ServiceImpl<THaveSalaryNosoc
@Override
public
void
generate
(
String
salaryMonth
)
{
//重新跑上月数据
this
.
remove
(
Wrappers
.<
THaveSalaryNosocial
>
query
().
lambda
().
eq
(
THaveSalaryNosocial:
:
getMonth
,
salaryMonth
));
this
.
remove
(
Wrappers
.<
THaveSalaryNosocial
>
query
().
lambda
().
eq
(
THaveSalaryNosocial:
:
get
Create
Month
,
salaryMonth
));
List
<
THaveSalaryNosocial
>
haveSalaryNosocialList
=
salaryAccountService
.
getLastMonthTHaveSalaryNosocial
(
salaryMonth
);
if
(!
Common
.
isNotEmpty
(
haveSalaryNosocialList
)){
log
.
error
(
"获取有社保无工资数据为空"
);
...
...
@@ -126,7 +126,13 @@ public class THaveSalaryNosocialServiceImpl extends ServiceImpl<THaveSalaryNosoc
//去缴费库查询查询这些人社保是否存在
Map
<
String
,
TPaymentInfo
>
empPaymentInfoMap
=
Maps
.
newHashMap
();
R
<
HaveSalaryNoSocialVo
>
noSocialVoR
=
socialDaprUtils
.
getPaymentinfoListByEmpdIdCard
(
Common
.
listObjectToStrList
(
haveSalaryNosocialList
,
"employeeIdCard"
),
salaryMonth
);
if
(
Common
.
isNotNull
(
noSocialVoR
)&&
Common
.
isNotNull
(
noSocialVoR
.
getData
()))
{
if
(
Common
.
isEmpty
(
noSocialVoR
)
||
noSocialVoR
.
getCode
()
==
CommonConstants
.
FAIL
){
log
.
error
(
"获取社保公积金信息失败"
);
return
;
}
if
(
Common
.
isNotNull
(
noSocialVoR
)
&&
Common
.
isNotNull
(
noSocialVoR
.
getData
())
&&
Common
.
isNotNull
(
noSocialVoR
.
getData
().
getPaymentInfos
()))
{
for
(
TPaymentInfo
paymentInfo
:
noSocialVoR
.
getData
().
getPaymentInfos
())
{
empPaymentInfoMap
.
put
(
paymentInfo
.
getEmpIdcard
(),
paymentInfo
);
}
...
...
@@ -134,6 +140,10 @@ public class THaveSalaryNosocialServiceImpl extends ServiceImpl<THaveSalaryNosoc
//结算主体
R
<
TSettleDomainListVo
>
domainListVoR
=
archivesDaprUtil
.
selectAllSettleDomainSelectVos
();
HashMap
<
String
,
TSettleDomainSelectVo
>
settleDomainSelectVoMap
=
Maps
.
newHashMap
();
if
(
Common
.
isEmpty
(
domainListVoR
)
||
domainListVoR
.
getCode
()
==
CommonConstants
.
FAIL
){
log
.
error
(
"获取项目信息失败"
);
return
;
}
if
(
Common
.
isNotNull
(
domainListVoR
)
&&
Common
.
isNotNull
(
domainListVoR
.
getData
())
&&
Common
.
isNotNull
(
domainListVoR
.
getData
().
getListSelectVO
()))
...
...
@@ -163,6 +173,7 @@ public class THaveSalaryNosocialServiceImpl extends ServiceImpl<THaveSalaryNosoc
haveSalaryNosocial
.
setCreateBy
(
allUserDTOMap
.
get
(
haveSalaryNosocial
.
getCreateBy
()));
}
haveSalaryNosocial
.
setCreateTime
(
LocalDateTime
.
now
());
haveSalaryNosocial
.
setCreateMonth
(
salaryMonth
);
this
.
save
(
haveSalaryNosocial
);
}
...
...
yifu-salary/yifu-salary-biz/src/main/resources/mapper/SysMessageSalaryMapper.xml
View file @
6b763454
...
...
@@ -209,6 +209,7 @@
LEFT JOIN t_salary_account_item i ON i.SALARY_ACCOUNT_ID = a.id and i.JAVA_FIED_NAME = 'actualSalarySum'
LEFT JOIN t_salary_account_item l ON l.SALARY_ACCOUNT_ID = a.id and l.JAVA_FIED_NAME = 'relaySalary'
WHERE
(t.`STATUS`=1 or t.id is null) and (c.`STATUS`=1 or c.id is null) and
a.DELETE_FLAG = 0
and a.FORM_TYPE='0'
and a.SALARY_MONTH = #{settleMonth}
...
...
yifu-salary/yifu-salary-biz/src/main/resources/mapper/THaveSalaryNosocialMapper.xml
View file @
6b763454
...
...
@@ -37,7 +37,7 @@
a.SETTLEMENT_ORGAN_NAME,
a.SETTLEMENT_ORGAN_NO,
a.month,
a.
SETTL
E_MONTH,
a.
CREAT
E_MONTH,
a.relay_salary,
a.FEED_BACK,
a.CREATE_NAME,
...
...
@@ -75,8 +75,8 @@
<if
test=
"tHaveSalaryNosocial.month != null"
>
AND a.month = #{tHaveSalaryNosocial.month}
</if>
<if
test=
"tHaveSalaryNosocial.
settl
eMonth != null"
>
AND a.
SETTLE_MONTH = #{tHaveSalaryNosocial.settl
eMonth}
<if
test=
"tHaveSalaryNosocial.
creat
eMonth != null"
>
AND a.
CREATE_MONTH = #{tHaveSalaryNosocial.creat
eMonth}
</if>
<if
test=
"tHaveSalaryNosocial.createName != null"
>
AND a.CREATE_NAME = #{tHaveSalaryNosocial.createName}
...
...
@@ -205,7 +205,7 @@
,b.*
FROM t_have_salary_nosocial a
left join t_feed_back b on a.ID=b.RELATE_ID
where a.
SETTL
E_MONTH in(#{lastOneMonth},#{lastTwoMonth},#{lastThreeMonth}) and b.REASON_TYPE is not null
where a.
CREAT
E_MONTH in(#{lastOneMonth},#{lastTwoMonth},#{lastThreeMonth}) and b.REASON_TYPE is not null
</select>
<select
id=
"noPageDiy"
resultMap=
"haveSalaryNoSocialExportMap"
>
...
...
yifu-salary/yifu-salary-biz/src/main/resources/mapper/TSalaryAccountMapper.xml
View file @
6b763454
...
...
@@ -387,7 +387,7 @@
, a.EMP_IDCARD employee_id_card
, a.EMP_NAME employee_name
, GROUP_CONCAT(a.relaySalary) relay_salary
, a.CREATE_BY CREATE_
USER_ID
, a.CREATE_BY CREATE_
BY
, GROUP_CONCAT(a.SALARY_MONTH) month
, a.EMP_NAME employee_name
, a.EMP_IDCARD employee_id_card
...
...
@@ -395,6 +395,7 @@
, a.DEPT_NAME SETTLEMENT_ORGAN_NAME
, a.DEPT_NO SETTLEMENT_ORGAN_NO
, a.SETTLEMENT_MONTH SETTLE_MONTH
,a.CREATE_NAME,a.CREATE_TIME
from (
select a.id
, s.DEPT_ID
...
...
@@ -411,6 +412,7 @@
, sum(if(item.JAVA_FIED_NAME in
('unitSocial', 'personalSocial', 'withholidingUnitSocial', 'withholidingPersonSocial'),
item.SALARY_MONEY, 0)) social
,a.CREATE_NAME,a.CREATE_TIME
from mvp_salary.t_salary_account a
left join mvp_salary.t_salary_account_item item on item.SALARY_ACCOUNT_ID = a.id
LEFT JOIN mvp_salary.t_salary_standard s on a.SALARY_FORM_ID = s.id
...
...
yifu-upms/yifu-upms-biz/src/main/java/com/yifu.cloud.plus.v1/yifu/admin/controller/UserController.java
View file @
6b763454
...
...
@@ -282,7 +282,7 @@ public class UserController {
* @return
**/
@Inner
@
Ge
tMapping
(
value
=
{
"/inner/getAllUserName"
})
@
Pos
tMapping
(
value
=
{
"/inner/getAllUserName"
})
public
AllUserNaVo
getAllUserDTO
()
{
AllUserNaVo
naVo
=
new
AllUserNaVo
();
List
<
SysUser
>
sysUsers
=
userService
.
list
(
Wrappers
.<
SysUser
>
query
().
lambda
());
...
...
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