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

1、档案接口增强 

2、sql支持大写
3、合并计税搜索
This commit is contained in:
钱涛 2022-08-04 11:45:26 +08:00
parent 07614d318f
commit d9bfd4d617
4 changed files with 64 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/com/engine/salary/entity/salaryarchive/dto/SalaryArchiveItemFormDTO.java
View File

@ -19,7 +19,7 @@ import java.util.Map;
@Builder
@NoArgsConstructor
@AllArgsConstructor
//薪资项目调整")
//薪资项目调整
public class SalaryArchiveItemFormDTO {
//薪资档案id")

3
src/com/engine/salary/service/impl/SalaryFormulaServiceImpl.java
View File

@ -146,11 +146,14 @@ public class SalaryFormulaServiceImpl extends Service implements SalaryFormulaSe
//将select因XSS过滤造成的异常字符转换回来
param.setFormula(param.getFormula().replaceAll("ｓｅｌｅｃｔ", "select"));
param.setFormula(param.getFormula().replaceAll("ＳＥＬＥＣＴ", "select"));
param.setFormula(param.getFormula().replaceAll("ｊｏｉｎ", "join"));
param.setFormula(param.getFormula().replaceAll("ＪＯＩＮ ", "join"));
param.setFormula(param.getFormula().replaceAll("ａｎｄ", "and"));
param.setFormula(param.getFormula().replaceAll("ｏｒ", "or"));
param.setFormula(param.getFormula().replaceAll("ｉｎ", "in"));
param.setFormula(param.getFormula().replaceAll("ｌｉｋｅ", "like"));
param.setFormula(param.getFormula().replaceAll("ＬＩＫＥ ", "like"));
}
//试运行公式

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

@ -18,6 +18,7 @@ import com.engine.salary.service.SalaryArchiveItemService;
import com.engine.salary.service.impl.SalaryArchiveItemServiceImpl;
import com.engine.salary.util.SalaryI18nUtil;
import com.engine.salary.util.page.PageInfo;
import com.engine.salary.wrapper.proxy.SalaryArchiveItemWrapperProxy;
import com.google.common.collect.Lists;
import org.apache.commons.collections4.CollectionUtils;
import org.apache.poi.xssf.usermodel.XSSFWorkbook;
@ -36,7 +37,7 @@ import java.util.stream.Collectors;
* @version 1.0
**/
public class SalaryArchiveItemWrapper extends Service {
public class SalaryArchiveItemWrapper extends Service implements SalaryArchiveItemWrapperProxy {
private SalaryArchiveItemService getSalaryArchiveItemService(User user) {
return (SalaryArchiveItemService) ServiceUtil.getService(SalaryArchiveItemServiceImpl.class, user);

58
src/com/engine/salary/wrapper/proxy/SalaryArchiveItemWrapperProxy.java Normal file
View File

@ -0,0 +1,58 @@
package com.engine.salary.wrapper.proxy;
import com.engine.salary.entity.salaryarchive.dto.SalaryArchiveItemFormDTO;
import com.engine.salary.entity.salaryarchive.dto.SalaryItemAdjustRecordListDTO;
import com.engine.salary.entity.salaryarchive.dto.SingleSalaryItemAdjustRecordListDTO;
import com.engine.salary.entity.salaryarchive.param.SalaryArchiveItemSaveParam;
import com.engine.salary.entity.salaryarchive.param.SalaryItemAdjustRecordQueryParam;
import com.engine.salary.entity.salaryarchive.param.SingleSalaryItemAdjustRecordQueryParam;
import com.engine.salary.util.page.PageInfo;
public interface SalaryArchiveItemWrapperProxy {
SalaryArchiveItemFormDTO getSalaryItemForm(Long salaryArchiveId);
/**
* 通过薪资档案的薪资项目id获取薪资项目调整表单
*
* @param salaryArchiveItemId
* @return
*/
SalaryArchiveItemFormDTO getSalaryItemFormBySalaryArchiveItemId(Long salaryArchiveItemId);
/**
* 保存薪资项目调整
*
* @param saveParam
* @return
*/
String saveSalaryItem(SalaryArchiveItemSaveParam saveParam);
/**
* 删除薪资项目调整
*
* @param salaryArchiveItemId
* @return
*/
String deleteSalaryItem(Long salaryArchiveItemId);
/**
* 薪资项目调整记录列表
*
* @param queryParam
* @return
*/
PageInfo<SalaryItemAdjustRecordListDTO> adjustRecordList(SalaryItemAdjustRecordQueryParam queryParam);
/**
* 单个档案的薪资项目调整记录列表
*
* @param queryParam
* @return
*/
PageInfo<SingleSalaryItemAdjustRecordListDTO> singleSalaryItemAdjustRecordList(SingleSalaryItemAdjustRecordQueryParam queryParam);
}