diff --git a/src/com/engine/salary/biz/AddUpDeductionBiz.java b/src/com/engine/salary/biz/AddUpDeductionBiz.java
index 954cc157a..c04f34936 100644
--- a/src/com/engine/salary/biz/AddUpDeductionBiz.java
+++ b/src/com/engine/salary/biz/AddUpDeductionBiz.java
@@ -121,60 +121,7 @@ public class AddUpDeductionBiz extends BaseBean {
     }
 
 
-    /**
-     * 导出
-     *
-     * @param param
-     * @return
-     */
-    public XSSFWorkbook export(AddUpDeductionQueryParam param) {
 
-        //获取操作按钮资源
-        List<List<String>> rowList = getExcelRowList(param);
-
-        //获取excel
-        return ExcelUtil.genWorkbook(rowList, "累计专项附加扣除");
-    }
-
-
-    /**
-     * 获取excel数据行
-     *
-     * @return 导出数据行集合
-     */
-    private List<List<String>> getExcelRowList(AddUpDeductionQueryParam param) {
-        //excel标题
-        List<String> title = Arrays.asList("姓名", "个税扣缴义务人", "部门", "手机号", "工号", "证件号码", "入职日期", "累计子女教育", "累计继续教育", "累计住房贷款利息", "累计住房租金", "累计赡养老人", "累计大病医疗", "累计婴幼儿照护");
-
-        SimpleDateFormat formatter = new SimpleDateFormat("yyyy-MM-dd");
-        List<AddUpDeductionDTO> list = list(param);
-        final List<List<String>> dataRowList = Optional.ofNullable(list)
-                .map(List::stream)
-                .map(operatorStream -> operatorStream.map(dto -> {
-                    List<String> cellList = new ArrayList<>();
-                    cellList.add(Util.null2String(dto.getUsername()));
-                    cellList.add(Util.null2String(dto.getTaxAgentName()));
-                    cellList.add(Util.null2String(dto.getDepartmentName()));
-                    cellList.add(Util.null2String(dto.getMobile()));
-                    cellList.add(Util.null2String(dto.getJobNum()));
-                    cellList.add(Util.null2String(dto.getIdNo()));
-                    cellList.add(Util.null2String(dto.getHiredate()));
-                    cellList.add(Util.null2String(dto.getAddUpChildEducation()));
-                    cellList.add(Util.null2String(dto.getAddUpContinuingEducation()));
-                    cellList.add(Util.null2String(dto.getAddUpHousingLoanInterest()));
-                    cellList.add(Util.null2String(dto.getAddUpHousingRent()));
-                    cellList.add(Util.null2String(dto.getAddUpSupportElderly()));
-                    cellList.add(Util.null2String(dto.getAddUpIllnessMedical()));
-                    cellList.add(Util.null2String(dto.getAddUpInfantCare()));
-                    return cellList;
-                }).collect(Collectors.toList()))
-                .orElse(Collections.emptyList());
-
-        List<List<String>> rowList = new ArrayList<>();
-        rowList.add(title);
-        rowList.addAll(dataRowList);
-        return rowList;
-    }
 
 
     /**
diff --git a/src/com/engine/salary/biz/SIAccountBiz.java b/src/com/engine/salary/biz/SIAccountBiz.java
index d681581ac..519469b7e 100644
--- a/src/com/engine/salary/biz/SIAccountBiz.java
+++ b/src/com/engine/salary/biz/SIAccountBiz.java
@@ -27,15 +27,13 @@ import com.engine.salary.mapper.siaccount.SIAccountDetailTempMapper;
 
 import com.engine.salary.mapper.sicategory.ICategoryMapper;
 import com.engine.salary.mapper.sischeme.InsuranceSchemeDetailMapper;
-import com.engine.salary.service.SIAccountService;
-import com.engine.salary.service.impl.SIAccountServiceImpl;
 import com.engine.salary.util.SalaryAssert;
 import com.engine.salary.util.SalaryDateUtil;
 import com.engine.salary.util.SalaryEntityUtil;
 import com.engine.salary.util.SalaryI18nUtil;
 import com.engine.salary.util.db.MapperProxyFactory;
 import com.engine.salary.util.page.PageInfo;
-import com.engine.salary.util.page.PageUtil;
+import com.engine.salary.util.page.SalaryPageUtil;
 import com.google.common.collect.Lists;
 import dm.jdbc.util.IdGenerator;
 import org.apache.commons.collections4.CollectionUtils;
@@ -43,9 +41,7 @@ import org.apache.commons.lang3.StringUtils;
 import org.apache.ibatis.session.SqlSession;
 import org.springframework.beans.BeanUtils;
 
-import org.springframework.transaction.annotation.Transactional;
 import weaver.conn.mybatis.MyBatisFactory;
-import weaver.hrm.User;
 
 import java.math.BigDecimal;
 import java.util.*;
@@ -71,7 +67,7 @@ public class SIAccountBiz extends Service{
         SqlSession sqlSession = MyBatisFactory.sqlSessionFactory.openSession();
         try {
             InsuranceAccountBatchMapper insuranceAccountBatchMapper = sqlSession.getMapper(InsuranceAccountBatchMapper.class);
-            PageUtil.start(queryParam.getCurrent(), queryParam.getPageSize());
+            SalaryPageUtil.start(queryParam.getCurrent(), queryParam.getPageSize());
             List<InsuranceAccountBatchPO> list  = insuranceAccountBatchMapper.list(queryParam);
             PageInfo<InsuranceAccountBatchPO> pageInfo = new PageInfo<>(list,InsuranceAccountBatchPO.class);
             return pageInfo;
@@ -85,7 +81,7 @@ public class SIAccountBiz extends Service{
         SqlSession sqlSession = MyBatisFactory.sqlSessionFactory.openSession();
         try {
             InsuranceAccountDetailMapper insuranceAccountDetailMapper = sqlSession.getMapper(InsuranceAccountDetailMapper.class);
-            PageUtil.start(queryParam.getCurrent(), queryParam.getPageSize());
+            SalaryPageUtil.start(queryParam.getCurrent(), queryParam.getPageSize());
             queryParam.setPaymentStatus(PaymentStatusEnum.COMMON.getValue());
             List<InsuranceAccountDetailPO> list = insuranceAccountDetailMapper.list(queryParam);
             PageInfo<InsuranceAccountDetailPO> pageInfo = new PageInfo<>(list,InsuranceAccountDetailPO.class);
@@ -1304,7 +1300,7 @@ public class SIAccountBiz extends Service{
 
     public PageInfo<InsuranceAccountViewListDTO> overView(InsuranceAccountDetailParam queryParam) {
 
-        PageUtil.start(queryParam.getCurrent(),queryParam.getPageSize());
+        SalaryPageUtil.start(queryParam.getCurrent(),queryParam.getPageSize());
         List<InsuranceAccountDetailPO> insuranceAccountDetailPOS = MapperProxyFactory.getProxy(InsuranceAccountDetailMapper.class).selectList(queryParam.getBillMonth());
 
         //获取扣缴义务人信息
diff --git a/src/com/engine/salary/biz/SIArchivesBiz.java b/src/com/engine/salary/biz/SIArchivesBiz.java
index 0f37d2265..fae3d95fe 100644
--- a/src/com/engine/salary/biz/SIArchivesBiz.java
+++ b/src/com/engine/salary/biz/SIArchivesBiz.java
@@ -8,7 +8,6 @@ import com.api.browser.bean.SearchConditionItem;
 import com.api.browser.bean.SearchConditionOption;
 import com.api.browser.util.ConditionFactory;
 import com.api.browser.util.ConditionType;
-import com.cloudstore.eccom.constant.WeaInputType;
 import com.cloudstore.eccom.pc.table.WeaTable;
 import com.cloudstore.eccom.pc.table.WeaTableCheckboxpopedom;
 import com.cloudstore.eccom.pc.table.WeaTableColumn;
@@ -41,7 +40,7 @@ import com.engine.salary.util.SalaryEntityUtil;
 import com.engine.salary.util.SalaryFormItemUtil;
 import com.engine.salary.util.db.MapperProxyFactory;
 import com.engine.salary.util.page.PageInfo;
-import com.engine.salary.util.page.PageUtil;
+import com.engine.salary.util.page.SalaryPageUtil;
 import org.apache.commons.collections.CollectionUtils;
 import org.apache.ibatis.session.SqlSession;
 import weaver.conn.mybatis.MyBatisFactory;
@@ -609,7 +608,7 @@ public class SIArchivesBiz {
         Map<String, Object> datas = new HashMap<>(16);
         try {
             SocialSchemeMapper socialSchemeMapper = sqlSession.getMapper(SocialSchemeMapper.class);
-            PageUtil.start(param.getCurrent(), param.getPageSize());
+            SalaryPageUtil.start(param.getCurrent(), param.getPageSize());
 //            List<InsuranceArchivesEmployeePO> page = socialSchemeMapper.listPageEmployeePOS(param);
             List<InsuranceArchivesEmployeePO> page = socialSchemeMapper.queryEmployeeList(param);
             PageInfo<InsuranceArchivesEmployeePO> pageInfo = new PageInfo<>(page, InsuranceArchivesEmployeePO.class);
diff --git a/src/com/engine/salary/biz/SalaryArchiveBiz.java b/src/com/engine/salary/biz/SalaryArchiveBiz.java
index bd2477c75..cbf8b4f41 100644
--- a/src/com/engine/salary/biz/SalaryArchiveBiz.java
+++ b/src/com/engine/salary/biz/SalaryArchiveBiz.java
@@ -5,7 +5,7 @@ import com.engine.salary.entity.salaryarchive.param.SalaryArchiveQueryParam;
 import com.engine.salary.entity.salaryarchive.po.SalaryArchivePO;
 import com.engine.salary.mapper.archive.SalaryArchiveMapper;
 import com.engine.salary.util.page.PageInfo;
-import com.engine.salary.util.page.PageUtil;
+import com.engine.salary.util.page.SalaryPageUtil;
 import org.apache.ibatis.session.SqlSession;
 import weaver.conn.mybatis.MyBatisFactory;
 
@@ -28,7 +28,7 @@ public class SalaryArchiveBiz {
         SqlSession sqlSession = MyBatisFactory.sqlSessionFactory.openSession();
         try {
             SalaryArchiveMapper mapper = sqlSession.getMapper(SalaryArchiveMapper.class);
-            PageUtil.start(param.getCurrent(), param.getPageSize());
+            SalaryPageUtil.start(param.getCurrent(), param.getPageSize());
             List<SalaryArchiveListDTO> list = mapper.list(param);
             PageInfo<SalaryArchiveListDTO> pageInfo = new PageInfo<SalaryArchiveListDTO>(list, SalaryArchiveListDTO.class);
             return pageInfo;
diff --git a/src/com/engine/salary/biz/SalaryArchiveItemBiz.java b/src/com/engine/salary/biz/SalaryArchiveItemBiz.java
index f74048490..a2f88b8d7 100644
--- a/src/com/engine/salary/biz/SalaryArchiveItemBiz.java
+++ b/src/com/engine/salary/biz/SalaryArchiveItemBiz.java
@@ -6,7 +6,7 @@ import com.engine.salary.entity.salaryarchive.param.SalaryItemAdjustRecordQueryP
 import com.engine.salary.entity.salaryarchive.po.SalaryArchiveItemPO;
 import com.engine.salary.mapper.archive.SalaryArchiveItemMapper;
 import com.engine.salary.util.page.PageInfo;
-import com.engine.salary.util.page.PageUtil;
+import com.engine.salary.util.page.SalaryPageUtil;
 import org.apache.ibatis.session.SqlSession;
 import weaver.conn.mybatis.MyBatisFactory;
 
@@ -123,7 +123,7 @@ public class SalaryArchiveItemBiz {
     public PageInfo<SalaryItemAdjustRecordListDTO> salaryItemAdjustRecordListPage(SalaryItemAdjustRecordQueryParam queryParam, List<Long> salaryItemIds) {
         SqlSession sqlSession = MyBatisFactory.sqlSessionFactory.openSession();
         try {
-            PageUtil.start(queryParam.getCurrent(), queryParam.getPageSize());
+            SalaryPageUtil.start(queryParam.getCurrent(), queryParam.getPageSize());
             SalaryArchiveItemMapper mapper = sqlSession.getMapper(SalaryArchiveItemMapper.class);
             List<SalaryItemAdjustRecordListDTO> salaryItemAdjustRecordListDTOS = mapper.salaryItemAdjustRecordList(queryParam, salaryItemIds);
             PageInfo<SalaryItemAdjustRecordListDTO> page = new PageInfo<SalaryItemAdjustRecordListDTO>(salaryItemAdjustRecordListDTOS,SalaryItemAdjustRecordListDTO.class);
diff --git a/src/com/engine/salary/biz/SalaryItemBiz.java b/src/com/engine/salary/biz/SalaryItemBiz.java
index fdf8ce1db..3a8b6083e 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.engine.salary.util.page.PageUtil;
+import com.engine.salary.util.page.SalaryPageUtil;
 import org.apache.ibatis.session.SqlSession;
 import weaver.conn.mybatis.MyBatisFactory;
 
@@ -92,7 +92,7 @@ public class SalaryItemBiz {
         SqlSession sqlSession = MyBatisFactory.sqlSessionFactory.openSession();
         try {
             SalaryItemMapper mapper = sqlSession.getMapper(SalaryItemMapper.class);
-            PageUtil.start(searchParam.getCurrent(), searchParam.getPageSize());
+            SalaryPageUtil.start(searchParam.getCurrent(), searchParam.getPageSize());
             List<SalaryItemPO> salaryItemPOList = mapper.listByParam(searchParam);
             return new PageInfo<SalaryItemPO>(salaryItemPOList);
         } finally {
diff --git a/src/com/engine/salary/biz/SalarySobCheckRuleBiz.java b/src/com/engine/salary/biz/SalarySobCheckRuleBiz.java
index 74d9abf9d..ee6a49edd 100644
--- a/src/com/engine/salary/biz/SalarySobCheckRuleBiz.java
+++ b/src/com/engine/salary/biz/SalarySobCheckRuleBiz.java
@@ -4,7 +4,7 @@ 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.PageUtil;
+import com.engine.salary.util.page.SalaryPageUtil;
 import org.apache.ibatis.session.SqlSession;
 import weaver.conn.mybatis.MyBatisFactory;
 
@@ -93,7 +93,7 @@ public class SalarySobCheckRuleBiz {
         SqlSession sqlSession = MyBatisFactory.sqlSessionFactory.openSession();
         try {
             SalarySobCheckRuleMapper mapper = sqlSession.getMapper(SalarySobCheckRuleMapper.class);
-            PageUtil.start(param.getCurrent(), param.getPageSize());
+            SalaryPageUtil.start(param.getCurrent(), param.getPageSize());
             List<SalarySobCheckRulePO> list = mapper.listByParam(param);
             PageInfo<SalarySobCheckRulePO> pageInfo = new PageInfo<SalarySobCheckRulePO>(list, SalarySobCheckRulePO.class);
             return pageInfo;
diff --git a/src/com/engine/salary/entity/datacollection/dto/AddUpDeductionRecordDTO.java b/src/com/engine/salary/entity/datacollection/dto/AddUpDeductionRecordDTO.java
index cc3ae1e3f..ff75cb973 100644
--- a/src/com/engine/salary/entity/datacollection/dto/AddUpDeductionRecordDTO.java
+++ b/src/com/engine/salary/entity/datacollection/dto/AddUpDeductionRecordDTO.java
@@ -43,6 +43,11 @@ public class AddUpDeductionRecordDTO {
     @ExcelProperty(index = 2)
     private String taxAgentName;
 
+    /**
+     * 个税扣缴义务人id
+     */
+    private Long taxAgentId;
+
 
     //部门
     @SalaryTableColumn(text = "部门", width = "10%", column = "departmentName")
