diff --git a/src/com/engine/organization/service/GradeService.java b/src/com/engine/organization/service/GradeService.java index 93a63251..46a59c2c 100644 --- a/src/com/engine/organization/service/GradeService.java +++ b/src/com/engine/organization/service/GradeService.java @@ -78,4 +78,6 @@ public interface GradeService { */ Map getTabInfo(); + + String getLevelId(Long id); } diff --git a/src/com/engine/organization/service/impl/GradeServiceImpl.java b/src/com/engine/organization/service/impl/GradeServiceImpl.java index 8b1e6bbc..c07349ed 100644 --- a/src/com/engine/organization/service/impl/GradeServiceImpl.java +++ b/src/com/engine/organization/service/impl/GradeServiceImpl.java @@ -161,15 +161,19 @@ public class GradeServiceImpl extends Service implements GradeService { Map completeParams = levelBrowserBean.getCompleteParams(); completeParams.put("currenttime", l); completeParams.put("scheme_id_"+ l,gradePO.getSchemeId()); + completeParams.put("level_id_"+ l,"''"); Map conditionDataParams = levelBrowserBean.getConditionDataParams(); conditionDataParams.put("currenttime", l); conditionDataParams.put("scheme_id_"+ l,gradePO.getSchemeId()); + conditionDataParams.put("level_id_"+ l,"''"); Map dataParams = levelBrowserBean.getDataParams(); dataParams.put("currenttime", l); dataParams.put("scheme_id_"+ l,gradePO.getSchemeId()); + dataParams.put("level_id_"+ l,"''"); Map destDataParams = levelBrowserBean.getDestDataParams(); destDataParams.put("currenttime", l); destDataParams.put("scheme_id_"+ l,gradePO.getSchemeId()); + destDataParams.put("level_id_"+ l,"''"); levelBrowserItem.setBrowserConditionParam(levelBrowserBean); @@ -212,6 +216,11 @@ public class GradeServiceImpl extends Service implements GradeService { return apiDatas; } + @Override + public String getLevelId(Long id) { + return MapperProxyFactory.getProxy(GradeMapper.class).getGradeByID(id).getLevelId(); + } + /** * 查询条件 * diff --git a/src/com/engine/organization/web/GradeController.java b/src/com/engine/organization/web/GradeController.java index f0a7f34b..47cd7191 100644 --- a/src/com/engine/organization/web/GradeController.java +++ b/src/com/engine/organization/web/GradeController.java @@ -12,10 +12,7 @@ import weaver.hrm.User; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; -import javax.ws.rs.GET; -import javax.ws.rs.POST; -import javax.ws.rs.Path; -import javax.ws.rs.Produces; +import javax.ws.rs.*; import javax.ws.rs.core.Context; import javax.ws.rs.core.MediaType; import java.util.Map; @@ -205,4 +202,18 @@ public class GradeController { return ReturnResult.exceptionHandle(e); } } + + @GET + @Path("/getLevelId") + @Produces(MediaType.APPLICATION_JSON) + public ReturnResult getLevelId(@Context HttpServletRequest request, @Context HttpServletResponse response, + @QueryParam("id")Long id) { + try { + User user = HrmUserVarify.getUser(request, response); + return ReturnResult.successed(getGradeWrapper(user).getLevelId(id)); + } catch (Exception e) { + return ReturnResult.exceptionHandle(e); + } + } + } diff --git a/src/com/engine/organization/wrapper/GradeWrapper.java b/src/com/engine/organization/wrapper/GradeWrapper.java index 0cf8583b..2c0e5735 100644 --- a/src/com/engine/organization/wrapper/GradeWrapper.java +++ b/src/com/engine/organization/wrapper/GradeWrapper.java @@ -144,4 +144,9 @@ public class GradeWrapper extends OrganizationWrapper { public Map getTabInfo() { return getGradeService(user).getTabInfo(); } + + + public String getLevelId(Long id) { + return getGradeService(user).getLevelId(id); + } }