diff --git a/docs/表结构SQL/MySQL.sql b/docs/表结构SQL/MySQL.sql index e07ea392..9f0e7172 100644 --- a/docs/表结构SQL/MySQL.sql +++ b/docs/表结构SQL/MySQL.sql @@ -481,7 +481,7 @@ CREATE TABLE HR_LOG ( operate_desc varchar(100) NULL, operator_id int NULL, operator_name varchar(100) NULL, - create_time date NULL, + create_time datetime NULL, operate_type int NULL, params_str varchar(2000) NULL, client_ip varchar(100) NULL, @@ -494,3 +494,21 @@ CREATE TABLE HR_LOG ( value varchar(100) NULL, CONSTRAINT HR_LOG_PK PRIMARY KEY (id) ); + +create table JCL_ORG_HRMRELATION ( + id int not null, + scheme_id int null, + level_id varchar(100) null, + grade_id int null, + sequence_id int null, + post_id int null, + post_info_id int null, + company_id int null, + department_id int null, + job_id int null, + creator int null, + delete_type int null, + create_time datetime null, + update_time datetime null, + constraint JCL_ORG_HRMRELATION_PK primary key (id) +); diff --git a/docs/表结构SQL/Oracle.sql b/docs/表结构SQL/Oracle.sql index 600b39f1..57df152b 100644 --- a/docs/表结构SQL/Oracle.sql +++ b/docs/表结构SQL/Oracle.sql @@ -462,4 +462,22 @@ CREATE TABLE HR_LOG ( MESSAGE NVARCHAR2(2000) NULL, VALUE NVARCHAR2(100) NULL, CONSTRAINT HR_LOG_PK PRIMARY KEY (ID) -); \ No newline at end of file +); + +CREATE TABLE JCL_ORG_HRMRELATION ( + ID NUMBER NOT NULL, + SCHEME_ID NUMBER NULL, + LEVEL_ID NVARCHAR2(100) NULL, + GRADE_ID NUMBER NULL, + SEQUENCE_ID NUMBER NULL, + POST_ID NUMBER NULL, + POST_INFO_ID NUMBER NULL, + COMPANY_ID NUMBER NULL, + DEPARTMENT_ID NUMBER NULL, + JOB_ID NUMBER NULL, + CREATOR NUMBER NULL, + DELETE_TYPE NUMBER NULL, + CREATE_TIME DATE NULL, + UPDATE_TIME DATE NULL, + CONSTRAINT JCL_ORG_HRMRELATION_PK PRIMARY KEY (ID) +); diff --git a/docs/表结构SQL/SqlServer.sql b/docs/表结构SQL/SqlServer.sql index 04c850ba..f791ae5b 100644 --- a/docs/表结构SQL/SqlServer.sql +++ b/docs/表结构SQL/SqlServer.sql @@ -461,4 +461,22 @@ CREATE TABLE HR_LOG ( message varchar(2000) NULL, value varchar(100) NULL, CONSTRAINT HR_LOG_PK PRIMARY KEY (id) +); + +create table JCL_ORG_HRMRELATION ( + id int not null, + scheme_id int null, + level_id varchar(100) null, + grade_id int null, + sequence_id int null, + post_id int null, + post_info_id int null, + company_id int null, + department_id int null, + job_id int null, + creator int null, + delete_type int null, + create_time datetime null, + update_time datetime null, + constraint JCL_ORG_HRMRELATION_PK primary key (id) ); \ No newline at end of file diff --git a/src/com/engine/organization/entity/hrmresource/bo/HrmRelationBO.java b/src/com/engine/organization/entity/hrmresource/bo/HrmRelationBO.java new file mode 100644 index 00000000..d1bff0ba --- /dev/null +++ b/src/com/engine/organization/entity/hrmresource/bo/HrmRelationBO.java @@ -0,0 +1,29 @@ +package com.engine.organization.entity.hrmresource.bo; + +import com.engine.organization.entity.hrmresource.param.HrmRelationSaveParam; +import com.engine.organization.entity.hrmresource.po.HrmRelationPO; + +/** + * @author:dxfeng + * @createTime: 2022/07/11 + * @version: 1.0 + */ +public class HrmRelationBO { + public static HrmRelationPO convertSaveParamToPO(HrmRelationSaveParam saveParam) { + if (null == saveParam) { + return null; + } + return HrmRelationPO.builder() + .id(saveParam.getId()) + .schemeId(saveParam.getSchemeId()) + .levelId(saveParam.getLevelId()) + .gradeId(saveParam.getGradeId()) + .sequenceId(saveParam.getSequenceId()) + .postId(saveParam.getPostId()) + .postInfoId(saveParam.getPostInfoId()) + .companyId(saveParam.getCompanyId()) + .departmentId(saveParam.getDepartmentId()) + .jobId(saveParam.getJobId()) + .build(); + } +} diff --git a/src/com/engine/organization/entity/hrmresource/param/HrmRelationSaveParam.java b/src/com/engine/organization/entity/hrmresource/param/HrmRelationSaveParam.java new file mode 100644 index 00000000..04a0c1e4 --- /dev/null +++ b/src/com/engine/organization/entity/hrmresource/param/HrmRelationSaveParam.java @@ -0,0 +1,67 @@ +package com.engine.organization.entity.hrmresource.param; + +import lombok.AllArgsConstructor; +import lombok.Builder; +import lombok.Data; +import lombok.NoArgsConstructor; + +/** + * @author:dxfeng + * @createTime: 2022/07/11 + * @version: 1.0 + */ +@Data +@Builder +@AllArgsConstructor +@NoArgsConstructor +public class HrmRelationSaveParam { + /** + * 人员ID + */ + private Long id; + + /** + * 等级方案ID + */ + private Long schemeId; + + /** + * 职等ID + */ + private String levelId; + + /** + * 职级ID + */ + private Long gradeId; + + /** + * 岗位序列ID + */ + private Long sequenceId; + + /** + * 职务分类ID + */ + private Long postId; + + /** + * 职务信息ID + */ + private Long postInfoId; + + /** + * 分部ID + */ + private Long companyId; + + /** + * 部门ID + */ + private Long departmentId; + + /** + * 岗位ID + */ + private Long jobId; +} diff --git a/src/com/engine/organization/entity/hrmresource/po/HrmRelationPO.java b/src/com/engine/organization/entity/hrmresource/po/HrmRelationPO.java new file mode 100644 index 00000000..0e9c7899 --- /dev/null +++ b/src/com/engine/organization/entity/hrmresource/po/HrmRelationPO.java @@ -0,0 +1,75 @@ +package com.engine.organization.entity.hrmresource.po; + +import lombok.AllArgsConstructor; +import lombok.Builder; +import lombok.Data; +import lombok.NoArgsConstructor; + +import java.util.Date; + +/** + * @author:dxfeng + * @createTime: 2022/07/11 + * @version: 1.0 + */ +@Data +@Builder +@AllArgsConstructor +@NoArgsConstructor +public class HrmRelationPO { + /** + * 人员ID + */ + private Long id; + + /** + * 等级方案ID + */ + private Long schemeId; + + /** + * 职等ID + */ + private String levelId; + + /** + * 职级ID + */ + private Long gradeId; + + /** + * 岗位序列ID + */ + private Long sequenceId; + + /** + * 职务分类ID + */ + private Long postId; + + /** + * 职务信息ID + */ + private Long postInfoId; + + /** + * 分部ID + */ + private Long companyId; + + /** + * 部门ID + */ + private Long departmentId; + + /** + * 岗位ID + */ + private Long jobId; + + private Long creator; + private Integer deleteType; + private Date createTime; + private Date updateTime; + +} diff --git a/src/com/engine/organization/mapper/hrmresource/HrmRelationMapper.java b/src/com/engine/organization/mapper/hrmresource/HrmRelationMapper.java new file mode 100644 index 00000000..2d82fdd5 --- /dev/null +++ b/src/com/engine/organization/mapper/hrmresource/HrmRelationMapper.java @@ -0,0 +1,18 @@ +package com.engine.organization.mapper.hrmresource; + +import com.engine.organization.entity.hrmresource.po.HrmRelationPO; +import org.apache.ibatis.annotations.Param; + +/** + * @description: + * @author:dxfeng + * @createTime: 2022/05/20 + * @version: 1.0 + */ +public interface HrmRelationMapper { + HrmRelationPO getRelationById(@Param("id") Long id); + + int insertIgnoreNull(HrmRelationPO relationPO); + + int updateHrmRelation(HrmRelationPO relationPO); +} diff --git a/src/com/engine/organization/mapper/hrmresource/HrmRelationMapper.xml b/src/com/engine/organization/mapper/hrmresource/HrmRelationMapper.xml new file mode 100644 index 00000000..01b0b6f7 --- /dev/null +++ b/src/com/engine/organization/mapper/hrmresource/HrmRelationMapper.xml @@ -0,0 +1,158 @@ + + + + + + + + + + + + + + + + + + + + + + + + t + . + id + , t.scheme_id + , t.level_id + , t.grade_id + , t.sequence_id + , t.post_id + , t.post_info_id + , t.company_id + , t.department_id + , t.job_id + , t.creator + , t.delete_type + , t.create_time + , t.update_time + + + INSERT INTO jcl_org_hrmrelation + + + creator, + + + delete_type, + + + create_time, + + + update_time, + + + id, + + + scheme_id, + + + level_id, + + + grade_id, + + + sequence_id, + + + post_id, + + + post_info_id, + + + company_id, + + + department_id, + + + job_id, + + + + + #{creator}, + + + #{deleteType}, + + + #{createTime}, + + + #{updateTime}, + + + #{id}, + + + #{schemeId}, + + + #{levelId}, + + + #{gradeId}, + + + #{sequenceId}, + + + #{postId}, + + + #{postInfoId}, + + + #{companyId}, + + + #{departmentId}, + + + #{jobId}, + + + + + update jcl_org_hrmrelation + + update_time=#{updateTime}, + scheme_id=#{schemeId}, + level_id=#{levelId}, + grade_id=#{gradeId}, + sequence_id=#{sequenceId}, + post_id=#{postId}, + post_info_id=#{postInfoId}, + company_id=#{companyId}, + department_id=#{departmentId}, + job_id=#{jobId}, + + WHERE id = #{id} AND delete_type = 0 + + + + + \ No newline at end of file diff --git a/src/com/engine/organization/mapper/scheme/GradeMapper.java b/src/com/engine/organization/mapper/scheme/GradeMapper.java index 562aaee5..4e246948 100644 --- a/src/com/engine/organization/mapper/scheme/GradeMapper.java +++ b/src/com/engine/organization/mapper/scheme/GradeMapper.java @@ -2,10 +2,12 @@ package com.engine.organization.mapper.scheme; import com.engine.organization.entity.scheme.po.GradePO; +import org.apache.ibatis.annotations.MapKey; import org.apache.ibatis.annotations.Param; import java.util.Collection; import java.util.List; +import java.util.Map; /** * @Author dxfeng @@ -81,4 +83,8 @@ public interface GradeMapper { List listUsedId(); List getGradeNameByIds(@Param("ids") Collection ids); + + @MapKey("id") + List> listGradessByIds(@Param("ids") Collection ids); + } diff --git a/src/com/engine/organization/mapper/scheme/GradeMapper.xml b/src/com/engine/organization/mapper/scheme/GradeMapper.xml index 46b23399..7f26ef91 100644 --- a/src/com/engine/organization/mapper/scheme/GradeMapper.xml +++ b/src/com/engine/organization/mapper/scheme/GradeMapper.xml @@ -66,6 +66,17 @@ #{id} + update jcl_org_grade diff --git a/src/com/engine/organization/service/HrmResourceService.java b/src/com/engine/organization/service/HrmResourceService.java index 5c0193b3..f7a3ddc8 100644 --- a/src/com/engine/organization/service/HrmResourceService.java +++ b/src/com/engine/organization/service/HrmResourceService.java @@ -1,5 +1,6 @@ package com.engine.organization.service; +import com.engine.organization.entity.hrmresource.param.HrmRelationSaveParam; import com.engine.organization.entity.hrmresource.param.HrmResourceSearchParam; import com.engine.organization.entity.searchtree.SearchTreeParams; @@ -73,4 +74,25 @@ public interface HrmResourceService { * @return */ Map getHasRight(); + + /** + * 拓展表单 + */ + Map getTabForm(Map params); + + /** + * 新增拓展表单 + * + * @param params + * @return + */ + long saveTabForm(HrmRelationSaveParam params); + + /** + * 更新拓展表单 + * + * @param params + * @return + */ + long updateTabForm(HrmRelationSaveParam params); } diff --git a/src/com/engine/organization/service/impl/HrmResourceServiceImpl.java b/src/com/engine/organization/service/impl/HrmResourceServiceImpl.java index c58aa7aa..026ec1ac 100644 --- a/src/com/engine/organization/service/impl/HrmResourceServiceImpl.java +++ b/src/com/engine/organization/service/impl/HrmResourceServiceImpl.java @@ -1,5 +1,6 @@ package com.engine.organization.service.impl; +import com.api.browser.bean.BrowserBean; import com.api.browser.bean.SearchConditionGroup; import com.api.browser.bean.SearchConditionItem; import com.cloudstore.eccom.result.WeaResultMsg; @@ -12,7 +13,10 @@ import com.engine.organization.entity.company.po.CompPO; import com.engine.organization.entity.department.bo.DepartmentBO; import com.engine.organization.entity.department.po.DepartmentPO; import com.engine.organization.entity.extend.po.ExtendTitlePO; +import com.engine.organization.entity.hrmresource.bo.HrmRelationBO; +import com.engine.organization.entity.hrmresource.param.HrmRelationSaveParam; import com.engine.organization.entity.hrmresource.param.HrmResourceSearchParam; +import com.engine.organization.entity.hrmresource.po.HrmRelationPO; import com.engine.organization.entity.hrmresource.vo.ScHrmResourceVO; import com.engine.organization.entity.job.bo.JobBO; import com.engine.organization.entity.job.po.JobPO; @@ -21,7 +25,14 @@ import com.engine.organization.entity.searchtree.SearchTreeParams; import com.engine.organization.mapper.comp.CompMapper; import com.engine.organization.mapper.department.DepartmentMapper; import com.engine.organization.mapper.extend.ExtendTitleMapper; +import com.engine.organization.mapper.hrmresource.HrmRelationMapper; import com.engine.organization.mapper.job.JobMapper; +import com.engine.organization.mapper.post.PostInfoMapper; +import com.engine.organization.mapper.post.PostMapper; +import com.engine.organization.mapper.scheme.GradeMapper; +import com.engine.organization.mapper.scheme.LevelMapper; +import com.engine.organization.mapper.scheme.SchemeMapper; +import com.engine.organization.mapper.sequence.SequenceMapper; import com.engine.organization.service.ExtService; import com.engine.organization.service.HrmResourceService; import com.engine.organization.util.MenuBtn; @@ -39,6 +50,7 @@ import weaver.hrm.User; import java.util.*; import java.util.stream.Collectors; +import java.util.stream.Stream; /** * @author:dxfeng @@ -82,6 +94,34 @@ public class HrmResourceServiceImpl extends Service implements HrmResourceServic */ private static final String JCL_ORG_HRMEXT_DT1 = "JCL_ORG_HRMRESOURCEEXT_DT1"; + private SchemeMapper getSchemeMapper() { + return MapperProxyFactory.getProxy(SchemeMapper.class); + } + + private LevelMapper getLevelMapper() { + return MapperProxyFactory.getProxy(LevelMapper.class); + } + + private GradeMapper getGradeMapper() { + return MapperProxyFactory.getProxy(GradeMapper.class); + } + + private SequenceMapper getSequenceMapper() { + return MapperProxyFactory.getProxy(SequenceMapper.class); + } + + private PostMapper getPostMapper() { + return MapperProxyFactory.getProxy(PostMapper.class); + } + + private PostInfoMapper getPostInfoMapper() { + return MapperProxyFactory.getProxy(PostInfoMapper.class); + } + + private HrmRelationMapper getHrmRelationMapper() { + return MapperProxyFactory.getProxy(HrmRelationMapper.class); + } + private DepartmentMapper getDepartmentMapper() { return MapperProxyFactory.getProxy(DepartmentMapper.class); } @@ -102,6 +142,7 @@ public class HrmResourceServiceImpl extends Service implements HrmResourceServic return ServiceUtil.getService(ExtServiceImpl.class, user); } + @Override public Map getSearchTree(SearchTreeParams params) { String keyword = params.getKeyword(); @@ -243,6 +284,116 @@ public class HrmResourceServiceImpl extends Service implements HrmResourceServic return btnDatas; } + @Override + public Map getTabForm(Map params) { + String viewAttrStr = (String) params.get("viewAttr"); + OrganizationAssert.notBlank(viewAttrStr, "未指定操作类型，请确认"); + String id = Util.null2String(params.get("id")); + OrganizationAssert.notBlank(id, "数据有误，请确认"); + int viewAttr = Integer.parseInt(viewAttrStr); + Map apiDatas = new HashMap<>(); + List selectItems = new ArrayList<>(); + List addGroups = new ArrayList<>(); + SearchConditionItem schemeId = OrganizationFormItemUtil.browserItem(user, 2, 17, viewAttr, false, "等级方案", "161", "schemeId", "schemeBrowser"); + schemeId.setRules("required"); + SearchConditionItem gradeId = OrganizationFormItemUtil.browserItem(user, 2, 17, viewAttr, false, "职级", "161", "gradeId", "gradeBrowser"); + gradeId.setRules("required"); + SearchConditionItem levelId = OrganizationFormItemUtil.browserItem(user, 2, 17, viewAttr, false, "职等", "162", "levelId", "levelBrowser"); + levelId.setRules("required"); + SearchConditionItem sequenceId = OrganizationFormItemUtil.browserItem(user, 2, 17, viewAttr, false, "岗位序列", "161", "sequenceId", "sequenceBrowser"); + sequenceId.setRules("required"); + SearchConditionItem postId = OrganizationFormItemUtil.browserItem(user, 2, 17, viewAttr, false, "职务分类", "161", "postId", "postBrowser"); + postId.setRules("required"); + SearchConditionItem postInfoId = OrganizationFormItemUtil.browserItem(user, 2, 17, viewAttr, false, "职务信息", "161", "postInfoId", "postInfoBrowser"); + postInfoId.setRules("required"); + SearchConditionItem companyId = OrganizationFormItemUtil.browserItem(user, 2, 17, viewAttr, false, "分部", "161", "companyId", "compBrowser"); + companyId.setRules("required"); + SearchConditionItem departmentId = OrganizationFormItemUtil.browserItem(user, 2, 17, viewAttr, false, "部门", "161", "departmentId", "deptBrowser"); + departmentId.setRules("required"); + SearchConditionItem jobId = OrganizationFormItemUtil.browserItem(user, 2, 17, viewAttr, false, "岗位", "161", "jobId", "jobBrowser"); + jobId.setRules("required"); + + + // 编辑状态下赋值操作 + HrmRelationPO relationPO = getHrmRelationMapper().getRelationById(Long.parseLong(id)); + if (null != relationPO) { + setBrowserValue(schemeId, relationPO.getSchemeId(), getSchemeMapper().listSchemesByIds(Stream.of(relationPO.getSchemeId()).collect(Collectors.toList())), null, null); + setBrowserValue(gradeId, relationPO.getGradeId(), getGradeMapper().listGradessByIds(Stream.of(relationPO.getGradeId()).collect(Collectors.toList())), "scheme_id", relationPO.getSchemeId()); + setBrowserValue(levelId, relationPO.getLevelId(), getLevelMapper().listLevelsByIds(DeleteParam.builder().ids(relationPO.getLevelId()).build().getIds()), "grade_id", relationPO.getGradeId()); + setBrowserValue(sequenceId, relationPO.getSequenceId(), getSequenceMapper().listSequencesByIds(Stream.of(relationPO.getSequenceId()).collect(Collectors.toList())), "scheme_id", relationPO.getSchemeId()); + setBrowserValue(postId, relationPO.getPostId(), getPostMapper().listPostsByIds(Stream.of(relationPO.getPostId()).collect(Collectors.toList())), null, null); + setBrowserValue(postInfoId, relationPO.getPostInfoId(), getPostInfoMapper().listPostInfosByIds(Stream.of(relationPO.getPostInfoId()).collect(Collectors.toList())), "post_id", relationPO.getPostId()); + setBrowserValue(companyId, relationPO.getCompanyId(), getCompMapper().listCompsByIds(Stream.of(relationPO.getCompanyId()).collect(Collectors.toList())), null, null); + setBrowserValue(departmentId, relationPO.getDepartmentId(), getDepartmentMapper().listDeptsByIds(Stream.of(relationPO.getDepartmentId()).collect(Collectors.toList())), "comp_id", relationPO.getCompanyId()); + setBrowserValue(jobId, relationPO.getJobId(), getJobMapper().listJobsByIds(Stream.of(relationPO.getJobId()).collect(Collectors.toList())), "dept_id", relationPO.getDepartmentId()); + } + + selectItems.add(schemeId); + selectItems.add(gradeId); + selectItems.add(levelId); + selectItems.add(sequenceId); + selectItems.add(postId); + selectItems.add(postInfoId); + selectItems.add(companyId); + selectItems.add(departmentId); + selectItems.add(jobId); + addGroups.add(new SearchConditionGroup("基本信息", true, selectItems)); + HashMap buttonsMap = new HashMap<>(); + buttonsMap.put("hasEdit", true); + buttonsMap.put("hasSave", true); + apiDatas.put("buttons", buttonsMap); + apiDatas.put("conditions", addGroups); + return apiDatas; + } + + @Override + public long saveTabForm(HrmRelationSaveParam params) { + HrmRelationPO hrmRelationPO = HrmRelationBO.convertSaveParamToPO(params); + hrmRelationPO.setCreator((long) user.getUID()); + hrmRelationPO.setCreateTime(new Date()); + hrmRelationPO.setDeleteType(0); + getHrmRelationMapper().insertIgnoreNull(hrmRelationPO); + return hrmRelationPO.getId(); + } + + @Override + public long updateTabForm(HrmRelationSaveParam params) { + HrmRelationPO hrmRelationPO = HrmRelationBO.convertSaveParamToPO(params); + hrmRelationPO.setUpdateTime(new Date()); + getHrmRelationMapper().updateHrmRelation(hrmRelationPO); + return hrmRelationPO.getId(); + } + + /** + * 浏览按钮赋值 + * + * @param browserItem + * @param browserValue + * @param maps + */ + private void setBrowserValue(SearchConditionItem browserItem, Object browserValue, List> maps, String relateField, Object relatedValue) { + browserItem.setValue(browserValue); + BrowserBean browserBean = browserItem.getBrowserConditionParam(); + browserBean.setReplaceDatas(maps); + browserItem.setBrowserConditionParam(browserBean); + + if (StringUtils.isNotBlank(relateField) && 1 != browserItem.getViewAttr()) { + long l = System.currentTimeMillis(); + Map completeParams = browserBean.getCompleteParams(); + completeParams.put("currenttime", l); + completeParams.put(relateField + "_" + l, relatedValue); + Map conditionDataParams = browserBean.getConditionDataParams(); + conditionDataParams.put("currenttime", l); + conditionDataParams.put(relateField + "_" + l, relatedValue); + Map dataParams = browserBean.getDataParams(); + dataParams.put("currenttime", l); + dataParams.put(relateField + "_" + l, relatedValue); + Map destDataParams = browserBean.getDestDataParams(); + destDataParams.put("currenttime", l); + destDataParams.put(relateField + "_" + l, relatedValue); + } + } + /** * 查询条件 * diff --git a/src/com/engine/organization/web/HrmResourceController.java b/src/com/engine/organization/web/HrmResourceController.java index ef14a065..c9d101fd 100644 --- a/src/com/engine/organization/web/HrmResourceController.java +++ b/src/com/engine/organization/web/HrmResourceController.java @@ -4,6 +4,7 @@ import com.alibaba.fastjson.JSON; import com.alibaba.fastjson.JSONObject; import com.engine.common.util.ParamUtil; import com.engine.common.util.ServiceUtil; +import com.engine.organization.entity.hrmresource.param.HrmRelationSaveParam; import com.engine.organization.entity.hrmresource.param.HrmResourceSearchParam; import com.engine.organization.entity.searchtree.SearchTreeParams; import com.engine.organization.util.response.ReturnResult; @@ -67,7 +68,7 @@ public class HrmResourceController { HrmResourceSearchParam param = JSONObject.toJavaObject((JSON) JSONObject.toJSON(map), HrmResourceSearchParam.class); return ReturnResult.successed(getHrmResourceWrapper(user).listPage(param)); } catch (Exception e) { - return ReturnResult.exceptionHandle(e); + return ReturnResult.exceptionHandle(e); } } @@ -86,7 +87,7 @@ public class HrmResourceController { User user = HrmUserVarify.getUser(request, response); return ReturnResult.successed(getHrmResourceWrapper(user).getSaveForm()); } catch (Exception e) { - return ReturnResult.exceptionHandle(e); + return ReturnResult.exceptionHandle(e); } } @@ -105,7 +106,7 @@ public class HrmResourceController { User user = HrmUserVarify.getUser(request, response); return ReturnResult.successed(getHrmResourceWrapper(user).saveBaseForm(params)); } catch (Exception e) { - return ReturnResult.exceptionHandle(e); + return ReturnResult.exceptionHandle(e); } } @@ -125,7 +126,7 @@ public class HrmResourceController { Map map = ParamUtil.request2Map(request); return ReturnResult.successed(getHrmResourceWrapper(user).getBaseForm(map)); } catch (Exception e) { - return ReturnResult.exceptionHandle(e); + return ReturnResult.exceptionHandle(e); } } @@ -145,7 +146,7 @@ public class HrmResourceController { Map map = ParamUtil.request2Map(request); return ReturnResult.successed(getHrmResourceWrapper(user).updateForm(map)); } catch (Exception e) { - return ReturnResult.exceptionHandle(e); + return ReturnResult.exceptionHandle(e); } } @@ -165,7 +166,7 @@ public class HrmResourceController { Map map = ParamUtil.request2Map(request); return ReturnResult.successed(getHrmResourceWrapper(user).getSearchCondition(map)); } catch (Exception e) { - return ReturnResult.exceptionHandle(e); + return ReturnResult.exceptionHandle(e); } } @@ -184,7 +185,44 @@ public class HrmResourceController { User user = HrmUserVarify.getUser(request, response); return ReturnResult.successed(getHrmResourceWrapper(user).getHasRight()); } catch (Exception e) { - return ReturnResult.exceptionHandle(e); + return ReturnResult.exceptionHandle(e); + } + } + + @GET + @Path("/getTabForm") + @Produces(MediaType.APPLICATION_JSON) + public ReturnResult getTabForm(@Context HttpServletRequest request, @Context HttpServletResponse response) { + try { + User user = HrmUserVarify.getUser(request, response); + Map map = ParamUtil.request2Map(request); + return ReturnResult.successed(getHrmResourceWrapper(user).getTabForm(map)); + } catch (Exception e) { + return ReturnResult.exceptionHandle(e); + } + } + + @POST + @Path("/saveTabForm") + @Produces(MediaType.APPLICATION_JSON) + public ReturnResult saveTabForm(@Context HttpServletRequest request, @Context HttpServletResponse response, @RequestBody HrmRelationSaveParam params) { + try { + User user = HrmUserVarify.getUser(request, response); + return ReturnResult.successed(getHrmResourceWrapper(user).saveTabForm(params)); + } catch (Exception e) { + return ReturnResult.exceptionHandle(e); + } + } + + @POST + @Path("/updateTabForm") + @Produces(MediaType.APPLICATION_JSON) + public ReturnResult updateTabForm(@Context HttpServletRequest request, @Context HttpServletResponse response, @RequestBody HrmRelationSaveParam params) { + try { + User user = HrmUserVarify.getUser(request, response); + return ReturnResult.successed(getHrmResourceWrapper(user).updateTabForm(params)); + } catch (Exception e) { + return ReturnResult.exceptionHandle(e); } } } diff --git a/src/com/engine/organization/wrapper/HrmResourceWrapper.java b/src/com/engine/organization/wrapper/HrmResourceWrapper.java index 32c35df8..b31d1dbb 100644 --- a/src/com/engine/organization/wrapper/HrmResourceWrapper.java +++ b/src/com/engine/organization/wrapper/HrmResourceWrapper.java @@ -1,6 +1,7 @@ package com.engine.organization.wrapper; import com.engine.common.util.ServiceUtil; +import com.engine.organization.entity.hrmresource.param.HrmRelationSaveParam; import com.engine.organization.entity.hrmresource.param.HrmResourceSearchParam; import com.engine.organization.entity.searchtree.SearchTreeParams; import com.engine.organization.service.HrmResourceService; @@ -55,5 +56,16 @@ public class HrmResourceWrapper extends OrganizationWrapper { return getHrmResourceService(user).getHasRight(); } + public Map getTabForm(Map params) { + return getHrmResourceService(user).getTabForm(params); + } + + public long saveTabForm(HrmRelationSaveParam params) { + return getHrmResourceService(user).saveTabForm(params); + } + + public long updateTabForm(HrmRelationSaveParam params) { + return getHrmResourceService(user).updateTabForm(params); + } }