diff --git a/src/com/engine/salary/mapper/datacollection/AddUpDeductionMapper.xml b/src/com/engine/salary/mapper/datacollection/AddUpDeductionMapper.xml
index 34b0855b1..b32b0ec09 100644
--- a/src/com/engine/salary/mapper/datacollection/AddUpDeductionMapper.xml
+++ b/src/com/engine/salary/mapper/datacollection/AddUpDeductionMapper.xml
@@ -85,8 +85,8 @@
         e.mobile,
         e.workcode as job_num,
         e.companystartdate as hiredate,
-        t2.name AS tax_agent_name,
-        t2.id AS tax_agent_name,
+        t2.name AS taxAgentName,
+        t2.id AS taxAgentId,
         t1.add_up_child_education,
         t1.add_up_continuing_education,
         t1.add_up_housing_loan_interest,
diff --git a/src/com/engine/salary/service/impl/AddUpDeductionServiceImpl.java b/src/com/engine/salary/service/impl/AddUpDeductionServiceImpl.java
index c61f5dd5c..c462f8e88 100644
--- a/src/com/engine/salary/service/impl/AddUpDeductionServiceImpl.java
+++ b/src/com/engine/salary/service/impl/AddUpDeductionServiceImpl.java
@@ -7,6 +7,7 @@ import com.engine.salary.cmd.datacollection.*;
 import com.engine.salary.entity.datacollection.AddUpDeduction;
 import com.engine.salary.entity.datacollection.DataCollectionEmployee;
 import com.engine.salary.entity.datacollection.dto.AddUpDeductionDTO;
+import com.engine.salary.entity.datacollection.dto.AddUpDeductionRecordDTO;
 import com.engine.salary.entity.datacollection.param.AddUpDeductionQueryParam;
 import com.engine.salary.entity.taxagent.bo.TaxAgentBO;
 import com.engine.salary.entity.taxagent.dto.TaxAgentEmployeeDTO;
@@ -20,13 +21,17 @@ import com.engine.salary.util.db.MapperProxyFactory;
 import com.engine.salary.util.excel.ExcelComment;
 import com.engine.salary.util.excel.ExcelUtil;
 import com.engine.salary.util.page.PageInfo;
-import com.engine.salary.util.page.PageUtil;
+import com.engine.salary.util.page.SalaryPageUtil;
 import com.google.common.collect.Lists;
 import org.apache.commons.collections4.CollectionUtils;
 import org.apache.commons.lang3.StringUtils;
 import org.apache.poi.xssf.usermodel.XSSFWorkbook;
 import weaver.general.Util;
 
+import javax.annotation.Resource;
+import java.text.SimpleDateFormat;
+import java.time.LocalDate;
+import java.time.LocalDateTime;
 import java.time.YearMonth;
 import java.util.*;
 import java.util.stream.Collectors;
