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
9da756c3
You need to sign in or sign up before continuing.
Commit
9da756c3
authored
Aug 29, 2022
by
fangxinjiang
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
消息提醒优化
parent
d7fcaa90
Show whitespace changes
Inline
Side-by-side
Showing
8 changed files
with
21 additions
and
21 deletions
+21
-21
SysMessageSalaryController.java
...v1/yifu/salary/controller/SysMessageSalaryController.java
+1
-1
THaveSalaryNosocialController.java
...yifu/salary/controller/THaveSalaryNosocialController.java
+2
-2
SysMessageSalaryServiceImpl.java
...yifu/salary/service/impl/SysMessageSalaryServiceImpl.java
+2
-2
THaveSalaryNosocialServiceImpl.java
...u/salary/service/impl/THaveSalaryNosocialServiceImpl.java
+2
-2
TSalaryAccountServiceImpl.java
...1/yifu/salary/service/impl/TSalaryAccountServiceImpl.java
+2
-2
SysMessageSalaryMapper.xml
...-biz/src/main/resources/mapper/SysMessageSalaryMapper.xml
+8
-8
THaveSalaryNosocialMapper.xml
...z/src/main/resources/mapper/THaveSalaryNosocialMapper.xml
+3
-3
TSalaryAccountMapper.xml
...ry-biz/src/main/resources/mapper/TSalaryAccountMapper.xml
+1
-1
No files found.
yifu-salary/yifu-salary-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/salary/controller/SysMessageSalaryController.java
View file @
9da756c3
...
@@ -114,7 +114,7 @@ public class SysMessageSalaryController {
...
@@ -114,7 +114,7 @@ public class SysMessageSalaryController {
@Operation
(
description
=
"最低工资提醒导出"
)
@Operation
(
description
=
"最低工资提醒导出"
)
@PostMapping
(
"/export"
)
@PostMapping
(
"/export"
)
public
void
export
(
HttpServletResponse
response
,
public
void
export
(
HttpServletResponse
response
,
SysMessageSalarySearchVo
searchVo
)
{
@RequestBody
SysMessageSalarySearchVo
searchVo
)
{
sysMessageSalaryService
.
listExport
(
response
,
searchVo
);
sysMessageSalaryService
.
listExport
(
response
,
searchVo
);
}
}
...
...
yifu-salary/yifu-salary-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/salary/controller/THaveSalaryNosocialController.java
View file @
9da756c3
...
@@ -128,7 +128,7 @@ public class THaveSalaryNosocialController {
...
@@ -128,7 +128,7 @@ public class THaveSalaryNosocialController {
@Operation
(
description
=
"有工资无社保消息提醒导出"
)
@Operation
(
description
=
"有工资无社保消息提醒导出"
)
@PostMapping
(
"/export"
)
@PostMapping
(
"/export"
)
public
void
export
(
HttpServletResponse
response
,
public
void
export
(
HttpServletResponse
response
,
THaveSalaryNosocialSearchVo
searchVo
)
{
@RequestBody
THaveSalaryNosocialSearchVo
searchVo
)
{
tHaveSalaryNosocialService
.
listExport
(
response
,
searchVo
);
tHaveSalaryNosocialService
.
listExport
(
response
,
searchVo
);
}
}
...
@@ -159,7 +159,7 @@ public class THaveSalaryNosocialController {
...
@@ -159,7 +159,7 @@ public class THaveSalaryNosocialController {
@Inner
@Inner
@PostMapping
(
"/inner/generate"
)
@PostMapping
(
"/inner/generate"
)
public
void
generate
()
{
public
void
generate
()
{
String
settleMonth
=
DateUtil
.
addMonth
(
-
1
);
String
settleMonth
=
DateUtil
.
addMonth
(
0
);
tHaveSalaryNosocialService
.
generate
(
settleMonth
);
tHaveSalaryNosocialService
.
generate
(
settleMonth
);
}
}
...
...
yifu-salary/yifu-salary-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/salary/service/impl/SysMessageSalaryServiceImpl.java
View file @
9da756c3
...
@@ -150,12 +150,12 @@ public class SysMessageSalaryServiceImpl extends ServiceImpl<SysMessageSalaryMap
...
@@ -150,12 +150,12 @@ public class SysMessageSalaryServiceImpl extends ServiceImpl<SysMessageSalaryMap
**/
**/
@Override
@Override
public
void
listExport
(
HttpServletResponse
response
,
SysMessageSalarySearchVo
searchVo
)
{
public
void
listExport
(
HttpServletResponse
response
,
SysMessageSalarySearchVo
searchVo
)
{
String
fileName
=
"最低工资提醒
查询
批量导出"
+
DateUtil
.
getThisTime
()
+
".xlsx"
;
String
fileName
=
"最低工资提醒批量导出"
+
DateUtil
.
getThisTime
()
+
".xlsx"
;
//获取要导出的列表
//获取要导出的列表
List
<
SysMessageSalaryExportVo
>
list
=
new
ArrayList
<>();
List
<
SysMessageSalaryExportVo
>
list
=
new
ArrayList
<>();
// TODO
// TODO
List
<
String
>
settleDomainIds
=
null
;
List
<
String
>
settleDomainIds
=
null
;
List
<
String
>
ids
=
null
;
List
<
String
>
ids
=
Common
.
getList
(
searchVo
.
getIds
())
;
String
sql
=
null
;
String
sql
=
null
;
int
count
=
noPageCountDiy
(
searchVo
,
settleDomainIds
,
ids
,
sql
);
int
count
=
noPageCountDiy
(
searchVo
,
settleDomainIds
,
ids
,
sql
);
ServletOutputStream
out
=
null
;
ServletOutputStream
out
=
null
;
...
...
yifu-salary/yifu-salary-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/salary/service/impl/THaveSalaryNosocialServiceImpl.java
View file @
9da756c3
...
@@ -120,7 +120,7 @@ public class THaveSalaryNosocialServiceImpl extends ServiceImpl<THaveSalaryNosoc
...
@@ -120,7 +120,7 @@ public class THaveSalaryNosocialServiceImpl extends ServiceImpl<THaveSalaryNosoc
this
.
remove
(
Wrappers
.<
THaveSalaryNosocial
>
query
().
lambda
().
eq
(
THaveSalaryNosocial:
:
getSettleMonth
,
settleMonth
));
this
.
remove
(
Wrappers
.<
THaveSalaryNosocial
>
query
().
lambda
().
eq
(
THaveSalaryNosocial:
:
getSettleMonth
,
settleMonth
));
List
<
THaveSalaryNosocial
>
haveSalaryNosocialList
=
salaryAccountService
.
getLastMonthTHaveSalaryNosocial
(
settleMonth
);
List
<
THaveSalaryNosocial
>
haveSalaryNosocialList
=
salaryAccountService
.
getLastMonthTHaveSalaryNosocial
(
settleMonth
);
if
(!
Common
.
isNotEmpty
(
haveSalaryNosocialList
)){
if
(!
Common
.
isNotEmpty
(
haveSalaryNosocialList
)){
log
.
error
(
"获取
上月
有社保无工资数据为空"
);
log
.
error
(
"获取有社保无工资数据为空"
);
return
;
return
;
}
}
//去缴费库查询查询这些人社保是否存在
//去缴费库查询查询这些人社保是否存在
...
@@ -191,7 +191,7 @@ public class THaveSalaryNosocialServiceImpl extends ServiceImpl<THaveSalaryNosoc
...
@@ -191,7 +191,7 @@ public class THaveSalaryNosocialServiceImpl extends ServiceImpl<THaveSalaryNosoc
**/
**/
@Override
@Override
public
void
listExport
(
HttpServletResponse
response
,
THaveSalaryNosocialSearchVo
searchVo
)
{
public
void
listExport
(
HttpServletResponse
response
,
THaveSalaryNosocialSearchVo
searchVo
)
{
String
fileName
=
"有工资无社保
查询
批量导出"
+
DateUtil
.
getThisTime
()
+
".xlsx"
;
String
fileName
=
"有工资无社保批量导出"
+
DateUtil
.
getThisTime
()
+
".xlsx"
;
//获取要导出的列表
//获取要导出的列表
List
<
THaveSalaryNoSocialExportVo
>
list
=
new
ArrayList
<>();
List
<
THaveSalaryNoSocialExportVo
>
list
=
new
ArrayList
<>();
// TODO
// TODO
...
...
yifu-salary/yifu-salary-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/salary/service/impl/TSalaryAccountServiceImpl.java
View file @
9da756c3
...
@@ -192,8 +192,8 @@ public class TSalaryAccountServiceImpl extends ServiceImpl<TSalaryAccountMapper,
...
@@ -192,8 +192,8 @@ public class TSalaryAccountServiceImpl extends ServiceImpl<TSalaryAccountMapper,
@Override
@Override
public
List
<
THaveSalaryNosocial
>
getLastMonthTHaveSalaryNosocial
(
String
month
)
{
public
List
<
THaveSalaryNosocial
>
getLastMonthTHaveSalaryNosocial
(
String
month
)
{
return
baseMapper
.
getLastMonthTHaveSalaryNosocial
(
month
,
return
baseMapper
.
getLastMonthTHaveSalaryNosocial
(
month
,
DateUtil
.
getYearAndMonth
(
month
,
CommonConstants
.
ONE_INT
),
DateUtil
.
getYearAndMonth
(
month
,
-
CommonConstants
.
ONE_INT
),
DateUtil
.
getYearAndMonth
(
month
,
CommonConstants
.
TWO_INT
));
DateUtil
.
getYearAndMonth
(
month
,
-
CommonConstants
.
TWO_INT
));
}
}
@Override
@Override
...
...
yifu-salary/yifu-salary-biz/src/main/resources/mapper/SysMessageSalaryMapper.xml
View file @
9da756c3
...
@@ -178,9 +178,9 @@
...
@@ -178,9 +178,9 @@
province,
province,
city,
city,
town,
town,
DEPAR
T_ID,
DEP
T_ID,
DEPAR
T_NAME,
DEP
T_NAME,
DEPAR
T_NO,
DEP
T_NO,
0 as TYPE
0 as TYPE
FROM
FROM
(
(
...
@@ -189,10 +189,10 @@
...
@@ -189,10 +189,10 @@
a.EMP_ID employee_id,
a.EMP_ID employee_id,
a.EMP_IDCARD employee_idnum,
a.EMP_IDCARD employee_idnum,
a.EMP_NAME employee_name,
a.EMP_NAME employee_name,
s.DEPAR
T_ID,
s.DEP
T_ID,
s.DEPAR
T_NAME,
s.DEP
T_NAME,
s.DEPAR
T_NO,
s.DEP
T_NO,
a.SALARY_
DATE
salary_month,
a.SALARY_
MONTH
salary_month,
a.SETTLEMENT_MONTH settle_month,
a.SETTLEMENT_MONTH settle_month,
sum(i.SALARY_MONEY) AS actual_salary,
sum(i.SALARY_MONEY) AS actual_salary,
sum(l.SALARY_MONEY) AS relay_Salary,
sum(l.SALARY_MONEY) AS relay_Salary,
...
@@ -212,7 +212,7 @@
...
@@ -212,7 +212,7 @@
a.DELETE_FLAG = 0
a.DELETE_FLAG = 0
and s.SEND_MONTH = #{settleMonth}
and s.SEND_MONTH = #{settleMonth}
AND s.STATUS IN (3, 4)
AND s.STATUS IN (3, 4)
GROUP BY a.EMP_IDCARD,a.SALARY_
DATE
GROUP BY a.EMP_IDCARD,a.SALARY_
MONTH
) b
) b
WHERE b.salary_base > b.actual_salary
WHERE b.salary_base > b.actual_salary
</select>
</select>
...
...
yifu-salary/yifu-salary-biz/src/main/resources/mapper/THaveSalaryNosocialMapper.xml
View file @
9da756c3
...
@@ -11,7 +11,7 @@
...
@@ -11,7 +11,7 @@
<result
property=
"customerName"
column=
"CUSTOMER_NAME"
/>
<result
property=
"customerName"
column=
"CUSTOMER_NAME"
/>
<result
property=
"settlementOrganName"
column=
"SETTLEMENT_ORGAN_NAME"
/>
<result
property=
"settlementOrganName"
column=
"SETTLEMENT_ORGAN_NAME"
/>
<result
property=
"settlementOrganNo"
column=
"SETTLEMENT_ORGAN_NO"
/>
<result
property=
"settlementOrganNo"
column=
"SETTLEMENT_ORGAN_NO"
/>
<result
property=
"feedBack"
column=
"FEEDBACK"
/>
<result
property=
"feedBack"
column=
"FEED
_
BACK"
/>
<result
property=
"reasonType"
column=
"REASON_TYPE"
/>
<result
property=
"reasonType"
column=
"REASON_TYPE"
/>
<result
property=
"month"
column=
"month"
/>
<result
property=
"month"
column=
"month"
/>
</resultMap>
</resultMap>
...
@@ -23,7 +23,7 @@
...
@@ -23,7 +23,7 @@
<result
property=
"month"
column=
"month"
/>
<result
property=
"month"
column=
"month"
/>
<result
property=
"relaySalary"
column=
"RELAY_SALARY"
/>
<result
property=
"relaySalary"
column=
"RELAY_SALARY"
/>
<result
property=
"createName"
column=
"CREATE_NAME"
/>
<result
property=
"createName"
column=
"CREATE_NAME"
/>
<result
property=
"feedBack"
column=
"FEEDBACK"
/>
<result
property=
"feedBack"
column=
"FEED
_
BACK"
/>
</resultMap>
</resultMap>
<sql
id=
"Base_Column_List"
>
<sql
id=
"Base_Column_List"
>
...
@@ -39,7 +39,7 @@
...
@@ -39,7 +39,7 @@
a.month,
a.month,
a.SETTLE_MONTH,
a.SETTLE_MONTH,
a.relay_salary,
a.relay_salary,
a.FEEDBACK,
a.FEED
_
BACK,
a.CREATE_NAME,
a.CREATE_NAME,
a.REASON_TYPE
a.REASON_TYPE
</sql>
</sql>
...
...
yifu-salary/yifu-salary-biz/src/main/resources/mapper/TSalaryAccountMapper.xml
View file @
9da756c3
...
@@ -338,7 +338,7 @@
...
@@ -338,7 +338,7 @@
where
where
a.DELETE_FLAG = 0
a.DELETE_FLAG = 0
and
s
.send_month in ( #{month} , #{month2} , #{month3})
and
a
.send_month in ( #{month} , #{month2} , #{month3})
AND s.STATUS IN (3, 4)
AND s.STATUS IN (3, 4)
GROUP BY a.EMP_IDCARD, a.SALARY_MONTH limit 10
GROUP BY a.EMP_IDCARD, a.SALARY_MONTH limit 10
) a
) a
...
...
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