diff --git a/src/com/engine/salary/entity/salaryarchive/dto/SalaryArchiveItemFormDTO.java b/src/com/engine/salary/entity/salaryarchive/dto/SalaryArchiveItemFormDTO.java index 22d856fbf..441973350 100644 --- a/src/com/engine/salary/entity/salaryarchive/dto/SalaryArchiveItemFormDTO.java +++ b/src/com/engine/salary/entity/salaryarchive/dto/SalaryArchiveItemFormDTO.java @@ -19,7 +19,7 @@ import java.util.Map; @Builder @NoArgsConstructor @AllArgsConstructor -//薪资项目调整") +//薪资项目调整 public class SalaryArchiveItemFormDTO { //薪资档案id") diff --git a/src/com/engine/salary/service/impl/SalaryFormulaServiceImpl.java b/src/com/engine/salary/service/impl/SalaryFormulaServiceImpl.java index 972fb7dd0..cba68be38 100644 --- a/src/com/engine/salary/service/impl/SalaryFormulaServiceImpl.java +++ b/src/com/engine/salary/service/impl/SalaryFormulaServiceImpl.java @@ -146,11 +146,14 @@ public class SalaryFormulaServiceImpl extends Service implements SalaryFormulaSe //将select因XSS过滤造成的异常字符转换回来 param.setFormula(param.getFormula().replaceAll("select", "select")); + param.setFormula(param.getFormula().replaceAll("SELECT", "select")); param.setFormula(param.getFormula().replaceAll("join", "join")); + param.setFormula(param.getFormula().replaceAll("JOIN ", "join")); param.setFormula(param.getFormula().replaceAll("and", "and")); param.setFormula(param.getFormula().replaceAll("or", "or")); param.setFormula(param.getFormula().replaceAll("in", "in")); param.setFormula(param.getFormula().replaceAll("like", "like")); + param.setFormula(param.getFormula().replaceAll("LIKE ", "like")); } //试运行公式 diff --git a/src/com/engine/salary/wrapper/SalaryArchiveItemWrapper.java b/src/com/engine/salary/wrapper/SalaryArchiveItemWrapper.java index f8bd27072..75b612545 100644 --- a/src/com/engine/salary/wrapper/SalaryArchiveItemWrapper.java +++ b/src/com/engine/salary/wrapper/SalaryArchiveItemWrapper.java @@ -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); diff --git a/src/com/engine/salary/wrapper/proxy/SalaryArchiveItemWrapperProxy.java b/src/com/engine/salary/wrapper/proxy/SalaryArchiveItemWrapperProxy.java new file mode 100644 index 000000000..5dd2719b0 --- /dev/null +++ b/src/com/engine/salary/wrapper/proxy/SalaryArchiveItemWrapperProxy.java @@ -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 adjustRecordList(SalaryItemAdjustRecordQueryParam queryParam); + + /** + * 单个档案的薪资项目调整记录列表 + * + * @param queryParam + * @return + */ + PageInfo singleSalaryItemAdjustRecordList(SingleSalaryItemAdjustRecordQueryParam queryParam); + + +}