@@ -50,6 +55,9 @@ public class AddUpDeductionServiceImpl extends Service implements AddUpDeduction
 
     @Override
     public XSSFWorkbook export(Map<String, Object> params) {
+
+        Boolean chief = taxAgentService.isChief((long) user.getUID());
+
         AddUpDeductionQueryParam addUpDeductionQueryParam = (AddUpDeductionQueryParam) params.get("addUpDeductionQueryParam");
 
         AddUpDeductionBiz addUpDeductionBiz = new AddUpDeductionBiz();
@@ -221,11 +229,10 @@ public class AddUpDeductionServiceImpl extends Service implements AddUpDeduction
 
     @Override
     public PageInfo<AddUpDeductionDTO> listPage(AddUpDeductionQueryParam queryParam, Long employeeId) {
-        PageInfo<AddUpDeductionDTO> dtoPage = PageUtil.buildPage(queryParam.getCurrent(), queryParam.getPageSize());
 
         // 未开启分权或是薪酬模块总管理员
         if (!taxAgentService.isOpenDevolution() || taxAgentService.isChief(employeeId)) {
-            PageUtil.start(queryParam.getCurrent(), queryParam.getPageSize());
+            SalaryPageUtil.start(queryParam.getCurrent(), queryParam.getPageSize());
             List<AddUpDeductionDTO> list = getAddUpDeductionMapper().list(queryParam);
             return new PageInfo<>(list, AddUpDeductionDTO.class);
         } else {
@@ -243,51 +250,262 @@ public class AddUpDeductionServiceImpl extends Service implements AddUpDeduction
             ).collect(Collectors.toList());
             // 填充总数和当页数据
             // 分页参数
+            PageInfo<AddUpDeductionDTO> dtoPage = SalaryPageUtil.buildPage(queryParam.getCurrent(), queryParam.getPageSize(), AddUpDeductionDTO.class);
             dtoPage.setTotal(list.size());
-            dtoPage.setRecords(SalaryPageUtil.subList((int) dtoPage.getCurrent(), (int) dtoPage.getSize(), list));
-            page = dtoPage;
+            dtoPage.setList(SalaryPageUtil.subList(dtoPage.getPageNum(), dtoPage.getSize(), list));
+            return dtoPage;
         }
-        return page;
     }
 
     @Override
