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

处理冲突

This commit is contained in:
钱涛 2024-12-11 11:07:36 +08:00
parent f94ab9c3be
commit b373f062c7
1 changed files with 3 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
src/com/engine/salary/wrapper/SalaryCommonWrapper.java
View File

@ -5,8 +5,6 @@ import com.engine.core.impl.Service;
import com.engine.salary.entity.browser.dto.BrowserDataDTO;
import com.engine.salary.entity.browser.param.BrowserDataQueryParam;
import com.engine.salary.entity.salaryitem.po.SalaryItemPO;
import com.engine.salary.entity.setting.param.PageListSettingQueryParam;
import com.engine.salary.entity.setting.param.PageListSettingSaveParam;
import com.engine.salary.entity.setting.dto.PageListTemplateDTO;
import com.engine.salary.entity.setting.dto.PageListTemplateDetailDTO;
import com.engine.salary.entity.setting.param.*;
@ -16,17 +14,13 @@ import com.engine.salary.service.SalarySobItemService;
import com.engine.salary.service.SettingService;
import com.engine.salary.service.impl.SalaryCacheServiceImpl;
import com.engine.salary.service.impl.SalarySobItemServiceImpl;
import com.engine.salary.service.impl.SettingServiceImpl;
import com.engine.salary.util.JsonUtil;
import com.engine.salary.util.page.PageInfo;
import com.engine.salary.util.page.SalaryPageUtil;
import org.apache.commons.lang3.StringUtils;
import com.engine.salary.service.impl.SettingServiceImpl;
import com.engine.salary.util.page.PageInfo;
import weaver.hrm.User;
import java.util.List;
import java.util.Map;
import java.util.List;
import java.util.Map;
import java.util.stream.Collectors;
@ -73,9 +67,6 @@ public class SalaryCommonWrapper extends Service {
return null;
}
public void savePageListSetting(PageListSettingSaveParam pageListSettingSaveParam) {
getSettingService(user).savePageListSetting(pageListSettingSaveParam);
public void savePageListSetting(PageListSettingSaveParam param) {
getSettingService(user).savePageListSetting(param);
}
@ -91,7 +82,7 @@ public class SalaryCommonWrapper extends Service {
public PageListTemplateDetailDTO getPageListTemplate(PageListTemplateQueryParam param) {
return getSettingService(user).getPageListTemplate(param);
return getSettingService(user).getPageListTemplate(param);
}
public List<PageListTemplatePO> getPageListTemplates(PageListTemplateQueryParam param) {
@ -107,7 +98,7 @@ public class SalaryCommonWrapper extends Service {
}
public void deletePageListTemplate(PageListTemplateDeleteParam param) {
getSettingService(user).deletePageListTemplate(param);
getSettingService(user).deletePageListTemplate(param);
}
public void changePageListTemplate(PageListTemplateChangeParam param) {