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
6bf81332
Commit
6bf81332
authored
Aug 15, 2022
by
huyuchen
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
薪资审核页面接口修改
parent
8765e70f
Show whitespace changes
Inline
Side-by-side
Showing
14 changed files
with
119 additions
and
25 deletions
+119
-25
TStatisticsDeclarer.java
...cloud/plus/v1/yifu/salary/entity/TStatisticsDeclarer.java
+8
-8
TStatisticsDeclarerVo.java
...u/cloud/plus/v1/yifu/salary/vo/TStatisticsDeclarerVo.java
+6
-6
TStatisticsBonusController.java
...v1/yifu/salary/controller/TStatisticsBonusController.java
+1
-1
TStatisticsDeclarerController.java
...yifu/salary/controller/TStatisticsDeclarerController.java
+2
-2
TStatisticsLaborController.java
...v1/yifu/salary/controller/TStatisticsLaborController.java
+14
-0
TStatisticsRemunerationController.java
.../salary/controller/TStatisticsRemunerationController.java
+15
-2
TStatisticsLaborService.java
.../plus/v1/yifu/salary/service/TStatisticsLaborService.java
+7
-0
TStatisticsRemunerationService.java
...1/yifu/salary/service/TStatisticsRemunerationService.java
+8
-0
TStatisticsLaborServiceImpl.java
...yifu/salary/service/impl/TStatisticsLaborServiceImpl.java
+26
-2
TStatisticsRemunerationServiceImpl.java
...lary/service/impl/TStatisticsRemunerationServiceImpl.java
+27
-2
TStatisticsBonusMapper.xml
...-biz/src/main/resources/mapper/TStatisticsBonusMapper.xml
+1
-0
TStatisticsLaborMapper.xml
...-biz/src/main/resources/mapper/TStatisticsLaborMapper.xml
+2
-0
TStatisticsRemunerationMapper.xml
...c/main/resources/mapper/TStatisticsRemunerationMapper.xml
+2
-0
spring.factories.txt
...cial-biz/src/main/resources/META-INF/spring.factories.txt
+0
-2
No files found.
yifu-salary/yifu-salary-api/src/main/java/com/yifu/cloud/plus/v1/yifu/salary/entity/TStatisticsDeclarer.java
View file @
6bf81332
...
@@ -66,9 +66,9 @@ public class TStatisticsDeclarer {
...
@@ -66,9 +66,9 @@ public class TStatisticsDeclarer {
/**
/**
* 员工姓名
* 员工姓名
*/
*/
@ExcelAttribute
(
name
=
"
员工
姓名"
,
maxLength
=
20
)
@ExcelAttribute
(
name
=
"姓名"
,
maxLength
=
20
)
@Length
(
max
=
20
,
message
=
"
员工
姓名不能超过20个字符"
)
@Length
(
max
=
20
,
message
=
"姓名不能超过20个字符"
)
@ExcelProperty
(
"
员工
姓名"
)
@ExcelProperty
(
"姓名"
)
private
String
empName
;
private
String
empName
;
/**
/**
* 身份证号
* 身份证号
...
@@ -87,14 +87,14 @@ public class TStatisticsDeclarer {
...
@@ -87,14 +87,14 @@ public class TStatisticsDeclarer {
/**
/**
* 人员状态
* 人员状态
*/
*/
@ExcelAttribute
(
name
=
"人员状态"
,
maxLength
=
2
)
@ExcelAttribute
(
name
=
"人员状态"
,
maxLength
=
2
,
readConverterExp
=
"0=在职,1=离职"
)
@Length
(
max
=
2
,
message
=
"人员状态不能超过2个字符"
)
@Length
(
max
=
2
,
message
=
"人员状态不能超过2个字符"
)
@ExcelProperty
(
"人员状态"
)
@ExcelProperty
(
"人员状态"
)
private
String
empStatus
;
private
String
empStatus
;
/**
/**
* 任职受雇从业类型
* 任职受雇从业类型
*/
*/
@ExcelAttribute
(
name
=
"任职受雇从业类型"
,
maxLength
=
2
)
@ExcelAttribute
(
name
=
"任职受雇从业类型"
,
maxLength
=
2
,
readConverterExp
=
"0=雇员,1=其他"
)
@Length
(
max
=
2
,
message
=
"任职受雇从业类型不能超过2个字符"
)
@Length
(
max
=
2
,
message
=
"任职受雇从业类型不能超过2个字符"
)
@ExcelProperty
(
"任职受雇从业类型"
)
@ExcelProperty
(
"任职受雇从业类型"
)
private
String
occupationType
;
private
String
occupationType
;
...
@@ -108,9 +108,9 @@ public class TStatisticsDeclarer {
...
@@ -108,9 +108,9 @@ public class TStatisticsDeclarer {
/**
/**
* 本月是否申报 0 是 1 否
* 本月是否申报 0 是 1 否
*/
*/
@ExcelAttribute
(
name
=
"本
月是否申报"
,
maxLength
=
1
)
@ExcelAttribute
(
name
=
"本
期是否申报"
,
maxLength
=
1
,
readConverterExp
=
"0=是,1=否"
)
@Length
(
max
=
1
,
message
=
"本
月
是否申报不能超过1个字符"
)
@Length
(
max
=
1
,
message
=
"本
期
是否申报不能超过1个字符"
)
@ExcelProperty
(
"本
月
是否申报"
)
@ExcelProperty
(
"本
期
是否申报"
)
private
String
isDeclare
;
private
String
isDeclare
;
/**
/**
* 不申报原因
* 不申报原因
...
...
yifu-salary/yifu-salary-api/src/main/java/com/yifu/cloud/plus/v1/yifu/salary/vo/TStatisticsDeclarerVo.java
View file @
6bf81332
...
@@ -43,9 +43,9 @@ public class TStatisticsDeclarerVo extends RowIndex implements Serializable {
...
@@ -43,9 +43,9 @@ public class TStatisticsDeclarerVo extends RowIndex implements Serializable {
/**
/**
* 员工姓名
* 员工姓名
*/
*/
@ExcelAttribute
(
name
=
"
员工
姓名"
,
maxLength
=
20
,
isNotEmpty
=
true
)
@ExcelAttribute
(
name
=
"姓名"
,
maxLength
=
20
,
isNotEmpty
=
true
)
@Schema
(
description
=
"
员工
姓名"
)
@Schema
(
description
=
"姓名"
)
@ExcelProperty
(
"
员工
姓名"
)
@ExcelProperty
(
"姓名"
)
private
String
empName
;
private
String
empName
;
/**
/**
* 身份证号
* 身份证号
...
@@ -57,9 +57,9 @@ public class TStatisticsDeclarerVo extends RowIndex implements Serializable {
...
@@ -57,9 +57,9 @@ public class TStatisticsDeclarerVo extends RowIndex implements Serializable {
/**
/**
* 本月是否申报
* 本月是否申报
*/
*/
@ExcelAttribute
(
name
=
"本
月是否申报"
,
maxLength
=
1
,
isNotEmpty
=
true
,
isDataId
=
true
,
readConverterExp
=
"0=是,1=否"
)
@ExcelAttribute
(
name
=
"本
期是否申报"
,
maxLength
=
1
,
isNotEmpty
=
true
,
readConverterExp
=
"0=是,1=否"
)
@Schema
(
description
=
"本
月
是否申报"
)
@Schema
(
description
=
"本
期
是否申报"
)
@ExcelProperty
(
"本
月
是否申报"
)
@ExcelProperty
(
"本
期
是否申报"
)
private
String
isDeclare
;
private
String
isDeclare
;
/**
/**
* 不申报原因
* 不申报原因
...
...
yifu-salary/yifu-salary-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/salary/controller/TStatisticsBonusController.java
View file @
6bf81332
...
@@ -136,7 +136,7 @@ public class TStatisticsBonusController {
...
@@ -136,7 +136,7 @@ public class TStatisticsBonusController {
@SysLog
(
"批量删除全年一次性奖金申报表"
)
@SysLog
(
"批量删除全年一次性奖金申报表"
)
@PostMapping
(
"/batchDelete"
)
@PostMapping
(
"/batchDelete"
)
@PreAuthorize
(
"@pms.hasPermission('salary_tstatisticsbonus_del')"
)
@PreAuthorize
(
"@pms.hasPermission('salary_tstatisticsbonus_del')"
)
public
R
batchDelete
(
@Request
Body
String
declareMonth
){
public
R
batchDelete
(
@Request
Param
String
declareMonth
){
return
tStatisticsBonusService
.
batchDelete
(
declareMonth
);
return
tStatisticsBonusService
.
batchDelete
(
declareMonth
);
}
}
}
}
yifu-salary/yifu-salary-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/salary/controller/TStatisticsDeclarerController.java
View file @
6bf81332
...
@@ -79,7 +79,7 @@ public class TStatisticsDeclarerController {
...
@@ -79,7 +79,7 @@ public class TStatisticsDeclarerController {
* @param id id
* @param id id
* @return R
* @return R
*/
*/
@Operation
(
summary
=
"通过id查询"
,
description
=
"通过id查询
:hasPermission('salary_tstatisticsdeclarer_get')
"
)
@Operation
(
summary
=
"通过id查询"
,
description
=
"通过id查询"
)
@GetMapping
(
"/{id}"
)
@GetMapping
(
"/{id}"
)
public
R
<
TStatisticsDeclarer
>
getById
(
@PathVariable
(
"id"
)
String
id
)
{
public
R
<
TStatisticsDeclarer
>
getById
(
@PathVariable
(
"id"
)
String
id
)
{
return
R
.
ok
(
tStatisticsDeclarerService
.
getById
(
id
));
return
R
.
ok
(
tStatisticsDeclarerService
.
getById
(
id
));
...
@@ -147,7 +147,7 @@ public class TStatisticsDeclarerController {
...
@@ -147,7 +147,7 @@ public class TStatisticsDeclarerController {
**/
**/
@Operation
(
description
=
"导出申报对象表 hasPermission('salary_tstatisticsdeclarer-export')"
)
@Operation
(
description
=
"导出申报对象表 hasPermission('salary_tstatisticsdeclarer-export')"
)
@PostMapping
(
"/export"
)
@PostMapping
(
"/export"
)
//
@PreAuthorize("@pms.hasPermission('salary_tstatisticsdeclarer-export')")
@PreAuthorize
(
"@pms.hasPermission('salary_tstatisticsdeclarer-export')"
)
public
void
export
(
HttpServletResponse
response
,
@RequestBody
TStatisticsDeclarerSearchVo
searchVo
)
{
public
void
export
(
HttpServletResponse
response
,
@RequestBody
TStatisticsDeclarerSearchVo
searchVo
)
{
tStatisticsDeclarerService
.
listExport
(
response
,
searchVo
);
tStatisticsDeclarerService
.
listExport
(
response
,
searchVo
);
}
}
...
...
yifu-salary/yifu-salary-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/salary/controller/TStatisticsLaborController.java
View file @
6bf81332
...
@@ -99,4 +99,18 @@ public class TStatisticsLaborController {
...
@@ -99,4 +99,18 @@ public class TStatisticsLaborController {
public
void
export
(
HttpServletResponse
response
,
@RequestBody
TStatisticsLaborSearchVo
searchVo
)
{
public
void
export
(
HttpServletResponse
response
,
@RequestBody
TStatisticsLaborSearchVo
searchVo
)
{
tStatisticsLaborService
.
listExport
(
response
,
searchVo
);
tStatisticsLaborService
.
listExport
(
response
,
searchVo
);
}
}
/**
* 本期劳务费申报表 批量删除
*
* @author huyc
* @date 2022-08-14 21:31:15
**/
@Operation
(
description
=
"批量删除本期劳务费申报表 hasPermission('salary_tstatisticslabor_del')"
)
@SysLog
(
"批量删除本期稿酬申报表"
)
@PostMapping
(
"/batchDelete"
)
@PreAuthorize
(
"@pms.hasPermission('salary_tstatisticslabor_del')"
)
public
R
batchDelete
(
@RequestBody
String
declareMonth
){
return
tStatisticsLaborService
.
batchDelete
(
declareMonth
);
}
}
}
yifu-salary/yifu-salary-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/salary/controller/TStatisticsRemunerationController.java
View file @
6bf81332
...
@@ -47,7 +47,6 @@ public class TStatisticsRemunerationController {
...
@@ -47,7 +47,6 @@ public class TStatisticsRemunerationController {
private
final
TStatisticsRemunerationService
tStatisticsRemunerationService
;
private
final
TStatisticsRemunerationService
tStatisticsRemunerationService
;
/**
/**
* 简单分页查询
* 简单分页查询
*
*
...
@@ -67,7 +66,7 @@ public class TStatisticsRemunerationController {
...
@@ -67,7 +66,7 @@ public class TStatisticsRemunerationController {
* @param id id
* @param id id
* @return R
* @return R
*/
*/
@Operation
(
summary
=
"通过id查询"
,
description
=
"通过id查询
:hasPermission('salary_tstatisticsremuneration_get')
"
)
@Operation
(
summary
=
"通过id查询"
,
description
=
"通过id查询"
)
@GetMapping
(
"/{id}"
)
@GetMapping
(
"/{id}"
)
public
R
<
TStatisticsRemuneration
>
getById
(
@PathVariable
(
"id"
)
String
id
)
{
public
R
<
TStatisticsRemuneration
>
getById
(
@PathVariable
(
"id"
)
String
id
)
{
return
R
.
ok
(
tStatisticsRemunerationService
.
getById
(
id
));
return
R
.
ok
(
tStatisticsRemunerationService
.
getById
(
id
));
...
@@ -99,4 +98,18 @@ public class TStatisticsRemunerationController {
...
@@ -99,4 +98,18 @@ public class TStatisticsRemunerationController {
public
void
export
(
HttpServletResponse
response
,
@RequestBody
TStatisticsRemunerationSearchVo
searchVo
)
{
public
void
export
(
HttpServletResponse
response
,
@RequestBody
TStatisticsRemunerationSearchVo
searchVo
)
{
tStatisticsRemunerationService
.
listExport
(
response
,
searchVo
);
tStatisticsRemunerationService
.
listExport
(
response
,
searchVo
);
}
}
/**
* 本期稿酬申报表 批量删除
*
* @author huyc
* @date 2022-08-14 21:31:15
**/
@Operation
(
description
=
"批量删除本期稿酬申报表 hasPermission('salary_tstatisticsremuneration_del')"
)
@SysLog
(
"批量删除本期稿酬申报表"
)
@PostMapping
(
"/batchDelete"
)
@PreAuthorize
(
"@pms.hasPermission('salary_tstatisticsbonus_del')"
)
public
R
batchDelete
(
@RequestBody
String
declareMonth
){
return
tStatisticsRemunerationService
.
batchDelete
(
declareMonth
);
}
}
}
yifu-salary/yifu-salary-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/salary/service/TStatisticsLaborService.java
View file @
6bf81332
...
@@ -48,4 +48,11 @@ public interface TStatisticsLaborService extends IService<TStatisticsLabor> {
...
@@ -48,4 +48,11 @@ public interface TStatisticsLaborService extends IService<TStatisticsLabor> {
void
listExport
(
HttpServletResponse
response
,
TStatisticsLaborSearchVo
searchVo
);
void
listExport
(
HttpServletResponse
response
,
TStatisticsLaborSearchVo
searchVo
);
List
<
TStatisticsLabor
>
noPageDiy
(
TStatisticsLaborSearchVo
searchVo
);
List
<
TStatisticsLabor
>
noPageDiy
(
TStatisticsLaborSearchVo
searchVo
);
/**
* 批量删除本期稿酬申报表
* @param declareMonth 申报月份
* @return
*/
R
batchDelete
(
String
declareMonth
);
}
}
yifu-salary/yifu-salary-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/salary/service/TStatisticsRemunerationService.java
View file @
6bf81332
...
@@ -20,6 +20,7 @@ package com.yifu.cloud.plus.v1.yifu.salary.service;
...
@@ -20,6 +20,7 @@ package com.yifu.cloud.plus.v1.yifu.salary.service;
import
com.baomidou.mybatisplus.core.metadata.IPage
;
import
com.baomidou.mybatisplus.core.metadata.IPage
;
import
com.baomidou.mybatisplus.extension.plugins.pagination.Page
;
import
com.baomidou.mybatisplus.extension.plugins.pagination.Page
;
import
com.baomidou.mybatisplus.extension.service.IService
;
import
com.baomidou.mybatisplus.extension.service.IService
;
import
com.yifu.cloud.plus.v1.yifu.common.core.util.R
;
import
com.yifu.cloud.plus.v1.yifu.salary.entity.TStatisticsRemuneration
;
import
com.yifu.cloud.plus.v1.yifu.salary.entity.TStatisticsRemuneration
;
import
com.yifu.cloud.plus.v1.yifu.salary.vo.TStatisticsRemunerationSearchVo
;
import
com.yifu.cloud.plus.v1.yifu.salary.vo.TStatisticsRemunerationSearchVo
;
...
@@ -41,4 +42,11 @@ public interface TStatisticsRemunerationService extends IService<TStatisticsRemu
...
@@ -41,4 +42,11 @@ public interface TStatisticsRemunerationService extends IService<TStatisticsRemu
void
listExport
(
HttpServletResponse
response
,
TStatisticsRemunerationSearchVo
searchVo
);
void
listExport
(
HttpServletResponse
response
,
TStatisticsRemunerationSearchVo
searchVo
);
/**
* 批量删除本期稿酬申报表
* @param declareMonth 申报月份
* @return
*/
R
batchDelete
(
String
declareMonth
);
}
}
yifu-salary/yifu-salary-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/salary/service/impl/TStatisticsLaborServiceImpl.java
View file @
6bf81332
...
@@ -46,6 +46,7 @@ import java.io.InputStream;
...
@@ -46,6 +46,7 @@ import java.io.InputStream;
import
java.net.URLEncoder
;
import
java.net.URLEncoder
;
import
java.util.ArrayList
;
import
java.util.ArrayList
;
import
java.util.List
;
import
java.util.List
;
import
java.util.stream.Collectors
;
/**
/**
* 本期劳务费申报表
* 本期劳务费申报表
...
@@ -74,7 +75,7 @@ public class TStatisticsLaborServiceImpl extends ServiceImpl<TStatisticsLaborMap
...
@@ -74,7 +75,7 @@ public class TStatisticsLaborServiceImpl extends ServiceImpl<TStatisticsLaborMap
*/
*/
@Override
@Override
public
void
listExport
(
HttpServletResponse
response
,
TStatisticsLaborSearchVo
searchVo
)
{
public
void
listExport
(
HttpServletResponse
response
,
TStatisticsLaborSearchVo
searchVo
)
{
String
fileName
=
"
不良记录批量
导出"
+
DateUtil
.
getThisTime
()
+
".xlsx"
;
String
fileName
=
"
本期劳务费
导出"
+
DateUtil
.
getThisTime
()
+
".xlsx"
;
//获取要导出的列表
//获取要导出的列表
List
<
TStatisticsLabor
>
list
=
new
ArrayList
<>();
List
<
TStatisticsLabor
>
list
=
new
ArrayList
<>();
long
count
=
noPageCountDiy
(
searchVo
);
long
count
=
noPageCountDiy
(
searchVo
);
...
@@ -85,7 +86,6 @@ public class TStatisticsLaborServiceImpl extends ServiceImpl<TStatisticsLaborMap
...
@@ -85,7 +86,6 @@ public class TStatisticsLaborServiceImpl extends ServiceImpl<TStatisticsLaborMap
response
.
setCharacterEncoding
(
"utf-8"
);
response
.
setCharacterEncoding
(
"utf-8"
);
response
.
setHeader
(
"Content-Disposition"
,
"attachment;filename="
+
URLEncoder
.
encode
(
fileName
,
"UTF-8"
));
response
.
setHeader
(
"Content-Disposition"
,
"attachment;filename="
+
URLEncoder
.
encode
(
fileName
,
"UTF-8"
));
// 这里 需要指定写用哪个class去写,然后写到第一个sheet,然后文件流会自动关闭
// 这里 需要指定写用哪个class去写,然后写到第一个sheet,然后文件流会自动关闭
//EasyExcel.write(out, TEmpBadRecord.class).sheet("不良记录").doWrite(list);
ExcelWriter
excelWriter
=
EasyExcel
.
write
(
out
,
TStatisticsLabor
.
class
).
build
();
ExcelWriter
excelWriter
=
EasyExcel
.
write
(
out
,
TStatisticsLabor
.
class
).
build
();
int
index
=
0
;
int
index
=
0
;
if
(
count
>
CommonConstants
.
ZERO_INT
)
{
if
(
count
>
CommonConstants
.
ZERO_INT
)
{
...
@@ -156,6 +156,15 @@ public class TStatisticsLaborServiceImpl extends ServiceImpl<TStatisticsLaborMap
...
@@ -156,6 +156,15 @@ public class TStatisticsLaborServiceImpl extends ServiceImpl<TStatisticsLaborMap
private
LambdaQueryWrapper
buildQueryWrapper
(
TStatisticsLaborSearchVo
entity
)
{
private
LambdaQueryWrapper
buildQueryWrapper
(
TStatisticsLaborSearchVo
entity
)
{
LambdaQueryWrapper
<
TStatisticsLabor
>
wrapper
=
Wrappers
.
lambdaQuery
();
LambdaQueryWrapper
<
TStatisticsLabor
>
wrapper
=
Wrappers
.
lambdaQuery
();
if
(
Common
.
isNotNull
(
entity
.
getDeclareMonth
()))
{
wrapper
.
eq
(
TStatisticsLabor:
:
getDeclareMonth
,
entity
.
getDeclareMonth
());
}
if
(
Common
.
isNotNull
(
entity
.
getEmpName
()))
{
wrapper
.
eq
(
TStatisticsLabor:
:
getEmpName
,
entity
.
getEmpName
());
}
if
(
Common
.
isNotNull
(
entity
.
getEmpIdcard
()))
{
wrapper
.
eq
(
TStatisticsLabor:
:
getEmpIdcard
,
entity
.
getEmpIdcard
());
}
return
wrapper
;
return
wrapper
;
}
}
...
@@ -217,6 +226,21 @@ public class TStatisticsLaborServiceImpl extends ServiceImpl<TStatisticsLaborMap
...
@@ -217,6 +226,21 @@ public class TStatisticsLaborServiceImpl extends ServiceImpl<TStatisticsLaborMap
return
R
.
ok
(
errorMessageList
);
return
R
.
ok
(
errorMessageList
);
}
}
@Override
public
R
batchDelete
(
String
declareMonth
)
{
if
(
Common
.
isNotNull
(
declareMonth
))
{
List
<
TStatisticsLabor
>
deleteList
=
baseMapper
.
selectList
(
Wrappers
.<
TStatisticsLabor
>
query
().
lambda
()
.
eq
(
TStatisticsLabor:
:
getDeclareMonth
,
declareMonth
));
if
(
Common
.
isNotNull
(
deleteList
))
{
List
<
String
>
idList
=
deleteList
.
stream
().
map
(
TStatisticsLabor:
:
getId
).
collect
(
Collectors
.
toList
());
baseMapper
.
deleteBatchIds
(
idList
);
return
R
.
ok
();
}
return
R
.
failed
(
CommonConstants
.
NO_DATA_TO_HANDLE
);
}
return
null
;
}
private
void
importTStatisticsLabor
(
List
<
TStatisticsLaborVo
>
excelVOList
,
List
<
ErrorMessage
>
errorMessageList
)
{
private
void
importTStatisticsLabor
(
List
<
TStatisticsLaborVo
>
excelVOList
,
List
<
ErrorMessage
>
errorMessageList
)
{
// 个性化校验逻辑
// 个性化校验逻辑
ErrorMessage
errorMsg
;
ErrorMessage
errorMsg
;
...
...
yifu-salary/yifu-salary-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/salary/service/impl/TStatisticsRemunerationServiceImpl.java
View file @
6bf81332
...
@@ -28,6 +28,7 @@ import com.yifu.cloud.plus.v1.yifu.common.core.constant.CommonConstants;
...
@@ -28,6 +28,7 @@ import com.yifu.cloud.plus.v1.yifu.common.core.constant.CommonConstants;
import
com.yifu.cloud.plus.v1.yifu.common.core.util.Common
;
import
com.yifu.cloud.plus.v1.yifu.common.core.util.Common
;
import
com.yifu.cloud.plus.v1.yifu.common.core.util.DateUtil
;
import
com.yifu.cloud.plus.v1.yifu.common.core.util.DateUtil
;
import
com.yifu.cloud.plus.v1.yifu.common.core.util.ExcelUtil
;
import
com.yifu.cloud.plus.v1.yifu.common.core.util.ExcelUtil
;
import
com.yifu.cloud.plus.v1.yifu.common.core.util.R
;
import
com.yifu.cloud.plus.v1.yifu.salary.entity.TStatisticsRemuneration
;
import
com.yifu.cloud.plus.v1.yifu.salary.entity.TStatisticsRemuneration
;
import
com.yifu.cloud.plus.v1.yifu.salary.mapper.TStatisticsRemunerationMapper
;
import
com.yifu.cloud.plus.v1.yifu.salary.mapper.TStatisticsRemunerationMapper
;
import
com.yifu.cloud.plus.v1.yifu.salary.service.TStatisticsRemunerationService
;
import
com.yifu.cloud.plus.v1.yifu.salary.service.TStatisticsRemunerationService
;
...
@@ -41,6 +42,7 @@ import java.io.IOException;
...
@@ -41,6 +42,7 @@ import java.io.IOException;
import
java.net.URLEncoder
;
import
java.net.URLEncoder
;
import
java.util.ArrayList
;
import
java.util.ArrayList
;
import
java.util.List
;
import
java.util.List
;
import
java.util.stream.Collectors
;
/**
/**
* 本期稿酬申报表
* 本期稿酬申报表
...
@@ -69,7 +71,7 @@ public class TStatisticsRemunerationServiceImpl extends ServiceImpl<TStatisticsR
...
@@ -69,7 +71,7 @@ public class TStatisticsRemunerationServiceImpl extends ServiceImpl<TStatisticsR
*/
*/
@Override
@Override
public
void
listExport
(
HttpServletResponse
response
,
TStatisticsRemunerationSearchVo
searchVo
)
{
public
void
listExport
(
HttpServletResponse
response
,
TStatisticsRemunerationSearchVo
searchVo
)
{
String
fileName
=
"
不良记录批量
导出"
+
DateUtil
.
getThisTime
()
+
".xlsx"
;
String
fileName
=
"
本期稿酬申报表
导出"
+
DateUtil
.
getThisTime
()
+
".xlsx"
;
//获取要导出的列表
//获取要导出的列表
List
<
TStatisticsRemuneration
>
list
=
new
ArrayList
<>();
List
<
TStatisticsRemuneration
>
list
=
new
ArrayList
<>();
long
count
=
noPageCountDiy
(
searchVo
);
long
count
=
noPageCountDiy
(
searchVo
);
...
@@ -80,7 +82,6 @@ public class TStatisticsRemunerationServiceImpl extends ServiceImpl<TStatisticsR
...
@@ -80,7 +82,6 @@ public class TStatisticsRemunerationServiceImpl extends ServiceImpl<TStatisticsR
response
.
setCharacterEncoding
(
"utf-8"
);
response
.
setCharacterEncoding
(
"utf-8"
);
response
.
setHeader
(
"Content-Disposition"
,
"attachment;filename="
+
URLEncoder
.
encode
(
fileName
,
"UTF-8"
));
response
.
setHeader
(
"Content-Disposition"
,
"attachment;filename="
+
URLEncoder
.
encode
(
fileName
,
"UTF-8"
));
// 这里 需要指定写用哪个class去写,然后写到第一个sheet,然后文件流会自动关闭
// 这里 需要指定写用哪个class去写,然后写到第一个sheet,然后文件流会自动关闭
//EasyExcel.write(out, TEmpBadRecord.class).sheet("不良记录").doWrite(list);
ExcelWriter
excelWriter
=
EasyExcel
.
write
(
out
,
TStatisticsRemuneration
.
class
).
build
();
ExcelWriter
excelWriter
=
EasyExcel
.
write
(
out
,
TStatisticsRemuneration
.
class
).
build
();
int
index
=
0
;
int
index
=
0
;
if
(
count
>
CommonConstants
.
ZERO_INT
)
{
if
(
count
>
CommonConstants
.
ZERO_INT
)
{
...
@@ -127,6 +128,21 @@ public class TStatisticsRemunerationServiceImpl extends ServiceImpl<TStatisticsR
...
@@ -127,6 +128,21 @@ public class TStatisticsRemunerationServiceImpl extends ServiceImpl<TStatisticsR
}
}
}
}
@Override
public
R
batchDelete
(
String
declareMonth
)
{
if
(
Common
.
isNotNull
(
declareMonth
))
{
List
<
TStatisticsRemuneration
>
deleteList
=
baseMapper
.
selectList
(
Wrappers
.<
TStatisticsRemuneration
>
query
().
lambda
()
.
eq
(
TStatisticsRemuneration:
:
getDeclareMonth
,
declareMonth
));
if
(
Common
.
isNotNull
(
deleteList
))
{
List
<
String
>
idList
=
deleteList
.
stream
().
map
(
TStatisticsRemuneration:
:
getId
).
collect
(
Collectors
.
toList
());
baseMapper
.
deleteBatchIds
(
idList
);
return
R
.
ok
();
}
return
R
.
failed
(
CommonConstants
.
NO_DATA_TO_HANDLE
);
}
return
null
;
}
private
List
<
TStatisticsRemuneration
>
noPageDiy
(
TStatisticsRemunerationSearchVo
searchVo
)
{
private
List
<
TStatisticsRemuneration
>
noPageDiy
(
TStatisticsRemunerationSearchVo
searchVo
)
{
LambdaQueryWrapper
<
TStatisticsRemuneration
>
wrapper
=
buildQueryWrapper
(
searchVo
);
LambdaQueryWrapper
<
TStatisticsRemuneration
>
wrapper
=
buildQueryWrapper
(
searchVo
);
List
<
String
>
idList
=
Common
.
getList
(
searchVo
.
getIds
());
List
<
String
>
idList
=
Common
.
getList
(
searchVo
.
getIds
());
...
@@ -150,6 +166,15 @@ public class TStatisticsRemunerationServiceImpl extends ServiceImpl<TStatisticsR
...
@@ -150,6 +166,15 @@ public class TStatisticsRemunerationServiceImpl extends ServiceImpl<TStatisticsR
private
LambdaQueryWrapper
buildQueryWrapper
(
TStatisticsRemunerationSearchVo
entity
)
{
private
LambdaQueryWrapper
buildQueryWrapper
(
TStatisticsRemunerationSearchVo
entity
)
{
LambdaQueryWrapper
<
TStatisticsRemuneration
>
wrapper
=
Wrappers
.
lambdaQuery
();
LambdaQueryWrapper
<
TStatisticsRemuneration
>
wrapper
=
Wrappers
.
lambdaQuery
();
if
(
Common
.
isNotNull
(
entity
.
getDeclareMonth
()))
{
wrapper
.
eq
(
TStatisticsRemuneration:
:
getDeclareMonth
,
entity
.
getDeclareMonth
());
}
if
(
Common
.
isNotNull
(
entity
.
getEmpName
()))
{
wrapper
.
eq
(
TStatisticsRemuneration:
:
getEmpName
,
entity
.
getEmpName
());
}
if
(
Common
.
isNotNull
(
entity
.
getEmpIdcard
()))
{
wrapper
.
eq
(
TStatisticsRemuneration:
:
getEmpIdcard
,
entity
.
getEmpIdcard
());
}
return
wrapper
;
return
wrapper
;
}
}
...
...
yifu-salary/yifu-salary-biz/src/main/resources/mapper/TStatisticsBonusMapper.xml
View file @
6bf81332
...
@@ -100,5 +100,6 @@
...
@@ -100,5 +100,6 @@
1=1
1=1
<include
refid=
"tStatisticsBonus_where"
/>
<include
refid=
"tStatisticsBonus_where"
/>
</where>
</where>
order by a.DECLARE_MONTH desc
</select>
</select>
</mapper>
</mapper>
yifu-salary/yifu-salary-biz/src/main/resources/mapper/TStatisticsLaborMapper.xml
View file @
6bf81332
...
@@ -90,5 +90,7 @@
...
@@ -90,5 +90,7 @@
1=1
1=1
<include
refid=
"tStatisticsLabor_where"
/>
<include
refid=
"tStatisticsLabor_where"
/>
</where>
</where>
group by a.EMP_IDCARD,a.DECLARE_MONTH,a.EMP_NAME
order by a.DECLARE_MONTH desc
</select>
</select>
</mapper>
</mapper>
yifu-salary/yifu-salary-biz/src/main/resources/mapper/TStatisticsRemunerationMapper.xml
View file @
6bf81332
...
@@ -85,5 +85,7 @@
...
@@ -85,5 +85,7 @@
1=1
1=1
<include
refid=
"tStatisticsRemuneration_where"
/>
<include
refid=
"tStatisticsRemuneration_where"
/>
</where>
</where>
group by a.EMP_IDCARD,a.DECLARE_MONTH,a.EMP_NAME
order by a.DECLARE_MONTH desc
</select>
</select>
</mapper>
</mapper>
yifu-social/yifu-social-biz/src/main/resources/META-INF/spring.factories.txt
deleted
100644 → 0
View file @
8765e70f
org.springframework.boot.autoconfigure.EnableAutoConfiguration=\
com.yifu.cloud.plus.v1.yifu.archives.config.FddAutoConfigue
\ No newline at end of file
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