-    public Page<AddUpDeductionRecordDTO> recordListPage(Page<AddUpDeductionRecordDTO> page, AddUpDeductionQueryParam queryParam, Long employeeId, String tenantKey) {
+    public PageInfo<AddUpDeductionRecordDTO> recordListPage(AddUpDeductionQueryParam queryParam, Long employeeId) {
         // 未开启分权或是薪酬模块总管理员
-        if (!taxAgentService.isOpenDevolution(tenantKey) || taxAgentService.isChief(employeeId, tenantKey)) {
-            getAddUpDeductionMapper().recordList(page, queryParam, tenantKey);
+        if (!taxAgentService.isOpenDevolution() || taxAgentService.isChief(employeeId)) {
+            SalaryPageUtil.start(queryParam.getCurrent(), queryParam.getPageSize());
+            List<AddUpDeductionRecordDTO> list = getAddUpDeductionMapper().recordList(queryParam);
+            return new PageInfo<>(list, AddUpDeductionRecordDTO.class);
         } else {
-            List<TaxAgentEmployeeDTO> taxAgentEmployees = taxAgentService.listTaxAgentAndEmployee(employeeId, tenantKey);
+            List<TaxAgentEmployeeDTO> taxAgentEmployees = taxAgentService.listTaxAgentAndEmployee(employeeId);
+            List<Long> taxAgentIdsAsAdmin = taxAgentService.listAllTaxAgentsAsAdmin(employeeId).stream().map(TaxAgentPO::getId).collect(Collectors.toList());
+//            List<AddUpDeductionPO> lastList = getLastListByModifier(employeeId, tenantKey);
+            List<AddUpDeductionRecordDTO> list = getAddUpDeductionMapper().recordList(queryParam);
+            list = list.stream().filter(f ->
+                            // 作为管理员
+                            taxAgentIdsAsAdmin.contains(f.getTaxAgentId())
+                                    // 作为分管理员
+                                    || TaxAgentBO.checkTaxAgentAndEmployee(taxAgentEmployees, f.getTaxAgentId(), f.getEmployeeId())
+                    // 自己最后修改过的，则可以看到最新和其历史
+//                            || lastList.stream().anyMatch(l -> l.getEmployeeId().equals(f.getEmployeeId()) && l.getTaxAgentId().equals(f.getTaxAgentId()) && !l.getDeclareMonth().isBefore(f.getDeclareMonth()))
+            ).collect(Collectors.toList());
+            // 分页参数
+            // 填充总数和当页数据
+            PageInfo<AddUpDeductionRecordDTO> dtoPage = SalaryPageUtil.buildPage(queryParam.getCurrent(), queryParam.getPageSize(), AddUpDeductionRecordDTO.class);
+            dtoPage.setTotal(list.size());
+            dtoPage.setList(SalaryPageUtil.subList(dtoPage.getPageNum(), dtoPage.getSize(), list));
+            return dtoPage;
+        }
+    }
+
+
+    @Override
+    public void export(Map<String, Object> map, String username, String eteamsId, boolean isChief, AddUpDeductionQueryParam queryParam, Long employeeId, String tenantKey) {
+        List<ExcelSheetData> sheetList = new ArrayList<>();
+
+        ExcelSheetData excelSheetData = new ExcelSheetData();
+
+        String nameI18n = SalaryI18nUtil.getI18nLabel(tenantKey, employeeId, 85380, "累计专项附加扣除");
+        // 1.工作簿名称
+        excelSheetData.setSheetName(nameI18n);
+        String[] header = {
+                SalaryI18nUtil.getI18nLabel(tenantKey, employeeId, 85429, "姓名"),
+                SalaryI18nUtil.getI18nLabel(tenantKey, employeeId, 86184, "个税扣缴义务人"),
+                SalaryI18nUtil.getI18nLabel(tenantKey, employeeId, 86185, "部门"),
+                SalaryI18nUtil.getI18nLabel(tenantKey, employeeId, 86186, "手机号"),
+                SalaryI18nUtil.getI18nLabel(tenantKey, employeeId, 86317, "工号"),
+                SalaryI18nUtil.getI18nLabel(tenantKey, employeeId, 86318, "证件号码"),
+                SalaryI18nUtil.getI18nLabel(tenantKey, employeeId, 86319, "入职日期"),
+                SalaryI18nUtil.getI18nLabel(tenantKey, employeeId, 86321, "累计子女教育"),
+                SalaryI18nUtil.getI18nLabel(tenantKey, employeeId, 86323, "累计继续教育"),
+                SalaryI18nUtil.getI18nLabel(tenantKey, employeeId, 86324, "累计住房贷款利息"),
+                SalaryI18nUtil.getI18nLabel(tenantKey, employeeId, 86325, "累计住房租金"),
+                SalaryI18nUtil.getI18nLabel(tenantKey, employeeId, 86326, "累计赡养老人"),
+                SalaryI18nUtil.getI18nLabel(tenantKey, employeeId, 105142, "累计大病医疗"),
+                SalaryI18nUtil.getI18nLabel(tenantKey, employeeId, 117732, "累计婴幼儿照护")
+        };
+        // 2.表头
+        excelSheetData.setHeaders(Collections.singletonList(header));
+        queryParam.setDeclareMonthDate(CollectionUtils.emptyIfNull(queryParam.getDeclareMonth()).stream().map(e-> LocalDate.of(e.getYear(),e.getMonthValue(),1)).collect(Collectors.toList()));
+        // 获取累计专项附加扣除
+        List<AddUpDeductionListDTO> list = addUpDeductionMapper.list(queryParam, tenantKey);
+
+        // 开启分权并且不是薪酬模块总管理员
+        if (taxAgentService.isOpenDevolution(tenantKey) && !isChief) {
+            List<TaxAgentEmployeeDTO>  taxAgentEmployees = taxAgentService.listTaxAgentAndEmployee(employeeId, tenantKey);
             List<Long> taxAgentIdsAsAdmin = taxAgentService.listAllTaxAgentsAsAdmin(employeeId, tenantKey).stream().map(TaxAgentPO::getId).collect(Collectors.toList());
             List<AddUpDeductionPO> lastList = getLastListByModifier(employeeId, tenantKey);
-            List<AddUpDeductionRecordDTO> list = getAddUpDeductionMapper().recordList(queryParam, tenantKey);
-            // 分页参数
-            Page<AddUpDeductionRecordDTO> dtoPage = SalaryPageUtil.buildPage(queryParam.getCurrent(), queryParam.getPageSize());
             list = list.stream().filter(f ->
                     // 作为管理员
                     taxAgentIdsAsAdmin.contains(f.getTaxAgentId())
                             // 作为分管理员
                             || TaxAgentBO.checkTaxAgentAndEmployee(taxAgentEmployees, f.getTaxAgentId(), f.getEmployeeId())
                             // 自己最后修改过的，则可以看到最新和其历史
-                            || lastList.stream().anyMatch(l -> l.getEmployeeId().equals(f.getEmployeeId()) && l.getTaxAgentId().equals(f.getTaxAgentId()) && !l.getDeclareMonth().isBefore(f.getDeclareMonth()))
+                            || lastList.stream().anyMatch(l->l.getEmployeeId().equals(f.getEmployeeId()) && l.getTaxAgentId().equals(f.getTaxAgentId()) && !l.getDeclareMonth().isBefore(f.getDeclareMonth()))
             ).collect(Collectors.toList());
-            // 填充总数和当页数据
-            dtoPage.setTotal(list.size());
-            dtoPage.setRecords(SalaryPageUtil.subList((int) dtoPage.getCurrent(), (int) dtoPage.getSize(), list));
-            page = dtoPage;
         }
-        return page;
+        List<SimpleUserInfo> simpleUserInfos = salaryEmployeeService.listByEmployeeIds(list.stream().map(AddUpDeductionListDTO::getEmployeeId).collect(Collectors.toList()), tenantKey);
+        List<List<Object>> rows = new ArrayList<>();
+        for (AddUpDeductionListDTO dto : list) {
+            List<Object> row = new ArrayList<>();
+            row.add(dto.getUsername());
+            row.add(dto.getTaxAgentName());
+            row.add(dto.getDepartmentName());
+            row.add(dto.getMobile());
+            row.add(dto.getJobNum());
+            row.add(DataCollectionBO.getIdNo(dto.getEmployeeId(), simpleUserInfos));
+            row.add(dto.getHiredate()+"");
+            row.add(dto.getAddUpChildEducation());
+            row.add(dto.getAddUpContinuingEducation());
+            row.add(dto.getAddUpHousingLoanInterest());
+            row.add(dto.getAddUpHousingRent());
+            row.add(dto.getAddUpSupportElderly());
+            row.add(dto.getAddUpIllnessMedical());
+            row.add(dto.getAddUpInfantCare());
+            rows.add(row);
+        }
+        // 3.表数据
+        excelSheetData.setRows(rows);
+
+        sheetList.add(excelSheetData);
+
+        salaryBatchService.simpleExportExcel(ExportExcelInfo.builder()
+                .bizId(map.get("biz").toString())
+                .flag(true)
+                .userId(employeeId)
+                .eteamsId(eteamsId)
+                .tenantKey(tenantKey)
+                .operator(username)
+                .module(map.get("module").toString())
+                .fileName(nameI18n + SalaryDateUtil.getFormatLocalDateTime(LocalDateTime.now()))
+                .handlerName(map.get("function").toString())
+                .dataType(nameI18n)
+                .function(map.get("function").toString()).build(), sheetList);
     }
 
     @Override
-    public List<AddUpDeductionPO> getAddUpDeductionList(YearMonth declareMonth, List<Long> employeeIds, String tenantKey) {
-        if (declareMonth == null || StringUtils.isEmpty(tenantKey)) {
-            throw new SalaryRunTimeException(SalaryI18nUtil.getI18nLabel(tenantKey, UserContext.getCurrentEmployeeId(), 100342, "参数有误：申报月份、租户key必传"));
+    public void downloadTemplate(Map<String, Object> map, String username, String eteamsId, boolean isChief, AddUpDeductionQueryParam queryParam, Long employeeId, String tenantKey) {
+        List<ExcelSheetData> sheetList = new ArrayList<>();
+
+        ExcelSheetData excelSheetData = new ExcelSheetData();
+
+        String nameI18n = SalaryI18nUtil.getI18nLabel(tenantKey, employeeId, 101603, "累计专项附加扣除导入模板");
+        // 1.工作簿名称
+        excelSheetData.setSheetName(nameI18n);
+        String[] header = {
+                SalaryI18nUtil.getI18nLabel(tenantKey, employeeId, 85429, "姓名"),
+                SalaryI18nUtil.getI18nLabel(tenantKey, employeeId, 86184, "个税扣缴义务人"),
+                SalaryI18nUtil.getI18nLabel(tenantKey, employeeId, 86185, "部门"),
+                SalaryI18nUtil.getI18nLabel(tenantKey, employeeId, 86186, "手机号"),
+                SalaryI18nUtil.getI18nLabel(tenantKey, employeeId, 86317, "工号"),
+                SalaryI18nUtil.getI18nLabel(tenantKey, employeeId, 86318, "证件号码"),
+                SalaryI18nUtil.getI18nLabel(tenantKey, employeeId, 86319, "入职日期"),
+                SalaryI18nUtil.getI18nLabel(tenantKey, employeeId, 86321, "累计子女教育"),
+                SalaryI18nUtil.getI18nLabel(tenantKey, employeeId, 86323, "累计继续教育"),
+                SalaryI18nUtil.getI18nLabel(tenantKey, employeeId, 86324, "累计住房贷款利息"),
+                SalaryI18nUtil.getI18nLabel(tenantKey, employeeId, 86325, "累计住房租金"),
+                SalaryI18nUtil.getI18nLabel(tenantKey, employeeId, 86326, "累计赡养老人"),
+                SalaryI18nUtil.getI18nLabel(tenantKey, employeeId, 105142, "累计大病医疗"),
+                SalaryI18nUtil.getI18nLabel(tenantKey, employeeId, 117732, "累计婴幼儿照护")
+        };
+        // 2.表头
+        excelSheetData.setHeaders(Collections.singletonList(header));
+        queryParam.setDeclareMonthDate(CollectionUtils.emptyIfNull(queryParam.getDeclareMonth()).stream().map(e-> LocalDate.of(e.getYear(),e.getMonthValue(),1)).collect(Collectors.toList()));
+        // 获取累计专项附加扣除
+        List<AddUpDeductionListDTO> list = addUpDeductionMapper.list(queryParam, tenantKey);
+        List<SimpleUserInfo> simpleUserInfos = salaryEmployeeService.listByEmployeeIds(list.stream().map(AddUpDeductionListDTO::getEmployeeId).collect(Collectors.toList()), tenantKey);
+        List<List<Object>> rows = new ArrayList<>();
+        for (AddUpDeductionListDTO dto : list) {
+            List<Object> row = new ArrayList<>();
+            row.add(dto.getUsername());
+            row.add(dto.getTaxAgentName());
+            row.add(dto.getDepartmentName());
+            row.add(dto.getMobile());
+            row.add(dto.getJobNum());
+            row.add(DataCollectionBO.getIdNo(dto.getEmployeeId(), simpleUserInfos));
+            row.add(dto.getHiredate()+"");
+            row.add(dto.getAddUpChildEducation());
+            row.add(dto.getAddUpContinuingEducation());
+            row.add(dto.getAddUpHousingLoanInterest());
+            row.add(dto.getAddUpHousingRent());
+            row.add(dto.getAddUpSupportElderly());
+            row.add(dto.getAddUpIllnessMedical());
+            row.add(dto.getAddUpInfantCare());
+            rows.add(row);
         }
-        return new LambdaQueryChainWrapper<>(getAddUpDeductionMapper())
-                .eq(AddUpDeductionPO::getDeleteType, 0)
-                .eq(AddUpDeductionPO::getTenantKey, tenantKey)
-                .eq(AddUpDeductionPO::getDeclareMonth, declareMonth.atDay(1))
-                .in(CollectionUtils.isNotEmpty(employeeIds), AddUpDeductionPO::getEmployeeId, employeeIds).list();
+        // 3.表数据
+        excelSheetData.setRows(rows);
+        // 4.注释
+        List<ExcelComment> excelComments = Lists.newArrayList();
+        salaryBatchService.createExcelComment(excelComments, SalaryI18nUtil.getI18nLabel(tenantKey, employeeId, 100344, "必填"), 0, 0, 0, 0);
+        salaryBatchService.createExcelComment(excelComments, SalaryI18nUtil.getI18nLabel(tenantKey, employeeId, 100344, "必填"), 0, 0, 1, 1);
+        salaryBatchService.createExcelComment(excelComments, SalaryI18nUtil.getI18nLabel(tenantKey, employeeId, 100343, "输入数字"), 0, 0, 7, 7);
+        salaryBatchService.createExcelComment(excelComments, SalaryI18nUtil.getI18nLabel(tenantKey, employeeId, 100343, "输入数字"), 0, 0, 8, 8);
+        salaryBatchService.createExcelComment(excelComments, SalaryI18nUtil.getI18nLabel(tenantKey, employeeId, 100343, "输入数字"), 0, 0, 9, 9);
+        salaryBatchService.createExcelComment(excelComments, SalaryI18nUtil.getI18nLabel(tenantKey, employeeId, 100343, "输入数字"), 0, 0, 10, 10);
+        salaryBatchService.createExcelComment(excelComments, SalaryI18nUtil.getI18nLabel(tenantKey, employeeId, 100343, "输入数字"), 0, 0, 11, 11);
+        salaryBatchService.createExcelComment(excelComments, SalaryI18nUtil.getI18nLabel(tenantKey, employeeId, 100343, "输入数字"), 0, 0, 12, 12);
+        salaryBatchService.createExcelComment(excelComments, SalaryI18nUtil.getI18nLabel(tenantKey, employeeId, 100343, "输入数字"), 0, 0, 13, 13);
+        excelSheetData.setExcelComment(excelComments);
+
+        sheetList.add(excelSheetData);
+
+        salaryBatchService.simpleExportExcel(ExportExcelInfo.builder()
+                .bizId(map.get("biz").toString())
+                .flag(true)
+                .userId(employeeId)
+                .eteamsId(eteamsId)
+                .tenantKey(tenantKey)
+                .operator(username)
+                .module(map.get("module").toString())
+                .fileName(nameI18n + SalaryDateUtil.getFormatLocalDateTime(LocalDateTime.now()))
+                .handlerName(map.get("function").toString())
+                .dataType(nameI18n)
+                .function(map.get("function").toString()).build(), sheetList);
+    }
+
+
+    /**
+     * 导出
+     *
+     * @param param
+     * @return
+     */
+    private XSSFWorkbook export(AddUpDeductionQueryParam param) {
+
+        //获取操作按钮资源
+        List<List<String>> rowList = getExcelRowList(param);
+
+        //获取excel
+        return ExcelUtil.genWorkbook(rowList, "累计专项附加扣除");
+    }
+
+
+    /**
+     * 获取excel数据行
+     *
+     * @return 导出数据行集合
+     */
+    private List<List<String>> getExcelRowList(AddUpDeductionQueryParam param) {
+        //excel标题
+        List<String> title = Arrays.asList("姓名", "个税扣缴义务人", "部门", "手机号", "工号", "证件号码", "入职日期", "累计子女教育", "累计继续教育", "累计住房贷款利息", "累计住房租金", "累计赡养老人", "累计大病医疗", "累计婴幼儿照护");
+
+        SimpleDateFormat formatter = new SimpleDateFormat("yyyy-MM-dd");
+        List<AddUpDeductionDTO> list = list(param);
+        final List<List<String>> dataRowList = Optional.ofNullable(list)
+                .map(List::stream)
+                .map(operatorStream -> operatorStream.map(dto -> {
+                    List<String> cellList = new ArrayList<>();
+                    cellList.add(Util.null2String(dto.getUsername()));
+                    cellList.add(Util.null2String(dto.getTaxAgentName()));
+                    cellList.add(Util.null2String(dto.getDepartmentName()));
+                    cellList.add(Util.null2String(dto.getMobile()));
+                    cellList.add(Util.null2String(dto.getJobNum()));
+                    cellList.add(Util.null2String(dto.getIdNo()));
+                    cellList.add(Util.null2String(dto.getHiredate()));
+                    cellList.add(Util.null2String(dto.getAddUpChildEducation()));
+                    cellList.add(Util.null2String(dto.getAddUpContinuingEducation()));
+                    cellList.add(Util.null2String(dto.getAddUpHousingLoanInterest()));
+                    cellList.add(Util.null2String(dto.getAddUpHousingRent()));
+                    cellList.add(Util.null2String(dto.getAddUpSupportElderly()));
+                    cellList.add(Util.null2String(dto.getAddUpIllnessMedical()));
+                    cellList.add(Util.null2String(dto.getAddUpInfantCare()));
+                    return cellList;
+                }).collect(Collectors.toList()))
+                .orElse(Collections.emptyList());
+
+        List<List<String>> rowList = new ArrayList<>();
+        rowList.add(title);
+        rowList.addAll(dataRowList);
+        return rowList;
     }
 
 
diff --git a/src/com/engine/salary/service/impl/AttendQuoteDataServiceImpl.java b/src/com/engine/salary/service/impl/AttendQuoteDataServiceImpl.java
index 283b81a2c..01f33b46f 100644
--- a/src/com/engine/salary/service/impl/AttendQuoteDataServiceImpl.java
+++ b/src/com/engine/salary/service/impl/AttendQuoteDataServiceImpl.java
@@ -38,7 +38,7 @@ import com.engine.salary.util.excel.ExcelParseHelper;
 import com.engine.salary.util.excel.ExcelSupport;
 import com.engine.salary.util.excel.ExcelUtil;
 import com.engine.salary.util.page.PageInfo;
-import com.engine.salary.util.page.PageUtil;
+import com.engine.salary.util.page.SalaryPageUtil;
 import com.engine.salary.util.valid.ValidUtil;
 import com.google.common.base.Joiner;
 import com.google.common.collect.Lists;
@@ -113,7 +113,7 @@ public class AttendQuoteDataServiceImpl extends Service implements AttendQuoteDa
 
     @Override
     public PageInfo<AttendQuoteDataBaseDTO> listPage(AttendQuoteDataQueryParam queryParam) {
-        PageUtil.start(queryParam.getCurrent(), queryParam.getPageSize());
+        SalaryPageUtil.start(queryParam.getCurrent(), queryParam.getPageSize());
         List<AttendQuoteDataBaseDTO> list = getAttendQuoteDataMapper().list(queryParam);
         PageInfo<AttendQuoteDataBaseDTO> page = new PageInfo<AttendQuoteDataBaseDTO>(list);
         return page;
diff --git a/src/com/engine/salary/service/impl/AttendQuoteFieldServiceImpl.java b/src/com/engine/salary/service/impl/AttendQuoteFieldServiceImpl.java
index fcb24d0e4..719d6cafb 100644
--- a/src/com/engine/salary/service/impl/AttendQuoteFieldServiceImpl.java
+++ b/src/com/engine/salary/service/impl/AttendQuoteFieldServiceImpl.java
@@ -18,7 +18,7 @@ import com.engine.salary.remote.attend.service.impl.RemoteAttend4SalaryServiceIm
 import com.engine.salary.service.AttendQuoteFieldService;
 import com.engine.salary.util.db.MapperProxyFactory;
 import com.engine.salary.util.page.PageInfo;
-import com.engine.salary.util.page.PageUtil;
+import com.engine.salary.util.page.SalaryPageUtil;
 import com.google.common.collect.Lists;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.collections4.CollectionUtils;
@@ -65,7 +65,7 @@ public class AttendQuoteFieldServiceImpl extends Service implements AttendQuoteF
 
     @Override
     public PageInfo<AttendQuoteFieldListDTO> listPage(AttendQuoteFieldQueryParam queryParam) {
-        PageUtil.start(queryParam.getCurrent(), queryParam.getPageSize());
+        SalaryPageUtil.start(queryParam.getCurrent(), queryParam.getPageSize());
         List<AttendQuoteFieldListDTO> list = getAttendQuoteFieldMapper().list(queryParam);
         return new PageInfo<>(list);
     }
diff --git a/src/com/engine/salary/service/impl/AttendQuoteServiceImpl.java b/src/com/engine/salary/service/impl/AttendQuoteServiceImpl.java
index c15cc325f..345101dc5 100644
--- a/src/com/engine/salary/service/impl/AttendQuoteServiceImpl.java
+++ b/src/com/engine/salary/service/impl/AttendQuoteServiceImpl.java
@@ -19,7 +19,7 @@ import com.engine.salary.service.SalaryAcctRecordService;
 import com.engine.salary.util.SalaryDateUtil;
 import com.engine.salary.util.db.MapperProxyFactory;
 import com.engine.salary.util.page.PageInfo;
-import com.engine.salary.util.page.PageUtil;
+import com.engine.salary.util.page.SalaryPageUtil;
 import org.apache.commons.collections4.CollectionUtils;
 import weaver.hrm.User;
 
@@ -53,7 +53,7 @@ public class AttendQuoteServiceImpl extends Service implements AttendQuoteServic
 
     @Override
     public PageInfo<AttendQuoteListDTO> listPage(AttendQuoteQueryParam queryParam) {
-        PageUtil.start(queryParam.getCurrent(), queryParam.getPageSize());
+        SalaryPageUtil.start(queryParam.getCurrent(), queryParam.getPageSize());
         List<AttendQuoteListDTO> list = getAttendQuoteMapper().list(queryParam);
         return new PageInfo<>(list, AttendQuoteListDTO.class);
     }
diff --git a/src/com/engine/salary/service/impl/SIAccountServiceImpl.java b/src/com/engine/salary/service/impl/SIAccountServiceImpl.java
index 38fafbfbd..917846326 100644
--- a/src/com/engine/salary/service/impl/SIAccountServiceImpl.java
+++ b/src/com/engine/salary/service/impl/SIAccountServiceImpl.java
@@ -27,13 +27,11 @@ import com.engine.salary.enums.siaccount.BillStatusEnum;
 import com.engine.salary.enums.siaccount.InspectStatusEnum;
 import com.engine.salary.enums.siaccount.PaymentStatusEnum;
 import com.engine.salary.enums.siaccount.ProjectTypeEnum;
-import com.engine.salary.enums.sicategory.DeleteTypeEnum;
 import com.engine.salary.enums.sicategory.WelfareTypeEnum;
 import com.engine.salary.mapper.siaccount.InsuranceAccountBatchMapper;
 import com.engine.salary.mapper.siaccount.InsuranceAccountDetailMapper;
 import com.engine.salary.mapper.siaccount.InsuranceAccountInspectMapper;
 import com.engine.salary.mapper.sicategory.ICategoryMapper;
-import com.engine.salary.mapper.sischeme.InsuranceSchemeMapper;
 import com.engine.salary.service.ColumnBuildService;
 import com.engine.salary.service.RecordsBuildService;
 import com.engine.salary.service.SIAccountService;
@@ -49,7 +47,7 @@ import com.engine.salary.util.SalaryI18nUtil;
 import com.engine.salary.util.db.MapperProxyFactory;
 import com.engine.salary.util.page.Column;
 import com.engine.salary.util.page.PageInfo;
-import com.engine.salary.util.page.PageUtil;
+import com.engine.salary.util.page.SalaryPageUtil;
 import com.engine.salary.util.valid.ValidUtil;
 import com.google.common.collect.Lists;
 import org.apache.commons.collections4.CollectionUtils;
@@ -206,7 +204,7 @@ public class SIAccountServiceImpl extends Service implements SIAccountService {
 
         //补缴缴纳列表
         queryParam.setPaymentStatus(PaymentStatusEnum.REPAIR.getValue());
-        PageUtil.start(queryParam.getCurrent(), queryParam.getPageSize());
+        SalaryPageUtil.start(queryParam.getCurrent(), queryParam.getPageSize());
         List<InsuranceAccountDetailPO> list = MapperProxyFactory.getProxy(InsuranceAccountDetailMapper.class).list(queryParam);
         PageInfo<InsuranceAccountDetailPO> pageInfo = new PageInfo<>(list,InsuranceAccountDetailPO.class);
         List<InsuranceAccountDetailPO> insuranceAccountDetailPOS = pageInfo.getList();
@@ -414,7 +412,7 @@ public class SIAccountServiceImpl extends Service implements SIAccountService {
     public Map<String, Object> changeList(InsuranceAccountDetailParam param) {
         Map<String,Object> datas = new HashMap<>();
         Long employeeId = (long)user.getUID();
-        PageUtil.start(param.getCurrent(),param.getPageSize());
+        SalaryPageUtil.start(param.getCurrent(),param.getPageSize());
         List<InsuranceArchivesEmployeePO> insuranceArchivesEmployeePOS = MapperProxyFactory.getProxy(InsuranceAccountDetailMapper.class).changeList(param.getUserName());
         PageInfo<InsuranceArchivesEmployeePO> pageInfo = new PageInfo<>(insuranceArchivesEmployeePOS);
 
@@ -476,7 +474,7 @@ public class SIAccountServiceImpl extends Service implements SIAccountService {
     public Map<String, Object> getInspectTable(InsuranceAccountDetailParam param) {
         Map<String,Object> datas = new HashMap<>();
 
-        PageUtil.start(param.getCurrent(),param.getPageSize());
+        SalaryPageUtil.start(param.getCurrent(),param.getPageSize());
         List<InsuranceAccountInspectPO> insuranceAccountInspectPOS = MapperProxyFactory.getProxy(InsuranceAccountInspectMapper.class).getByBillMonth(param.getBillMonth());
         List<Map<String, Object>> records = getService(user).buildInspectRecords(insuranceAccountInspectPOS);
 
diff --git a/src/com/engine/salary/service/impl/SIReportServiceImpl.java b/src/com/engine/salary/service/impl/SIReportServiceImpl.java
index de3fe5b39..c4749535c 100644
--- a/src/com/engine/salary/service/impl/SIReportServiceImpl.java
+++ b/src/com/engine/salary/service/impl/SIReportServiceImpl.java
@@ -7,7 +7,7 @@ import com.engine.salary.mapper.siaccount.SIAccountDetailMapper;
 import com.engine.salary.service.SIReportService;
 import com.engine.salary.util.db.MapperProxyFactory;
 import com.engine.salary.util.page.PageInfo;
-import com.engine.salary.util.page.PageUtil;
+import com.engine.salary.util.page.SalaryPageUtil;
 
 import java.util.List;
 
@@ -20,7 +20,7 @@ public class SIReportServiceImpl extends Service implements SIReportService {
 
     @Override
     public PageInfo<InsuranceAccountDetailPO> welfareList(QueryAccountDetailParam param) {
-        PageUtil.start(param.getCurrent(),param.getPageSize());
+        SalaryPageUtil.start(param.getCurrent(),param.getPageSize());
         List<InsuranceAccountDetailPO> insuranceAccountDetailPOS = getSIAccountDetailMapper().listSome(param);
         PageInfo<InsuranceAccountDetailPO> page = new PageInfo<>(insuranceAccountDetailPOS ,InsuranceAccountDetailPO.class);
         return page;
diff --git a/src/com/engine/salary/service/impl/SISchemeServiceImpl.java b/src/com/engine/salary/service/impl/SISchemeServiceImpl.java
index 2ef403831..94f5d43c2 100644
--- a/src/com/engine/salary/service/impl/SISchemeServiceImpl.java
+++ b/src/com/engine/salary/service/impl/SISchemeServiceImpl.java
@@ -1,6 +1,5 @@
 package com.engine.salary.service.impl;
 
-import cn.hutool.core.util.BooleanUtil;
 import com.alibaba.fastjson.JSON;
 import com.alibaba.fastjson.TypeReference;
 import com.cloudstore.eccom.pc.table.WeaTableColumn;
@@ -9,18 +8,7 @@ import com.engine.core.impl.Service;
 import com.engine.salary.biz.EmployBiz;
 import com.engine.salary.biz.SISchemeBiz;
 import com.engine.salary.cmd.sischeme.*;
-import com.engine.salary.constant.SalaryDefaultTenantConstant;
 import com.engine.salary.entity.datacollection.DataCollectionEmployee;
-import com.engine.salary.entity.datacollection.param.AttendQuoteDataImportParam;
-import com.engine.salary.entity.datacollection.po.AttendQuoteDataPO;
-import com.engine.salary.entity.datacollection.po.AttendQuoteDataValuePO;
-import com.engine.salary.entity.datacollection.po.AttendQuoteFieldPO;
-import com.engine.salary.entity.datacollection.po.AttendQuotePO;
-import com.engine.salary.entity.salaryacct.dto.SalaryAcctRecordListDTO;
-import com.engine.salary.entity.salaryacct.po.SalaryAcctRecordPO;
-import com.engine.salary.entity.salaryarchive.dto.TaxAgentListDTO;
-import com.engine.salary.entity.salarysob.po.SalarySobPO;
-import com.engine.salary.entity.siaccount.param.DSTenantKeyThreadVar;
 import com.engine.salary.entity.siarchives.param.InsuranceArchivesListParam;
 import com.engine.salary.entity.siarchives.po.*;
 import com.engine.salary.entity.sicategory.po.ICategoryPO;
@@ -30,9 +18,7 @@ import com.engine.salary.entity.sischeme.param.SISchemaImportParam;
 import com.engine.salary.entity.sischeme.po.InsuranceSchemeDetailPO;
 import com.engine.salary.entity.sischeme.po.InsuranceSchemePO;
 import com.engine.salary.entity.taxrate.TaxAgent;
-import com.engine.salary.enums.datacollection.AttendQuoteSourceTypeEnum;
 import com.engine.salary.enums.sicategory.*;
-import com.engine.salary.exception.SalaryRunTimeException;
 import com.engine.salary.mapper.siarchives.FundSchemeMapper;
 import com.engine.salary.mapper.siarchives.OtherSchemeMapper;
 import com.engine.salary.mapper.siarchives.SocialSchemeMapper;
@@ -44,15 +30,13 @@ import com.engine.salary.service.SISchemeService;
 import com.engine.salary.service.TaxAgentService;
 import com.engine.salary.util.*;
 import com.engine.salary.util.db.MapperProxyFactory;
-import com.engine.salary.util.excel.ExcelComment;
 import com.engine.salary.util.excel.ExcelParseHelper;
 import com.engine.salary.util.excel.ExcelSupport;
 import com.engine.salary.util.excel.ExcelUtil;
 import com.engine.salary.util.page.PageInfo;
-import com.engine.salary.util.page.PageUtil;
+import com.engine.salary.util.page.SalaryPageUtil;
 import com.engine.salary.util.valid.ValidUtil;
 import com.google.common.collect.Maps;
-import com.kingbase8.util.LOGGER;
 import dm.jdbc.util.IdGenerator;
 import org.apache.commons.collections4.CollectionUtils;
 import org.apache.commons.lang3.StringUtils;
@@ -60,10 +44,8 @@ import org.apache.poi.ss.usermodel.Sheet;
 import org.apache.poi.util.IOUtils;
 import org.apache.poi.xssf.usermodel.XSSFWorkbook;
 import weaver.file.ImageFileManager;
-import weaver.hrm.User;
 
 import java.io.InputStream;
-import java.time.LocalDateTime;
 import java.util.*;
 import java.util.function.Function;
 import java.util.stream.Collectors;
@@ -165,7 +147,7 @@ public class SISchemeServiceImpl extends Service implements SISchemeService {
     public PageInfo<InsuranceSchemeListDTO> list(InsuranceSchemeParam queryParam) {
         SalaryAssert.notNull(queryParam.getWelfareTypeEnum(), SalaryI18nUtil.getI18nLabel( 84026, "参数错误"));
 
-        PageUtil.start(queryParam.getCurrent(), queryParam.getPageSize());
+        SalaryPageUtil.start(queryParam.getCurrent(), queryParam.getPageSize());
         List<InsuranceSchemePO> insuranceSchemePOS = MapperProxyFactory.getProxy(InsuranceSchemeMapper.class).listByWelfareType(queryParam.getWelfareTypeEnum().getValue());
         PageInfo<InsuranceSchemePO> pageInfo = new PageInfo<>(insuranceSchemePOS, InsuranceSchemePO.class);
         List<InsuranceSchemeListDTO> collect = insuranceSchemePOS.stream().map(item ->
diff --git a/src/com/engine/salary/service/impl/SalaryAcctEmployeeServiceImpl.java b/src/com/engine/salary/service/impl/SalaryAcctEmployeeServiceImpl.java
index 580cdad3e..c78bac48c 100644
--- a/src/com/engine/salary/service/impl/SalaryAcctEmployeeServiceImpl.java
+++ b/src/com/engine/salary/service/impl/SalaryAcctEmployeeServiceImpl.java
@@ -21,7 +21,7 @@ import com.engine.salary.util.SalaryEntityUtil;
 import com.engine.salary.util.SalaryI18nUtil;
 import com.engine.salary.util.db.MapperProxyFactory;
 import com.engine.salary.util.page.PageInfo;
-import com.engine.salary.util.page.PageUtil;
+import com.engine.salary.util.page.SalaryPageUtil;
 import com.engine.salary.util.valid.ValidUtil;
 import org.apache.commons.collections4.CollectionUtils;
 import org.apache.commons.lang3.StringUtils;
@@ -178,7 +178,7 @@ public class SalaryAcctEmployeeServiceImpl extends Service implements SalaryAcct
     public PageInfo<SalaryAcctEmployeePO> listPageByParam(SalaryAcctEmployeeQueryParam queryParam) {
         ValidUtil.doValidator(queryParam);
         // 分页参数
-        PageUtil.start(queryParam.getCurrent(), queryParam.getPageSize());
+        SalaryPageUtil.start(queryParam.getCurrent(), queryParam.getPageSize());
         // 查询薪资核算人员
         List<SalaryAcctEmployeePO> salaryAcctEmployeePOS = getSalaryAcctEmployeeMapper().listPage(queryParam);
         return new PageInfo<>(salaryAcctEmployeePOS);
@@ -231,7 +231,7 @@ public class SalaryAcctEmployeeServiceImpl extends Service implements SalaryAcct
         Set<Long> lastMonthSalaryAcctRecordIds = SalaryEntityUtil.properties(salaryAcctRecordPOS, SalaryAcctRecordPO::getId);
         // 查询环比减少人员
         // 分页参数
-        PageUtil.start(queryParam.getCurrent(), queryParam.getPageSize());
+        SalaryPageUtil.start(queryParam.getCurrent(), queryParam.getPageSize());
         List<SalaryAcctEmployeePO> salaryAcctEmployeePOS = getSalaryAcctEmployeeMapper().listPage4Reduce(lastMonthSalaryAcctRecordIds, queryParam);
         PageInfo<SalaryAcctEmployeePO> salaryAcctEmployeePOPageInfo = new PageInfo<>(salaryAcctEmployeePOS);
         return salaryAcctEmployeePOPageInfo;
@@ -260,7 +260,7 @@ public class SalaryAcctEmployeeServiceImpl extends Service implements SalaryAcct
         // 查询合并计税的薪资核算人员
         Set<Long> otherSalaryAcctRecordIds = SalaryEntityUtil.properties(otherSalaryAcctRecordPOS, SalaryAcctRecordPO::getId);
         // 分页参数
-        PageUtil.start(queryParam.getCurrent(), queryParam.getPageSize());
+        SalaryPageUtil.start(queryParam.getCurrent(), queryParam.getPageSize());
         List<SalaryAcctEmployeePO> salaryAcctEmployeePOS = getSalaryAcctEmployeeMapper().listPage4ConsolidatedTax(otherSalaryAcctRecordIds, queryParam);
         PageInfo<SalaryAcctEmployeePO> salaryAcctEmployeePOPageInfo = new PageInfo<>(salaryAcctEmployeePOS);
         return salaryAcctEmployeePOPageInfo;
diff --git a/src/com/engine/salary/service/impl/SalaryAcctRecordServiceImpl.java b/src/com/engine/salary/service/impl/SalaryAcctRecordServiceImpl.java
index 78f0f1649..362b5b283 100644
--- a/src/com/engine/salary/service/impl/SalaryAcctRecordServiceImpl.java
+++ b/src/com/engine/salary/service/impl/SalaryAcctRecordServiceImpl.java
@@ -21,7 +21,7 @@ import com.engine.salary.util.SalaryEntityUtil;
 import com.engine.salary.util.SalaryI18nUtil;
 import com.engine.salary.util.db.MapperProxyFactory;
 import com.engine.salary.util.page.PageInfo;
-import com.engine.salary.util.page.PageUtil;
+import com.engine.salary.util.page.SalaryPageUtil;
 import com.engine.salary.util.valid.ValidUtil;
 import org.apache.commons.collections4.CollectionUtils;
 import org.apache.commons.lang3.StringUtils;
@@ -140,7 +140,7 @@ public class SalaryAcctRecordServiceImpl extends Service implements SalaryAcctRe
         po.setSalaryMonths(localDateRange);
 
         // 查询薪资核算记录
-        PageUtil.start(queryParam.getCurrent(), queryParam.getPageSize());
+        SalaryPageUtil.start(queryParam.getCurrent(), queryParam.getPageSize());
         List<SalaryAcctRecordPO> salaryAcctRecordPOS = getSalaryAcctRecordMapper().listSome(po);
         page.setList(salaryAcctRecordPOS);
         return page;
diff --git a/src/com/engine/salary/service/impl/SalaryArchiveTaxAgentServiceImpl.java b/src/com/engine/salary/service/impl/SalaryArchiveTaxAgentServiceImpl.java
index ed205f6c9..ee8b7dc3a 100644
--- a/src/com/engine/salary/service/impl/SalaryArchiveTaxAgentServiceImpl.java
+++ b/src/com/engine/salary/service/impl/SalaryArchiveTaxAgentServiceImpl.java
@@ -20,7 +20,7 @@ import com.engine.salary.util.SalaryI18nUtil;
 import com.engine.salary.util.db.MapperProxyFactory;
 import com.engine.salary.util.excel.ExcelUtil;
 import com.engine.salary.util.page.PageInfo;
-import com.engine.salary.util.page.PageUtil;
+import com.engine.salary.util.page.SalaryPageUtil;
 import com.google.common.collect.Lists;
 import org.apache.commons.collections4.CollectionUtils;
 import org.apache.commons.lang3.StringUtils;
@@ -56,7 +56,7 @@ public class SalaryArchiveTaxAgentServiceImpl extends Service implements SalaryA
 
     @Override
     public PageInfo<TaxAgentAdjustRecordListDTO> taxAgentAdjustRecordListPage(TaxAgentAdjustRecordQueryParam queryParam) {
-        PageUtil.start(queryParam.getCurrent(), queryParam.getPageSize());
+        SalaryPageUtil.start(queryParam.getCurrent(), queryParam.getPageSize());
         List<TaxAgentAdjustRecordListDTO> taxAgentAdjustRecordListDTOS = getSalaryArchiveTaxAgentMapper().taxAgentAdjustRecordList(queryParam);
         PageInfo<TaxAgentAdjustRecordListDTO> pageInfo = new PageInfo<TaxAgentAdjustRecordListDTO>(taxAgentAdjustRecordListDTOS, TaxAgentAdjustRecordListDTO.class);
         return pageInfo;
diff --git a/src/com/engine/salary/service/impl/SalaryComparisonResultServiceImpl.java b/src/com/engine/salary/service/impl/SalaryComparisonResultServiceImpl.java
index 6b4eeb63c..e020d92a9 100644
--- a/src/com/engine/salary/service/impl/SalaryComparisonResultServiceImpl.java
+++ b/src/com/engine/salary/service/impl/SalaryComparisonResultServiceImpl.java
@@ -29,7 +29,7 @@ import com.engine.salary.util.SalaryEntityUtil;
 import com.engine.salary.util.SalaryI18nUtil;
 import com.engine.salary.util.db.MapperProxyFactory;
 import com.engine.salary.util.page.PageInfo;
-import com.engine.salary.util.page.PageUtil;
+import com.engine.salary.util.page.SalaryPageUtil;
 import com.google.common.collect.Sets;
 import org.apache.commons.collections4.CollectionUtils;
 import org.apache.commons.lang3.BooleanUtils;
@@ -220,7 +220,7 @@ public class SalaryComparisonResultServiceImpl extends Service implements Salary
         PageInfo<Map<String, Object>> dtoPage = new PageInfo<>();
         dtoPage.setTotal(resultMapList.size());
         if (needPage) {
-            dtoPage.setList(PageUtil.subList(queryParam.getCurrent(), queryParam.getPageSize(), resultMapList));
+            dtoPage.setList(SalaryPageUtil.subList(queryParam.getCurrent(), queryParam.getPageSize(), resultMapList));
         } else {
             dtoPage.setList(resultMapList);
         }
diff --git a/src/com/engine/salary/service/impl/SalarySobRangeServiceImpl.java b/src/com/engine/salary/service/impl/SalarySobRangeServiceImpl.java
index 191ca0391..9257c5eb7 100644
--- a/src/com/engine/salary/service/impl/SalarySobRangeServiceImpl.java
+++ b/src/com/engine/salary/service/impl/SalarySobRangeServiceImpl.java
@@ -22,7 +22,7 @@ import com.engine.salary.service.SalarySobService;
 import com.engine.salary.util.SalaryEntityUtil;
 import com.engine.salary.util.SalaryI18nUtil;
 import com.engine.salary.util.page.PageInfo;
-import com.engine.salary.util.page.PageUtil;
+import com.engine.salary.util.page.SalaryPageUtil;
 import com.engine.salary.util.valid.ValidUtil;
 import org.apache.commons.collections4.CollectionUtils;
 import org.apache.commons.lang3.StringUtils;
@@ -108,7 +108,7 @@ public class SalarySobRangeServiceImpl extends Service implements SalarySobRange
         // 填充总数和当页数据
         PageInfo<SalarySobRangeListDTO> pageInfo = new PageInfo<SalarySobRangeListDTO>(salarySobRangeListDTOS,SalarySobRangeListDTO.class);
         pageInfo.setTotal(salarySobRangeListDTOS.size());
-        pageInfo.setList(PageUtil.subList(queryParam.getCurrent(), queryParam.getPageSize(), salarySobRangeListDTOS));
+        pageInfo.setList(SalaryPageUtil.subList(queryParam.getCurrent(), queryParam.getPageSize(), salarySobRangeListDTOS));
         return pageInfo;
     }
 
diff --git a/src/com/engine/salary/service/impl/TaxAgentManageRangeServiceImpl.java b/src/com/engine/salary/service/impl/TaxAgentManageRangeServiceImpl.java
index 021a6f7ad..f4c1e3b4f 100644
--- a/src/com/engine/salary/service/impl/TaxAgentManageRangeServiceImpl.java
+++ b/src/com/engine/salary/service/impl/TaxAgentManageRangeServiceImpl.java
@@ -28,7 +28,7 @@ import com.engine.salary.util.SalaryEntityUtil;
 import com.engine.salary.util.SalaryI18nUtil;
 import com.engine.salary.util.db.MapperProxyFactory;
 import com.engine.salary.util.page.PageInfo;
-import com.engine.salary.util.page.PageUtil;
+import com.engine.salary.util.page.SalaryPageUtil;
 import com.google.common.collect.Lists;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.collections4.CollectionUtils;
@@ -322,7 +322,7 @@ public class TaxAgentManageRangeServiceImpl extends Service implements TaxAgentM
                 .collect(Collectors.toList());
         List<PositionInfo> positionComInfos = employBiz.listPositionInfo(positionIds);
         // 分页参数
-        PageInfo<TaxAgentManageRangeListDTO> dtoPage = PageUtil.buildPage(queryParam.getCurrent(), queryParam.getPageSize(), TaxAgentManageRangeListDTO.class);
+        PageInfo<TaxAgentManageRangeListDTO> dtoPage = SalaryPageUtil.buildPage(queryParam.getCurrent(), queryParam.getPageSize(), TaxAgentManageRangeListDTO.class);
         // 查询人员状态
 //        List<HrmStatus> hrmStatusList = hrmCommonHrmStatusService.list();
         List<HrmStatus> hrmStatusList = UserStatusEnum.getHrmStatusList();
@@ -336,7 +336,7 @@ public class TaxAgentManageRangeServiceImpl extends Service implements TaxAgentM
         }
         // 填充总数和当页数据
         dtoPage.setTotal(taxAgentManageRangeList.size());
-        dtoPage.setList(PageUtil.subList(dtoPage.getPageNum(), dtoPage.getSize(), taxAgentManageRangeList));
+        dtoPage.setList(SalaryPageUtil.subList(dtoPage.getPageNum(), dtoPage.getSize(), taxAgentManageRangeList));
         return dtoPage;
     }
 
diff --git a/src/com/engine/salary/service/impl/TaxAgentV2ServiceImpl.java b/src/com/engine/salary/service/impl/TaxAgentV2ServiceImpl.java
index e47dcf260..64f876eda 100644
--- a/src/com/engine/salary/service/impl/TaxAgentV2ServiceImpl.java
+++ b/src/com/engine/salary/service/impl/TaxAgentV2ServiceImpl.java
@@ -33,7 +33,7 @@ import com.engine.salary.service.*;
 import com.engine.salary.util.SalaryI18nUtil;
 import com.engine.salary.util.db.MapperProxyFactory;
 import com.engine.salary.util.page.PageInfo;
-import com.engine.salary.util.page.PageUtil;
+import com.engine.salary.util.page.SalaryPageUtil;
 import com.engine.salary.util.valid.RuntimeTypeEnum;
 import com.engine.salary.util.valid.ValidUtil;
 import com.google.common.collect.Lists;
@@ -186,7 +186,7 @@ public class TaxAgentV2ServiceImpl extends Service implements TaxAgentV2Service
 
     @Override
     public PageInfo<TaxAgentPO> listPage(TaxAgentQueryParam queryParam) {
-        PageUtil.start(queryParam.getCurrent(), queryParam.getPageSize());
+        SalaryPageUtil.start(queryParam.getCurrent(), queryParam.getPageSize());
         List<TaxAgentPO> taxAgentPOS = getTaxAgentMapper().listBySome(queryParam);
         return new PageInfo<>(taxAgentPOS);
     }
diff --git a/src/com/engine/salary/service/impl/TaxDeclarationServiceImpl.java b/src/com/engine/salary/service/impl/TaxDeclarationServiceImpl.java
index f023a38af..f670cfd9b 100644
--- a/src/com/engine/salary/service/impl/TaxDeclarationServiceImpl.java
+++ b/src/com/engine/salary/service/impl/TaxDeclarationServiceImpl.java
@@ -21,7 +21,7 @@ import com.engine.salary.util.SalaryEntityUtil;
 import com.engine.salary.util.SalaryI18nUtil;
 import com.engine.salary.util.db.MapperProxyFactory;
 import com.engine.salary.util.page.PageInfo;
-import com.engine.salary.util.page.PageUtil;
+import com.engine.salary.util.page.SalaryPageUtil;
 import org.apache.commons.collections4.CollectionUtils;
 import org.apache.ibatis.session.SqlSession;
 import weaver.conn.mybatis.MyBatisFactory;
@@ -63,7 +63,7 @@ public class TaxDeclarationServiceImpl extends Service implements TaxDeclaration
         }
         po.setSalaryMonths(localDateRange);
         // 查询个税申报表
-        PageUtil.start(queryParam.getCurrent(), queryParam.getPageSize());
+        SalaryPageUtil.start(queryParam.getCurrent(), queryParam.getPageSize());
         List<TaxDeclarationPO> taxDeclarationPOS = getTaxDeclarationMapper().listSome(po);
         page.setList(taxDeclarationPOS);
 
diff --git a/src/com/engine/salary/util/page/PageUtil.java b/src/com/engine/salary/util/page/SalaryPageUtil.java
similarity index 98%
rename from src/com/engine/salary/util/page/PageUtil.java
rename to src/com/engine/salary/util/page/SalaryPageUtil.java
index 5bea08831..bd8ab155f 100644
--- a/src/com/engine/salary/util/page/PageUtil.java
+++ b/src/com/engine/salary/util/page/SalaryPageUtil.java
@@ -7,7 +7,7 @@ import java.util.Collections;
 import java.util.List;
 
 
-public class PageUtil {
+public class SalaryPageUtil {
 
     public static void start(Integer pageNum, Integer pageSize) {
         pageNum = pageNum == null || pageNum <= 0 ? 1 : pageNum;
diff --git a/src/com/engine/salary/wrapper/SalarySendWrapper.java b/src/com/engine/salary/wrapper/SalarySendWrapper.java
index e4f02ea7e..79a654a58 100644
--- a/src/com/engine/salary/wrapper/SalarySendWrapper.java
+++ b/src/com/engine/salary/wrapper/SalarySendWrapper.java
@@ -30,7 +30,7 @@ import com.engine.salary.service.impl.SalaryTemplateServiceImpl;
 import com.engine.salary.service.impl.TaxAgentServiceImpl;
 import com.engine.salary.util.SalaryI18nUtil;
 import com.engine.salary.util.page.PageInfo;
-import com.engine.salary.util.page.PageUtil;
+import com.engine.salary.util.page.SalaryPageUtil;
 import org.apache.commons.collections.CollectionUtils;
 import org.apache.commons.lang3.StringUtils;
 import org.apache.ibatis.session.SqlSession;
@@ -84,7 +84,7 @@ public class SalarySendWrapper extends Service {
                     queryParam.getSalaryYearMonth().stream().map(e -> e + "-01 00:00:00").collect(Collectors.toList()));
 
             SalarySendMapper salarySendMapper = sqlSession.getMapper(SalarySendMapper.class);
-            PageUtil.start(queryParam.getCurrent(), queryParam.getPageSize());
+            SalaryPageUtil.start(queryParam.getCurrent(), queryParam.getPageSize());
             List<SalarySendListDTO> list = salarySendMapper.list(queryParam);
             PageInfo<SalarySendListDTO> pageInfo = new PageInfo<>(list, SalarySendListDTO.class);
             List<SalarySendListDTO> pageList = pageInfo.getList();
diff --git a/src/com/engine/salary/wrapper/TaxAgentSubAdminWrapper.java b/src/com/engine/salary/wrapper/TaxAgentSubAdminWrapper.java
index edf8381a3..1c047a268 100644
--- a/src/com/engine/salary/wrapper/TaxAgentSubAdminWrapper.java
+++ b/src/com/engine/salary/wrapper/TaxAgentSubAdminWrapper.java
@@ -13,7 +13,7 @@ import com.engine.salary.service.TaxAgentManageRangeService;
 import com.engine.salary.service.TaxAgentSubAdminService;
 import com.engine.salary.util.SalaryI18nUtil;
 import com.engine.salary.util.page.PageInfo;
-import com.engine.salary.util.page.PageUtil;
+import com.engine.salary.util.page.SalaryPageUtil;
 import com.engine.salary.util.valid.ValidUtil;
 import com.google.common.collect.Lists;
 import org.apache.commons.lang3.StringUtils;
@@ -54,10 +54,10 @@ public class TaxAgentSubAdminWrapper extends Service {
         List<DataCollectionEmployee> subAdminList = employBiz.getEmployeeByIds(list.stream().map(TaxAgentSubAdminPO::getEmployeeId).distinct().collect(Collectors.toList()));
 
         List<TaxAgentSubAdminListDTO> records = TaxAgentBO.convertToSubAdminListDTO(list, range, subAdminList);
-        PageInfo<TaxAgentSubAdminListDTO> listPage = PageUtil.buildPage(queryParam.getCurrent(), queryParam.getPageSize(), TaxAgentSubAdminListDTO.class);
+        PageInfo<TaxAgentSubAdminListDTO> listPage = SalaryPageUtil.buildPage(queryParam.getCurrent(), queryParam.getPageSize(), TaxAgentSubAdminListDTO.class);
         // 填充总数和当页数据
         listPage.setTotal(records.size());
-        listPage.setList(PageUtil.subList(listPage.getPageNum(), listPage.getSize(), records));
+        listPage.setList(SalaryPageUtil.subList(listPage.getPageNum(), listPage.getSize(), records));
 
         return listPage;
     }
diff --git a/src/com/engine/salary/wrapper/TaxAgentWrapper.java b/src/com/engine/salary/wrapper/TaxAgentWrapper.java
index 54d09a860..8f8fe7bb5 100644
--- a/src/com/engine/salary/wrapper/TaxAgentWrapper.java
+++ b/src/com/engine/salary/wrapper/TaxAgentWrapper.java
@@ -20,7 +20,7 @@ import com.engine.salary.service.*;
 import com.engine.salary.service.impl.*;
 import com.engine.salary.util.SalaryI18nUtil;
 import com.engine.salary.util.page.PageInfo;
-import com.engine.salary.util.page.PageUtil;
+import com.engine.salary.util.page.SalaryPageUtil;
 import com.google.common.collect.Maps;
 import org.apache.commons.collections.CollectionUtils;
 import org.apache.commons.lang3.StringUtils;
@@ -124,11 +124,11 @@ public class TaxAgentWrapper extends Service {
                 list = list.stream().filter(f -> adminTaxAgentIds.contains(f.getId())).collect(Collectors.toList());
                 // 分页参数
                 // 填充总数和当页数据
-                PageInfo<TaxAgentPO> dtoPage = PageUtil.buildPage(queryParam.getCurrent(), queryParam.getPageSize());
+                PageInfo<TaxAgentPO> dtoPage = SalaryPageUtil.buildPage(queryParam.getCurrent(), queryParam.getPageSize());
                 dtoPage.setTotal(list.size());
                 dtoPage.setPageNum(queryParam.getCurrent());
                 dtoPage.setPageSize(queryParam.getPageSize());
-                dtoPage.setList(PageUtil.subList(dtoPage.getPageNum(), dtoPage.getPageSize(), list));
+                dtoPage.setList(SalaryPageUtil.subList(dtoPage.getPageNum(), dtoPage.getPageSize(), list));
                 page = dtoPage;
             }
         }