qt
/
weaver-hrm-salary
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

薪资档案排序

This commit is contained in:
钱涛 2022-09-19 18:21:34 +08:00
parent bc1e874a1c
commit f678aa46d6
9 changed files with 50 additions and 62 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
src/com/engine/salary/biz/SalaryArchiveBiz.java
View File

@ -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<SalaryArchiveListDTO> listPage(SalaryArchiveQueryParam param) {
SqlSession sqlSession = MyBatisFactory.sqlSessionFactory.openSession();
try {
SalaryArchiveMapper mapper = sqlSession.getMapper(SalaryArchiveMapper.class);
SalaryPageUtil.start(param.getCurrent(), param.getPageSize());
List<SalaryArchiveListDTO> list = mapper.list(param);
PageInfo<SalaryArchiveListDTO> pageInfo = new PageInfo<SalaryArchiveListDTO>(list, SalaryArchiveListDTO.class);
return pageInfo;
} finally {
sqlSession.close();
}
}
public Collection<SalaryArchiveListDTO> 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<SalaryArchivePO> salaryArchiveSaves) {
if (CollectionUtils.isEmpty(salaryArchiveSaves)) {

21
src/com/engine/salary/common/BaseQueryParam.java
View File

@ -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;
}

4
src/com/engine/salary/entity/salaryarchive/param/SalaryArchiveQueryParam.java
View File

@ -61,8 +61,4 @@ public class SalaryArchiveQueryParam extends BaseQueryParam {
*/
private String archiveStatus;
/**
* 排序配置
*/
private String orderRule;
}

18
src/com/engine/salary/mapper/archive/SalaryArchiveMapper.xml
View File

@ -148,8 +148,10 @@
<if test="param.hiredate != null and param.hiredate.size() == 2">
AND (e.companystartdate BETWEEN #{param.hiredate[0]} AND #{param.hiredate[1]})
</if>
ORDER BY e.dspOrder
<!-- 排序 -->
<if test="param.orderRule != null">
ORDER BY #{param.orderRule.orderRule} #{param.orderRule.ascOrDesc}
</if>
</select>
<select id="list" resultType="com.engine.salary.entity.salaryarchive.dto.SalaryArchiveListDTO" databaseId="oracle">
SELECT
@ -204,8 +206,10 @@
<if test="param.hiredate != null and param.hiredate.size() == 2">
AND (e.companystartdate BETWEEN #{param.hiredate[0]} AND #{param.hiredate[1]})
</if>
ORDER BY e.dspOrder
<!-- 排序 -->
<if test="param.orderRule != null">
ORDER BY #{param.orderRule.orderRule} #{param.orderRule.ascOrDesc}
</if>
</select>
<select id="list" resultType="com.engine.salary.entity.salaryarchive.dto.SalaryArchiveListDTO"
databaseId="sqlserver">
@ -261,8 +265,10 @@
<if test="param.hiredate != null and param.hiredate.size() == 2">
AND (e.companystartdate BETWEEN #{param.hiredate[0]} AND #{param.hiredate[1]})
</if>
ORDER BY e.dspOrder
<!-- 排序 -->
<if test="param.orderRule != null">
ORDER BY #{param.orderRule.orderRule} #{param.orderRule.ascOrDesc}
</if>
</select>
<insert id="batchInsert">

12
src/com/engine/salary/service/impl/SalaryArchiveServiceImpl.java
View File

@ -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<Long, List<TaxAgentManageRangeEmployeeDTO.TaxAgentEmployee>> 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<SalaryArchiveListDTO> 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<TaxAgentPO> taxAgentList = getTaxAgentService(user).listAll();
//排序配置
OrderRuleVO orderRule = getSalarySysConfService(user).orderRule();
queryParam.setOrderRule(orderRule);
Collection<SalaryArchiveListDTO> salaryArchives = getSalaryArchiveMapper().list(queryParam);
//分权

6
src/com/engine/salary/sys/entity/vo/OrderRuleVO.java
View File

@ -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";
}

14
src/com/engine/salary/sys/enums/OrderRuleEnum.java
View File

@ -12,13 +12,13 @@ import org.apache.commons.lang3.StringUtils;
* @version 1.0
**/
public enum OrderRuleEnum implements BaseEnum<String> {
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;

8
src/com/engine/salary/sys/service/impl/SalarySysConfServiceImpl.java
View File

@ -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;
}

2
src/com/engine/salary/wrapper/SalaryArchiveItemWrapper.java
View File

@ -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);
}
/**