Commit 62e21be7 authored by hongguangwu's avatar hongguangwu

Merge remote-tracking branch 'origin/MVP1.7.0' into MVP1.7.0

parents afed6ddf 15ba61b5
...@@ -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
* *
......
...@@ -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;
......
...@@ -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)){
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment