Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Contribute to GitLab
Sign in
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
c0c26429
You need to sign in or sign up before continuing.
Commit
c0c26429
authored
Oct 25, 2024
by
fangxinjiang
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
员工报账查询&批量导出&审核人导出最终版-fxj
parent
1e0bd2e8
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
0 additions
and
8 deletions
+0
-8
TSalaryAccountItemExportVo.java
...ud/plus/v1/yifu/salary/vo/TSalaryAccountItemExportVo.java
+0
-2
TSalaryAccountController.java
...s/v1/yifu/salary/controller/TSalaryAccountController.java
+0
-3
TSalaryAccountServiceImpl.java
...1/yifu/salary/service/impl/TSalaryAccountServiceImpl.java
+0
-3
No files found.
yifu-salary/yifu-salary-api/src/main/java/com/yifu/cloud/plus/v1/yifu/salary/vo/TSalaryAccountItemExportVo.java
View file @
c0c26429
...
@@ -22,8 +22,6 @@ import com.alibaba.excel.annotation.write.style.HeadFontStyle;
...
@@ -22,8 +22,6 @@ import com.alibaba.excel.annotation.write.style.HeadFontStyle;
import
io.swagger.v3.oas.annotations.media.Schema
;
import
io.swagger.v3.oas.annotations.media.Schema
;
import
lombok.Data
;
import
lombok.Data
;
import
java.math.BigDecimal
;
/**
/**
* 工资报账表明细项 t_salary_account_item
* 工资报账表明细项 t_salary_account_item
*
*
...
...
yifu-salary/yifu-salary-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/salary/controller/TSalaryAccountController.java
View file @
c0c26429
...
@@ -21,11 +21,8 @@ import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
...
@@ -21,11 +21,8 @@ import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
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.yifu.cloud.plus.v1.yifu.archives.vo.TSettleDomainListVo
;
import
com.yifu.cloud.plus.v1.yifu.archives.vo.TSettleDomainListVo
;
import
com.yifu.cloud.plus.v1.yifu.common.core.constant.CacheConstants
;
import
com.yifu.cloud.plus.v1.yifu.common.core.constant.CommonConstants
;
import
com.yifu.cloud.plus.v1.yifu.common.core.constant.CommonConstants
;
import
com.yifu.cloud.plus.v1.yifu.common.core.constant.ResultConstants
;
import
com.yifu.cloud.plus.v1.yifu.common.core.constant.SecurityConstants
;
import
com.yifu.cloud.plus.v1.yifu.common.core.constant.SecurityConstants
;
import
com.yifu.cloud.plus.v1.yifu.common.core.redis.RedisDistributedLock
;
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.LocalDateTimeUtils
;
import
com.yifu.cloud.plus.v1.yifu.common.core.util.LocalDateTimeUtils
;
import
com.yifu.cloud.plus.v1.yifu.common.core.util.R
;
import
com.yifu.cloud.plus.v1.yifu.common.core.util.R
;
...
...
yifu-salary/yifu-salary-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/salary/service/impl/TSalaryAccountServiceImpl.java
View file @
c0c26429
...
@@ -27,7 +27,6 @@ import com.yifu.cloud.plus.v1.yifu.common.core.constant.CommonConstants;
...
@@ -27,7 +27,6 @@ import com.yifu.cloud.plus.v1.yifu.common.core.constant.CommonConstants;
import
com.yifu.cloud.plus.v1.yifu.common.core.constant.ResultConstants
;
import
com.yifu.cloud.plus.v1.yifu.common.core.constant.ResultConstants
;
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.R
;
import
com.yifu.cloud.plus.v1.yifu.ekp.vo.EkpSalaryParamVo
;
import
com.yifu.cloud.plus.v1.yifu.ekp.vo.EkpSalaryParamVo
;
import
com.yifu.cloud.plus.v1.yifu.insurances.vo.EkpSocialViewVo
;
import
com.yifu.cloud.plus.v1.yifu.insurances.vo.EkpSocialViewVo
;
import
com.yifu.cloud.plus.v1.yifu.salary.entity.TDeptSee
;
import
com.yifu.cloud.plus.v1.yifu.salary.entity.TDeptSee
;
...
@@ -154,7 +153,6 @@ public class TSalaryAccountServiceImpl extends ServiceImpl<TSalaryAccountMapper,
...
@@ -154,7 +153,6 @@ public class TSalaryAccountServiceImpl extends ServiceImpl<TSalaryAccountMapper,
searchVo
.
setLimitEnd
(
CommonConstants
.
EXCEL_EXPORT_LIMIT_1
);
searchVo
.
setLimitEnd
(
CommonConstants
.
EXCEL_EXPORT_LIMIT_1
);
list
=
noPageDiyLast
(
searchVo
,
deptNos
);
list
=
noPageDiyLast
(
searchVo
,
deptNos
);
if
(
Common
.
isNotNull
(
list
))
{
if
(
Common
.
isNotNull
(
list
))
{
log
.
error
(
"导出条数:"
+
list
.
size
());
if
(
i
%
CommonConstants
.
EXCEL_EXPORT_LIMIT
==
0
){
if
(
i
%
CommonConstants
.
EXCEL_EXPORT_LIMIT
==
0
){
writeSheet
=
EasyExcelFactory
.
writerSheet
(
"工资报账主表(工资条)"
+
index
).
build
();
writeSheet
=
EasyExcelFactory
.
writerSheet
(
"工资报账主表(工资条)"
+
index
).
build
();
index
++;
index
++;
...
@@ -216,7 +214,6 @@ public class TSalaryAccountServiceImpl extends ServiceImpl<TSalaryAccountMapper,
...
@@ -216,7 +214,6 @@ public class TSalaryAccountServiceImpl extends ServiceImpl<TSalaryAccountMapper,
searchVo
.
setLimitEnd
(
CommonConstants
.
EXCEL_EXPORT_LIMIT_2
);
searchVo
.
setLimitEnd
(
CommonConstants
.
EXCEL_EXPORT_LIMIT_2
);
list
=
baseMapper
.
auditExportDiy
(
searchVo
,
searchVo
.
getIdList
());
list
=
baseMapper
.
auditExportDiy
(
searchVo
,
searchVo
.
getIdList
());
if
(
Common
.
isNotNull
(
list
))
{
if
(
Common
.
isNotNull
(
list
))
{
log
.
error
(
"导出条数:"
+
list
.
size
());
//先把数据封装完成
//先把数据封装完成
idList
=
list
.
stream
().
map
(
TSalaryAccountExportVo:
:
getId
).
collect
(
Collectors
.
toList
());
idList
=
list
.
stream
().
map
(
TSalaryAccountExportVo:
:
getId
).
collect
(
Collectors
.
toList
());
if
(
Common
.
isNotNull
(
idList
)){
if
(
Common
.
isNotNull
(
idList
)){
...
...
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