liang.cheng
/
weaver-hrm-organization
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

花名册修复

This commit is contained in:
Chengliang 2024-07-25 10:55:39 +08:00
parent 07b3bd5ae7
commit 710d6f5000
4 changed files with 13 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/com/engine/organization/service/HrmResourceService.java
View File

@ -133,7 +133,7 @@ public interface HrmResourceService {
* @param params
* @return
*/
Integer saveCustomTemplate(SearchTemplateParam params);
Map<String, Object> saveCustomTemplate(SearchTemplateParam params);
/**
* 批量修改保存定制列模板

15
src/com/engine/organization/service/impl/HrmResourceServiceImpl.java
View File

@ -351,14 +351,14 @@ public class HrmResourceServiceImpl extends Service implements HrmResourceServic
}
@Override
public Integer saveCustomTemplate(SearchTemplateParam params) {
public Map<String, Object> saveCustomTemplate(SearchTemplateParam params) {
// 重复名称校验
Map<String, Object> data = new HashMap<>();
SearchTemplatePO searchTemplateByName = getHrmResourceMapper().getCustomTemplateByName(user.getUID(), params.getShowname());
OrganizationAssert.isFalse("默认模板".equals(params.getShowname()) || null != searchTemplateByName, SystemEnv.getHtmlLabelName(547439, user.getLanguage()));
SearchTemplatePO templatePO = buildSearchTemplateByFields(params.getFields());
if (null == templatePO) {
return -1;
}
OrganizationAssert.notNull(templatePO,"模板存储失败");
templatePO.setName(params.getShowname());
templatePO.setCreator(user.getUID());
templatePO.setIsused("0");
@ -366,7 +366,12 @@ public class HrmResourceServiceImpl extends Service implements HrmResourceServic
templatePO.setUpdateTime(new Date());
templatePO.setOverall(0);
getHrmResourceMapper().insertCustomTemplate(templatePO);
return templatePO.getId();
Map<String, Object> param = new HashMap<>();
param.put("type","custom");
param.put("id",templatePO.getId());
data.put("result",getSearchTemplate(param));
return data;
}
@Override

3
src/com/engine/organization/web/HrmResourceController.java
View File

@ -286,8 +286,7 @@ public class HrmResourceController {
public ReturnResult saveCustomTemplate(@Context HttpServletRequest request, @Context HttpServletResponse response, @RequestBody SearchTemplateParam params) {
try {
User user = HrmUserVarify.getUser(request, response);
Integer templateId = getHrmResourceWrapper(user).saveCustomTemplate(params);
return ReturnResult.successed(user,Util.null2String(templateId));
return ReturnResult.successed(user,getHrmResourceWrapper(user).saveCustomTemplate(params));
} catch (Exception e) {
return ReturnResult.exceptionHandle(e);
}

2
src/com/engine/organization/wrapper/HrmResourceWrapper.java
View File

@ -91,7 +91,7 @@ public class HrmResourceWrapper extends OrganizationWrapper {
return getHrmResourceService(user).getSearchTemplate(params);
}
public Integer saveCustomTemplate(SearchTemplateParam params) {
public Map<String, Object> saveCustomTemplate(SearchTemplateParam params) {
return getHrmResourceService(user).saveCustomTemplate(params);
}