From 309cb2047db3359a07920996a476cf9b025d0675 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=92=B1=E6=B6=9B?= <15850646081@163.com>
Date: Fri, 9 Dec 2022 15:28:29 +0800
Subject: [PATCH 1/2] =?UTF-8?q?=E9=85=8D=E7=BD=AE=E6=96=87=E4=BB=B6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
resource/WEB-INF/config/MyBatis.xml | 1 -
.../impl/AddUpDeductionServiceImpl.java | 3 +--
.../impl/AddUpSituationServiceImpl.java | 8 ++++---
.../impl/AttendQuoteDataServiceImpl.java | 23 +++++++++---------
.../salary/util/page/SalaryPageUtil.java | 24 ++++++++++++++++++-
5 files changed, 40 insertions(+), 19 deletions(-)
diff --git a/resource/WEB-INF/config/MyBatis.xml b/resource/WEB-INF/config/MyBatis.xml
index 7de8d02d1..31cc6f0dd 100644
--- a/resource/WEB-INF/config/MyBatis.xml
+++ b/resource/WEB-INF/config/MyBatis.xml
@@ -9,7 +9,6 @@
-
diff --git a/src/com/engine/salary/service/impl/AddUpDeductionServiceImpl.java b/src/com/engine/salary/service/impl/AddUpDeductionServiceImpl.java
index 6bfa10eff..7130b96fc 100644
--- a/src/com/engine/salary/service/impl/AddUpDeductionServiceImpl.java
+++ b/src/com/engine/salary/service/impl/AddUpDeductionServiceImpl.java
@@ -855,10 +855,9 @@ public class AddUpDeductionServiceImpl extends Service implements AddUpDeduction
OrderRuleVO orderRule = getSalarySysConfService(user).orderRule();
queryParam.setOrderRule(orderRule);
- SalaryPageUtil.start(queryParam.getCurrent(), queryParam.getPageSize());
List list = getAddUpDeductionMapper().list(queryParam);
AddUpDeductionStrDTOEncrypt.decryptAddUpDeductionList(list);
- return new PageInfo<>(list, AddUpDeductionDTO.class);
+ return SalaryPageUtil.buildPage(queryParam.getCurrent(), queryParam.getPageSize(), list, AddUpDeductionDTO.class);
}
@Override
diff --git a/src/com/engine/salary/service/impl/AddUpSituationServiceImpl.java b/src/com/engine/salary/service/impl/AddUpSituationServiceImpl.java
index ee52107f4..83ab197ac 100644
--- a/src/com/engine/salary/service/impl/AddUpSituationServiceImpl.java
+++ b/src/com/engine/salary/service/impl/AddUpSituationServiceImpl.java
@@ -15,7 +15,10 @@ import com.engine.salary.entity.datacollection.AddUpSituation;
import com.engine.salary.entity.datacollection.DataCollectionEmployee;
import com.engine.salary.entity.datacollection.dto.AddUpSituationDTO;
import com.engine.salary.entity.datacollection.dto.AddUpSituationRecordDTO;
-import com.engine.salary.entity.datacollection.param.*;
+import com.engine.salary.entity.datacollection.param.AddUpSituationDeleteParam;
+import com.engine.salary.entity.datacollection.param.AddUpSituationImportParam;
+import com.engine.salary.entity.datacollection.param.AddUpSituationParam;
+import com.engine.salary.entity.datacollection.param.AddUpSituationQueryParam;
import com.engine.salary.entity.salaryacct.po.SalaryAcctEmployeePO;
import com.engine.salary.entity.taxagent.dto.TaxAgentManageRangeEmployeeDTO;
import com.engine.salary.entity.taxagent.po.TaxAgentPO;
@@ -196,10 +199,9 @@ public class AddUpSituationServiceImpl extends Service implements AddUpSituation
}
queryParam.setTaxAgentIds(taxAgentIdsAsAdmin);
}
- SalaryPageUtil.start(queryParam.getCurrent(), queryParam.getPageSize());
List list = getAddUpSituationMapper().list(queryParam);
AddUpSituationDTOEncrypt.decryptAddUpSituationDTOList(list);
- return new PageInfo<>(list, AddUpSituationDTO.class);
+ return SalaryPageUtil.buildPage(queryParam.getCurrent(), queryParam.getPageSize(), list, AddUpSituationDTO.class);
}
diff --git a/src/com/engine/salary/service/impl/AttendQuoteDataServiceImpl.java b/src/com/engine/salary/service/impl/AttendQuoteDataServiceImpl.java
index d2865804d..fbaf62b40 100644
--- a/src/com/engine/salary/service/impl/AttendQuoteDataServiceImpl.java
+++ b/src/com/engine/salary/service/impl/AttendQuoteDataServiceImpl.java
@@ -134,9 +134,8 @@ public class AttendQuoteDataServiceImpl extends Service implements AttendQuoteDa
OrderRuleVO orderRule = getSalarySysConfService(user).orderRule();
queryParam.setOrderRule(orderRule);
- SalaryPageUtil.start(queryParam.getCurrent(), queryParam.getPageSize());
List list = getAttendQuoteDataMapper().list(queryParam);
- PageInfo page = new PageInfo(list);
+ PageInfo page = SalaryPageUtil.buildPage(queryParam.getCurrent(), queryParam.getPageSize(), list, AttendQuoteDataBaseDTO.class);
return page;
}
@@ -487,7 +486,7 @@ public class AttendQuoteDataServiceImpl extends Service implements AttendQuoteDa
if (CollectionUtils.isNotEmpty(values)) {
log.info("考勤数据：{}", values);
//去除空值
- values = values.stream().filter(po->StringUtils.isNotBlank(po.getDataValue())).collect(Collectors.toList());
+ values = values.stream().filter(po -> StringUtils.isNotBlank(po.getDataValue())).collect(Collectors.toList());
dataValueBiz.insertData(values);
}
}
@@ -785,8 +784,8 @@ public class AttendQuoteDataServiceImpl extends Service implements AttendQuoteDa
}
/**
- * @description 编辑数据
* @return null
+ * @description 编辑数据
* @author Harryxzy
* @date 2022/10/28 14:40
*/
@@ -799,33 +798,33 @@ public class AttendQuoteDataServiceImpl extends Service implements AttendQuoteDa
ids.add(attendQuoteDataEditParam.getId());
AttendQuoteDataQueryParam build = AttendQuoteDataQueryParam.builder().ids(ids).build();
List list = dataBiz.list(build);
- if(list == null || list.size() == 0){
+ if (list == null || list.size() == 0) {
throw new SalaryRunTimeException("该数据不存在！");
}
Map attendQuoteFieldData = new HashMap<>();
- for(Map.Entry entrySet:attendQuoteData.entrySet()){
+ for (Map.Entry entrySet : attendQuoteData.entrySet()) {
String[] s = entrySet.getKey().split("_");
- attendQuoteFieldData.put(s[0],entrySet.getValue());
+ attendQuoteFieldData.put(s[0], entrySet.getValue());
}
- for(Map.Entry entrySet : attendQuoteFieldData.entrySet()){
+ for (Map.Entry entrySet : attendQuoteFieldData.entrySet()) {
AttendQuoteDataValuePO updatePO = AttendQuoteDataValuePO.builder().employeeId(list.get(0).getEmployeeId()).attendQuoteFieldId(SalaryEntityUtil.string2Long(entrySet.getKey())).dataValue(entrySet.getValue()).build();
attendQuoteDataValueBiz.updateDataValue(updatePO);
}
}
/**
- * @description 获取数据
* @return void
+ * @description 获取数据
* @author Harryxzy
* @date 2022/10/31 14:12
*/
@Override
- public Map getData(AttendQuoteDataEditParam attendQuoteDataEditParam) {
+ public Map getData(AttendQuoteDataEditParam attendQuoteDataEditParam) {
ArrayList ids = new ArrayList<>();
ids.add(attendQuoteDataEditParam.getId());
AttendQuoteDataQueryParam build = AttendQuoteDataQueryParam.builder().ids(ids).build();
List list = dataBiz.list(build);
- if(list==null || list.size()==0){
+ if (list == null || list.size() == 0) {
throw new SalaryRunTimeException("该数据不存在！");
}
// 所有考勤字段
@@ -853,7 +852,7 @@ public class AttendQuoteDataServiceImpl extends Service implements AttendQuoteDa
result.putAll(weaTable.makeDataResult());
result.success();
Map datas = new HashMap<>();
- datas.put("data",listMaps.get(0));
+ datas.put("data", listMaps.get(0));
datas.put("dataKey", result.getResultMap());
return datas;
}
diff --git a/src/com/engine/salary/util/page/SalaryPageUtil.java b/src/com/engine/salary/util/page/SalaryPageUtil.java
index bbb2917d5..58bca7ddf 100644
--- a/src/com/engine/salary/util/page/SalaryPageUtil.java
+++ b/src/com/engine/salary/util/page/SalaryPageUtil.java
@@ -27,7 +27,7 @@ public class SalaryPageUtil {
return pageInfo;
}
- public static PageInfo buildPage(Integer pageNo, Integer pageSize,Class clazz) {
+ public static PageInfo buildPage(Integer pageNo, Integer pageSize, Class clazz) {
pageNo = pageNo == null || pageNo <= 0 ? 1 : pageNo;
pageSize = pageSize == null || pageSize <= 0 ? 10 : pageSize;
PageInfo pageInfo = new PageInfo<>(clazz);
@@ -37,6 +37,28 @@ public class SalaryPageUtil {
return pageInfo;
}
+ /**
+ * 内存分页
+ *
+ * @param pageNo
+ * @param pageSize
+ * @param source
+ * @param clazz
+ * @param
+ * @return
+ */
+ public static PageInfo buildPage(Integer pageNo, Integer pageSize, List source, Class clazz) {
+ pageNo = pageNo == null || pageNo <= 0 ? 1 : pageNo;
+ pageSize = pageSize == null || pageSize <= 0 ? 10 : pageSize;
+ PageInfo pageInfo = new PageInfo<>(clazz);
+ pageInfo.setPageNum(pageNo);
+ pageInfo.setPageSize(pageSize);
+ pageInfo.setTotal(source == null ? 0 : source.size());
+ pageInfo.setList(subList(pageNo, pageSize, source));
+ return pageInfo;
+ }
+
+
/**
* 分页
*
From b58e71989d63d9e6a8306af84675d3053db2ef8f Mon Sep 17 00:00:00 2001
From: fcli
Date: Mon, 12 Dec 2022 10:25:55 +0800
Subject: [PATCH 2/2] =?UTF-8?q?feat:=20=E7=BB=9F=E4=B8=80=E4=BF=AE?=
=?UTF-8?q?=E6=94=B9=E5=88=B0=E5=86=85=E5=AD=98=E5=88=86=E9=A1=B5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
src/com/engine/salary/biz/SIAccountBiz.java | 13 ++++++------
src/com/engine/salary/biz/SIArchivesBiz.java | 5 ++---
.../salary/biz/SalaryArchiveItemBiz.java | 7 ++++---
src/com/engine/salary/biz/SalaryItemBiz.java | 7 +++----
.../salary/biz/SalarySobCheckRuleBiz.java | 8 +++-----
.../impl/AddUpDeductionServiceImpl.java | 7 ++++---
.../impl/AddUpSituationServiceImpl.java | 8 ++++----
.../impl/AttendQuoteFieldServiceImpl.java | 3 +--
.../service/impl/AttendQuoteServiceImpl.java | 4 ++--
.../impl/OtherDeductionServiceImpl.java | 14 +++++++------
.../service/impl/SIAccountServiceImpl.java | 17 ++++++++--------
.../service/impl/SIImportServiceImpl.java | 4 ++--
.../service/impl/SIReportServiceImpl.java | 4 ++--
.../impl/SalaryAcctEmployeeServiceImpl.java | 9 ++++-----
.../impl/SalaryAcctRecordServiceImpl.java | 4 ++--
.../SalaryArchiveTaxAgentServiceImpl.java | 5 ++---
.../impl/SalarySendRangeServiceImpl.java | 13 ++++--------
.../service/impl/SalarySendServiceImpl.java | 10 ++++------
.../service/impl/SalarySobServiceImpl.java | 4 ++--
.../impl/SpecialAddDeductionServiceImpl.java | 20 +++++++++++--------
.../service/impl/TaxAgentServiceImpl.java | 4 ++--
.../impl/TaxDeclarationServiceImpl.java | 4 ++--
.../salary/wrapper/SalarySendWrapper.java | 5 ++---
23 files changed, 86 insertions(+), 93 deletions(-)
diff --git a/src/com/engine/salary/biz/SIAccountBiz.java b/src/com/engine/salary/biz/SIAccountBiz.java
index 16828b51e..d8e5020e8 100644
--- a/src/com/engine/salary/biz/SIAccountBiz.java
+++ b/src/com/engine/salary/biz/SIAccountBiz.java
@@ -119,11 +119,12 @@ public class SIAccountBiz extends Service {
}
public PageInfo listPage(InsuranceAccountBatchParam queryParam) {
- SalaryPageUtil.start(queryParam.getCurrent(), queryParam.getPageSize());
List list = getInsuranceAccountBatchMapper().list(queryParam);
list = SiAccountEncrypt.decryptInsuranceAccountBatchList(list);
- PageInfo pageInfo = new PageInfo<>(list, InsuranceAccountBatchPO.class);
- return pageInfo;
+ PageInfo page = SalaryPageUtil.buildPage(queryParam.getCurrent(), queryParam.getPageSize(),
+ list, InsuranceAccountBatchPO.class);
+ SiAccountEncrypt.decryptInsuranceAccountBatchList(page.getList());
+ return page;
}
public PageInfo listCommonPage(InsuranceAccountDetailParam queryParam) {
@@ -141,11 +142,11 @@ public class SIAccountBiz extends Service {
OrderRuleVO orderRule = getSalarySysConfService(user).orderRule();
queryParam.setOrderRule(orderRule);
- SalaryPageUtil.start(queryParam.getCurrent(), queryParam.getPageSize());
List list = getInsuranceAccountDetailMapper().list(queryParam);
- InsuranceAccountDetailPOEncrypt.decryptInsuranceAccountDetailPOList(list);
- PageInfo pageInfo = new PageInfo<>(list, InsuranceAccountDetailPO.class);
+ PageInfo pageInfo = SalaryPageUtil.buildPage(queryParam.getCurrent(), queryParam.getPageSize(),
+ list, InsuranceAccountDetailPO.class);
+ InsuranceAccountDetailPOEncrypt.decryptInsuranceAccountDetailPOList(pageInfo.getList());
return pageInfo;
}
diff --git a/src/com/engine/salary/biz/SIArchivesBiz.java b/src/com/engine/salary/biz/SIArchivesBiz.java
index 62fa5fc76..99019e219 100644
--- a/src/com/engine/salary/biz/SIArchivesBiz.java
+++ b/src/com/engine/salary/biz/SIArchivesBiz.java
@@ -967,14 +967,13 @@ public class SIArchivesBiz {
pageInfo.setTotal(page.size());
pageInfo.setList(SalaryPageUtil.subList(pageInfo.getPageNum(), pageInfo.getPageSize(), page));
} else {
- SalaryPageUtil.start(param.getCurrent(), param.getPageSize());
-// List page = socialSchemeMapper.listPageEmployeePOS(param);
log.info("从数据库获取档案列表数据开始");
sw.start("获取档案列表数据");
page = socialSchemeMapper.queryEmployeeList(param);
sw.stop();
log.info("从数据库获取档案列表数据完成！");
- pageInfo = new PageInfo<>(page, InsuranceArchivesEmployeePO.class);
+ pageInfo = SalaryPageUtil.buildPage(param.getCurrent(), param.getPageSize(),
+ page, InsuranceArchivesEmployeePO.class);
}
List> records = null;
log.info("buildTableData方法处理福利档案列表数据开始");
diff --git a/src/com/engine/salary/biz/SalaryArchiveItemBiz.java b/src/com/engine/salary/biz/SalaryArchiveItemBiz.java
index e36c02296..abb427566 100644
--- a/src/com/engine/salary/biz/SalaryArchiveItemBiz.java
+++ b/src/com/engine/salary/biz/SalaryArchiveItemBiz.java
@@ -160,11 +160,12 @@ public class SalaryArchiveItemBiz {
public PageInfo salaryItemAdjustRecordListPage(SalaryItemAdjustRecordQueryParam queryParam, List salaryItemIds) {
SqlSession sqlSession = MyBatisFactory.sqlSessionFactory.openSession();
try {
- SalaryPageUtil.start(queryParam.getCurrent(), queryParam.getPageSize());
SalaryArchiveItemMapper mapper = sqlSession.getMapper(SalaryArchiveItemMapper.class);
List salaryItemAdjustRecordListDTOS = mapper.salaryItemAdjustRecordList(queryParam, salaryItemIds);
- SalaryItemAdjustRecordListDTOEncrypt.decryptSalaryItemAdjustRecordListDTOList(salaryItemAdjustRecordListDTOS);
- PageInfo page = new PageInfo(salaryItemAdjustRecordListDTOS, SalaryItemAdjustRecordListDTO.class);
+ PageInfo page = SalaryPageUtil.buildPage(queryParam.getCurrent(), queryParam.getPageSize(),
+ salaryItemAdjustRecordListDTOS,
+ SalaryItemAdjustRecordListDTO.class);
+ SalaryItemAdjustRecordListDTOEncrypt.decryptSalaryItemAdjustRecordListDTOList(page.getList());
return page;
} finally {
sqlSession.close();
diff --git a/src/com/engine/salary/biz/SalaryItemBiz.java b/src/com/engine/salary/biz/SalaryItemBiz.java
index ef3ed6d56..3309bf874 100644
--- a/src/com/engine/salary/biz/SalaryItemBiz.java
+++ b/src/com/engine/salary/biz/SalaryItemBiz.java
@@ -5,7 +5,7 @@ import com.engine.salary.entity.salaryitem.po.SalaryItemPO;
import com.engine.salary.enums.SalaryOnOffEnum;
import com.engine.salary.mapper.salaryitem.SalaryItemMapper;
import com.engine.salary.util.page.PageInfo;
-import com.github.pagehelper.PageHelper;
+import com.engine.salary.util.page.SalaryPageUtil;
import com.google.common.collect.Lists;
import org.apache.commons.collections4.CollectionUtils;
import org.apache.ibatis.session.SqlSession;
@@ -98,10 +98,9 @@ public class SalaryItemBiz {
SqlSession sqlSession = MyBatisFactory.sqlSessionFactory.openSession();
try {
SalaryItemMapper mapper = sqlSession.getMapper(SalaryItemMapper.class);
-// SalaryPageUtil.start(searchParam.getCurrent(), searchParam.getPageSize());
- PageHelper.startPage(searchParam.getCurrent(), searchParam.getPageSize());
List salaryItemPOList = mapper.listByParam(searchParam);
- return new PageInfo(salaryItemPOList);
+ return SalaryPageUtil.buildPage(searchParam.getCurrent(), searchParam.getPageSize(),
+ salaryItemPOList, SalaryItemPO.class);
} finally {
sqlSession.close();
}
diff --git a/src/com/engine/salary/biz/SalarySobCheckRuleBiz.java b/src/com/engine/salary/biz/SalarySobCheckRuleBiz.java
index 88ed8f4bf..e11c3d37d 100644
--- a/src/com/engine/salary/biz/SalarySobCheckRuleBiz.java
+++ b/src/com/engine/salary/biz/SalarySobCheckRuleBiz.java
@@ -4,10 +4,9 @@ import com.engine.salary.entity.salarysob.param.SalarySobCheckRuleQueryParam;
import com.engine.salary.entity.salarysob.po.SalarySobCheckRulePO;
import com.engine.salary.mapper.salarysob.SalarySobCheckRuleMapper;
import com.engine.salary.util.page.PageInfo;
-
+import com.engine.salary.util.page.SalaryPageUtil;
import com.google.common.collect.Lists;
import org.apache.commons.collections4.CollectionUtils;
-import com.engine.salary.util.page.SalaryPageUtil;
import org.apache.ibatis.session.SqlSession;
import weaver.conn.mybatis.MyBatisFactory;
@@ -100,10 +99,9 @@ public class SalarySobCheckRuleBiz {
SqlSession sqlSession = MyBatisFactory.sqlSessionFactory.openSession();
try {
SalarySobCheckRuleMapper mapper = sqlSession.getMapper(SalarySobCheckRuleMapper.class);
- SalaryPageUtil.start(param.getCurrent(), param.getPageSize());
List list = mapper.listByParam(param);
- PageInfo pageInfo = new PageInfo(list, SalarySobCheckRulePO.class);
- return pageInfo;
+ return SalaryPageUtil.buildPage(param.getCurrent(), param.getPageSize(),
+ list, SalarySobCheckRulePO.class);
} finally {
sqlSession.close();
}
diff --git a/src/com/engine/salary/service/impl/AddUpDeductionServiceImpl.java b/src/com/engine/salary/service/impl/AddUpDeductionServiceImpl.java
index 7130b96fc..2665d539b 100644
--- a/src/com/engine/salary/service/impl/AddUpDeductionServiceImpl.java
+++ b/src/com/engine/salary/service/impl/AddUpDeductionServiceImpl.java
@@ -873,10 +873,11 @@ public class AddUpDeductionServiceImpl extends Service implements AddUpDeduction
queryParam.setTaxAgentIds(taxAgentIdsAsAdmin);
}
- SalaryPageUtil.start(queryParam.getCurrent(), queryParam.getPageSize());
List list = getAddUpDeductionMapper().recordList(queryParam);
- AddUpDeductionRecordStrDTOEncrypt.decryptAddUpDeductionRecordDTO(list);
- return new PageInfo<>(list, AddUpDeductionRecordDTO.class);
+ PageInfo page = SalaryPageUtil.buildPage(queryParam.getCurrent(), queryParam.getPageSize(),
+ list, AddUpDeductionRecordDTO.class);
+ AddUpDeductionRecordStrDTOEncrypt.decryptAddUpDeductionRecordDTO(page.getList());
+ return page;
}
diff --git a/src/com/engine/salary/service/impl/AddUpSituationServiceImpl.java b/src/com/engine/salary/service/impl/AddUpSituationServiceImpl.java
index 83ab197ac..a3bf8ea0a 100644
--- a/src/com/engine/salary/service/impl/AddUpSituationServiceImpl.java
+++ b/src/com/engine/salary/service/impl/AddUpSituationServiceImpl.java
@@ -218,11 +218,11 @@ public class AddUpSituationServiceImpl extends Service implements AddUpSituation
queryParam.setTaxAgentIds(taxAgentIdsAsAdmin);
}
- SalaryPageUtil.start(queryParam.getCurrent(), queryParam.getPageSize());
List list = getAddUpSituationMapper().recordList(queryParam);
- AddUpSituationRecordDTOEncrypt.decryptAddUpSituationRecordDTOList(list);
- return new PageInfo<>(list, AddUpSituationRecordDTO.class);
-
+ PageInfo page = SalaryPageUtil.buildPage(queryParam.getCurrent(), queryParam.getPageSize(),
+ list, AddUpSituationRecordDTO.class);
+ AddUpSituationRecordDTOEncrypt.decryptAddUpSituationRecordDTOList(page.getList());
+ return page;
}
@Override
diff --git a/src/com/engine/salary/service/impl/AttendQuoteFieldServiceImpl.java b/src/com/engine/salary/service/impl/AttendQuoteFieldServiceImpl.java
index 719d6cafb..f8d4b8eba 100644
--- a/src/com/engine/salary/service/impl/AttendQuoteFieldServiceImpl.java
+++ b/src/com/engine/salary/service/impl/AttendQuoteFieldServiceImpl.java
@@ -65,9 +65,8 @@ public class AttendQuoteFieldServiceImpl extends Service implements AttendQuoteF
@Override
public PageInfo listPage(AttendQuoteFieldQueryParam queryParam) {
- SalaryPageUtil.start(queryParam.getCurrent(), queryParam.getPageSize());
List list = getAttendQuoteFieldMapper().list(queryParam);
- return new PageInfo<>(list);
+ return SalaryPageUtil.buildPage(queryParam.getCurrent(), queryParam.getPageSize(), list, AttendQuoteFieldListDTO.class);
}
diff --git a/src/com/engine/salary/service/impl/AttendQuoteServiceImpl.java b/src/com/engine/salary/service/impl/AttendQuoteServiceImpl.java
index 6c6ba3e3c..177cca276 100644
--- a/src/com/engine/salary/service/impl/AttendQuoteServiceImpl.java
+++ b/src/com/engine/salary/service/impl/AttendQuoteServiceImpl.java
@@ -79,9 +79,9 @@ public class AttendQuoteServiceImpl extends Service implements AttendQuoteServic
queryParam.setSalarySobIds(salarySobIds);
}
- SalaryPageUtil.start(queryParam.getCurrent(), queryParam.getPageSize());
List list = getAttendQuoteMapper().list(queryParam);
- return new PageInfo<>(list, AttendQuoteListDTO.class);
+ return SalaryPageUtil.buildPage(queryParam.getCurrent(), queryParam.getPageSize(),
+ list, AttendQuoteListDTO.class);
}
@Override
diff --git a/src/com/engine/salary/service/impl/OtherDeductionServiceImpl.java b/src/com/engine/salary/service/impl/OtherDeductionServiceImpl.java
index dd4a026ca..e897c7d50 100644
--- a/src/com/engine/salary/service/impl/OtherDeductionServiceImpl.java
+++ b/src/com/engine/salary/service/impl/OtherDeductionServiceImpl.java
@@ -117,10 +117,11 @@ public class OtherDeductionServiceImpl extends Service implements OtherDeduction
}
queryParam.setTaxAgentIds(taxAgentIdsAsAdmin);
}
- SalaryPageUtil.start(queryParam.getCurrent(), queryParam.getPageSize());
List list = getOtherDeductionMapper().list(queryParam);
- OtherDeductionListDTOEncrypt.decryptOtherDeductionListDTOList(list);
- return new PageInfo<>(list, OtherDeductionListDTO.class);
+ PageInfo page = SalaryPageUtil.buildPage(queryParam.getCurrent(), queryParam.getPageSize(),
+ list, OtherDeductionListDTO.class);
+ OtherDeductionListDTOEncrypt.decryptOtherDeductionListDTOList(page.getList());
+ return page;
}
@Override
@@ -142,10 +143,11 @@ public class OtherDeductionServiceImpl extends Service implements OtherDeduction
}
queryParam.setTaxAgentIds(taxAgentIdsAsAdmin);
}
- SalaryPageUtil.start(queryParam.getCurrent(), queryParam.getPageSize());
List list = getOtherDeductionMapper().recordList(queryParam);
- OtherDeductionRecordDTOEncrypt.decryptOtherDeductionRecordDTOList(list);
- return new PageInfo<>(list, OtherDeductionRecordDTO.class);
+ PageInfo page = SalaryPageUtil.buildPage(queryParam.getCurrent(), queryParam.getPageSize(),
+ list, OtherDeductionRecordDTO.class);
+ OtherDeductionRecordDTOEncrypt.decryptOtherDeductionRecordDTOList(page.getList());
+ return page;
}
diff --git a/src/com/engine/salary/service/impl/SIAccountServiceImpl.java b/src/com/engine/salary/service/impl/SIAccountServiceImpl.java
index b59e86774..e6b9e51f4 100644
--- a/src/com/engine/salary/service/impl/SIAccountServiceImpl.java
+++ b/src/com/engine/salary/service/impl/SIAccountServiceImpl.java
@@ -310,9 +310,9 @@ public class SIAccountServiceImpl extends Service implements SIAccountService {
OrderRuleVO orderRule = getSalarySysConfService(user).orderRule();
queryParam.setOrderRule(orderRule);
- SalaryPageUtil.start(queryParam.getCurrent(), queryParam.getPageSize());
List list = getInsuranceAccountDetailMapper().list(queryParam);
- PageInfo pageInfo = new PageInfo<>(list, InsuranceAccountDetailPO.class);
+ PageInfo pageInfo = SalaryPageUtil.buildPage(queryParam.getCurrent(),queryParam.getPageSize(),
+ list, InsuranceAccountDetailPO.class);
List insuranceAccountDetailPOS = pageInfo.getList();
InsuranceAccountDetailPOEncrypt.decryptInsuranceAccountDetailPOList(insuranceAccountDetailPOS);
//数据组装
@@ -376,9 +376,9 @@ public class SIAccountServiceImpl extends Service implements SIAccountService {
OrderRuleVO orderRule = getSalarySysConfService(user).orderRule();
queryParam.setOrderRule(orderRule);
- SalaryPageUtil.start(queryParam.getCurrent(), queryParam.getPageSize());
List list = getInsuranceAccountDetailMapper().list(queryParam);
- PageInfo pageInfo = new PageInfo<>(list, InsuranceAccountDetailPO.class);
+ PageInfo pageInfo = SalaryPageUtil.buildPage(queryParam.getCurrent(),queryParam.getPageSize(),
+ list, InsuranceAccountDetailPO.class);
List insuranceAccountDetailPOS = pageInfo.getList();
InsuranceAccountDetailPOEncrypt.decryptInsuranceAccountDetailPOList(insuranceAccountDetailPOS);
//数据组装
@@ -585,9 +585,9 @@ public class SIAccountServiceImpl extends Service implements SIAccountService {
public Map changeList(InsuranceAccountDetailParam param) {
Map datas = new HashMap<>();
Long employeeId = (long) user.getUID();
- SalaryPageUtil.start(param.getCurrent(), param.getPageSize());
List insuranceArchivesEmployeePOS = getInsuranceAccountDetailMapper().changeList(param.getUserName());
- PageInfo pageInfo = new PageInfo<>(insuranceArchivesEmployeePOS);
+ PageInfo pageInfo = SalaryPageUtil.buildPage(param.getCurrent(), param.getPageSize(),
+ insuranceArchivesEmployeePOS, InsuranceArchivesEmployeePO.class);
List> records = siArchivesBiz.buildTableData(insuranceArchivesEmployeePOS);
PageInfo> pageInfos = new PageInfo<>(records);
@@ -647,11 +647,10 @@ public class SIAccountServiceImpl extends Service implements SIAccountService {
public Map getInspectTable(InsuranceAccountDetailParam param) {
Map datas = new HashMap<>();
- SalaryPageUtil.start(param.getCurrent(), param.getPageSize());
List insuranceAccountInspectPOS = MapperProxyFactory.getProxy(InsuranceAccountInspectMapper.class).getByBillMonth(param.getBillMonth());
List> records = getService(user).buildInspectRecords(insuranceAccountInspectPOS, Long.valueOf(param.getPaymentOrganization()));
-
- PageInfo> pageInfos = new PageInfo<>(records);
+ List> paged = SalaryPageUtil.subList(param.getCurrent(), param.getPageSize(), records);
+ PageInfo> pageInfos = new PageInfo<>(paged);
pageInfos.setTotal(records.size());
pageInfos.setPageNum(param.getCurrent());
pageInfos.setPageSize(param.getPageSize());
diff --git a/src/com/engine/salary/service/impl/SIImportServiceImpl.java b/src/com/engine/salary/service/impl/SIImportServiceImpl.java
index aecdd2e8d..ab09e3a5f 100644
--- a/src/com/engine/salary/service/impl/SIImportServiceImpl.java
+++ b/src/com/engine/salary/service/impl/SIImportServiceImpl.java
@@ -98,9 +98,9 @@ public class SIImportServiceImpl extends Service implements SIImportService {
SqlSession sqlSession = MyBatisFactory.sqlSessionFactory.openSession();
SocialSchemeMapper socialSchemeMapper = sqlSession.getMapper(SocialSchemeMapper.class);
List page = new ArrayList<>();
- SalaryPageUtil.start(param.getCurrent(), param.getPageSize());
page = socialSchemeMapper.queryEmployeeList(param);
- PageInfo pageInfo = new PageInfo<>(page, InsuranceArchivesEmployeePO.class);
+ PageInfo pageInfo = SalaryPageUtil.buildPage(param.getCurrent(), param.getPageSize(),
+ page, InsuranceArchivesEmployeePO.class);
int total = (int)pageInfo.getTotal();
param.setPageSize(total);
param.setCurrent(1);
diff --git a/src/com/engine/salary/service/impl/SIReportServiceImpl.java b/src/com/engine/salary/service/impl/SIReportServiceImpl.java
index a89e68f27..619547e83 100644
--- a/src/com/engine/salary/service/impl/SIReportServiceImpl.java
+++ b/src/com/engine/salary/service/impl/SIReportServiceImpl.java
@@ -21,9 +21,9 @@ public class SIReportServiceImpl extends Service implements SIReportService {
@Override
public PageInfo welfareList(QueryAccountDetailParam param) {
- SalaryPageUtil.start(param.getCurrent(),param.getPageSize());
List insuranceAccountDetailPOS = getSIAccountDetailMapper().listSome(param);
- PageInfo page = new PageInfo<>(insuranceAccountDetailPOS ,InsuranceAccountDetailPO.class);
+ PageInfo page = SalaryPageUtil.buildPage(param.getCurrent(), param.getPageSize(),
+ insuranceAccountDetailPOS ,InsuranceAccountDetailPO.class);
List list = page.getList();
InsuranceAccountDetailPOEncrypt.decryptInsuranceAccountDetailPOList(list);
page.setList(list);
diff --git a/src/com/engine/salary/service/impl/SalaryAcctEmployeeServiceImpl.java b/src/com/engine/salary/service/impl/SalaryAcctEmployeeServiceImpl.java
index df9666c18..f1bf13b19 100644
--- a/src/com/engine/salary/service/impl/SalaryAcctEmployeeServiceImpl.java
+++ b/src/com/engine/salary/service/impl/SalaryAcctEmployeeServiceImpl.java
@@ -190,10 +190,10 @@ public class SalaryAcctEmployeeServiceImpl extends Service implements SalaryAcct
queryParam.setOrderRule(orderRule);
// 分页参数
- SalaryPageUtil.start(queryParam.getCurrent(), queryParam.getPageSize());
// 查询薪资核算人员
List salaryAcctEmployeePOS = getSalaryAcctEmployeeMapper().listPage(queryParam);
- return new PageInfo<>(salaryAcctEmployeePOS);
+ return SalaryPageUtil.buildPage(queryParam.getCurrent(), queryParam.getPageSize(),
+ salaryAcctEmployeePOS, SalaryAcctEmployeePO.class);
}
@Override
@@ -322,10 +322,9 @@ public class SalaryAcctEmployeeServiceImpl extends Service implements SalaryAcct
// 查询合并计税的薪资核算人员
Set otherSalaryAcctRecordIds = SalaryEntityUtil.properties(otherSalaryAcctRecordPOS, SalaryAcctRecordPO::getId);
// 分页参数
- SalaryPageUtil.start(queryParam.getCurrent(), queryParam.getPageSize());
List salaryAcctEmployeePOS = getSalaryAcctEmployeeMapper().listPage4ConsolidatedTax(otherSalaryAcctRecordIds, queryParam);
- PageInfo salaryAcctEmployeePOPageInfo = new PageInfo<>(salaryAcctEmployeePOS);
- return salaryAcctEmployeePOPageInfo;
+ return SalaryPageUtil.buildPage(queryParam.getCurrent(),queryParam.getPageSize(),
+ salaryAcctEmployeePOS, SalaryAcctEmployeePO.class);
}
@Override
diff --git a/src/com/engine/salary/service/impl/SalaryAcctRecordServiceImpl.java b/src/com/engine/salary/service/impl/SalaryAcctRecordServiceImpl.java
index a7347ea31..0076efe20 100644
--- a/src/com/engine/salary/service/impl/SalaryAcctRecordServiceImpl.java
+++ b/src/com/engine/salary/service/impl/SalaryAcctRecordServiceImpl.java
@@ -172,9 +172,9 @@ public class SalaryAcctRecordServiceImpl extends Service implements SalaryAcctRe
}
// 查询薪资核算记录
- SalaryPageUtil.start(queryParam.getCurrent(), queryParam.getPageSize());
List salaryAcctRecordPOS = getSalaryAcctRecordMapper().listSome(po);
- return new PageInfo<>(salaryAcctRecordPOS, SalaryAcctRecordPO.class);
+ return SalaryPageUtil.buildPage(queryParam.getCurrent(), queryParam.getPageSize(),
+ salaryAcctRecordPOS, SalaryAcctRecordPO.class);
}
@Override
diff --git a/src/com/engine/salary/service/impl/SalaryArchiveTaxAgentServiceImpl.java b/src/com/engine/salary/service/impl/SalaryArchiveTaxAgentServiceImpl.java
index 624958552..eede97198 100644
--- a/src/com/engine/salary/service/impl/SalaryArchiveTaxAgentServiceImpl.java
+++ b/src/com/engine/salary/service/impl/SalaryArchiveTaxAgentServiceImpl.java
@@ -60,10 +60,9 @@ public class SalaryArchiveTaxAgentServiceImpl extends Service implements SalaryA
@Override
public PageInfo taxAgentAdjustRecordListPage(TaxAgentAdjustRecordQueryParam queryParam) {
- SalaryPageUtil.start(queryParam.getCurrent(), queryParam.getPageSize());
List taxAgentAdjustRecordListDTOS = getSalaryArchiveTaxAgentMapper().taxAgentAdjustRecordList(queryParam);
- PageInfo pageInfo = new PageInfo(taxAgentAdjustRecordListDTOS, TaxAgentAdjustRecordListDTO.class);
- return pageInfo;
+ return SalaryPageUtil.buildPage(queryParam.getCurrent(), queryParam.getPageSize(),
+ taxAgentAdjustRecordListDTOS, TaxAgentAdjustRecordListDTO.class);
}
@Override
diff --git a/src/com/engine/salary/service/impl/SalarySendRangeServiceImpl.java b/src/com/engine/salary/service/impl/SalarySendRangeServiceImpl.java
index d1cd3db78..bf15ff818 100644
--- a/src/com/engine/salary/service/impl/SalarySendRangeServiceImpl.java
+++ b/src/com/engine/salary/service/impl/SalarySendRangeServiceImpl.java
@@ -94,9 +94,6 @@ public class SalarySendRangeServiceImpl extends Service implements SalarySendRan
@Override
public PageInfo listPage(SalarySendRangeQueryParam queryParam) {
- if (StrUtil.isEmpty(queryParam.getTargetName())) {
- SalaryPageUtil.start(queryParam.getCurrent(), queryParam.getPageSize());
- }
SalarySendRangeMapper mapper = MapperProxyFactory.getProxy(SalarySendRangeMapper.class);
List listDTOs = mapper.selectByParam(queryParam);
PageInfo page = new PageInfo<>(listDTOs, SalarySendRangeListDTO.class);
@@ -164,11 +161,9 @@ public class SalarySendRangeServiceImpl extends Service implements SalarySendRan
return s;
}).filter(Objects::nonNull)
.collect(Collectors.toList());
- if (StrUtil.isNotEmpty(queryParam.getTargetName())) {
- page.setTotal(listDTOs.size());
- List list = SalaryPageUtil.subList(queryParam.getCurrent(), queryParam.getPageSize(), listDTOs);
- page.setList(list);
- }
+ page.setTotal(listDTOs.size());
+ List list = SalaryPageUtil.subList(queryParam.getCurrent(), queryParam.getPageSize(), listDTOs);
+ page.setList(list);
return page;
}
@@ -179,7 +174,7 @@ public class SalarySendRangeServiceImpl extends Service implements SalarySendRan
@Override
public void deleteByIds(List sendRangeIds) {
- runMapper(mapper-> {
+ runMapper(mapper -> {
for (Long sendRangeId : sendRangeIds) {
mapper.deleteByPrimaryKey(sendRangeId);
}
diff --git a/src/com/engine/salary/service/impl/SalarySendServiceImpl.java b/src/com/engine/salary/service/impl/SalarySendServiceImpl.java
index e90030326..5efcfbe16 100644
--- a/src/com/engine/salary/service/impl/SalarySendServiceImpl.java
+++ b/src/com/engine/salary/service/impl/SalarySendServiceImpl.java
@@ -453,10 +453,9 @@ public class SalarySendServiceImpl extends Service implements SalarySendService
OrderRuleVO orderRule = getSalarySysConfService(user).orderRule();
queryParam.setOrderRule(orderRule);
- SalaryPageUtil.start(queryParam.getCurrent(), queryParam.getPageSize());
List page = salarySendInfoMapper.list(queryParam);
- PageInfo result = new PageInfo<>(page, SalarySendInfoListDTO.class);
- return result;
+ return SalaryPageUtil.buildPage(queryParam.getCurrent(), queryParam.getPageSize(),
+ page, SalarySendInfoListDTO.class);
}
@Override
@@ -493,10 +492,9 @@ public class SalarySendServiceImpl extends Service implements SalarySendService
return new PageInfo<>();
}
}
- SalaryPageUtil.start(queryParam.getCurrent(), queryParam.getPageSize());
List list = MapperProxyFactory.getProxy(SalarySendInfoMapper.class).detailList(queryParam, otherSalaryAcctRecordIds);
- PageInfo pageInfo = new PageInfo<>(list, SalarySendDetailListDTO.class);
- return pageInfo;
+ return SalaryPageUtil.buildPage(queryParam.getCurrent(), queryParam.getPageSize(),
+ list, SalarySendDetailListDTO.class);
}
/**
diff --git a/src/com/engine/salary/service/impl/SalarySobServiceImpl.java b/src/com/engine/salary/service/impl/SalarySobServiceImpl.java
index dfd10acd9..9c60d1154 100644
--- a/src/com/engine/salary/service/impl/SalarySobServiceImpl.java
+++ b/src/com/engine/salary/service/impl/SalarySobServiceImpl.java
@@ -190,9 +190,9 @@ public class SalarySobServiceImpl extends Service implements SalarySobService {
page.setList(subSalarySobs);
return page;
} else {
- SalaryPageUtil.start(queryParam.getCurrent(), queryParam.getPageSize());
List salarySobPOS = salarySobMapper.listSome(build);
- return new PageInfo<>(salarySobPOS, SalarySobPO.class);
+ return SalaryPageUtil.buildPage(queryParam.getCurrent(), queryParam.getPageSize(),
+ salarySobPOS, SalarySobPO.class);
}
}
diff --git a/src/com/engine/salary/service/impl/SpecialAddDeductionServiceImpl.java b/src/com/engine/salary/service/impl/SpecialAddDeductionServiceImpl.java
index df9b604be..f3c74b186 100644
--- a/src/com/engine/salary/service/impl/SpecialAddDeductionServiceImpl.java
+++ b/src/com/engine/salary/service/impl/SpecialAddDeductionServiceImpl.java
@@ -9,7 +9,10 @@ import com.engine.salary.encrypt.datacollection.SpecialAddDeductionEncrypt;
import com.engine.salary.entity.datacollection.DataCollectionEmployee;
import com.engine.salary.entity.datacollection.dto.SpecialAddDeductionListDTO;
import com.engine.salary.entity.datacollection.dto.SpecialAddDeductionRecordDTO;
-import com.engine.salary.entity.datacollection.param.*;
+import com.engine.salary.entity.datacollection.param.SpecialAddDeductionImportParam;
+import com.engine.salary.entity.datacollection.param.SpecialAddDeductionParam;
+import com.engine.salary.entity.datacollection.param.SpecialAddDeductionQueryParam;
+import com.engine.salary.entity.datacollection.param.SpecialAddDeductionRecordDeleteParam;
import com.engine.salary.entity.datacollection.po.SpecialAddDeductionPO;
import com.engine.salary.entity.taxagent.dto.TaxAgentEmployeeTaxAgentDTO;
import com.engine.salary.entity.taxagent.dto.TaxAgentManageRangeEmployeeDTO;
@@ -99,10 +102,11 @@ public class SpecialAddDeductionServiceImpl extends Service implements SpecialAd
if (needAuth) {
putQueryRange(queryParam);
}
- SalaryPageUtil.start(queryParam.getCurrent(), queryParam.getPageSize());
List list = getSpecialAddDeductionMapper().listByParam(queryParam);
- SpecialAddDeductionEncrypt.decrypt(list);
- return new PageInfo<>(list, SpecialAddDeductionListDTO.class);
+ PageInfo page = SalaryPageUtil.buildPage(queryParam.getCurrent(), queryParam.getPageSize(),
+ list, SpecialAddDeductionListDTO.class);
+ SpecialAddDeductionEncrypt.decrypt(page.getList());
+ return page;
}
@Override
@@ -113,11 +117,11 @@ public class SpecialAddDeductionServiceImpl extends Service implements SpecialAd
if (needAuth) {
putQueryRange(queryParam);
}
- SalaryPageUtil.start(queryParam.getCurrent(), queryParam.getPageSize());
List list = getSpecialAddDeductionMapper().listDtoByParam(queryParam);
- SpecialAddDeductionEncrypt.decrypt(list);
-
- return new PageInfo<>(list, SpecialAddDeductionRecordDTO.class);
+ PageInfo page = SalaryPageUtil.buildPage(queryParam.getCurrent(), queryParam.getPageSize(),
+ list, SpecialAddDeductionRecordDTO.class);
+ SpecialAddDeductionEncrypt.decrypt(page.getList());
+ return page;
}
private void putQueryRange(SpecialAddDeductionQueryParam queryParam) {
diff --git a/src/com/engine/salary/service/impl/TaxAgentServiceImpl.java b/src/com/engine/salary/service/impl/TaxAgentServiceImpl.java
index 0d1a32b54..0573737f7 100644
--- a/src/com/engine/salary/service/impl/TaxAgentServiceImpl.java
+++ b/src/com/engine/salary/service/impl/TaxAgentServiceImpl.java
@@ -215,9 +215,9 @@ public class TaxAgentServiceImpl extends Service implements TaxAgentService {
@Override
public PageInfo listPage(TaxAgentQueryParam queryParam) {
- SalaryPageUtil.start(queryParam.getCurrent(), queryParam.getPageSize());
List taxAgentPOS = getTaxAgentMapper().listBySome(queryParam);
- return new PageInfo<>(taxAgentPOS);
+ return SalaryPageUtil.buildPage(queryParam.getCurrent(), queryParam.getPageSize(),
+ taxAgentPOS, TaxAgentPO.class);
}
@Override
diff --git a/src/com/engine/salary/service/impl/TaxDeclarationServiceImpl.java b/src/com/engine/salary/service/impl/TaxDeclarationServiceImpl.java
index a9c95c094..f518e664e 100644
--- a/src/com/engine/salary/service/impl/TaxDeclarationServiceImpl.java
+++ b/src/com/engine/salary/service/impl/TaxDeclarationServiceImpl.java
@@ -122,9 +122,9 @@ public class TaxDeclarationServiceImpl extends Service implements TaxDeclaration
}
// 查询个税申报表
- SalaryPageUtil.start(queryParam.getCurrent(), queryParam.getPageSize());
List taxDeclarationPOS = getTaxDeclarationMapper().listSome(po);
- return new PageInfo<>(taxDeclarationPOS, TaxDeclarationPO.class);
+ return SalaryPageUtil.buildPage(queryParam.getCurrent(), queryParam.getPageSize(),
+ taxDeclarationPOS, TaxDeclarationPO.class);
}
diff --git a/src/com/engine/salary/wrapper/SalarySendWrapper.java b/src/com/engine/salary/wrapper/SalarySendWrapper.java
index c0e4fb0f0..d8e2c2ac7 100644
--- a/src/com/engine/salary/wrapper/SalarySendWrapper.java
+++ b/src/com/engine/salary/wrapper/SalarySendWrapper.java
@@ -94,16 +94,15 @@ public class SalarySendWrapper extends Service {
if (CollectionUtils.isNotEmpty(salarySobIds)) {
queryParam.setSalarySobIds(salarySobIds);
SalarySendMapper salarySendMapper = sqlSession.getMapper(SalarySendMapper.class);
- SalaryPageUtil.start(queryParam.getCurrent(), queryParam.getPageSize());
list = salarySendMapper.list(queryParam);
}
} else {
SalarySendMapper salarySendMapper = sqlSession.getMapper(SalarySendMapper.class);
- SalaryPageUtil.start(queryParam.getCurrent(), queryParam.getPageSize());
list = salarySendMapper.list(queryParam);
}
- PageInfo pageInfo = new PageInfo<>(list, SalarySendListDTO.class);
+ PageInfo pageInfo = SalaryPageUtil.buildPage(queryParam.getCurrent(), queryParam.getPageSize(),
+ list, SalarySendListDTO.class);
List pageList = pageInfo.getList();
List salarySobIds = pageList.stream().map(SalarySendListDTO::getSalarySobId).distinct().collect(Collectors.toList());
// 获取默认模板