diff --git a/src/com/engine/salary/biz/SalaryArchiveBiz.java b/src/com/engine/salary/biz/SalaryArchiveBiz.java index c16256c76..b1bd7e124 100644 --- a/src/com/engine/salary/biz/SalaryArchiveBiz.java +++ b/src/com/engine/salary/biz/SalaryArchiveBiz.java @@ -1,17 +1,12 @@ package com.engine.salary.biz; -import com.engine.salary.entity.salaryarchive.dto.SalaryArchiveListDTO; -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.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; -import java.util.Collection; import java.util.List; public class SalaryArchiveBiz { @@ -26,28 +21,6 @@ public class SalaryArchiveBiz { } } - public PageInfo listPage(SalaryArchiveQueryParam param) { - SqlSession sqlSession = MyBatisFactory.sqlSessionFactory.openSession(); - try { - SalaryArchiveMapper mapper = sqlSession.getMapper(SalaryArchiveMapper.class); - SalaryPageUtil.start(param.getCurrent(), param.getPageSize()); - List list = mapper.list(param); - PageInfo pageInfo = new PageInfo(list, SalaryArchiveListDTO.class); - return pageInfo; - } finally { - sqlSession.close(); - } - } - - public Collection list(SalaryArchiveQueryParam queryParam) { - SqlSession sqlSession = MyBatisFactory.sqlSessionFactory.openSession(); - try { - SalaryArchiveMapper mapper = sqlSession.getMapper(SalaryArchiveMapper.class); - return mapper.list(queryParam); - } finally { - sqlSession.close(); - } - } public void batchInsert(List salaryArchiveSaves) { if (CollectionUtils.isEmpty(salaryArchiveSaves)) { diff --git a/src/com/engine/salary/common/BaseQueryParam.java b/src/com/engine/salary/common/BaseQueryParam.java index fe018729e..dd9a8bc3c 100644 --- a/src/com/engine/salary/common/BaseQueryParam.java +++ b/src/com/engine/salary/common/BaseQueryParam.java @@ -1,22 +1,27 @@ package com.engine.salary.common; +import com.engine.salary.sys.entity.vo.OrderRuleVO; import lombok.AllArgsConstructor; import lombok.Data; import lombok.NoArgsConstructor; -/** - * @Author weaver_cl - * @Description: 基础查询参数 - * @Date 2022/3/17 - * @Version V1.0 - **/ + @Data @NoArgsConstructor @AllArgsConstructor public class BaseQueryParam { - //当前页码 + /** + * 页码 + */ private Integer current = 1; - //每页数据条数 + /** + * 分页大小 + */ private Integer pageSize = 10; + + /** + * 排序规则 + */ + private OrderRuleVO orderRule; } diff --git a/src/com/engine/salary/entity/salaryarchive/param/SalaryArchiveQueryParam.java b/src/com/engine/salary/entity/salaryarchive/param/SalaryArchiveQueryParam.java index e17ed8931..88bbc8728 100644 --- a/src/com/engine/salary/entity/salaryarchive/param/SalaryArchiveQueryParam.java +++ b/src/com/engine/salary/entity/salaryarchive/param/SalaryArchiveQueryParam.java @@ -61,8 +61,4 @@ public class SalaryArchiveQueryParam extends BaseQueryParam { */ private String archiveStatus; - /** - * 排序配置 - */ - private String orderRule; } diff --git a/src/com/engine/salary/mapper/archive/SalaryArchiveMapper.xml b/src/com/engine/salary/mapper/archive/SalaryArchiveMapper.xml index 8a4ea9613..a85cd484c 100644 --- a/src/com/engine/salary/mapper/archive/SalaryArchiveMapper.xml +++ b/src/com/engine/salary/mapper/archive/SalaryArchiveMapper.xml @@ -148,8 +148,10 @@ AND (e.companystartdate BETWEEN #{param.hiredate[0]} AND #{param.hiredate[1]}) - - ORDER BY e.dspOrder + + + ORDER BY #{param.orderRule.orderRule} #{param.orderRule.ascOrDesc} + diff --git a/src/com/engine/salary/service/impl/SalaryArchiveServiceImpl.java b/src/com/engine/salary/service/impl/SalaryArchiveServiceImpl.java index 87500eede..368457f27 100644 --- a/src/com/engine/salary/service/impl/SalaryArchiveServiceImpl.java +++ b/src/com/engine/salary/service/impl/SalaryArchiveServiceImpl.java @@ -32,6 +32,7 @@ import com.engine.salary.mapper.archive.SalaryArchiveMapper; import com.engine.salary.service.SalaryAcctEmployeeService; import com.engine.salary.service.SalaryArchiveService; import com.engine.salary.service.TaxAgentService; +import com.engine.salary.sys.entity.vo.OrderRuleVO; import com.engine.salary.sys.service.SalarySysConfService; import com.engine.salary.sys.service.impl.SalarySysConfServiceImpl; import com.engine.salary.util.SalaryDateUtil; @@ -135,7 +136,8 @@ public class SalaryArchiveServiceImpl extends Service implements SalaryArchiveSe Map> taxAgentEmployeesMap = SalaryEntityUtil.convert2Map(taxAgentEmployeeDTOS, TaxAgentManageRangeEmployeeDTO::getTaxAgentId, TaxAgentManageRangeEmployeeDTO::getEmployeeList); //排序配置 - getSalarySysConfService(user).orderRule(); + OrderRuleVO orderRule = getSalarySysConfService(user).orderRule(); + queryParam.setOrderRule(orderRule); if (needAuth) { @@ -207,6 +209,10 @@ public class SalaryArchiveServiceImpl extends Service implements SalaryArchiveSe public List list(SalaryArchiveQueryParam queryParam) { long currentEmployeeId = user.getUID(); + //排序配置 + OrderRuleVO orderRule = getSalarySysConfService(user).orderRule(); + queryParam.setOrderRule(orderRule); + Boolean needAuth = getTaxAgentService(user).isNeedAuth(currentEmployeeId); if (needAuth) { @@ -361,6 +367,10 @@ public class SalaryArchiveServiceImpl extends Service implements SalaryArchiveSe // 获取所有个税扣缴义务人 Collection taxAgentList = getTaxAgentService(user).listAll(); + //排序配置 + OrderRuleVO orderRule = getSalarySysConfService(user).orderRule(); + queryParam.setOrderRule(orderRule); + Collection salaryArchives = getSalaryArchiveMapper().list(queryParam); //分权 diff --git a/src/com/engine/salary/sys/entity/vo/OrderRuleVO.java b/src/com/engine/salary/sys/entity/vo/OrderRuleVO.java index fa53b013f..ea4a1deea 100644 --- a/src/com/engine/salary/sys/entity/vo/OrderRuleVO.java +++ b/src/com/engine/salary/sys/entity/vo/OrderRuleVO.java @@ -1,7 +1,5 @@ package com.engine.salary.sys.entity.vo; -import com.engine.salary.sys.enums.AscOrDescEnum; -import com.engine.salary.sys.enums.OrderRuleEnum; import lombok.AllArgsConstructor; import lombok.Builder; import lombok.Data; @@ -15,10 +13,10 @@ public class OrderRuleVO { /** * 排序规则 */ - private OrderRuleEnum orderRule; + private String orderRule = "dspOrder"; /** * 正序或者倒序 */ - private AscOrDescEnum ascOrDesc; + private String ascOrDesc ="asc"; } diff --git a/src/com/engine/salary/sys/enums/OrderRuleEnum.java b/src/com/engine/salary/sys/enums/OrderRuleEnum.java index e17a0511d..66b6620f0 100644 --- a/src/com/engine/salary/sys/enums/OrderRuleEnum.java +++ b/src/com/engine/salary/sys/enums/OrderRuleEnum.java @@ -12,13 +12,13 @@ import org.apache.commons.lang3.StringUtils; * @version 1.0 **/ public enum OrderRuleEnum implements BaseEnum { - DSPORDER("dspOrder", "人员显示顺序", 1), - DEPTSHOWORDER("deptShowOrder", "部门显示顺序", 1), - SUBCOMSHOWORDER("subcomShowOrder", "分部显示顺序", 1), - LASTNAME("lastName", "人员名称", 1), - DEPTNAME("deptName", "部门名称", 1), - SUBCOMNAME("subcomName", "分部名称", 1), - SHOWORDEROFDEPTTREE("showOrderOfDeptTree", "组织", 1); + DSPORDER("e.dspOrder", "人员显示顺序", 1), + DEPTSHOWORDER("d.ShowOrder", "部门显示顺序", 1), + SUBCOMSHOWORDER("c.ShowOrder", "分部显示顺序", 1), + LASTNAME("e.lastName", "人员名称", 1), + DEPTNAME("d.departmentname", "部门名称", 1), + SUBCOMNAME("c.subcompanyname", "分部名称", 1), + SHOWORDEROFDEPTTREE("d.showOrderOfTree", "组织", 1); private String value; diff --git a/src/com/engine/salary/sys/service/impl/SalarySysConfServiceImpl.java b/src/com/engine/salary/sys/service/impl/SalarySysConfServiceImpl.java index 47323ed3d..18000ac0c 100644 --- a/src/com/engine/salary/sys/service/impl/SalarySysConfServiceImpl.java +++ b/src/com/engine/salary/sys/service/impl/SalarySysConfServiceImpl.java @@ -127,14 +127,14 @@ public class SalarySysConfServiceImpl extends Service implements SalarySysConfSe SalarySysConfPO orderPO = getSalarySysConfMapper().getOneByCode(ASCORDESC_CODE); OrderRuleVO orderRuleVO = OrderRuleVO.builder().build(); if (rulePO == null) { - orderRuleVO.setOrderRule(OrderRuleEnum.DSPORDER); + orderRuleVO.setOrderRule(OrderRuleEnum.DSPORDER.getValue()); } else { - orderRuleVO.setOrderRule(OrderRuleEnum.parseByValue(rulePO.getConfValue())); + orderRuleVO.setOrderRule(OrderRuleEnum.parseByValue(rulePO.getConfValue()).getValue()); } if (orderPO == null) { - orderRuleVO.setAscOrDesc(AscOrDescEnum.ASC); + orderRuleVO.setAscOrDesc(AscOrDescEnum.ASC.getValue()); } else { - orderRuleVO.setAscOrDesc(AscOrDescEnum.parseByValue(orderPO.getConfValue())); + orderRuleVO.setAscOrDesc(AscOrDescEnum.parseByValue(orderPO.getConfValue()).getValue()); } return orderRuleVO; } diff --git a/src/com/engine/salary/wrapper/SalaryArchiveItemWrapper.java b/src/com/engine/salary/wrapper/SalaryArchiveItemWrapper.java index 9955c31ba..fca2f61bd 100644 --- a/src/com/engine/salary/wrapper/SalaryArchiveItemWrapper.java +++ b/src/com/engine/salary/wrapper/SalaryArchiveItemWrapper.java @@ -163,7 +163,7 @@ public class SalaryArchiveItemWrapper extends Service implements SalaryArchiveIt * @return */ public String checkSaveSalaryItem(SalaryArchiveItemSaveParam saveParam) { - return getSalaryArchiveItemService(user).saveSalaryItem(saveParam); + return getSalaryArchiveItemService(user).checkSaveSalaryItem(saveParam); } /**