From d9bfd4d617275d2a831f5e4b006f2b7541a6c577 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=92=B1=E6=B6=9B?= <15850646081@163.com> Date: Thu, 4 Aug 2022 11:45:26 +0800 Subject: [PATCH] =?UTF-8?q?1=E3=80=81=E6=A1=A3=E6=A1=88=E6=8E=A5=E5=8F=A3?= =?UTF-8?q?=E5=A2=9E=E5=BC=BA=202=E3=80=81sql=E6=94=AF=E6=8C=81=E5=A4=A7?= =?UTF-8?q?=E5=86=99=203=E3=80=81=E5=90=88=E5=B9=B6=E8=AE=A1=E7=A8=8E?= =?UTF-8?q?=E6=90=9C=E7=B4=A2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../dto/SalaryArchiveItemFormDTO.java | 2 +- .../impl/SalaryFormulaServiceImpl.java | 3 + .../wrapper/SalaryArchiveItemWrapper.java | 3 +- .../proxy/SalaryArchiveItemWrapperProxy.java | 58 +++++++++++++++++++ 4 files changed, 64 insertions(+), 2 deletions(-) create mode 100644 src/com/engine/salary/wrapper/proxy/SalaryArchiveItemWrapperProxy.java 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")); + 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")); } //试运行公式 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); + + +}