diff --git a/src/com/engine/organization/mapper/scheme/LevelMapper.java b/src/com/engine/organization/mapper/scheme/LevelMapper.java index 2768a852..94bd12b5 100644 --- a/src/com/engine/organization/mapper/scheme/LevelMapper.java +++ b/src/com/engine/organization/mapper/scheme/LevelMapper.java @@ -59,4 +59,11 @@ public interface LevelMapper { * @param ids */ int deleteByIds(@Param("ids") Collection ids); + + /** + * 根据禁用标记统计 + * @param tag + * @return + */ + int getCountByTag(@Param("tag") int tag); } diff --git a/src/com/engine/organization/mapper/scheme/LevelMapper.xml b/src/com/engine/organization/mapper/scheme/LevelMapper.xml index 00ce54a7..8957a81c 100644 --- a/src/com/engine/organization/mapper/scheme/LevelMapper.xml +++ b/src/com/engine/organization/mapper/scheme/LevelMapper.xml @@ -41,6 +41,12 @@ from jcl_org_level t where level_no = #{levelNo} AND delete_type = 0 + update jcl_org_level diff --git a/src/com/engine/organization/service/impl/LevelServiceImpl.java b/src/com/engine/organization/service/impl/LevelServiceImpl.java index 8370861f..74b5a5d9 100644 --- a/src/com/engine/organization/service/impl/LevelServiceImpl.java +++ b/src/com/engine/organization/service/impl/LevelServiceImpl.java @@ -139,11 +139,16 @@ public class LevelServiceImpl extends Service implements LevelService { Map apiDatas = new HashMap<>(); List topTabs = new ArrayList<>(); topTabs.add(TopTab.builder().color("#000000").groupId("flowAll").showCount(true).title("全部").viewCondition("-1").build()); - topTabs.add(TopTab.builder().color("#ff3232").groupId("flowNew").showCount(true).title("启用").viewCondition("0").build()); - topTabs.add(TopTab.builder().color("#fea468").groupId("flowRes").showCount(true).title("禁用").viewCondition("1").build()); - apiDatas.put("topTabs",topTabs); + topTabs.add(TopTab.builder().color("#ff3232").groupId("enable").showCount(true).title("启用").viewCondition("0").build()); + topTabs.add(TopTab.builder().color("#fea468").groupId("disable").showCount(true).title("禁用").viewCondition("1").build()); + apiDatas.put("topTabs", topTabs); - apiDatas.put("topTabCount",topTabs); + HashMap countMap = new HashMap<>(); + countMap.put("flowAll", getLevelMapper().getCountByTag(-1)); + countMap.put("enable", getLevelMapper().getCountByTag(0)); + countMap.put("disable", getLevelMapper().getCountByTag(1)); + + apiDatas.put("topTabCount", countMap); return apiDatas; } diff --git a/src/com/engine/organization/web/LevelController.java b/src/com/engine/organization/web/LevelController.java index 1344761d..c360b03b 100644 --- a/src/com/engine/organization/web/LevelController.java +++ b/src/com/engine/organization/web/LevelController.java @@ -190,4 +190,16 @@ public class LevelController { return ReturnResult.exceptionHandle(e.getMessage()); } } + + @GET + @Path("/getTableInfo") + @Produces(MediaType.APPLICATION_JSON) + public ReturnResult getTableInfo(@Context HttpServletRequest request, @Context HttpServletResponse response) { + try { + User user = HrmUserVarify.getUser(request, response); + return ReturnResult.successed(getLevelWrapper(user).getTableInfo()); + } catch (Exception e) { + return ReturnResult.exceptionHandle(e.getMessage()); + } + } } diff --git a/src/com/engine/organization/wrapper/LevelWrapper.java b/src/com/engine/organization/wrapper/LevelWrapper.java index 1e490d3b..fa351099 100644 --- a/src/com/engine/organization/wrapper/LevelWrapper.java +++ b/src/com/engine/organization/wrapper/LevelWrapper.java @@ -99,4 +99,13 @@ public class LevelWrapper extends Service { public Map getTableBtn() { return getLevelService(user).getTableBtn(); } + + /** + * 获取列表tabs + * + * @return + */ + public Map getTableInfo() { + return getLevelService(user).getTableInfo(); + } }